GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/amd/bilby,birman,chausie,majolica: rework FCH IRQ mapping generation 

This ports the changes to the way the fch_pic_routing and
fch_apic_routing arrays get populated from Mandolin to Bilby, Birman,
Chausie and Majolica. 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 <felix-coreboot@felixheld.de>
Change-Id: Ia957056b60dafbc52a9809a4563a348ad7443376
Reviewed-on: https://review.coreboot.org/c/coreboot/+/68849
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:40:39 +02:00
parent ec69bdcd2f
commit 166932c5c0
4 changed files with 83 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,18 +56,32 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_MISC2, 0x00, 0x00 }, { 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) static void init_tables(void)
{ {
const struct fch_irq_routing *entry; const struct fch_irq_routing *mb_irq_map;
int i; 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_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_irq_map); i++) { for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
entry = fch_irq_map + i; if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; printk(BIOS_WARNING,
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; "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;
} }
} }

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

@ -2,6 +2,7 @@
#include <amdblocks/amd_pci_util.h> #include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <string.h> #include <string.h>
@ -60,18 +61,32 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_HPET_H, 0x00, 0x00 }, { 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) static void init_tables(void)
{ {
const struct fch_irq_routing *entry; const struct fch_irq_routing *mb_irq_map;
int i; 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_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_irq_map); i++) { for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
entry = fch_irq_map + i; if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; printk(BIOS_WARNING,
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; "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;
} }
} }

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

@ -2,6 +2,7 @@
#include <amdblocks/amd_pci_util.h> #include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <string.h> #include <string.h>
@ -58,18 +59,32 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_HPET_H, 0x00, 0x00 }, { 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) static void init_tables(void)
{ {
const struct fch_irq_routing *entry; const struct fch_irq_routing *mb_irq_map;
int i; 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_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_irq_map); i++) { for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
entry = fch_irq_map + i; if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; printk(BIOS_WARNING,
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; "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;
} }
} }

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

@ -2,6 +2,7 @@
#include <amdblocks/amd_pci_util.h> #include <amdblocks/amd_pci_util.h>
#include <commonlib/helpers.h> #include <commonlib/helpers.h>
#include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <soc/acpi.h> #include <soc/acpi.h>
#include <string.h> #include <string.h>
@ -58,18 +59,32 @@ static const struct fch_irq_routing fch_irq_map[] = {
{ PIRQ_HPET_H, 0x00, 0x00 }, { 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) static void init_tables(void)
{ {
const struct fch_irq_routing *entry; const struct fch_irq_routing *mb_irq_map;
int i; 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_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_irq_map); i++) { for (i = 0; i < mb_fch_irq_mapping_table_size; i++) {
entry = fch_irq_map + i; if (mb_irq_map[i].intr_index >= FCH_IRQ_ROUTING_ENTRIES) {
fch_pic_routing[entry->intr_index] = entry->pic_irq_num; printk(BIOS_WARNING,
fch_apic_routing[entry->intr_index] = entry->apic_irq_num; "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;
} }
} }