diff options
Diffstat (limited to 'src/mainboard/amd')
-rw-r--r-- | src/mainboard/amd/dinar/get_bus_conf.c | 12 | ||||
-rw-r--r-- | src/mainboard/amd/dinar/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/inagua/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/inagua/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/olivehill/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/olivehill/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/parmer/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/parmer/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/persimmon/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/persimmon/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/south_station/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/south_station/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/thatcher/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/thatcher/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/torpedo/get_bus_conf.c | 8 | ||||
-rw-r--r-- | src/mainboard/amd/torpedo/irq_tables.c | 1 | ||||
-rw-r--r-- | src/mainboard/amd/union_station/get_bus_conf.c | 7 | ||||
-rw-r--r-- | src/mainboard/amd/union_station/irq_tables.c | 1 |
18 files changed, 0 insertions, 78 deletions
diff --git a/src/mainboard/amd/dinar/get_bus_conf.c b/src/mainboard/amd/dinar/get_bus_conf.c index fcd4684c5d..fdf4b6794b 100644 --- a/src/mainboard/amd/dinar/get_bus_conf.c +++ b/src/mainboard/amd/dinar/get_bus_conf.c @@ -30,7 +30,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sb700[2]; u8 bus_rd890[14]; @@ -81,9 +80,6 @@ void get_bus_conf(void) if (dev) { bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } /* rd890 */ @@ -91,16 +87,8 @@ void get_bus_conf(void) dev = dev_find_slot(bus_rd890[0], PCI_DEVFN(sbdn_rd890 + i, 0)); if (dev) { bus_rd890[i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - if(255 != bus_rd890[i]) { - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; - } } } - - /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; - printk(BIOS_DEBUG, "Mainboard - Get_bus_conf.c - get_bus_conf - End.\n"); } diff --git a/src/mainboard/amd/dinar/irq_tables.c b/src/mainboard/amd/dinar/irq_tables.c index 0000111068..865d264429 100644 --- a/src/mainboard/amd/dinar/irq_tables.c +++ b/src/mainboard/amd/dinar/irq_tables.c @@ -43,7 +43,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->slot = slot; pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sb700[2]; extern unsigned long sbdn_sb700; diff --git a/src/mainboard/amd/inagua/get_bus_conf.c b/src/mainboard/amd/inagua/get_bus_conf.c index 2c38bdd2f3..c688791022 100644 --- a/src/mainboard/amd/inagua/get_bus_conf.c +++ b/src/mainboard/amd/inagua/get_bus_conf.c @@ -30,7 +30,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sb800[6]; u32 apicid_sb800; @@ -66,22 +65,16 @@ void get_bus_conf(void) if (dev) { bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, i)); if (dev) { bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base; diff --git a/src/mainboard/amd/inagua/irq_tables.c b/src/mainboard/amd/inagua/irq_tables.c index 1318d4d510..98d68d3736 100644 --- a/src/mainboard/amd/inagua/irq_tables.c +++ b/src/mainboard/amd/inagua/irq_tables.c @@ -44,7 +44,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->slot = slot; pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sb800[6]; extern unsigned long sbdn_sb800; diff --git a/src/mainboard/amd/olivehill/get_bus_conf.c b/src/mainboard/amd/olivehill/get_bus_conf.c index 3aeeb90d8c..508a73cfba 100644 --- a/src/mainboard/amd/olivehill/get_bus_conf.c +++ b/src/mainboard/amd/olivehill/get_bus_conf.c @@ -32,7 +32,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_yangtze[6]; u32 apicid_yangtze; @@ -80,22 +79,16 @@ void get_bus_conf(void) if (dev) { bus_yangtze[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_yangtze[0], PCI_DEVFN(sbdn_yangtze + 0x14, i)); if (dev) { bus_yangtze[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; apicid_yangtze = apicid_base; diff --git a/src/mainboard/amd/olivehill/irq_tables.c b/src/mainboard/amd/olivehill/irq_tables.c index bea6eb2ed3..8dbea45ed4 100644 --- a/src/mainboard/amd/olivehill/irq_tables.c +++ b/src/mainboard/amd/olivehill/irq_tables.c @@ -43,7 +43,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_yangtze[6]; extern unsigned long sbdn_yangtze; diff --git a/src/mainboard/amd/parmer/get_bus_conf.c b/src/mainboard/amd/parmer/get_bus_conf.c index c792887dff..490e3c200d 100644 --- a/src/mainboard/amd/parmer/get_bus_conf.c +++ b/src/mainboard/amd/parmer/get_bus_conf.c @@ -32,7 +32,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_hudson[6]; u32 apicid_hudson; @@ -70,22 +69,16 @@ void get_bus_conf(void) if (dev) { bus_hudson[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_hudson[0], PCI_DEVFN(sbdn_hudson + 0x14, i)); if (dev) { bus_hudson[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; apicid_hudson = apicid_base; diff --git a/src/mainboard/amd/parmer/irq_tables.c b/src/mainboard/amd/parmer/irq_tables.c index 20fbb5d263..19f800743f 100644 --- a/src/mainboard/amd/parmer/irq_tables.c +++ b/src/mainboard/amd/parmer/irq_tables.c @@ -43,7 +43,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_hudson[6]; extern unsigned long sbdn_hudson; diff --git a/src/mainboard/amd/persimmon/get_bus_conf.c b/src/mainboard/amd/persimmon/get_bus_conf.c index 995cb4254c..412744c463 100644 --- a/src/mainboard/amd/persimmon/get_bus_conf.c +++ b/src/mainboard/amd/persimmon/get_bus_conf.c @@ -31,7 +31,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sb800[6]; u32 apicid_sb800; u32 apicver_sb800; @@ -67,23 +66,17 @@ void get_bus_conf(void) if (dev) { bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, i)); if (dev) { bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; /* diff --git a/src/mainboard/amd/persimmon/irq_tables.c b/src/mainboard/amd/persimmon/irq_tables.c index dbbb2afddf..840e7b1bb5 100644 --- a/src/mainboard/amd/persimmon/irq_tables.c +++ b/src/mainboard/amd/persimmon/irq_tables.c @@ -44,7 +44,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->slot = slot; pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sb800[6]; extern unsigned long sbdn_sb800; diff --git a/src/mainboard/amd/south_station/get_bus_conf.c b/src/mainboard/amd/south_station/get_bus_conf.c index b95ef1c8e2..f221a4591f 100644 --- a/src/mainboard/amd/south_station/get_bus_conf.c +++ b/src/mainboard/amd/south_station/get_bus_conf.c @@ -30,7 +30,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sb800[6]; u32 apicid_sb800; @@ -68,23 +67,17 @@ void get_bus_conf(void) if (dev) { bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, i)); if (dev) { bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base; diff --git a/src/mainboard/amd/south_station/irq_tables.c b/src/mainboard/amd/south_station/irq_tables.c index dbbb2afddf..840e7b1bb5 100644 --- a/src/mainboard/amd/south_station/irq_tables.c +++ b/src/mainboard/amd/south_station/irq_tables.c @@ -44,7 +44,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->slot = slot; pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sb800[6]; extern unsigned long sbdn_sb800; diff --git a/src/mainboard/amd/thatcher/get_bus_conf.c b/src/mainboard/amd/thatcher/get_bus_conf.c index 577ec9fd7e..b7d6d23d4a 100644 --- a/src/mainboard/amd/thatcher/get_bus_conf.c +++ b/src/mainboard/amd/thatcher/get_bus_conf.c @@ -32,7 +32,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_hudson[6]; u32 apicid_hudson; @@ -67,22 +66,16 @@ void get_bus_conf(void) if (dev) { bus_hudson[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_hudson[0], PCI_DEVFN(sbdn_hudson + 0x14, i)); if (dev) { bus_hudson[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; apicid_hudson = apicid_base; diff --git a/src/mainboard/amd/thatcher/irq_tables.c b/src/mainboard/amd/thatcher/irq_tables.c index 20fbb5d263..19f800743f 100644 --- a/src/mainboard/amd/thatcher/irq_tables.c +++ b/src/mainboard/amd/thatcher/irq_tables.c @@ -43,7 +43,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_hudson[6]; extern unsigned long sbdn_hudson; diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c index 1e962e83e8..3f8f50ed99 100644 --- a/src/mainboard/amd/torpedo/get_bus_conf.c +++ b/src/mainboard/amd/torpedo/get_bus_conf.c @@ -29,7 +29,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sb900[6]; /* @@ -71,8 +70,6 @@ void get_bus_conf(void) if (dev) { bus_sb900[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { @@ -81,13 +78,8 @@ void get_bus_conf(void) if (dev) { bus_sb900[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } - /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; - printk(BIOS_DEBUG, "Mainboard - %s - %s - End.\n", __FILE__, __func__); } diff --git a/src/mainboard/amd/torpedo/irq_tables.c b/src/mainboard/amd/torpedo/irq_tables.c index 53cf6fa9c0..f47d9dc4ff 100644 --- a/src/mainboard/amd/torpedo/irq_tables.c +++ b/src/mainboard/amd/torpedo/irq_tables.c @@ -45,7 +45,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->slot = slot; pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sb900[6]; extern unsigned long sbdn_sb900; diff --git a/src/mainboard/amd/union_station/get_bus_conf.c b/src/mainboard/amd/union_station/get_bus_conf.c index 632fedef8d..0b55a2ac79 100644 --- a/src/mainboard/amd/union_station/get_bus_conf.c +++ b/src/mainboard/amd/union_station/get_bus_conf.c @@ -30,7 +30,6 @@ /* Global variables for MB layouts and these will be shared by irqtable mptable * and acpi_tables busnum is default. */ -u8 bus_isa; u8 bus_sb800[6]; u32 apicid_sb800; @@ -70,23 +69,17 @@ void get_bus_conf(void) if (dev) { bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); - - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } for (i = 0; i < 4; i++) { dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, i)); if (dev) { bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS); - bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS); - bus_isa++; } } /* I/O APICs: APIC ID Version State Address */ - bus_isa = 10; apicid_base = CONFIG_MAX_CPUS; apicid_sb800 = apicid_base; diff --git a/src/mainboard/amd/union_station/irq_tables.c b/src/mainboard/amd/union_station/irq_tables.c index dbbb2afddf..840e7b1bb5 100644 --- a/src/mainboard/amd/union_station/irq_tables.c +++ b/src/mainboard/amd/union_station/irq_tables.c @@ -44,7 +44,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn, pirq_info->slot = slot; pirq_info->rfu = rfu; } -extern u8 bus_isa; extern u8 bus_sb800[6]; extern unsigned long sbdn_sb800; |