diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-03 11:38:43 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-01-04 17:20:51 +0000 |
| commit | 8052fe459c777db7985bdfed3ca198a556fc970c (patch) | |
| tree | c4a421408e507161c0f5ab71d1e7c5a4ffd00ec0 /src/mainboard/amd/mahogany_fam10 | |
| parent | 0571afe5d2b576f8e89eaabf4bbd0f7a31fd0a62 (diff) | |
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>
Diffstat (limited to 'src/mainboard/amd/mahogany_fam10')
| -rw-r--r-- | src/mainboard/amd/mahogany_fam10/get_bus_conf.c | 4 | ||||
| -rw-r--r-- | src/mainboard/amd/mahogany_fam10/irq_tables.c | 5 | ||||
| -rw-r--r-- | src/mainboard/amd/mahogany_fam10/mptable.c | 3 |
3 files changed, 4 insertions, 8 deletions
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, |