summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mainboard/asus/kcma-d8/get_bus_conf.c14
-rw-r--r--src/mainboard/asus/kcma-d8/irq_tables.c5
-rw-r--r--src/mainboard/asus/kcma-d8/mptable.c2
-rw-r--r--src/mainboard/asus/kgpe-d16/get_bus_conf.c14
-rw-r--r--src/mainboard/asus/kgpe-d16/irq_tables.c6
-rw-r--r--src/mainboard/asus/kgpe-d16/mptable.c2
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c13
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/irq_tables.c5
-rw-r--r--src/mainboard/supermicro/h8scm_fam10/mptable.c3
9 files changed, 10 insertions, 54 deletions
diff --git a/src/mainboard/asus/kcma-d8/get_bus_conf.c b/src/mainboard/asus/kcma-d8/get_bus_conf.c
index af893914f8..03a8415cfc 100644
--- a/src/mainboard/asus/kcma-d8/get_bus_conf.c
+++ b/src/mainboard/asus/kcma-d8/get_bus_conf.c
@@ -25,7 +25,6 @@
/* Global variables for MB layouts and these will be shared by irqtable mptable
* and acpi_tables busnum is default.
*/
-u8 bus_sp5100[2];
u32 apicid_sp5100;
/*
@@ -50,7 +49,6 @@ u32 hcdnx[] = {
void get_bus_conf(void)
{
u32 apicid_base;
- struct device *dev;
int i;
sysconf.hc_possible_num = ARRAY_SIZE(pci1234x);
@@ -63,17 +61,7 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
- for (i = 0; i < 2; i++) {
- bus_sp5100[i] = 0;
- }
-
- bus_sp5100[0] = (sysconf.pci1234[0] >> 16) & 0xff;
-
- /* sp5100 */
- dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4));
- if (dev) {
- bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
+ pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
/* I/O APICs: APIC ID Version State Address */
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
diff --git a/src/mainboard/asus/kcma-d8/irq_tables.c b/src/mainboard/asus/kcma-d8/irq_tables.c
index df6dae06cc..06e842a09b 100644
--- a/src/mainboard/asus/kcma-d8/irq_tables.c
+++ b/src/mainboard/asus/kcma-d8/irq_tables.c
@@ -60,7 +60,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
pirq_info->rfu = rfu;
}
-extern u8 bus_sp5100[2];
unsigned long write_pirq_routing_table(unsigned long addr)
{
@@ -86,7 +85,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION;
/* Where the interrupt router resides */
- pirq->rtr_bus = bus_sp5100[0];
+ pirq->rtr_bus = pirq_router_bus;
pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
pirq->exclusive_irqs = 0;
@@ -102,7 +101,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sp5100[0],
+ write_pirq_info(pirq_info, pirq_router_bus,
PCI_DEVFN(0x14, 4), LNKA, IRQBM, LNKB,
IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0);
pirq_info++;
diff --git a/src/mainboard/asus/kcma-d8/mptable.c b/src/mainboard/asus/kcma-d8/mptable.c
index 68b90b0877..44ba1567ae 100644
--- a/src/mainboard/asus/kcma-d8/mptable.c
+++ b/src/mainboard/asus/kcma-d8/mptable.c
@@ -21,8 +21,6 @@
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-extern u8 bus_sp5100[2];
-
extern u32 apicid_sp5100;
diff --git a/src/mainboard/asus/kgpe-d16/get_bus_conf.c b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
index af893914f8..03a8415cfc 100644
--- a/src/mainboard/asus/kgpe-d16/get_bus_conf.c
+++ b/src/mainboard/asus/kgpe-d16/get_bus_conf.c
@@ -25,7 +25,6 @@
/* Global variables for MB layouts and these will be shared by irqtable mptable
* and acpi_tables busnum is default.
*/
-u8 bus_sp5100[2];
u32 apicid_sp5100;
/*
@@ -50,7 +49,6 @@ u32 hcdnx[] = {
void get_bus_conf(void)
{
u32 apicid_base;
- struct device *dev;
int i;
sysconf.hc_possible_num = ARRAY_SIZE(pci1234x);
@@ -63,17 +61,7 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
- for (i = 0; i < 2; i++) {
- bus_sp5100[i] = 0;
- }
-
- bus_sp5100[0] = (sysconf.pci1234[0] >> 16) & 0xff;
-
- /* sp5100 */
- dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4));
- if (dev) {
- bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
+ pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
/* I/O APICs: APIC ID Version State Address */
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
diff --git a/src/mainboard/asus/kgpe-d16/irq_tables.c b/src/mainboard/asus/kgpe-d16/irq_tables.c
index df6dae06cc..0819dee09e 100644
--- a/src/mainboard/asus/kgpe-d16/irq_tables.c
+++ b/src/mainboard/asus/kgpe-d16/irq_tables.c
@@ -60,8 +60,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
pirq_info->rfu = rfu;
}
-extern u8 bus_sp5100[2];
-
unsigned long write_pirq_routing_table(unsigned long addr)
{
struct irq_routing_table *pirq;
@@ -86,7 +84,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION;
/* Where the interrupt router resides */
- pirq->rtr_bus = bus_sp5100[0];
+ pirq->rtr_bus = pirq_router_bus;
pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
pirq->exclusive_irqs = 0;
@@ -102,7 +100,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sp5100[0],
+ write_pirq_info(pirq_info, pirq_router_bus,
PCI_DEVFN(0x14, 4), LNKA, IRQBM, LNKB,
IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0);
pirq_info++;
diff --git a/src/mainboard/asus/kgpe-d16/mptable.c b/src/mainboard/asus/kgpe-d16/mptable.c
index ad4925a825..c1b2a5de5d 100644
--- a/src/mainboard/asus/kgpe-d16/mptable.c
+++ b/src/mainboard/asus/kgpe-d16/mptable.c
@@ -21,8 +21,6 @@
#include <stdint.h>
#include <cpu/amd/amdfam10_sysconf.h>
-extern u8 bus_sp5100[2];
-
extern u32 apicid_sp5100;
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 5f574236ea..b36008118f 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -25,7 +25,6 @@
* and acpi_tables busnum is default.
*/
u8 bus_sr5650[14];
-u8 bus_sp5100[2];
u32 apicid_sp5100;
/*
@@ -63,23 +62,13 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
- for (i = 0; i < 2; i++) {
- bus_sp5100[i] = 0;
- }
for (i = 0; i < ARRAY_SIZE(bus_sr5650); i++) {
bus_sr5650[i] = 0;
}
bus_sr5650[0] = (sysconf.pci1234[0] >> 16) & 0xff;
- bus_sp5100[0] = bus_sr5650[0];
-
-
- /* sp5100 */
- dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4));
- if (dev) {
- bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
- }
+ pirq_router_bus = bus_sr5650[0];
/* sr5650 */
for (i = 1; i < ARRAY_SIZE(bus_sr5650); i++) {
diff --git a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
index 5f9c50d610..81fae72956 100644
--- a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
@@ -40,7 +40,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
pirq_info->rfu = rfu;
}
-extern u8 bus_sp5100[2];
unsigned long write_pirq_routing_table(unsigned long addr)
{
@@ -65,7 +64,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->signature = PIRQ_SIGNATURE;
pirq->version = PIRQ_VERSION;
- pirq->rtr_bus = bus_sp5100[0];
+ pirq->rtr_bus = pirq_router_bus;
pirq->rtr_devfn = PCI_DEVFN(0x14, 4);
pirq->exclusive_irqs = 0;
@@ -81,7 +80,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sp5100[0],
+ write_pirq_info(pirq_info, pirq_router_bus,
PCI_DEVFN(0x14, 4), 0x1, 0xdef8, 0x2,
0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
pirq_info++;
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index 9acf299deb..4715be9b37 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -21,7 +21,6 @@
#include <cpu/amd/amdfam10_sysconf.h>
extern u8 bus_sr5650[14];
-extern u8 bus_sp5100[2];
extern u32 apicid_sp5100;
@@ -49,7 +48,7 @@ static void *smp_write_config_table(void *v)
u32 *dword;
u8 byte;
- dev = dev_find_slot(0, //bus_sp5100[0], TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0.
+ dev = dev_find_slot(0, //pirq_router_bus TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0.
PCI_DEVFN(0x14, 0));
if (dev) {
dword = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 15:58:16 +0000