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

siemens/sitemp_g1p1: Get rid of bus_isa and bus_type 

Each variable is essentially unused or incorrect.

Change-Id: I4d2a10c9b45306ac6e6026a31765d3b912fd855c
Signed-off-by: Patrick Georgi <patrick.georgi@secunet.com>
Reviewed-on: http://review.coreboot.org/242
Tested-by: build bot (Jenkins)
Reviewed-by: Marc Jones <marcj303@gmail.com>
This commit is contained in:
Patrick Georgi 2011-10-06 14:34:22 +02:00 committed by Patrick Georgi
parent 390a3374ca
commit c5ae30617a
3 changed files with 5 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
View File

@ -32,7 +32,6 @@
/* Global variables for MB layouts and these will be shared by irqtable mptable /* Global variables for MB layouts and these will be shared by irqtable mptable
* and acpi_tables busnum is default. * and acpi_tables busnum is default.
*/ */
u8 bus_isa;
u8 bus_rs690[8]; u8 bus_rs690[8];
u8 bus_sb600[2]; u8 bus_sb600[2];
u32 apicid_sb600; u32 apicid_sb600;
@ -54,8 +53,6 @@ u32 hcdnx[] = {
0x20202020, 0x20202020,
}; };
u32 bus_type[256];
u32 sbdn_rs690; u32 sbdn_rs690;
u32 sbdn_sb600; u32 sbdn_sb600;
@ -67,7 +64,7 @@ void get_bus_conf(void)
{ {
u32 apicid_base; u32 apicid_base;
device_t dev; device_t dev;
int i, j; int i;
if (get_bus_conf_done == 1) if (get_bus_conf_done == 1)
return; /* do it only once */ return; /* do it only once */
@ -92,25 +89,13 @@ void get_bus_conf(void)
bus_rs690[i] = 0; bus_rs690[i] = 0;
} }
for (i = 0; i < 256; i++) {
bus_type[i] = 0; /* default ISA bus. */
}
bus_type[0] = 1; /* pci */
bus_rs690[0] = (sysconf.pci1234[0] >> 16) & 0xff; bus_rs690[0] = (sysconf.pci1234[0] >> 16) & 0xff;
bus_sb600[0] = bus_rs690[0]; bus_sb600[0] = bus_rs690[0];
bus_type[bus_rs690[0]] = 1;
/* sb600 */ /* sb600 */
dev = dev_find_slot(bus_sb600[0], PCI_DEVFN(sbdn_sb600 + 0x14, 4)); dev = dev_find_slot(bus_sb600[0], PCI_DEVFN(sbdn_sb600 + 0x14, 4));
if (dev) { if (dev) {
bus_sb600[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); bus_sb600[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
for (j = bus_sb600[1]; j < bus_isa; j++)
bus_type[j] = 1;
} }
/* rs690 */ /* rs690 */
@ -118,16 +103,10 @@ void get_bus_conf(void)
dev = dev_find_slot(bus_rs690[0], PCI_DEVFN(sbdn_rs690 + i, 0)); dev = dev_find_slot(bus_rs690[0], PCI_DEVFN(sbdn_rs690 + i, 0));
if (dev) { if (dev) {
bus_rs690[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); bus_rs690[i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
if(255 != bus_rs690[i]) {
bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
bus_isa++;
bus_type[bus_rs690[i]] = 1; /* PCI bus. */
}
} }
} }
/* I/O APICs: APIC ID Version State Address */ /* I/O APICs: APIC ID Version State Address */
bus_isa = 10;
#if CONFIG_LOGICAL_CPUS==1 #if CONFIG_LOGICAL_CPUS==1
apicid_base = get_apicid_base(1); apicid_base = get_apicid_base(1);
#else #else

1
src/mainboard/siemens/sitemp_g1p1/irq_tables.c
View File

@ -68,7 +68,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
pirq_info->slot = slot; pirq_info->slot = slot;
pirq_info->rfu = rfu; pirq_info->rfu = rfu;
} }
extern u8 bus_isa;
extern u8 bus_rs690[8]; extern u8 bus_rs690[8];
extern u8 bus_sb600[2]; extern u8 bus_sb600[2];
extern unsigned long sbdn_sb600; extern unsigned long sbdn_sb600;

12
src/mainboard/siemens/sitemp_g1p1/mptable.c
View File

@ -26,13 +26,11 @@
#include <cpu/amd/amdk8_sysconf.h> #include <cpu/amd/amdk8_sysconf.h>
extern u8 bus_isa;
extern u8 bus_rs690[8]; extern u8 bus_rs690[8];
extern u8 bus_sb600[2]; extern u8 bus_sb600[2];
extern u32 apicid_sb600; extern u32 apicid_sb600;
extern u32 bus_type[256];
extern u32 sbdn_rs690; extern u32 sbdn_rs690;
extern u32 sbdn_sb600; extern u32 sbdn_sb600;
@ -46,12 +44,9 @@ static void *smp_write_config_table(void *v)
smp_write_processors(mc); smp_write_processors(mc);
get_bus_conf(); get_bus_conf();
printk(BIOS_DEBUG, "%s: bus_isa=%d, apic_id=0x%x\n", __func__, bus_isa, apicid_sb600); printk(BIOS_DEBUG, "%s: apic_id=0x%x\n", __func__, apicid_sb600);
mptable_write_buses(mc, NULL, &isa_bus); mptable_write_buses(mc, NULL, &isa_bus);
if (isa_bus != bus_isa) {
printk(BIOS_ERR, "ISA bus numbering schemes differ! Please fix mptable.c\n");
}
/* I/O APICs: APIC ID Version State Address */ /* I/O APICs: APIC ID Version State Address */
{ {
device_t dev; device_t dev;
@ -63,9 +58,10 @@ static void *smp_write_config_table(void *v)
smp_write_ioapic(mc, apicid_sb600, 0x20, res->base); smp_write_ioapic(mc, apicid_sb600, 0x20, res->base);
} }
} }
mptable_add_isa_interrupts(mc, bus_isa, apicid_sb600, 0); mptable_add_isa_interrupts(mc, isa_bus, apicid_sb600, 0);
/* I/O Ints: Type Polarity Trigger Bus ID IRQ APIC ID PIN# */ /* I/O Ints: Type Polarity Trigger Bus ID IRQ APIC ID PIN# */
mptable_lintsrc(mc, bus_isa); mptable_lintsrc(mc, isa_bus);
/* Compute the checksums */ /* Compute the checksums */
return mptable_finalize(mc); return mptable_finalize(mc);