sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/amd,google: unify fch_irq_routing struct instance name

Browse Source 
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>
This commit is contained in:
Felix Held
2022-10-25 23:30:43 +02:00
parent ce934056df
commit 067f703329
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/amd/bilby/mainboard.c
View File

@@ -31,7 +31,7 @@
static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES]; static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES];
static uint8_t fch_apic_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_A, 8, 16 },
{ PIRQ_B, 10, 17 }, { PIRQ_B, 10, 17 },
{ PIRQ_C, 11, 18 }, { PIRQ_C, 11, 18 },
@@ -64,8 +64,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(bilby_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = bilby_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/amd/birman/mainboard.c
View File

@@ -31,7 +31,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
* 8: rtc0 <- soc/amd/common/acpi/lpc.asl * 8: rtc0 <- soc/amd/common/acpi/lpc.asl
* 9: acpi <- 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_A, 12, PIRQ_NC },
{ PIRQ_B, 14, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC },
{ PIRQ_C, 15, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC },
@@ -68,8 +68,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(birman_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = birman_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/amd/chausie/mainboard.c
View File

@@ -29,7 +29,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
* 8: rtc0 <- soc/amd/common/acpi/lpc.asl * 8: rtc0 <- soc/amd/common/acpi/lpc.asl
* 9: acpi <- 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_A, 12, PIRQ_NC },
{ PIRQ_B, 14, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC },
{ PIRQ_C, 15, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC },
@@ -66,8 +66,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(chausie_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = chausie_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/amd/majolica/mainboard.c
View File

@@ -28,7 +28,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
* 8: rtc0 <- soc/amd/common/acpi/lpc.asl * 8: rtc0 <- soc/amd/common/acpi/lpc.asl
* 9: acpi <- 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_A, 12, PIRQ_NC },
{ PIRQ_B, 14, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC },
{ PIRQ_C, 15, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC },
@@ -66,8 +66,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(majolica_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = majolica_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/amd/mandolin/mainboard.c
View File

@@ -26,7 +26,7 @@
static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES]; static uint8_t fch_pic_routing[FCH_IRQ_ROUTING_ENTRIES];
static uint8_t fch_apic_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_A, 8, 16 },
{ PIRQ_B, 10, 17 }, { PIRQ_B, 10, 17 },
{ PIRQ_C, 11, 18 }, { PIRQ_C, 11, 18 },
@@ -59,8 +59,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(mandolin_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = mandolin_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/google/guybrush/mainboard.c
View File

@@ -44,7 +44,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
* 8: rtc0 <- soc/amd/common/acpi/lpc.asl * 8: rtc0 <- soc/amd/common/acpi/lpc.asl
* 9: acpi <- 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_A, 12, PIRQ_NC },
{ PIRQ_B, 14, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC },
{ PIRQ_C, 15, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC },
@@ -82,8 +82,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(guybrush_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = guybrush_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/google/skyrim/mainboard.c
View File

@@ -31,7 +31,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
* 9: acpi <- soc/amd/common/acpi/lpc.asl * 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_A, 12, PIRQ_NC },
{ PIRQ_B, 14, PIRQ_NC }, { PIRQ_B, 14, PIRQ_NC },
{ PIRQ_C, 15, PIRQ_NC }, { PIRQ_C, 15, PIRQ_NC },
@@ -68,8 +68,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(skyrim_fch); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = skyrim_fch + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }

6
src/mainboard/google/zork/mainboard.c
View File

@@ -53,7 +53,7 @@ static uint8_t fch_apic_routing[FCH_IRQ_ROUTING_ENTRIES];
* 9: acpi <- soc/amd/common/acpi/lpc.asl * 9: acpi <- soc/amd/common/acpi/lpc.asl
* 12: i8042 <- ec/google/chromeec/acpi/superio.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_A, 6, PIRQ_NC },
{ PIRQ_B, 13, PIRQ_NC }, { PIRQ_B, 13, PIRQ_NC },
{ PIRQ_C, 14, PIRQ_NC }, { PIRQ_C, 14, PIRQ_NC },
@@ -86,8 +86,8 @@ static void init_tables(void)
memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing)); memset(fch_pic_routing, PIRQ_NC, sizeof(fch_pic_routing));
memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing)); memset(fch_apic_routing, PIRQ_NC, sizeof(fch_apic_routing));
for (i = 0; i < ARRAY_SIZE(fch_pirq); i++) { for (i = 0; i < ARRAY_SIZE(fch_irq_map); i++) {
entry = fch_pirq + i; entry = fch_irq_map + i;
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; fch_pic_routing[entry->intr_index] = entry->pic_irq_num;
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; fch_apic_routing[entry->intr_index] = entry->apic_irq_num;
} }