Replace dual_core and quad_core CMOS (nvram) options with multi_core. Fix some white space.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5380 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@ -61,7 +61,7 @@ unsigned get_apicid_base(unsigned ioapic_num)
|
||||
unsigned nb_cfg_54;
|
||||
int bsp_apic_id = lapicid(); // bsp apicid
|
||||
|
||||
get_option(&disable_siblings, "dual_core");
|
||||
get_option(&disable_siblings, "multi_core");
|
||||
|
||||
//get the nodes number
|
||||
dev = dev_find_slot(0, PCI_DEVFN(0x18,0));
|
||||
@ -129,7 +129,7 @@ void amd_sibling_init(device_t cpu)
|
||||
/* On the bootstrap processor see if I want sibling cpus enabled */
|
||||
if (first_time) {
|
||||
first_time = 0;
|
||||
get_option(&disable_siblings, "dual_core");
|
||||
get_option(&disable_siblings, "multi_core");
|
||||
}
|
||||
result = cpuid(0x80000008);
|
||||
/* See how many sibling cpus we have */
|
||||
|
@ -57,8 +57,8 @@ static inline void start_other_cores(void)
|
||||
unsigned nodeid;
|
||||
|
||||
if (CONFIG_HAVE_OPTION_TABLE &&
|
||||
read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) {
|
||||
return; // disable dual_core
|
||||
read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) {
|
||||
return; // disable multi_core
|
||||
}
|
||||
|
||||
nodes = get_nodes();
|
||||
|
@ -131,7 +131,7 @@ static void for_each_ap(u32 bsp_apicid, u32 core_range,
|
||||
disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
|
||||
#if CONFIG_LOGICAL_CPUS == 1
|
||||
if(read_option(CMOS_VSTART_quad_core, CMOS_VLEN_quad_core, 0) != 0) { // 0 mean quad core
|
||||
if(read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core
|
||||
disable_siblings = 1;
|
||||
}
|
||||
#endif
|
||||
|
@ -57,7 +57,7 @@ static void for_each_ap(unsigned bsp_apicid, unsigned core_range, process_ap_t p
|
||||
|
||||
disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
#if CONFIG_LOGICAL_CPUS == 1 && CONFIG_HAVE_OPTION_TABLE == 1
|
||||
if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0) { // 0 mean dual core
|
||||
if(read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) { // 0 mean multi core
|
||||
disable_siblings = 1;
|
||||
}
|
||||
#endif
|
||||
|
@ -82,7 +82,7 @@ u32 get_apicid_base(u32 ioapic_num)
|
||||
|
||||
u32 disable_siblings = !CONFIG_LOGICAL_CPUS;
|
||||
|
||||
get_option(&disable_siblings, "quad_core");
|
||||
get_option(&disable_siblings, "multi_core");
|
||||
|
||||
siblings = get_max_siblings(sysconf.nodes);
|
||||
|
||||
|
@ -86,8 +86,8 @@ static void start_other_cores(void)
|
||||
u32 nodes;
|
||||
u32 nodeid;
|
||||
|
||||
// disable quad_core
|
||||
if (read_option(CMOS_VSTART_quad_core, CMOS_VLEN_quad_core, 0) != 0) {
|
||||
// disable multi_core
|
||||
if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0) != 0) {
|
||||
printk(BIOS_DEBUG, "Skip additional core init\n");
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user