soc/intel/apollolake: Provide interface to update TCC offset

This change provides an interface for apollolake to set TCC before
BIOS reset complete happens in romstage.

With this change, we can add code to update Tcc in devicetree.

BUG=b:117789732
TEST=Match the result from TAT UI

Change-Id: I4419d3bbe2628fcb26ef81828d6325fc952dbabc
Signed-off-by: John Su <john_su@compal.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/29351
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Justin TerAvest <teravest@chromium.org>
Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com>
This commit is contained in:
John Su 2018-11-06 10:51:43 +08:00 committed by Furquan Shaikh
parent 63952e1060
commit 85376bfd9b
3 changed files with 54 additions and 19 deletions

View File

@ -112,6 +112,9 @@ struct soc_intel_apollolake_config {
/* Enable DPTF support */ /* Enable DPTF support */
int dptf_enable; int dptf_enable;
/* TCC activation offset value in degrees Celsius */
int tcc_offset;
/* PL1 override value in mW for APL */ /* PL1 override value in mW for APL */
uint16_t tdp_pl1_override_mw; uint16_t tdp_pl1_override_mw;
/* PL2 override value in mW for APL */ /* PL2 override value in mW for APL */

View File

@ -28,29 +28,30 @@
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/mtrr.h> #include <cpu/x86/mtrr.h>
#include <cpu/x86/pae.h> #include <cpu/x86/pae.h>
#include <delay.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/resource.h> #include <device/resource.h>
#include <intelblocks/lpc_lib.h>
#include <fsp/api.h> #include <fsp/api.h>
#include <fsp/memmap.h> #include <fsp/memmap.h>
#include <fsp/util.h> #include <fsp/util.h>
#include <intelblocks/cpulib.h> #include <intelblocks/cpulib.h>
#include <intelblocks/lpc_lib.h>
#include <intelblocks/msr.h>
#include <intelblocks/pmclib.h>
#include <intelblocks/smm.h> #include <intelblocks/smm.h>
#include <intelblocks/systemagent.h> #include <intelblocks/systemagent.h>
#include <intelblocks/pmclib.h>
#include <mrc_cache.h> #include <mrc_cache.h>
#include <soc/cpu.h> #include <soc/cpu.h>
#include <soc/iomap.h> #include <soc/iomap.h>
#include <soc/meminit.h> #include <soc/meminit.h>
#include <soc/systemagent.h>
#include <soc/pci_devs.h> #include <soc/pci_devs.h>
#include <soc/pm.h> #include <soc/pm.h>
#include <soc/romstage.h> #include <soc/romstage.h>
#include <soc/systemagent.h>
#include <spi_flash.h> #include <spi_flash.h>
#include <string.h> #include <string.h>
#include <timestamp.h>
#include <timer.h> #include <timer.h>
#include <delay.h> #include <timestamp.h>
#include "chip.h" #include "chip.h"
static const uint8_t hob_variable_guid[16] = { static const uint8_t hob_variable_guid[16] = {
@ -99,6 +100,32 @@ static void soc_early_romstage_init(void)
lpc_io_setup_comm_a_b(); lpc_io_setup_comm_a_b();
} }
/* Thermal throttle activation offset */
static void configure_thermal_target(void)
{
const struct device *dev = dev_find_slot(0, SA_DEVFN_ROOT);
if (!dev) {
printk(BIOS_ERR, "Could not find SOC devicetree config\n");
return;
}
const config_t *conf = dev->chip_info;
if (!dev->chip_info) {
printk(BIOS_ERR, "Could not find chip info\n");
return;
}
msr_t msr;
if (!conf->tcc_offset)
return;
msr = rdmsr(MSR_TEMPERATURE_TARGET);
/* Bits 27:24 */
msr.lo &= ~(TEMPERATURE_TCC_MASK << TEMPERATURE_TCC_SHIFT);
msr.lo |= (conf->tcc_offset & TEMPERATURE_TCC_MASK)
<< TEMPERATURE_TCC_SHIFT;
wrmsr(MSR_TEMPERATURE_TARGET, msr);
}
/* /*
* Punit Initialization code. This all isn't documented, but * Punit Initialization code. This all isn't documented, but
* this is the recipe. * this is the recipe.
@ -109,6 +136,9 @@ static bool punit_init(void)
uint32_t data; uint32_t data;
struct stopwatch sw; struct stopwatch sw;
/* Thermal throttle activation offset */
configure_thermal_target();
/* /*
* Software Core Disable Mask (P_CR_CORE_DISABLE_MASK_0_0_0_MCHBAR). * Software Core Disable Mask (P_CR_CORE_DISABLE_MASK_0_0_0_MCHBAR).
* Enable all cores here. * Enable all cores here.

View File

@ -20,26 +20,26 @@
#define MSR_PLATFORM_INFO 0xce #define MSR_PLATFORM_INFO 0xce
#define MSR_PKG_CST_CONFIG_CONTROL 0xe2 #define MSR_PKG_CST_CONFIG_CONTROL 0xe2
/* Set MSR_PKG_CST_CONFIG_CONTROL[3:0] for Package C-State limit */ /* Set MSR_PKG_CST_CONFIG_CONTROL[3:0] for Package C-State limit */
#define PKG_C_STATE_LIMIT_C2_MASK 0x2 #define PKG_C_STATE_LIMIT_C2_MASK 0x2
/* Set MSR_PKG_CST_CONFIG_CONTROL[7:4] for Core C-State limit*/ /* Set MSR_PKG_CST_CONFIG_CONTROL[7:4] for Core C-State limit*/
#define CORE_C_STATE_LIMIT_C10_MASK 0x70 #define CORE_C_STATE_LIMIT_C10_MASK 0x70
/* Set MSR_PKG_CST_CONFIG_CONTROL[10] to IO redirect to MWAIT */ /* Set MSR_PKG_CST_CONFIG_CONTROL[10] to IO redirect to MWAIT */
#define IO_MWAIT_REDIRECT_MASK 0x400 #define IO_MWAIT_REDIRECT_MASK 0x400
/* Set MSR_PKG_CST_CONFIG_CONTROL[15] to lock CST_CFG [0-15] bits */ /* Set MSR_PKG_CST_CONFIG_CONTROL[15] to lock CST_CFG [0-15] bits */
#define CST_CFG_LOCK_MASK 0x8000 #define CST_CFG_LOCK_MASK 0x8000
#define MSR_BIOS_UPGD_TRIG 0x7a #define MSR_BIOS_UPGD_TRIG 0x7a
#define SGX_ACTIVATE_BIT (1) #define SGX_ACTIVATE_BIT (1)
#define MSR_PMG_IO_CAPTURE_BASE 0xe4 #define MSR_PMG_IO_CAPTURE_BASE 0xe4
#define MSR_POWER_MISC 0x120 #define MSR_POWER_MISC 0x120
#define ENABLE_IA_UNTRUSTED (1 << 6) #define ENABLE_IA_UNTRUSTED (1 << 6)
#define FLUSH_DL1_L2 (1 << 8) #define FLUSH_DL1_L2 (1 << 8)
#define MSR_EMULATE_PM_TMR 0x121 #define MSR_EMULATE_PM_TMR 0x121
#define EMULATE_DELAY_OFFSET_VALUE 20 #define EMULATE_DELAY_OFFSET_VALUE 20
#define EMULATE_PM_TMR_EN (1 << 16) #define EMULATE_PM_TMR_EN (1 << 16)
#define EMULATE_DELAY_VALUE 0x13 #define EMULATE_DELAY_VALUE 0x13
#define MSR_FEATURE_CONFIG 0x13c #define MSR_FEATURE_CONFIG 0x13c
#define FEATURE_CONFIG_RESERVED_MASK 0x3ULL #define FEATURE_CONFIG_RESERVED_MASK 0x3ULL
#define FEATURE_CONFIG_LOCK (1 << 0) #define FEATURE_CONFIG_LOCK (1 << 0)
#define SMM_MCA_CAP_MSR 0x17d #define SMM_MCA_CAP_MSR 0x17d
#define SMM_CPU_SVRSTR_BIT 57 #define SMM_CPU_SVRSTR_BIT 57
#define SMM_CPU_SVRSTR_MASK (1 << (SMM_CPU_SVRSTR_BIT - 32)) #define SMM_CPU_SVRSTR_MASK (1 << (SMM_CPU_SVRSTR_BIT - 32))
@ -49,9 +49,11 @@
/* This is burst mode BIT 38 in IA32_MISC_ENABLE MSR at offset 1A0h */ /* This is burst mode BIT 38 in IA32_MISC_ENABLE MSR at offset 1A0h */
#define BURST_MODE_DISABLE (1 << 6) #define BURST_MODE_DISABLE (1 << 6)
#define MSR_TEMPERATURE_TARGET 0x1a2 #define MSR_TEMPERATURE_TARGET 0x1a2
#define TEMPERATURE_TCC_MASK 0xf
#define TEMPERATURE_TCC_SHIFT 24
#define MSR_PREFETCH_CTL 0x1a4 #define MSR_PREFETCH_CTL 0x1a4
#define PREFETCH_L1_DISABLE (1 << 0) #define PREFETCH_L1_DISABLE (1 << 0)
#define PREFETCH_L2_DISABLE (1 << 2) #define PREFETCH_L2_DISABLE (1 << 2)
#define MSR_MISC_PWR_MGMT 0x1aa #define MSR_MISC_PWR_MGMT 0x1aa
#define MISC_PWR_MGMT_EIST_HW_DIS (1 << 0) #define MISC_PWR_MGMT_EIST_HW_DIS (1 << 0)
#define MISC_PWR_MGMT_ISST_EN (1 << 6) #define MISC_PWR_MGMT_ISST_EN (1 << 6)
@ -80,7 +82,7 @@
* Time Window = (float)((1+X/4)*(2*^Y), X Corresponds to [23:22], * Time Window = (float)((1+X/4)*(2*^Y), X Corresponds to [23:22],
* Y to [21:17] in MSR 0x610. 28 sec is equal to 0x6e. * Y to [21:17] in MSR 0x610. 28 sec is equal to 0x6e.
*/ */
#define MB_POWER_LIMIT1_TIME_DEFAULT 0x6e #define MB_POWER_LIMIT1_TIME_DEFAULT 0x6e
#define MSR_PKG_POWER_SKU 0x614 #define MSR_PKG_POWER_SKU 0x614
#define MSR_DDR_RAPL_LIMIT 0x618 #define MSR_DDR_RAPL_LIMIT 0x618
#define MSR_C_STATE_LATENCY_CONTROL_3 0x633 #define MSR_C_STATE_LATENCY_CONTROL_3 0x633