From 64a9b2b423c3749ae37c636bcda6d5896e433ec4 Mon Sep 17 00:00:00 2001 From: Jason Chen CJ Date: Thu, 9 Aug 2018 16:16:54 +0800 Subject: [PATCH] Revert "[REVERT-ME]: disable turbo mode" This reverts commit b3690987bd30804ce3c886c85bdc1ba6bf369f22. --- hypervisor/arch/x86/cpu.c | 12 ------------ hypervisor/include/arch/x86/msr.h | 3 --- 2 files changed, 15 deletions(-) diff --git a/hypervisor/arch/x86/cpu.c b/hypervisor/arch/x86/cpu.c index 4d7bf082f..bec82a833 100644 --- a/hypervisor/arch/x86/cpu.c +++ b/hypervisor/arch/x86/cpu.c @@ -378,7 +378,6 @@ static void get_cpu_name(void) void bsp_boot_init(void) { uint64_t rsp; - uint64_t misc_en; start_tsc = rdtsc(); @@ -388,11 +387,6 @@ void bsp_boot_init(void) bitmap_set_nolock(BOOT_CPU_ID, &pcpu_active_bitmap); - misc_en = msr_read(MSR_IA32_MISC_ENABLE); - if ((misc_en & TURBO_MODE_DISABLE) == 0UL) { - msr_write(MSR_IA32_MISC_ENABLE, misc_en | TURBO_MODE_DISABLE); - } - /* Get CPU capabilities thru CPUID, including the physical address bit * limit which is required for initializing paging. */ @@ -516,7 +510,6 @@ static void bsp_boot_post(void) void cpu_secondary_init(void) { uint64_t rsp; - uint64_t misc_en; /* Switch this CPU to use the same page tables set-up by the * primary/boot CPU @@ -535,11 +528,6 @@ void cpu_secondary_init(void) bitmap_set_nolock(get_cpu_id(), &pcpu_active_bitmap); - misc_en = msr_read(MSR_IA32_MISC_ENABLE); - if ((misc_en & TURBO_MODE_DISABLE) == 0UL) { - msr_write(MSR_IA32_MISC_ENABLE, misc_en | TURBO_MODE_DISABLE); - } - /* Switch to run-time stack */ rsp = (uint64_t)(&get_cpu_var(stack)[CONFIG_STACK_SIZE - 1]); rsp &= ~(CPU_STACK_ALIGN - 1UL); diff --git a/hypervisor/include/arch/x86/msr.h b/hypervisor/include/arch/x86/msr.h index 4c9bded10..ae531c9ba 100644 --- a/hypervisor/include/arch/x86/msr.h +++ b/hypervisor/include/arch/x86/msr.h @@ -554,7 +554,4 @@ #define SPEC_ENABLE_STIBP (1U<<1) #define PRED_SET_IBPB (1U<<0) -/* Turbo config bit */ -#define TURBO_MODE_DISABLE (1UL<<38) - #endif /* MSR_H */