Shaunak Saha (shaunak.saha@intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17203
-gerrit
commit 0b5aefd533827c2c75a4a33caacc0f592863fc6e Author: Shaunak Saha shaunak.saha@intel.com Date: Mon Oct 10 12:34:28 2016 -0700
intel/apollolake: Enable turbo
This patch adds punit initialization code after FspMemoryInit so that turbo can be initialized after that.
BUG=chrome-os-partner:58158 BRANCH=None
Change-Id: I4939da47da82b9a728cf1b5cf6d5ec54b4f5b31d Signed-off-by: Shaunak Saha shaunak.saha@intel.com --- src/soc/intel/apollolake/chip.h | 1 + src/soc/intel/apollolake/include/soc/cpu.h | 2 ++ src/soc/intel/apollolake/include/soc/iomap.h | 6 ++++ src/soc/intel/apollolake/romstage.c | 53 ++++++++++++++++++++++++++++ src/soc/intel/apollolake/tsc_freq.c | 41 +++++++++++++++++++++ 5 files changed, 103 insertions(+)
diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index 6c3bcd8..b5d132d 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -124,4 +124,5 @@ struct soc_intel_apollolake_config { uint16_t prt0_gpio; };
+void set_max_freq(void); #endif /* _SOC_APOLLOLAKE_CHIP_H_ */ diff --git a/src/soc/intel/apollolake/include/soc/cpu.h b/src/soc/intel/apollolake/include/soc/cpu.h index e94972d..603d139 100644 --- a/src/soc/intel/apollolake/include/soc/cpu.h +++ b/src/soc/intel/apollolake/include/soc/cpu.h @@ -88,4 +88,6 @@ void apollolake_init_cpus(struct device *dev); /* Common Timer Copy (CTC) frequency - 19.2MHz. */ #define CTC_FREQ 19200000
+#define APL_BURST_MODE_DISABLE 0x0000004000000000 + #endif /* _SOC_APOLLOLAKE_CPU_H_ */ diff --git a/src/soc/intel/apollolake/include/soc/iomap.h b/src/soc/intel/apollolake/include/soc/iomap.h index d5d8f87..3c94d1b 100644 --- a/src/soc/intel/apollolake/include/soc/iomap.h +++ b/src/soc/intel/apollolake/include/soc/iomap.h @@ -25,6 +25,12 @@ #define MCH_BASE_ADDR 0xfed10000 #define MCH_BASE_SIZE (32 * KiB)
+#define P_CR_CORE_DISABLE_MASK_0_0_0_MCHBAR 0x7168 +#define P_CR_BIOS_RESET_CPL_0_0_0_MCHBAR 0x7078 +#define PUNIT_THERMAL_DEVICE_IRQ 0x700C +#define PUINT_THERMAL_DEVICE_IRQ_VEC_NUMBER 0x18 +#define PUINT_THERMAL_DEVICE_IRQ_LOCK 0x80000000 + #define ACPI_PMIO_BASE 0x400 #define ACPI_PMIO_SIZE 0x100 #define R_ACPI_PM1_TMR 0x8 diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c index 1f6a38f..ffa20f7 100644 --- a/src/soc/intel/apollolake/romstage.c +++ b/src/soc/intel/apollolake/romstage.c @@ -40,6 +40,8 @@ #include <soc/uart.h> #include <string.h> #include <timestamp.h> +#include <delay.h> +#include "chip.h"
static struct chipset_power_state power_state CAR_GLOBAL;
@@ -100,6 +102,53 @@ static void migrate_power_state(int is_recovery) } ROMSTAGE_CBMEM_INIT_HOOK(migrate_power_state);
+/* + * Punit Initialization code.This all isn't documented, but + * this is the recipe . + */ +static void punit_init(void) +{ + uint32_t reg; + uint32_t data; + + /* Software Core Disable Mask (P_CR_CORE_DISABLE_MASK_0_0_0_MCHBAR) */ + write32((void *)(MCH_BASE_ADDR + P_CR_CORE_DISABLE_MASK_0_0_0_MCHBAR), + 0x0); + + /* P-Unit bring up */ + reg = read32((void *)(MCH_BASE_ADDR + + P_CR_BIOS_RESET_CPL_0_0_0_MCHBAR)); + if (reg == 0xffffffff) { + /* P-unit not found */ + printk(BIOS_DEBUG,"Punit MMIO not available \n"); + } else { + /* Set Punit interrupt pin IPIN offset 3D */ + write32((void *)(0xE000103D),0x002); + + /* Set PUINT IRQ to 24 and INTPIN LOCK */ + write32((void *)(MCH_BASE_ADDR + PUNIT_THERMAL_DEVICE_IRQ), + PUINT_THERMAL_DEVICE_IRQ_VEC_NUMBER | + PUINT_THERMAL_DEVICE_IRQ_LOCK); + + data = read32((void *)(MCH_BASE_ADDR + 0x7818)); + data &= 0xFFFFE01F; + data |= (0x20 | 0x200); + write32((void *)(MCH_BASE_ADDR + 0x7818), data); + + /* Stage0 BIOS Reset Complete (RST_CPL) */ + write32((void *)(MCH_BASE_ADDR + + P_CR_BIOS_RESET_CPL_0_0_0_MCHBAR), 0x1); + + /* Poll for bit 8 in same reg (RST_CPL) */ + data = read32((void *)(MCH_BASE_ADDR + + P_CR_BIOS_RESET_CPL_0_0_0_MCHBAR)); + while ( !(read32 ((void *)(MCH_BASE_ADDR + + P_CR_BIOS_RESET_CPL_0_0_0_MCHBAR)) & 0x100) ) { + udelay(100); + } + } +} + asmlinkage void car_stage_entry(void) { struct postcar_frame pcf; @@ -119,6 +168,10 @@ asmlinkage void car_stage_entry(void)
s3wake = fill_power_state(ps) == ACPI_S3; fsp_memory_init(s3wake); + + punit_init(); + set_max_freq(); + if (postcar_frame_init(&pcf, 1*KiB)) die("Unable to initialize postcar frame.\n");
diff --git a/src/soc/intel/apollolake/tsc_freq.c b/src/soc/intel/apollolake/tsc_freq.c index 9dd1dea..6510c00 100644 --- a/src/soc/intel/apollolake/tsc_freq.c +++ b/src/soc/intel/apollolake/tsc_freq.c @@ -14,12 +14,53 @@ * GNU General Public License for more details. */
+#include <cpu/intel/turbo.h> #include <cpu/x86/msr.h> #include <cpu/x86/tsc.h> #include <soc/cpu.h> +#include <console/console.h> +#include <delay.h> +#include "chip.h"
unsigned long tsc_freq_mhz(void) { msr_t msr = rdmsr(MSR_PLATFORM_INFO); return (BASE_CLOCK_MHZ * ((msr.lo >> 8) & 0xff)); } + +void set_max_freq(void) +{ + msr_t msr, msr_rd; + unsigned int eax; + + eax = cpuid_eax(6); + + msr = rdmsr(MSR_IA32_MISC_ENABLES); + if ((eax == 0) && ((msr.hi & APL_BURST_MODE_DISABLE) == 0)) { + /* Burst Mode has been factory configured as disabled + * and is not available in this physical processor + * package. + */ + printk(BIOS_DEBUG, "Burst Mode is factory disabled\n"); + return; + } + + /* Enable burst mode */ + msr.hi = 0; + wrmsr(MSR_IA32_MISC_ENABLES, msr); + + /* Enable speed step. */ + msr = rdmsr(MSR_IA32_MISC_ENABLES); + msr.lo |= (1 << 16); + wrmsr(MSR_IA32_MISC_ENABLES, msr); + + /* Set P-State ratio */ + msr = rdmsr(IA32_PERL_CTL); + msr.lo &= ~(0xff00); + + /* Read the frequency limit ratio and set it properly in PERF_CTL */ + msr_rd = rdmsr(FREQ_LIMIT_RATIO); + msr.lo |= ((msr_rd.lo & 0xff) << 8); + + wrmsr(IA32_PERL_CTL, msr); +}