From 82f08449567f0aab34e6d47294f968f2d50f62a8 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Thu, 30 Nov 2017 20:21:42 +0000 Subject: [PATCH] Properly skip the first CPU. It only accidentally worked because the CPU_FOREACH() loop always starts from BSP (cpu0) and the if condition is always false for APs. Reported by: cem --- sys/x86/cpufreq/hwpstate.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/x86/cpufreq/hwpstate.c b/sys/x86/cpufreq/hwpstate.c index 74e72948c522..ab90ac2b3277 100644 --- a/sys/x86/cpufreq/hwpstate.c +++ b/sys/x86/cpufreq/hwpstate.c @@ -167,10 +167,8 @@ static int hwpstate_goto_pstate(device_t dev, int id) { sbintime_t sbt; - int i; uint64_t msr; - int j; - int limit; + int cpu, i, j, limit; /* get the current pstate limit */ msr = rdmsr(MSR_AMD_10H_11H_LIMIT); @@ -178,8 +176,8 @@ hwpstate_goto_pstate(device_t dev, int id) if (limit > id) id = limit; - HWPSTATE_DEBUG(dev, "setting P%d-state on cpu%d\n", id, - PCPU_GET(cpuid)); + cpu = curcpu; + HWPSTATE_DEBUG(dev, "setting P%d-state on cpu%d\n", id, cpu); /* Go To Px-state */ wrmsr(MSR_AMD_10H_11H_CONTROL, id); @@ -188,7 +186,7 @@ hwpstate_goto_pstate(device_t dev, int id) * Probably should take _PSD into account. */ CPU_FOREACH(i) { - if (i == PCPU_GET(cpuid)) + if (i == cpu) continue; /* Bind to each cpu. */