nb/intel/pineview: Use parallel MP init

Remove guards around CPU code on which all platforms use parallel MP
init code.

This removes the option to disable HT siblings.

Tested on Foxconn D41S.

Change-Id: I89f7d514d75fe933c3a8858da37004419189674b
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/25602
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2018-04-10 15:18:38 +02:00 committed by Patrick Georgi
parent c82950bf79
commit 84fdda3812
6 changed files with 2 additions and 45 deletions

View File

@ -17,12 +17,9 @@
#include <device/device.h> #include <device/device.h>
#include <string.h> #include <string.h>
#include <cpu/cpu.h> #include <cpu/cpu.h>
#include <cpu/x86/mtrr.h>
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <cpu/x86/lapic.h> #include <cpu/x86/lapic.h>
#include <cpu/intel/microcode.h>
#include <cpu/intel/speedstep.h> #include <cpu/intel/speedstep.h>
#include <cpu/intel/hyperthreading.h>
#include <cpu/x86/cache.h> #include <cpu/x86/cache.h>
#include <cpu/x86/name.h> #include <cpu/x86/name.h>
#include <cpu/intel/common/common.h> #include <cpu/intel/common/common.h>
@ -84,20 +81,10 @@ static void model_106cx_init(struct device *cpu)
/* Turn on caching if we haven't already */ /* Turn on caching if we haven't already */
x86_enable_cache(); x86_enable_cache();
/* Update the microcode */
if (!IS_ENABLED(CONFIG_PARALLEL_MP))
intel_update_microcode_from_cbfs();
/* Print processor name */ /* Print processor name */
fill_processor_name(processor_name); fill_processor_name(processor_name);
printk(BIOS_INFO, "CPU: %s.\n", processor_name); printk(BIOS_INFO, "CPU: %s.\n", processor_name);
/* Setup MTRRs */
if (!IS_ENABLED(CONFIG_PARALLEL_MP)) {
x86_setup_mtrrs();
x86_mtrr_check();
}
/* Enable the local CPU APICs */ /* Enable the local CPU APICs */
setup_lapic(); setup_lapic();
@ -111,10 +98,6 @@ static void model_106cx_init(struct device *cpu)
configure_misc(); configure_misc();
/* TODO: PIC thermal sensor control */ /* TODO: PIC thermal sensor control */
/* Start up my CPU siblings */
if (!IS_ENABLED(CONFIG_PARALLEL_MP))
intel_sibling_init(cpu);
} }
static struct device_operations cpu_dev_ops = { static struct device_operations cpu_dev_ops = {

View File

@ -44,7 +44,6 @@ entries
416 512 s 0 boot_devices 416 512 s 0 boot_devices
# coreboot config options: cpu # coreboot config options: cpu
944 1 e 2 hyper_threading
#945 7 r 0 unused #945 7 r 0 unused
# coreboot config options: northbridge # coreboot config options: northbridge

View File

@ -44,7 +44,6 @@ entries
416 512 s 0 boot_devices 416 512 s 0 boot_devices
# coreboot config options: cpu # coreboot config options: cpu
944 1 e 2 hyper_threading
#945 7 r 0 unused #945 7 r 0 unused
# coreboot config options: northbridge # coreboot config options: northbridge

View File

@ -31,6 +31,7 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy
select POSTCAR_STAGE select POSTCAR_STAGE
select POSTCAR_CONSOLE select POSTCAR_CONSOLE
select SMM_TSEG select SMM_TSEG
select PARALLEL_MP
config BOOTBLOCK_NORTHBRIDGE_INIT config BOOTBLOCK_NORTHBRIDGE_INIT
string string

View File

@ -151,26 +151,6 @@ void northbridge_write_smram(u8 smram)
pci_write_config8(dev, SMRAM, smram); pci_write_config8(dev, SMRAM, smram);
} }
/*
* Really doesn't belong here but will go away with parallel mp init,
* so let it be here for a while...
*/
int cpu_get_apic_id_map(int *apic_id_map)
{
unsigned int i;
/* Logical processors (threads) per core */
const struct cpuid_result cpuid1 = cpuid(1);
/* Read number of cores. */
const char cores = (cpuid1.ebx >> 16) & 0xf;
/* TODO in parallel MP cpuid(1).ebx */
for (i = 0; i < cores; i++)
apic_id_map[i] = i;
return cores;
}
static void mch_domain_set_resources(struct device *dev) static void mch_domain_set_resources(struct device *dev)
{ {
struct resource *res; struct resource *res;
@ -218,7 +198,7 @@ static struct device_operations pci_domain_ops = {
static void cpu_bus_init(struct device *dev) static void cpu_bus_init(struct device *dev)
{ {
initialize_cpus(dev->link_list); bsp_init_and_start_aps(dev->link_list);
} }
static struct device_operations cpu_bus_ops = { static struct device_operations cpu_bus_ops = {

View File

@ -350,11 +350,6 @@ static void i82801gx_lock_smm(struct device *dev)
printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n"); printk(BIOS_DEBUG, "S3 wakeup, enabling ACPI via APMC\n");
outb(APM_CNT_ACPI_ENABLE, APM_CNT); outb(APM_CNT_ACPI_ENABLE, APM_CNT);
} }
/* Don't allow evil boot loaders, kernels, or
* userspace applications to deceive us:
*/
if (!IS_ENABLED(CONFIG_PARALLEL_MP))
smm_lock();
#if TEST_SMM_FLASH_LOCKDOWN #if TEST_SMM_FLASH_LOCKDOWN
/* Now try this: */ /* Now try this: */