[M] Change in coreboot[master]: mb/amd,google: unify fch_irq_routing struct instance name - coreboot-gerrit

27 Oct 2022

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/68846 )
Change subject: mb/amd,google: unify fch_irq_routing struct instance name
......................................................................
mb/amd,google: unify fch_irq_routing struct instance name
Use the same fch_irq_map name in all mainboards using the Picasso,
Cezanne, Mendocino and Morgana instead of using a mainboard-specific
name.
Signed-off-by: Felix Held felix-coreboot@felixheld.de
Change-Id: I035cffb9c6c8afd6bd115831e8eed4a395e2a7fc
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68846
Tested-by: build bot (Jenkins) no-reply@coreboot.org
Reviewed-by: Fred Reitberger reitbergerfred@gmail.com
---
M src/mainboard/amd/bilby/mainboard.c
M src/mainboard/amd/birman/mainboard.c
M src/mainboard/amd/chausie/mainboard.c
M src/mainboard/amd/majolica/mainboard.c
M src/mainboard/amd/mandolin/mainboard.c
M src/mainboard/google/guybrush/mainboard.c
M src/mainboard/google/skyrim/mainboard.c
M src/mainboard/google/zork/mainboard.c
8 files changed, 41 insertions(+), 24 deletions(-)
Approvals:
  build bot (Jenkins): Verified
  Fred Reitberger: Looks good to me, approved

diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c
index c931053..c594a90 100644
--- a/src/mainboard/amd/bilby/mainboard.c
+++ b/src/mainboard/amd/bilby/mainboard.c
@@ -31,7 +31,7 @@
 static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES];
 static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
-static const struct fch_irq_routing bilby_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	8,		16 },
    { PIRQ_B,	10,		17 },
    { PIRQ_C,	11,		18 },
@@ -64,8 +64,8 @@
    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(bilby_fch); i++) {
-		entry = bilby_fch + i;
+	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;
    }
diff --git a/src/mainboard/amd/birman/mainboard.c b/src/mainboard/amd/birman/mainboard.c
index 8b27e37..4c641f5 100644
--- a/src/mainboard/amd/birman/mainboard.c
+++ b/src/mainboard/amd/birman/mainboard.c
@@ -31,7 +31,7 @@
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing birman_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	12,		PIRQ_NC },
    { PIRQ_B,	14,		PIRQ_NC },
    { PIRQ_C,	15,		PIRQ_NC },
@@ -68,8 +68,8 @@
    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(birman_fch); i++) {
-		entry = birman_fch + i;
+	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;
    }
diff --git a/src/mainboard/amd/chausie/mainboard.c b/src/mainboard/amd/chausie/mainboard.c
index 0318e43..c014236 100644
--- a/src/mainboard/amd/chausie/mainboard.c
+++ b/src/mainboard/amd/chausie/mainboard.c
@@ -29,7 +29,7 @@
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing chausie_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	12,		PIRQ_NC },
    { PIRQ_B,	14,		PIRQ_NC },
    { PIRQ_C,	15,		PIRQ_NC },
@@ -66,8 +66,8 @@
    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(chausie_fch); i++) {
-		entry = chausie_fch + i;
+	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;
    }
diff --git a/src/mainboard/amd/majolica/mainboard.c b/src/mainboard/amd/majolica/mainboard.c
index 32b29e4..31ac515 100644
--- a/src/mainboard/amd/majolica/mainboard.c
+++ b/src/mainboard/amd/majolica/mainboard.c
@@ -28,7 +28,7 @@
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing majolica_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	12,		PIRQ_NC },
    { PIRQ_B,	14,		PIRQ_NC },
    { PIRQ_C,	15,		PIRQ_NC },
@@ -66,8 +66,8 @@
    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(majolica_fch); i++) {
-		entry = majolica_fch + i;
+	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;
    }
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index 43fa415..6c4e545 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -26,7 +26,7 @@
 static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES];
 static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
-static const struct fch_irq_routing mandolin_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	8,		16 },
    { PIRQ_B,	10,		17 },
    { PIRQ_C,	11,		18 },
@@ -59,8 +59,8 @@
    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(mandolin_fch); i++) {
-		entry = mandolin_fch + i;
+	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;
    }
diff --git a/src/mainboard/google/guybrush/mainboard.c b/src/mainboard/google/guybrush/mainboard.c
index d3a45c1..150835c 100644
--- a/src/mainboard/google/guybrush/mainboard.c
+++ b/src/mainboard/google/guybrush/mainboard.c
@@ -44,7 +44,7 @@
  *  8: rtc0 <- soc/amd/common/acpi/lpc.asl
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing guybrush_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	12,		PIRQ_NC },
    { PIRQ_B,	14,		PIRQ_NC },
    { PIRQ_C,	15,		PIRQ_NC },
@@ -82,8 +82,8 @@
    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(guybrush_fch); i++) {
-		entry = guybrush_fch + i;
+	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;
    }
diff --git a/src/mainboard/google/skyrim/mainboard.c b/src/mainboard/google/skyrim/mainboard.c
index 3ddcf42..0469c59 100644
--- a/src/mainboard/google/skyrim/mainboard.c
+++ b/src/mainboard/google/skyrim/mainboard.c
@@ -31,7 +31,7 @@
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  */
-static const struct fch_irq_routing skyrim_fch[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	12,		PIRQ_NC },
    { PIRQ_B,	14,		PIRQ_NC },
    { PIRQ_C,	15,		PIRQ_NC },
@@ -68,8 +68,8 @@
    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(skyrim_fch); i++) {
-		entry = skyrim_fch + i;
+	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;
    }
diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c
index bab79b4..a925851 100644
--- a/src/mainboard/google/zork/mainboard.c
+++ b/src/mainboard/google/zork/mainboard.c
@@ -53,7 +53,7 @@
  *  9: acpi <- soc/amd/common/acpi/lpc.asl
  * 12: i8042 <- ec/google/chromeec/acpi/superio.asl
  */
-static const struct fch_irq_routing fch_pirq[] = {
+static const struct fch_irq_routing fch_irq_map[] = {
    { PIRQ_A,	6,		PIRQ_NC },
    { PIRQ_B,	13,		PIRQ_NC },
    { PIRQ_C,	14,		PIRQ_NC },
@@ -86,8 +86,8 @@
    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_pirq); i++) {
-		entry = fch_pirq + i;
+	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;
    }
-- 
To view, visit https://review.coreboot.org/c/coreboot/+/68846
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I035cffb9c6c8afd6bd115831e8eed4a395e2a7fc
Gerrit-Change-Number: 68846
Gerrit-PatchSet: 2
Gerrit-Owner: Felix Held felix-coreboot@felixheld.de
Gerrit-Reviewer: Felix Held felix-coreboot@felixheld.de
Gerrit-Reviewer: Fred Reitberger reitbergerfred@gmail.com
Gerrit-Reviewer: Jason Glenesk jason.glenesk@gmail.com
Gerrit-Reviewer: Jason Nien jason.nien@amd.corp-partner.google.com
Gerrit-Reviewer: Martin Roth martin.roth@amd.corp-partner.google.com
Gerrit-Reviewer: build bot (Jenkins) no-reply@coreboot.org
Gerrit-MessageType: merged



    