summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/advansus/a785e-i/get_bus_conf.c6
-rw-r--r--src/mainboard/advansus/a785e-i/irq_tables.c5
-rw-r--r--src/mainboard/advansus/a785e-i/mptable.c1
-rw-r--r--src/mainboard/amd/bimini_fam10/get_bus_conf.c6
-rw-r--r--src/mainboard/amd/bimini_fam10/irq_tables.c5
-rw-r--r--src/mainboard/amd/bimini_fam10/mptable.c1
-rw-r--r--src/mainboard/amd/mahogany_fam10/get_bus_conf.c4
-rw-r--r--src/mainboard/amd/mahogany_fam10/irq_tables.c5
-rw-r--r--src/mainboard/amd/mahogany_fam10/mptable.c3
-rw-r--r--src/mainboard/amd/tilapia_fam10/get_bus_conf.c4
-rw-r--r--src/mainboard/amd/tilapia_fam10/irq_tables.c5
-rw-r--r--src/mainboard/amd/tilapia_fam10/mptable.c3
-rw-r--r--src/mainboard/asus/m4a78-em/get_bus_conf.c4
-rw-r--r--src/mainboard/asus/m4a78-em/mptable.c3
-rw-r--r--src/mainboard/asus/m4a785-m/get_bus_conf.c4
-rw-r--r--src/mainboard/asus/m4a785-m/mptable.c3
-rw-r--r--src/mainboard/asus/m5a88-v/get_bus_conf.c6
-rw-r--r--src/mainboard/asus/m5a88-v/irq_tables.c5
-rw-r--r--src/mainboard/asus/m5a88-v/mptable.c1
-rw-r--r--src/mainboard/avalue/eax-785e/get_bus_conf.c6
-rw-r--r--src/mainboard/avalue/eax-785e/irq_tables.c5
-rw-r--r--src/mainboard/avalue/eax-785e/mptable.c1
-rw-r--r--src/mainboard/gigabyte/ma785gm/get_bus_conf.c4
-rw-r--r--src/mainboard/gigabyte/ma785gm/irq_tables.c5
-rw-r--r--src/mainboard/gigabyte/ma785gm/mptable.c3
-rw-r--r--src/mainboard/gigabyte/ma785gmt/get_bus_conf.c4
-rw-r--r--src/mainboard/gigabyte/ma785gmt/irq_tables.c5
-rw-r--r--src/mainboard/gigabyte/ma785gmt/mptable.c3
-rw-r--r--src/mainboard/gigabyte/ma78gm/get_bus_conf.c4
-rw-r--r--src/mainboard/gigabyte/ma78gm/irq_tables.c5
-rw-r--r--src/mainboard/gigabyte/ma78gm/mptable.c3
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c4
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/irq_tables.c5
-rw-r--r--src/mainboard/iei/kino-780am2-fam10/mptable.c3
-rw-r--r--src/mainboard/jetway/pa78vm5/get_bus_conf.c4
-rw-r--r--src/mainboard/jetway/pa78vm5/irq_tables.c5
-rw-r--r--src/mainboard/jetway/pa78vm5/mptable.c3
37 files changed, 48 insertions, 98 deletions
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index 8b995e4535..9538098c34 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
static u32 sbdn_rs780;
-u32 sbdn_sb800;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
for (i = 0; i < ARRAY_SIZE(bus_rs780); i++) {
@@ -78,13 +76,13 @@ void get_bus_conf(void)
/* sb800 */
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x15, i));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x15, i));
if (dev) {
bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/advansus/a785e-i/irq_tables.c b/src/mainboard/advansus/a785e-i/irq_tables.c
index b194b41b89..006a8dd155 100644
--- a/src/mainboard/advansus/a785e-i/irq_tables.c
+++ b/src/mainboard/advansus/a785e-i/irq_tables.c
@@ -40,7 +40,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb800[6];
-extern unsigned long sbdn_sb800;
unsigned long write_pirq_routing_table(unsigned long addr)
{
@@ -66,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION;
pirq->rtr_bus = bus_sb800[0];
- pirq->rtr_devfn = ((sbdn_sb800 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 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_sb800[0], ((sbdn_sb800 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/advansus/a785e-i/mptable.c b/src/mainboard/advansus/a785e-i/mptable.c
index 6dd8342d09..9188a19abc 100644
--- a/src/mainboard/advansus/a785e-i/mptable.c
+++ b/src/mainboard/advansus/a785e-i/mptable.c
@@ -22,7 +22,6 @@
extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 sbdn_sb800;
u8 intr_data[] = {
[0x00] = 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, /* INTA# - INTH# */
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index 5359c0e249..3c9b2f50ee 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
static u32 sbdn_rs780;
-u32 sbdn_sb800;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
@@ -77,13 +75,13 @@ void get_bus_conf(void)
bus_sb800[0] = bus_rs780[0];
/* sb800 */
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x15, i));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x15, i));
if (dev) {
bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/amd/bimini_fam10/irq_tables.c b/src/mainboard/amd/bimini_fam10/irq_tables.c
index c5f85063ae..9ffa97ac0e 100644
--- a/src/mainboard/amd/bimini_fam10/irq_tables.c
+++ b/src/mainboard/amd/bimini_fam10/irq_tables.c
@@ -40,7 +40,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb800[6];
-extern unsigned long sbdn_sb800;
unsigned long write_pirq_routing_table(unsigned long addr)
{
@@ -66,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION;
pirq->rtr_bus = bus_sb800[0];
- pirq->rtr_devfn = ((sbdn_sb800 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 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_sb800[0], ((sbdn_sb800 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/amd/bimini_fam10/mptable.c b/src/mainboard/amd/bimini_fam10/mptable.c
index 49cbd088e2..7feabf7cbf 100644
--- a/src/mainboard/amd/bimini_fam10/mptable.c
+++ b/src/mainboard/amd/bimini_fam10/mptable.c
@@ -23,7 +23,6 @@
extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 sbdn_sb800;
u8 intr_data[] = {
[0x00] = 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, /* INTA# - INTH# */
diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/amd/mahogany_fam10/irq_tables.c b/src/mainboard/amd/mahogany_fam10/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/amd/mahogany_fam10/irq_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/amd/tilapia_fam10/irq_tables.c b/src/mainboard/amd/tilapia_fam10/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/amd/tilapia_fam10/irq_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index e0d89b5f1e..a60080eac8 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
static u32 sbdn_rs780;
-u32 sbdn_sb800;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
@@ -78,13 +76,13 @@ void get_bus_conf(void)
/* sb800 */
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x15, i));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x15, i));
if (dev) {
bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/asus/m5a88-v/irq_tables.c b/src/mainboard/asus/m5a88-v/irq_tables.c
index b194b41b89..006a8dd155 100644
--- a/src/mainboard/asus/m5a88-v/irq_tables.c
+++ b/src/mainboard/asus/m5a88-v/irq_tables.c
@@ -40,7 +40,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb800[6];
-extern unsigned long sbdn_sb800;
unsigned long write_pirq_routing_table(unsigned long addr)
{
@@ -66,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION;
pirq->rtr_bus = bus_sb800[0];
- pirq->rtr_devfn = ((sbdn_sb800 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 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_sb800[0], ((sbdn_sb800 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c
index 90337f017d..4a1c40e090 100644
--- a/src/mainboard/asus/m5a88-v/mptable.c
+++ b/src/mainboard/asus/m5a88-v/mptable.c
@@ -22,7 +22,6 @@
extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 sbdn_sb800;
u8 intr_data[] = {
[0x00] = 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, /* INTA# - INTH# */
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index e0d89b5f1e..a60080eac8 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
static u32 sbdn_rs780;
-u32 sbdn_sb800;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb800 = 0;
memset(bus_sb800, 0, sizeof(bus_sb800));
@@ -78,13 +76,13 @@ void get_bus_conf(void)
/* sb800 */
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x14, 4));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb800[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
for (i = 0; i < 4; i++) {
- dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(sbdn_sb800 + 0x15, i));
+ dev = dev_find_slot(bus_sb800[0], PCI_DEVFN(0x15, i));
if (dev) {
bus_sb800[2 + i] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/avalue/eax-785e/irq_tables.c b/src/mainboard/avalue/eax-785e/irq_tables.c
index b194b41b89..006a8dd155 100644
--- a/src/mainboard/avalue/eax-785e/irq_tables.c
+++ b/src/mainboard/avalue/eax-785e/irq_tables.c
@@ -40,7 +40,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb800[6];
-extern unsigned long sbdn_sb800;
unsigned long write_pirq_routing_table(unsigned long addr)
{
@@ -66,7 +65,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
pirq->version = PIRQ_VERSION;
pirq->rtr_bus = bus_sb800[0];
- pirq->rtr_devfn = ((sbdn_sb800 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 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_sb800[0], ((sbdn_sb800 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb800[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/avalue/eax-785e/mptable.c b/src/mainboard/avalue/eax-785e/mptable.c
index d3af6ec17a..2197dabe7c 100644
--- a/src/mainboard/avalue/eax-785e/mptable.c
+++ b/src/mainboard/avalue/eax-785e/mptable.c
@@ -22,7 +22,6 @@
extern u8 bus_sb800[6];
extern u32 apicid_sb800;
-extern u32 sbdn_sb800;
u8 intr_data[] = {
[0x00] = 0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, /* INTA# - INTH# */
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/gigabyte/ma785gm/irq_tables.c b/src/mainboard/gigabyte/ma785gm/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/gigabyte/ma785gm/irq_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/gigabyte/ma785gmt/irq_tables.c b/src/mainboard/gigabyte/ma785gmt/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/gigabyte/ma785gmt/irq_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/gigabyte/ma78gm/irq_tables.c b/src/mainboard/gigabyte/ma78gm/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/gigabyte/ma78gm/irq_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/iei/kino-780am2-fam10/irq_tables.c b/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index 4ea9e66913..1fd89cc2de 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -24,7 +24,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -47,7 +46,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,
diff --git a/src/mainboard/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index 299393791f..97d9e28cf3 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -46,7 +46,6 @@ u32 hcdnx[] = {
};
static u32 sbdn_rs780;
-u32 sbdn_sb700;
void get_bus_conf(void)
{
@@ -64,7 +63,6 @@ void get_bus_conf(void)
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
sbdn_rs780 = sysconf.sbdn;
- sbdn_sb700 = 0;
for (i = 0; i < 2; i++) {
bus_sb700[i] = 0;
@@ -77,7 +75,7 @@ void get_bus_conf(void)
bus_sb700[0] = bus_rs780[0];
/* sb700 */
- dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(sbdn_sb700 + 0x14, 4));
+ dev = dev_find_slot(bus_sb700[0], PCI_DEVFN(0x14, 4));
if (dev) {
bus_sb700[1] = pci_read_config8(dev, PCI_SECONDARY_BUS);
}
diff --git a/src/mainboard/jetway/pa78vm5/irq_tables.c b/src/mainboard/jetway/pa78vm5/irq_tables.c
index 83a701df43..70d427e9c6 100644
--- a/src/mainboard/jetway/pa78vm5/irq_tables.c
+++ b/src/mainboard/jetway/pa78vm5/irq_tables.c
@@ -41,7 +41,6 @@ static void write_pirq_info(struct irq_info *pirq_info, u8 bus, u8 devfn,
}
extern u8 bus_sb700[2];
-extern unsigned long sbdn_sb700;
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->rtr_bus = bus_sb700[0];
- pirq->rtr_devfn = ((sbdn_sb700 + 0x14) << 3) | 4;
+ pirq->rtr_devfn = (0x14 << 3) | 4;
pirq->exclusive_irqs = 0;
@@ -82,7 +81,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
slot_num = 0;
/* pci bridge */
- write_pirq_info(pirq_info, bus_sb700[0], ((sbdn_sb700 + 0x14) << 3) | 4,
+ write_pirq_info(pirq_info, bus_sb700[0], (0x14 << 3) | 4,
0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0,
0);
pirq_info++;
diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index edbc0e6a9d..f153a7e562 100644
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/mptable.c
@@ -25,7 +25,6 @@ extern u8 bus_sb700[2];
extern u32 apicid_sb700;
-extern u32 sbdn_sb700;
static void *smp_write_config_table(void *v)
{
@@ -48,7 +47,7 @@ static void *smp_write_config_table(void *v)
dev =
dev_find_slot(bus_sb700[0],
- PCI_DEVFN(sbdn_sb700 + 0x14, 0));
+ PCI_DEVFN(0x14, 0));
if (dev) {
dword = pci_read_config32(dev, 0x74) & 0xfffffff0;
smp_write_ioapic(mc, apicid_sb700,