GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/skylake: Use CPU MP Init Common code 

This patch uses the common CPU Mp Init code.

BUG=none
BRANCH=none
TEST=Build and boot poppy

Change-Id: Ieb2f8ae25a31e86e9251fe97859678745fe610f5
Signed-off-by: Barnali Sarkar <barnali.sarkar@intel.com>
Reviewed-on: https://review.coreboot.org/20190
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Barnali Sarkar 2017-06-13 20:22:33 +05:30 committed by Aaron Durbin
parent 91d38a5b0e
commit 7327386051
4 changed files with 22 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/soc/intel/skylake/Kconfig
View File

@ -53,6 +53,7 @@ config CPU_SPECIFIC_OPTIONS
select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE select SOC_INTEL_COMMON_ACPI_WAKE_SOURCE
select SOC_INTEL_COMMON_BLOCK select SOC_INTEL_COMMON_BLOCK
select SOC_INTEL_COMMON_BLOCK_CPU select SOC_INTEL_COMMON_BLOCK_CPU
select SOC_INTEL_COMMON_BLOCK_CPU_MPINIT
select SOC_INTEL_COMMON_BLOCK_FAST_SPI select SOC_INTEL_COMMON_BLOCK_FAST_SPI
select SOC_INTEL_COMMON_BLOCK_GSPI select SOC_INTEL_COMMON_BLOCK_GSPI
select SOC_INTEL_COMMON_BLOCK_ITSS select SOC_INTEL_COMMON_BLOCK_ITSS

1
src/soc/intel/skylake/bootblock/report_platform.c
View File

@ -20,6 +20,7 @@
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include <device/pci.h> #include <device/pci.h>
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <intelblocks/mp_init.h>
#include <soc/bootblock.h> #include <soc/bootblock.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/pch.h> #include <soc/pch.h>

105
src/soc/intel/skylake/cpu.c
View File

@ -36,6 +36,7 @@
#include <delay.h> #include <delay.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <intelblocks/fast_spi.h> #include <intelblocks/fast_spi.h>
#include <intelblocks/mp_init.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/msr.h> #include <soc/msr.h>
@ -45,9 +46,19 @@
#include <soc/smm.h> #include <soc/smm.h>
#include <soc/systemagent.h> #include <soc/systemagent.h>
/* MP initialization support. */ /*
* TODO: This Global variable must be removed once the following
* two cases are resolved -
*
* 1) SGX enabling for the BSP issue gets solved, due to which
* configure_sgx() function is kept inside soc_init_cpus().
* 2) uCode loading after SMM relocation is deleted inside
* per_cpu_smm_trigger() function, since as per
* current BWG, uCode loading can be done after all feature
* programmings are done. There is no specific recommendation
* to do it after SMM Relocation.
*/
static const void *microcode_patch; static const void *microcode_patch;
static int ht_disabled;
/* Convert time in seconds to POWER_LIMIT_1_TIME MSR value */ /* Convert time in seconds to POWER_LIMIT_1_TIME MSR value */
static const u8 power_limit_time_sec_to_msr[] = { static const u8 power_limit_time_sec_to_msr[] = {
@ -394,7 +405,7 @@ static void enable_pm_timer_emulation(void)
} }
/* All CPUs including BSP will run the following function. */ /* All CPUs including BSP will run the following function. */
static void cpu_core_init(device_t cpu) void soc_core_init(device_t cpu, const void *microcode)
{ {
/* Clear out pending MCEs */ /* Clear out pending MCEs */
configure_mca(); configure_mca();
@ -425,75 +436,19 @@ static void cpu_core_init(device_t cpu)
enable_turbo(); enable_turbo();
/* Configure SGX */ /* Configure SGX */
configure_sgx(microcode_patch); configure_sgx(microcode);
}
static struct device_operations cpu_dev_ops = {
.init = cpu_core_init,
};
static struct cpu_device_id cpu_table[] = {
{ X86_VENDOR_INTEL, CPUID_SKYLAKE_C0 },
{ X86_VENDOR_INTEL, CPUID_SKYLAKE_D0 },
{ X86_VENDOR_INTEL, CPUID_SKYLAKE_HQ0 },
{ X86_VENDOR_INTEL, CPUID_SKYLAKE_HR0 },
{ X86_VENDOR_INTEL, CPUID_KABYLAKE_G0 },
{ X86_VENDOR_INTEL, CPUID_KABYLAKE_H0 },
{ X86_VENDOR_INTEL, CPUID_KABYLAKE_Y0 },
{ X86_VENDOR_INTEL, CPUID_KABYLAKE_HA0 },
{ X86_VENDOR_INTEL, CPUID_KABYLAKE_HB0 },
{ 0, 0 },
};
static const struct cpu_driver driver __cpu_driver = {
.ops = &cpu_dev_ops,
.id_table = cpu_table,
};
static int get_cpu_count(void)
{
msr_t msr;
int num_threads;
int num_cores;
msr = rdmsr(MSR_CORE_THREAD_COUNT);
num_threads = (msr.lo >> 0) & 0xffff;
num_cores = (msr.lo >> 16) & 0xffff;
printk(BIOS_DEBUG, "CPU has %u cores, %u threads enabled.\n",
num_cores, num_threads);
ht_disabled = num_threads == num_cores;
return num_threads;
}
static void get_microcode_info(const void **microcode, int *parallel)
{
microcode_patch = intel_microcode_find();
*microcode = microcode_patch;
*parallel = 1;
intel_microcode_load_unlocked(microcode_patch);
} }
static int adjust_apic_id(int index, int apic_id) static int adjust_apic_id(int index, int apic_id)
{ {
if (ht_disabled) unsigned int num_cores, num_threads;
if (cpu_read_topology(&num_cores, &num_threads))
return 2 * index; return 2 * index;
else else
return index; return index;
} }
/* Check whether the current CPU is the sibling hyperthread. */
int is_secondary_thread(void)
{
int apic_id;
apic_id = lapicid();
if (!ht_disabled && (apic_id & 1))
return 1;
return 0;
}
static void per_cpu_smm_trigger(void) static void per_cpu_smm_trigger(void)
{ {
/* Relocate the SMM handler. */ /* Relocate the SMM handler. */
@ -537,11 +492,9 @@ static const struct mp_ops mp_ops = {
.post_mp_init = post_mp_init, .post_mp_init = post_mp_init,
}; };
static void soc_init_cpus(void *unused) void soc_init_cpus(struct bus *cpu_bus, const void *microcode)
{ {
device_t dev = dev_find_path(NULL, DEVICE_PATH_CPU_CLUSTER); microcode_patch = microcode;
assert(dev != NULL);
struct bus *cpu_bus = dev->link_list;
if (mp_init_with_smm(cpu_bus, &mp_ops)) if (mp_init_with_smm(cpu_bus, &mp_ops))
printk(BIOS_ERR, "MP initialization failure.\n"); printk(BIOS_ERR, "MP initialization failure.\n");
@ -558,20 +511,6 @@ static void soc_init_cpus(void *unused)
configure_sgx(microcode_patch); configure_sgx(microcode_patch);
} }
/* Ensure to re-program all MTRRs based on DRAM resource settings */
static void soc_post_cpus_init(void *unused)
{
if (mp_run_on_all_cpus(&x86_setup_mtrrs_with_detect, 1000) < 0)
printk(BIOS_ERR, "MTRR programming failure\n");
/* Temporarily cache the memory-mapped boot media. */
if (IS_ENABLED(CONFIG_BOOT_DEVICE_MEMORY_MAPPED) &&
IS_ENABLED(CONFIG_BOOT_DEVICE_SPI_FLASH))
fast_spi_cache_bios_region();
x86_mtrr_check();
}
int soc_skip_ucode_update(u32 current_patch_id, u32 new_patch_id) int soc_skip_ucode_update(u32 current_patch_id, u32 new_patch_id)
{ {
msr_t msr1; msr_t msr1;
@ -594,7 +533,3 @@ int soc_skip_ucode_update(u32 current_patch_id, u32 new_patch_id)
return (msr1.lo & PRMRR_SUPPORTED) && return (msr1.lo & PRMRR_SUPPORTED) &&
(current_patch_id == new_patch_id - 1); (current_patch_id == new_patch_id - 1);
} }
/* Do CPU MP Init before FSP Silicon Init */
BOOT_STATE_INIT_ENTRY(BS_DEV_INIT_CHIPS, BS_ON_ENTRY, soc_init_cpus, NULL);
BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_EXIT, soc_post_cpus_init, NULL);

12
src/soc/intel/skylake/include/soc/cpu.h
View File

@ -23,17 +23,6 @@
/* CPU types */ /* CPU types */
#define SKYLAKE_FAMILY_ULT 0x406e0 #define SKYLAKE_FAMILY_ULT 0x406e0
/* Supported CPUIDs */
#define CPUID_SKYLAKE_C0 0x406e2
#define CPUID_SKYLAKE_D0 0x406e3
#define CPUID_SKYLAKE_HQ0 0x506e1
#define CPUID_SKYLAKE_HR0 0x506e3
#define CPUID_KABYLAKE_G0 0x406e8
#define CPUID_KABYLAKE_H0 0x806e9
#define CPUID_KABYLAKE_Y0 0x806ea
#define CPUID_KABYLAKE_HA0 0x506e8
#define CPUID_KABYLAKE_HB0 0x906e9
/* Latency times in units of 1024ns. */ /* Latency times in units of 1024ns. */
#define C_STATE_LATENCY_CONTROL_0_LIMIT 0x4e #define C_STATE_LATENCY_CONTROL_0_LIMIT 0x4e
#define C_STATE_LATENCY_CONTROL_1_LIMIT 0x76 #define C_STATE_LATENCY_CONTROL_1_LIMIT 0x76
@ -67,7 +56,6 @@ void set_power_limits(u8 power_limit_1_time);
u32 cpu_family_model(void); u32 cpu_family_model(void);
u32 cpu_stepping(void); u32 cpu_stepping(void);
int cpu_is_ult(void); int cpu_is_ult(void);
int is_secondary_thread(void);
void configure_sgx(const void *microcode_patch); void configure_sgx(const void *microcode_patch);
#endif #endif