From patchwork Wed Mar 19 15:45:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dirk.brandewie@gmail.com X-Patchwork-Id: 3859741 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 511989F369 for ; Wed, 19 Mar 2014 18:18:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8032820123 for ; Wed, 19 Mar 2014 18:18:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9F1ED20122 for ; Wed, 19 Mar 2014 18:18:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965578AbaCSPqL (ORCPT ); Wed, 19 Mar 2014 11:46:11 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:33839 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965568AbaCSPqJ (ORCPT ); Wed, 19 Mar 2014 11:46:09 -0400 Received: by mail-pd0-f171.google.com with SMTP id r10so8800224pdi.16 for ; Wed, 19 Mar 2014 08:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HZVPL+QrIdAwzfq8NJcQS8UpFiKSjfPboF5uAvsIxKA=; b=tWw0KjypiqE7e7eRX4tu3HJ8NBrZeilxI4KY6tmhVA8Mh8qonVMTw2GXvNShBBCKBs 9PrwhJ9LyVVaaskHjP7VKsxvLMKt4nUk5puHeGblQdJpmA2/DlG1yTtOlsE3k8h0Pf25 IT9Mqt+job+XkAc1cXm69D2BZnOCncMMwTnnMDybejaXnVCR+9dRpKLqvL5yg1NGxTg2 xWZUDWVzWlkCxdekSEdpK12Tv66NUArZy4zvQlt2VxixSTYt0cRHClOsdlTRKaCZQonX RfFe1KvHHqvjyWVmDMn2upoYsh5fIivgVbT4O2+zU86zdtULA8yDTvTH1xcmJsNhFPcn PWkg== X-Received: by 10.66.171.76 with SMTP id as12mr40813838pac.52.1395243969203; Wed, 19 Mar 2014 08:46:09 -0700 (PDT) Received: from echolake.localdomain (static-50-43-42-35.bvtn.or.frontiernet.net. [50.43.42.35]) by mx.google.com with ESMTPSA id x9sm63433275pbu.1.2014.03.19.08.46.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Mar 2014 08:46:08 -0700 (PDT) From: dirk.brandewie@gmail.com To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, rjw@rjwysocki.net, patrick.marlier@gmail.com, viresh.kumar@linaro.org, srivatsa.bhat@linux.vnet.ibm.com, dirk.brandewie@gmail.com, Dirk Brandewie Subject: [PATCH 2/2] intel_pstate: Set core to min P state during core offline Date: Wed, 19 Mar 2014 08:45:54 -0700 Message-Id: <1395243954-28262-3-git-send-email-dirk.j.brandewie@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1395243954-28262-1-git-send-email-dirk.j.brandewie@intel.com> References: <1395243954-28262-1-git-send-email-dirk.j.brandewie@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dirk Brandewie Change to use ->exit_prepare() callback to do clean up during CPU hotplug. The requested P state for an offline core will be used by the hardware coordination function to select the package P state. If the core is under load when it is offlined it will fix the package P state floor to the requested P state of offline core. Reported-by: Patrick Marlier Signed-off-by: Dirk Brandewie --- drivers/cpufreq/intel_pstate.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 2cd36b9..e9092fd 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -447,7 +447,7 @@ static void core_set_pstate(struct cpudata *cpudata, int pstate) if (limits.no_turbo) val |= (u64)1 << 32; - wrmsrl(MSR_IA32_PERF_CTL, val); + wrmsrl_on_cpu(cpudata->cpu, MSR_IA32_PERF_CTL, val); } static struct cpu_defaults core_params = { @@ -773,16 +773,22 @@ static int intel_pstate_verify_policy(struct cpufreq_policy *policy) return 0; } -static int intel_pstate_cpu_exit(struct cpufreq_policy *policy) +static int intel_pstate_cpu_stop(struct cpufreq_policy *policy) { - int cpu = policy->cpu; + int cpu_num = policy->cpu; + struct cpudata *cpu = all_cpu_data[cpu_num]; + + pr_info("intel_pstate CPU %d exiting\n", cpu_num); + + del_timer(&all_cpu_data[cpu_num]->timer); + intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate); + kfree(all_cpu_data[cpu_num]); + all_cpu_data[cpu_num] = NULL; - del_timer(&all_cpu_data[cpu]->timer); - kfree(all_cpu_data[cpu]); - all_cpu_data[cpu] = NULL; return 0; } + static int intel_pstate_cpu_init(struct cpufreq_policy *policy) { struct cpudata *cpu; @@ -818,7 +824,7 @@ static struct cpufreq_driver intel_pstate_driver = { .setpolicy = intel_pstate_set_policy, .get = intel_pstate_get, .init = intel_pstate_cpu_init, - .exit = intel_pstate_cpu_exit, + .stop = intel_pstate_cpu_stop, .name = "intel_pstate", };