From 228746b3464d2b76bd418e2214351976c316ba68 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Thu, 3 Jan 2019 11:38:51 +0200 Subject: amdfam10 boards: Drop const variable sbdn_sp5100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8756a81324ba3d4374bb6b06f7f0ddade6ba530f Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/30636 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Angel Pons --- src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c | 4 +--- src/mainboard/supermicro/h8scm_fam10/irq_tables.c | 5 ++--- src/mainboard/supermicro/h8scm_fam10/mptable.c | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/mainboard/supermicro') diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c index ab9f6d96a9..5f574236ea 100644 --- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c +++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c @@ -46,7 +46,6 @@ u32 hcdnx[] = { }; -u32 sbdn_sp5100; void get_bus_conf(void) { @@ -63,7 +62,6 @@ void get_bus_conf(void) get_pci1234(); sysconf.sbdn = (sysconf.hcdn[0] & 0xff); - sbdn_sp5100 = 0; for (i = 0; i < 2; i++) { bus_sp5100[i] = 0; @@ -78,7 +76,7 @@ void get_bus_conf(void) /* sp5100 */ - dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(sbdn_sp5100 + 0x14, 4)); + dev = dev_find_slot(bus_sp5100[0], PCI_DEVFN(0x14, 4)); if (dev) { bus_sp5100[1] = pci_read_config8(dev, PCI_SECONDARY_BUS); } diff --git a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c index 82e773621e..6591041c16 100644 --- a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c +++ b/src/mainboard/supermicro/h8scm_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_sp5100[2]; -extern unsigned long sbdn_sp5100; 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_sp5100[0]; - pirq->rtr_devfn = ((sbdn_sp5100 + 0x14) << 3) | 4; + pirq->rtr_devfn = (0x14 << 3) | 4; pirq->exclusive_irqs = 0; @@ -83,7 +82,7 @@ unsigned long write_pirq_routing_table(unsigned long addr) /* pci bridge */ write_pirq_info(pirq_info, bus_sp5100[0], - ((sbdn_sp5100 + 0x14) << 3) | 4, 0x1, 0xdef8, 0x2, + (0x14 << 3) | 4, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0); pirq_info++; slot_num++; diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c index 3e6ef3a61d..9acf299deb 100644 --- a/src/mainboard/supermicro/h8scm_fam10/mptable.c +++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c @@ -25,7 +25,6 @@ extern u8 bus_sp5100[2]; extern u32 apicid_sp5100; -extern u32 sbdn_sp5100; static void *smp_write_config_table(void *v) @@ -51,7 +50,7 @@ static void *smp_write_config_table(void *v) u8 byte; dev = dev_find_slot(0, //bus_sp5100[0], TODO: why bus_sp5100[0] use same value of bus_sr5650[0] assigned by get_pci1234(), instead of 0. - PCI_DEVFN(sbdn_sp5100 + 0x14, 0)); + PCI_DEVFN(0x14, 0)); if (dev) { dword = (u32 *)(pci_read_config32(dev, 0x74) & 0xfffffff0); smp_write_ioapic(mc, apicid_sp5100, 0x11, dword); -- cgit v1.2.3