amdfam10 boards: Drop extern on apicid_sp5100
The value get_bus_conf() initialises this value to is discarded. Change-Id: I8382861574e6f8ab52839169502a5af7c3742daa Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/30780 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
@@ -22,25 +22,10 @@
|
|||||||
|
|
||||||
#include <cpu/amd/amdfam10_sysconf.h>
|
#include <cpu/amd/amdfam10_sysconf.h>
|
||||||
|
|
||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
|
||||||
* and acpi_tables busnum is default.
|
|
||||||
*/
|
|
||||||
u32 apicid_sp5100;
|
|
||||||
|
|
||||||
|
|
||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 apicid_base;
|
|
||||||
|
|
||||||
get_default_pci1234(1);
|
get_default_pci1234(1);
|
||||||
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
|
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
|
||||||
|
|
||||||
pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
|
pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
|
||||||
apicid_base = get_apicid_base(1);
|
|
||||||
else
|
|
||||||
apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
|
|
||||||
apicid_sp5100 = apicid_base + 0;
|
|
||||||
}
|
}
|
||||||
|
@@ -21,14 +21,11 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <cpu/amd/amdfam10_sysconf.h>
|
#include <cpu/amd/amdfam10_sysconf.h>
|
||||||
|
|
||||||
extern u32 apicid_sp5100;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void *smp_write_config_table(void *v)
|
static void *smp_write_config_table(void *v)
|
||||||
{
|
{
|
||||||
struct mp_config_table *mc;
|
struct mp_config_table *mc;
|
||||||
int bus_isa;
|
int bus_isa;
|
||||||
|
u32 apicid_sp5100;
|
||||||
u32 apicid_sr5650;
|
u32 apicid_sr5650;
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
uint8_t sp5100_bus_number;
|
uint8_t sp5100_bus_number;
|
||||||
|
@@ -22,26 +22,12 @@
|
|||||||
|
|
||||||
#include <cpu/amd/amdfam10_sysconf.h>
|
#include <cpu/amd/amdfam10_sysconf.h>
|
||||||
|
|
||||||
/* Global variables for MB layouts and these will be shared by irqtable mptable
|
|
||||||
* and acpi_tables busnum is default.
|
|
||||||
*/
|
|
||||||
u32 apicid_sp5100;
|
|
||||||
|
|
||||||
|
|
||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 apicid_base;
|
|
||||||
|
|
||||||
get_default_pci1234(1);
|
get_default_pci1234(1);
|
||||||
|
|
||||||
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
|
sysconf.sbdn = (sysconf.hcdn[0] & 0xff);
|
||||||
|
|
||||||
pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
|
pirq_router_bus = (sysconf.pci1234[0] >> 16) & 0xff;
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
|
||||||
apicid_base = get_apicid_base(1);
|
|
||||||
else
|
|
||||||
apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
|
|
||||||
apicid_sp5100 = apicid_base + 0;
|
|
||||||
}
|
}
|
||||||
|
@@ -21,14 +21,11 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <cpu/amd/amdfam10_sysconf.h>
|
#include <cpu/amd/amdfam10_sysconf.h>
|
||||||
|
|
||||||
extern u32 apicid_sp5100;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void *smp_write_config_table(void *v)
|
static void *smp_write_config_table(void *v)
|
||||||
{
|
{
|
||||||
struct mp_config_table *mc;
|
struct mp_config_table *mc;
|
||||||
int bus_isa;
|
int bus_isa;
|
||||||
|
u32 apicid_sp5100;
|
||||||
u32 apicid_sr5650;
|
u32 apicid_sr5650;
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
uint8_t sp5100_bus_number;
|
uint8_t sp5100_bus_number;
|
||||||
|
@@ -25,11 +25,9 @@
|
|||||||
* and acpi_tables busnum is default.
|
* and acpi_tables busnum is default.
|
||||||
*/
|
*/
|
||||||
u8 bus_sr5650[14];
|
u8 bus_sr5650[14];
|
||||||
u32 apicid_sp5100;
|
|
||||||
|
|
||||||
void get_bus_conf(void)
|
void get_bus_conf(void)
|
||||||
{
|
{
|
||||||
u32 apicid_base;
|
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
@@ -54,11 +52,4 @@ void get_bus_conf(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* I/O APICs: APIC ID Version State Address */
|
|
||||||
if (IS_ENABLED(CONFIG_LOGICAL_CPUS))
|
|
||||||
apicid_base = get_apicid_base(1);
|
|
||||||
else
|
|
||||||
apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
|
|
||||||
apicid_sp5100 = apicid_base + 0;
|
|
||||||
}
|
}
|
||||||
|
@@ -22,14 +22,11 @@
|
|||||||
|
|
||||||
extern u8 bus_sr5650[14];
|
extern u8 bus_sr5650[14];
|
||||||
|
|
||||||
extern u32 apicid_sp5100;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void *smp_write_config_table(void *v)
|
static void *smp_write_config_table(void *v)
|
||||||
{
|
{
|
||||||
struct mp_config_table *mc;
|
struct mp_config_table *mc;
|
||||||
int bus_isa;
|
int bus_isa;
|
||||||
|
u32 apicid_sp5100;
|
||||||
u32 apicid_sr5650;
|
u32 apicid_sr5650;
|
||||||
|
|
||||||
mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
|
mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
|
||||||
|
Reference in New Issue
Block a user