[coreboot-gerrit] Change in coreboot[master]: soc/intel/xeon_sp: Tidy up adding MADT ioapic entries

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47299 )

Change subject: soc/intel/xeon_sp: Tidy up adding MADT ioapic entries
......................................................................

soc/intel/xeon_sp: Tidy up adding MADT ioapic entries

Add a helper function to print out debug info and add the MADT entry.

Change-Id: I1a00f87c6edef530c5352929ee9279782be4b112
Signed-off-by: Arthur Heymans 
---
M src/soc/intel/xeon_sp/acpi.c
1 file changed, 14 insertions(+), 13 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/47299/1

diff --git a/src/soc/intel/xeon_sp/acpi.c b/src/soc/intel/xeon_sp/acpi.c
index acf030b..b7e20d4 100644
--- a/src/soc/intel/xeon_sp/acpi.c
+++ b/src/soc/intel/xeon_sp/acpi.c
@@ -72,6 +72,16 @@
    return current;
 }

+static unsigned long add_madt_ioapic(unsigned long current, int stack, int ioapic_id,
+				     uint32_t ioapic_base, int gsi_base)
+{
+	printk(BIOS_DEBUG, "Adding MADT IOAPIC for stack: %d, ioapic_id: 0x%x, "
+	       "ioapic_base: 0x%x, gsi_base: 0x%x\n",
+	       stack,  ioapic_id, ioapic_base, gsi_base);
+	return acpi_create_madt_ioapic((acpi_madt_ioapic_t *)current, ioapic_id,
+				       ioapic_base, gsi_base);
+}
+
 unsigned long acpi_fill_madt(unsigned long current)
 {
    int cur_index;
@@ -99,12 +109,8 @@
    	assert(cur_index < ARRAY_SIZE(gsi_bases));
    	int ioapic_id = ioapic_ids[cur_index];
    	int gsi_base = gsi_bases[cur_index];
-		printk(BIOS_DEBUG, "Adding MADT IOAPIC for stack: %d, ioapic_id: 0x%x, "
-			"ioapic_base: 0x%x, gsi_base: 0x%x\n",
-			stack,  ioapic_id, ri->IoApicBase, gsi_base);
-		current += acpi_create_madt_ioapic(
-			(acpi_madt_ioapic_t *)current,
-			ioapic_id, ri->IoApicBase, gsi_base);
+		current += add_madt_ioapic(current, stack, ioapic_id, ri->IoApicBase,
+					   gsi_base);
    	++cur_index;

/*
@@ -116,13 +122,8 @@
    		assert(cur_index < ARRAY_SIZE(gsi_bases));
    		ioapic_id = ioapic_ids[cur_index];
    		gsi_base = gsi_bases[cur_index];
-			printk(BIOS_DEBUG, "Adding MADT IOAPIC for stack: %d, ioapic_id: 0x%x, "
-				"ioapic_base: 0x%x, gsi_base: 0x%x\n",
-				stack,  ioapic_id,
-				ri->IoApicBase + 0x1000, gsi_base);
-			current += acpi_create_madt_ioapic(
-				(acpi_madt_ioapic_t *)current,
-				ioapic_id, ri->IoApicBase + 0x1000, gsi_base);
+			current += add_madt_ioapic(current, stack, ioapic_id,
+						   ri->IoApicBase + 0x1000, gsi_base);
    		++cur_index;
    	}
    }