[M] Change in coreboot[master]: mb/google/guybrush,skyrim,zork: rework FCH IRQ mapping table generation

[Felix Held (Code Review)]

Attention is currently required from: Jason Nien, Martin Roth.

Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/68850 )

Change subject: mb/google/guybrush,skyrim,zork: rework FCH IRQ mapping table generation
......................................................................

mb/google/guybrush,skyrim,zork: rework FCH IRQ mapping table generation

This ports the changes to the way the fch_pic_routing and
fch_apic_routing arrays get populated from Mandolin to Guybrush, Skyrim
and Zork. This is a preparation to move the init_tables implementation
to the common AMD SoC code in a later patch.

Signed-off-by: Felix Held 
Change-Id: Ie550238dfa0d4c7cebe849966d40fa0b1984a0f6
---
M src/mainboard/google/guybrush/mainboard.c
M src/mainboard/google/skyrim/mainboard.c
M src/mainboard/google/zork/mainboard.c
3 files changed, 75 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/68850/1

diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c
index 150835c..8deb2ac 100644
--- a/src/mainboard/google/guybrush/mainboard.c
+++ b/src/mainboard/google/guybrush/mainboard.c
@@ -74,18 +74,32 @@
    { PIRQ_HPET_H,	0x00,		0x00 },
 };

+static const struct fch_irq_routing *mb_get_fch_irq_mapping(size_t *length)
+{
+	*length = ARRAY_SIZE(fch_irq_map);
+	return fch_irq_map;
+}
+
 static void init_tables(void)
 {
-	const struct fch_irq_routing *entry;
-	int i;
+	const struct fch_irq_routing *mb_irq_map;
+	size_t mb_fch_irq_mapping_table_size;
+	size_t i;
+
+	mb_irq_map = mb_get_fch_irq_mapping(&mb_fch_irq_mapping_table_size);

memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
    memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));

-	for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
-		entry = fch_irq_map + i;
-		fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
-		fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
+	for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
+		if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
+			printk(BIOS_WARNING,
+			       "Invalid IRQ index %u in FCH IRQ routing table entry %zu\n",
+			       mb_irq_map[i].intr_index, i);
+			continue;
+		}
+		fch_pic_routing[mb_irq_map[i].intr_index] = mb_irq_map[i].pic_irq_num;
+		fch_apic_routing[mb_irq_map[i].intr_index] = mb_irq_map[i].apic_irq_num;
    }
 }

diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c
index 0469c59..ca3c9aa 100644
--- a/src/mainboard/google/skyrim/mainboard.c
+++ b/src/mainboard/google/skyrim/mainboard.c
@@ -60,18 +60,32 @@
    { PIRQ_HPET_H,	0x00,		0x00 },
 };

+static const struct fch_irq_routing *mb_get_fch_irq_mapping(size_t *length)
+{
+	*length = ARRAY_SIZE(fch_irq_map);
+	return fch_irq_map;
+}
+
 static void init_tables(void)
 {
-	const struct fch_irq_routing *entry;
-	int i;
+	const struct fch_irq_routing *mb_irq_map;
+	size_t mb_fch_irq_mapping_table_size;
+	size_t i;
+
+	mb_irq_map = mb_get_fch_irq_mapping(&mb_fch_irq_mapping_table_size);

memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
    memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));

-	for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
-		entry = fch_irq_map + i;
-		fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
-		fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
+	for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
+		if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
+			printk(BIOS_WARNING,
+			       "Invalid IRQ index %u in FCH IRQ routing table entry %zu\n",
+			       mb_irq_map[i].intr_index, i);
+			continue;
+		}
+		fch_pic_routing[mb_irq_map[i].intr_index] = mb_irq_map[i].pic_irq_num;
+		fch_apic_routing[mb_irq_map[i].intr_index] = mb_irq_map[i].apic_irq_num;
    }
 }

diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c
index a925851..aaa2548 100644
--- a/src/mainboard/google/zork/mainboard.c
+++ b/src/mainboard/google/zork/mainboard.c
@@ -78,18 +78,32 @@
    { PIRQ_MISC2,	0x00,		0x00 },
 };

+static const struct fch_irq_routing *mb_get_fch_irq_mapping(size_t *length)
+{
+	*length = ARRAY_SIZE(fch_irq_map);
+	return fch_irq_map;
+}
+
 static void init_tables(void)
 {
-	const struct fch_irq_routing *entry;
-	int i;
+	const struct fch_irq_routing *mb_irq_map;
+	size_t mb_fch_irq_mapping_table_size;
+	size_t i;
+
+	mb_irq_map = mb_get_fch_irq_mapping(&mb_fch_irq_mapping_table_size);

memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
    memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));

-	for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
-		entry = fch_irq_map + i;
-		fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
-		fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
+	for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
+		if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
+			printk(BIOS_WARNING,
+			       "Invalid IRQ index %u in FCH IRQ routing table entry %zu\n",
+			       mb_irq_map[i].intr_index, i);
+			continue;
+		}
+		fch_pic_routing[mb_irq_map[i].intr_index] = mb_irq_map[i].pic_irq_num;
+		fch_apic_routing[mb_irq_map[i].intr_index] = mb_irq_map[i].apic_irq_num;
    }
 }