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

amdfam10 boards: Drop const variables sbdn_sb800 and sbdn_sb700 

They evaluate to const zero and obscure PCI_DEVFN() use.

Change-Id: I8bd8dced62094d5ee8e957241ac29ead054f5c05
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/30632
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:43 +02:00
parent 0571afe5d2
commit 8052fe459c
37 changed files with 48 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/advansus/a785e-i/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/advansus/a785e-i/irq_tables.c
View File

@ -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++;

1
src/mainboard/advansus/a785e-i/mptable.c
View File

@ -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# */

6
src/mainboard/amd/bimini_fam10/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/amd/bimini_fam10/irq_tables.c
View File

@ -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++;

1
src/mainboard/amd/bimini_fam10/mptable.c
View File

@ -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# */

4
src/mainboard/amd/mahogany_fam10/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/amd/mahogany_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_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++;

3
src/mainboard/amd/mahogany_fam10/mptable.c
View File

@ -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,

4
src/mainboard/amd/tilapia_fam10/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/amd/tilapia_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_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++;

3
src/mainboard/amd/tilapia_fam10/mptable.c
View File

@ -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,

4
src/mainboard/asus/m4a78-em/get_bus_conf.c
View File

@ -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);
}

3
src/mainboard/asus/m4a78-em/mptable.c
View File

@ -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,

4
src/mainboard/asus/m4a785-m/get_bus_conf.c
View File

@ -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);
}

3
src/mainboard/asus/m4a785-m/mptable.c
View File

@ -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,

6
src/mainboard/asus/m5a88-v/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/asus/m5a88-v/irq_tables.c
View File

@ -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++;

1
src/mainboard/asus/m5a88-v/mptable.c
View File

@ -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# */

6
src/mainboard/avalue/eax-785e/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/avalue/eax-785e/irq_tables.c
View File

@ -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++;

1
src/mainboard/avalue/eax-785e/mptable.c
View File

@ -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# */

4
src/mainboard/gigabyte/ma785gm/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/gigabyte/ma785gm/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_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++;

3
src/mainboard/gigabyte/ma785gm/mptable.c
View File

@ -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,

4
src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/gigabyte/ma785gmt/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_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++;

3
src/mainboard/gigabyte/ma785gmt/mptable.c
View File

@ -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,

4
src/mainboard/gigabyte/ma78gm/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/gigabyte/ma78gm/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_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++;

3
src/mainboard/gigabyte/ma78gm/mptable.c
View File

@ -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,

4
src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/iei/kino-780am2-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_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++;

3
src/mainboard/iei/kino-780am2-fam10/mptable.c
View File

@ -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,

4
src/mainboard/jetway/pa78vm5/get_bus_conf.c
View File

@ -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);
}

5
src/mainboard/jetway/pa78vm5/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_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++;

3
src/mainboard/jetway/pa78vm5/mptable.c
View File

@ -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,