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

cpu/intel/haswell: Rename HASWELL_BCLK to CPU_BCLK

Browse source 
This is just to ease merging with Broadwell.

Tested with BUILD_TIMELESS=1, Asrock B85M Pro4 remains identical.

Change-Id: I9239489fe48f04714e6626b57ef07ca8b3013024
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46910
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2020-10-28 19:15:36 +01:00 committed by Patrick Georgi
parent d95fe364aa
commit ca965496ff
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cpu/intel/haswell/acpi.c
View file

@ -209,7 +209,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
/* Max Non-Turbo Ratio */ /* Max Non-Turbo Ratio */
ratio_max = (msr.lo >> 8) & 0xff; ratio_max = (msr.lo >> 8) & 0xff;
} }
clock_max = ratio_max * HASWELL_BCLK; clock_max = ratio_max * CPU_BCLK;
/* Calculate CPU TDP in mW */ /* Calculate CPU TDP in mW */
msr = rdmsr(MSR_PKG_POWER_SKU_UNIT); msr = rdmsr(MSR_PKG_POWER_SKU_UNIT);
@ -273,7 +273,7 @@ static void generate_P_state_entries(int core, int cores_per_package)
/* Calculate power at this ratio */ /* Calculate power at this ratio */
power = calculate_power(power_max, ratio_max, ratio); power = calculate_power(power_max, ratio_max, ratio);
clock = ratio * HASWELL_BCLK; clock = ratio * CPU_BCLK;
acpigen_write_PSS_package( acpigen_write_PSS_package(
clock, /*MHz*/ clock, /*MHz*/

2
src/cpu/intel/haswell/haswell.h
View file

@ -18,7 +18,7 @@
#define HASWELL_STEPPING_ULT_C0 1 #define HASWELL_STEPPING_ULT_C0 1
/* Haswell bus clock is fixed at 100MHz */ /* Haswell bus clock is fixed at 100MHz */
#define HASWELL_BCLK 100 #define CPU_BCLK 100
#define MSR_CORE_THREAD_COUNT 0x35 #define MSR_CORE_THREAD_COUNT 0x35
#define MSR_FEATURE_CONFIG 0x13c #define MSR_FEATURE_CONFIG 0x13c

2
src/cpu/intel/haswell/haswell_init.c
View file

@ -596,7 +596,7 @@ static void set_max_ratio(void)
wrmsr(IA32_PERF_CTL, perf_ctl); wrmsr(IA32_PERF_CTL, perf_ctl);
printk(BIOS_DEBUG, "CPU: frequency set to %d\n", printk(BIOS_DEBUG, "CPU: frequency set to %d\n",
((perf_ctl.lo >> 8) & 0xff) * HASWELL_BCLK); ((perf_ctl.lo >> 8) & 0xff) * CPU_BCLK);
} }
static void configure_mca(void) static void configure_mca(void)