diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2016-10-25 10:14:32 -0500 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2016-10-25 19:27:50 +0200 |
| commit | 06590a20142249ef11e306dc8f4f3469e4847b5a (patch) | |
| tree | d4c3ced4808ee6ce9768c9d01021d98b1c17b61b /src/soc/intel/apollolake/cpu.c | |
| parent | 79daac98903360db656c49f0078a2bd1744ca25b (diff) | |
Revert "soc/apollolake: Add soc core init"
This reverts commit a52f883b100f3229dd4d86c81c08781993861f73
(https://review.coreboot.org/16587).
The above commit caused another sever kernel boot regression upwards
of 2 minutes to get through kernel init on quad core systems.
BUG=chrome-os-partner:58994
Change-Id: Id4abc332bf2266e3b3b7be714371ce9cf329bcd9
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/17121
Tested-by: build bot (Jenkins)
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Andrey Petrov <andrey.petrov@intel.com>
Diffstat (limited to 'src/soc/intel/apollolake/cpu.c')
| -rw-r--r-- | src/soc/intel/apollolake/cpu.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c index bd5cff50a9..e67842c369 100644 --- a/src/soc/intel/apollolake/cpu.c +++ b/src/soc/intel/apollolake/cpu.c @@ -25,32 +25,11 @@ #include <cpu/x86/mtrr.h> #include <device/device.h> #include <device/pci.h> -#include <reg_script.h> #include <soc/cpu.h> -#include <soc/iomap.h> #include <soc/smm.h> -static const struct reg_script core_msr_script[] = { - /* Enable C-state and IO/MWAIT redirect */ - REG_MSR_WRITE(MSR_PMG_CST_CONFIG_CONTROL, - (PKG_C_STATE_LIMIT_C2_MASK | CORE_C_STATE_LIMIT_C10_MASK - | IO_MWAIT_REDIRECT_MASK | CST_CFG_LOCK_MASK)), - /* Power Management I/O base address for I/O trapping to C-states */ - REG_MSR_WRITE(MSR_PMG_IO_CAPTURE_BASE, - (ACPI_PMIO_CST_REG | (PMG_IO_BASE_CST_RNG_BLK_SIZE << 16))), - /* Disable C1E */ - REG_MSR_RMW(MSR_POWER_CTL, ~0x2, 0), - REG_SCRIPT_END -}; - -static void soc_core_init(device_t cpu) -{ - /* Set core MSRs */ - reg_script_run(core_msr_script); -} - static struct device_operations cpu_dev_ops = { - .init = soc_core_init, + .init = DEVICE_NOOP, }; static struct cpu_device_id cpu_table[] = { |