From patchwork Tue Nov 18 08:37:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ethan zhao X-Patchwork-Id: 5326511 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0150EC11AC for ; Tue, 18 Nov 2014 08:42:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 361D120176 for ; Tue, 18 Nov 2014 08:42:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5B10C2012B for ; Tue, 18 Nov 2014 08:42:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752715AbaKRIm3 (ORCPT ); Tue, 18 Nov 2014 03:42:29 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:37361 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753787AbaKRIhf (ORCPT ); Tue, 18 Nov 2014 03:37:35 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id sAI8bTjH030171 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 18 Nov 2014 08:37:29 GMT Received: from userz7021.oracle.com (userz7021.oracle.com [156.151.31.85]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id sAI8bSvc021287 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 18 Nov 2014 08:37:29 GMT Received: from abhmp0005.oracle.com (abhmp0005.oracle.com [141.146.116.11]) by userz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id sAI8bSEi012443; Tue, 18 Nov 2014 08:37:28 GMT Received: from localhost.localdomain.com (/10.182.70.25) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 18 Nov 2014 00:37:27 -0800 From: Ethan Zhao To: dirk.j.brandewie@intel.com, viresh.kumar@linaro.org, rjw@rjwysocki.net, corbet@lwn.net Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, ethan.kernel@gmail.com, joe.jin@oracle.com, brian.maly@oracle.com, Ethan Zhao Subject: [PATCH 2/3] intel_pstate: allow driver to be built as a module Date: Tue, 18 Nov 2014 17:37:01 +0900 Message-Id: <1416299826-15813-3-git-send-email-ethan.zhao@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1416299826-15813-1-git-send-email-ethan.zhao@oracle.com> References: <1416299826-15813-1-git-send-email-ethan.zhao@oracle.com> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] 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.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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: Brian Maly To provide the flexibility of module, allow this driver to be configured and built as a module. Signed-off-by: Brian Maly Signed-off-by: Ethan Zhao --- drivers/cpufreq/Kconfig.x86 | 2 +- drivers/cpufreq/intel_pstate.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86 index 89ae88f..94c9e6b 100644 --- a/drivers/cpufreq/Kconfig.x86 +++ b/drivers/cpufreq/Kconfig.x86 @@ -3,7 +3,7 @@ # config X86_INTEL_PSTATE - bool "Intel P state control" + tristate "Intel P state control" depends on X86 help This driver provides a P state for Intel core processors. diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 5498eb0..7c5faea 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -590,7 +590,9 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate) if (pstate == cpu->pstate.current_pstate) return; +#ifndef MODULE trace_cpu_frequency(pstate * cpu->pstate.scaling, cpu->cpu); +#endif cpu->pstate.current_pstate = pstate; @@ -705,12 +707,14 @@ static void intel_pstate_timer_func(unsigned long __data) intel_pstate_adjust_busy_pstate(cpu); +#ifndef MODULE trace_pstate_sample(fp_toint(sample->core_pct_busy), fp_toint(intel_pstate_get_scaled_busy(cpu)), cpu->pstate.current_pstate, sample->mperf, sample->aperf, sample->freq); +#endif intel_pstate_set_sample_time(cpu); } @@ -1054,6 +1058,7 @@ out: } device_initcall(intel_pstate_init); +#ifndef MODULE static int __init intel_pstate_setup(char *str) { if (!str) @@ -1064,6 +1069,7 @@ static int __init intel_pstate_setup(char *str) return 0; } early_param("intel_pstate", intel_pstate_setup); +#endif MODULE_AUTHOR("Dirk Brandewie "); MODULE_DESCRIPTION("'intel_pstate' - P state driver Intel Core processors");