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

amdfam10 boards: Drop const variable sbdn_sp5100 

Change-Id: I8756a81324ba3d4374bb6b06f7f0ddade6ba530f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30636
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2019-01-03 11:38:51 +02:00
parent af39e0ebc1
commit 228746b346
9 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mainboard/asus/kcma-d8/get_bus_conf.c
View File

@ -47,7 +47,6 @@ u32 hcdnx[] = {
}; };
u32 sbdn_sp5100;
void get_bus_conf(void) void get_bus_conf(void)
{ {
@ -64,7 +63,6 @@ void get_bus_conf(void)
get_pci1234(); get_pci1234();
sysconf.sbdn = (sysconf.hcdn[0] & 0xff); sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_sp5100 = 0;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
bus_sp5100[i] = 0; bus_sp5100[i] = 0;
@ -79,7 +77,7 @@ void get_bus_conf(void)
/* sp5100 */ /* sp5100 */
dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4)); dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4));
if (dev) { if (dev) {
bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }

3
src/mainboard/asus/kcma-d8/irq_tables.c
View File

@ -61,7 +61,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_sp5100[2]; extern u8 bus_sp5100[2];
extern u32 sbdn_sp5100;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)
{ {
@ -104,7 +103,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
/* pci bridge */ /* pci bridge */
write_pirq_info(pirq_info, bus_sp5100[0], write_pirq_info(pirq_info, bus_sp5100[0],
((sbdn_sp5100 + 0x14) << 3) | 4, LNKA, IRQBM, LNKB, (0x14 << 3) | 4, LNKA, IRQBM, LNKB,
IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0); IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0);
pirq_info++; pirq_info++;
slot_num++; slot_num++;

3
src/mainboard/asus/kcma-d8/mptable.c
View File

@ -25,7 +25,6 @@ extern u8 bus_sp5100[2];
extern u32 apicid_sp5100; extern u32 apicid_sp5100;
extern u32 sbdn_sp5100;
static void *smp_write_config_table(void *v) static void *smp_write_config_table(void *v)
@ -58,7 +57,7 @@ static void *smp_write_config_table(void *v)
sp5100_bus_number = 0; //bus_sp5100[0]; TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0. sp5100_bus_number = 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(sp5100_bus_number, PCI_DEVFN(sbdn_sp5100 + 0x14, 0)); dev = dev_find_slot(sp5100_bus_number, PCI_DEVFN(0x14, 0));
if (dev) { if (dev) {
dword_ptr = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0); dword_ptr = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0);
smp_write_ioapic(mc, apicid_sp5100, 0x11, dword_ptr); smp_write_ioapic(mc, apicid_sp5100, 0x11, dword_ptr);

4
src/mainboard/asus/kgpe-d16/get_bus_conf.c
View File

@ -47,7 +47,6 @@ u32 hcdnx[] = {
}; };
u32 sbdn_sp5100;
void get_bus_conf(void) void get_bus_conf(void)
{ {
@ -64,7 +63,6 @@ void get_bus_conf(void)
get_pci1234(); get_pci1234();
sysconf.sbdn = (sysconf.hcdn[0] & 0xff); sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_sp5100 = 0;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
bus_sp5100[i] = 0; bus_sp5100[i] = 0;
@ -79,7 +77,7 @@ void get_bus_conf(void)
/* sp5100 */ /* sp5100 */
dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4)); dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4));
if (dev) { if (dev) {
bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }

3
src/mainboard/asus/kgpe-d16/irq_tables.c
View File

@ -61,7 +61,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_sp5100[2]; extern u8 bus_sp5100[2];
extern u32 sbdn_sp5100;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)
{ {
@ -104,7 +103,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
/* pci bridge */ /* pci bridge */
write_pirq_info(pirq_info, bus_sp5100[0], write_pirq_info(pirq_info, bus_sp5100[0],
((sbdn_sp5100 + 0x14) << 3) | 4, LNKA, IRQBM, LNKB, (0x14 << 3) | 4, LNKA, IRQBM, LNKB,
IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0); IRQBM, LNKC, IRQBM, LNKD, IRQBM, 0, 0);
pirq_info++; pirq_info++;
slot_num++; slot_num++;

3
src/mainboard/asus/kgpe-d16/mptable.c
View File

@ -25,7 +25,6 @@ extern u8 bus_sp5100[2];
extern u32 apicid_sp5100; extern u32 apicid_sp5100;
extern u32 sbdn_sp5100;
static void *smp_write_config_table(void *v) static void *smp_write_config_table(void *v)
@ -58,7 +57,7 @@ static void *smp_write_config_table(void *v)
sp5100_bus_number = 0; //bus_sp5100[0]; TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0. sp5100_bus_number = 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(sp5100_bus_number, PCI_DEVFN(sbdn_sp5100 + 0x14, 0)); dev = dev_find_slot(sp5100_bus_number, PCI_DEVFN(0x14, 0));
if (dev) { if (dev) {
dword_ptr = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0); dword_ptr = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0);
smp_write_ioapic(mc, apicid_sp5100, 0x11, dword_ptr); smp_write_ioapic(mc, apicid_sp5100, 0x11, dword_ptr);

4
src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
View File

@ -46,7 +46,6 @@ u32 hcdnx[] = {
}; };
u32 sbdn_sp5100;
void get_bus_conf(void) void get_bus_conf(void)
{ {
@ -63,7 +62,6 @@ void get_bus_conf(void)
get_pci1234(); get_pci1234();
sysconf.sbdn = (sysconf.hcdn[0] & 0xff); sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_sp5100 = 0;
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
bus_sp5100[i] = 0; bus_sp5100[i] = 0;
@ -78,7 +76,7 @@ void get_bus_conf(void)
/* sp5100 */ /* sp5100 */
dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4)); dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4));
if (dev) { if (dev) {
bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
} }

5
src/mainboard/supermicro/h8scm_fam10/irq_tables.c
View File

@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
} }
extern u8 bus_sp5100[2]; extern u8 bus_sp5100[2];
extern unsigned long sbdn_sp5100;
unsigned long write_pirq_routing_table(unsigned long addr) unsigned long write_pirq_routing_table(unsigned long addr)
{ {
@ -67,7 +66,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION; pirq->version = PIRQ_VERSION;
pirq->rtr_bus = bus_sp5100[0]; pirq->rtr_bus = bus_sp5100[0];
pirq->rtr_devfn = ((sbdn_sp5100 + 0x14) << 3) | 4; pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0; pirq->exclusive_irqs = 0;
@ -83,7 +82,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
/* pci bridge */ /* pci bridge */
write_pirq_info(pirq_info, bus_sp5100[0], write_pirq_info(pirq_info, bus_sp5100[0],
((sbdn_sp5100 + 0x14) << 3) | 4, 0x1, 0xdef8, 0x2, (0x14 << 3) | 4, 0x1, 0xdef8, 0x2,
0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
pirq_info++; pirq_info++;
slot_num++; slot_num++;

3
src/mainboard/supermicro/h8scm_fam10/mptable.c
View File

@ -25,7 +25,6 @@ extern u8 bus_sp5100[2];
extern u32 apicid_sp5100; extern u32 apicid_sp5100;
extern u32 sbdn_sp5100;
static void *smp_write_config_table(void *v) static void *smp_write_config_table(void *v)
@ -51,7 +50,7 @@ static void *smp_write_config_table(void *v)
u8 byte; 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, //bus_sp5100[0], TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0.
PCI_DEVFN(sbdn_sp5100 + 0x14, 0)); PCI_DEVFN(0x14, 0));
if (dev) { if (dev) {
dword = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0); dword = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0);
smp_write_ioapic(mc, apicid_sp5100, 0x11, dword); smp_write_ioapic(mc, apicid_sp5100, 0x11, dword);