From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756549Ab3LVAxL (ORCPT ); Sat, 21 Dec 2013 19:53:11 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:64875 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755858Ab3LVAxJ (ORCPT ); Sat, 21 Dec 2013 19:53:09 -0500 From: "Rafael J. Wysocki" To: Jacob Pan Cc: LKML , Linux PM , Srinivas Pandruvada , Rafael Wysocki , Gavin Hindman , "Triplett, Josh" Subject: Re: [PATCH] powercap/rapl: add support for ValleyView Soc Date: Sun, 22 Dec 2013 02:06:33 +0100 Message-ID: <1553570.ISCzPqBYzN@vostro.rjw.lan> User-Agent: KMail/4.10.5 (Linux/3.12.0-rc6+; KDE/4.10.5; x86_64; ; ) In-Reply-To: <1386801567-26661-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1386801567-26661-1-git-send-email-jacob.jun.pan@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, December 11, 2013 02:39:27 PM Jacob Pan wrote: > This patch adds support for RAPL on Intel ValleyView based SoC > platforms, such as Baytrail. > > Besides adding CPU ID, special energy unit encoding is handled > for ValleyView. > > Signed-off-by: Jacob Pan Queued up for 3.14, thanks! > --- > drivers/powercap/intel_rapl.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c > index 2a786c5..3c67683 100644 > --- a/drivers/powercap/intel_rapl.c > +++ b/drivers/powercap/intel_rapl.c > @@ -833,6 +833,11 @@ static int rapl_write_data_raw(struct rapl_domain *rd, > return 0; > } > > +static const struct x86_cpu_id energy_unit_quirk_ids[] = { > + { X86_VENDOR_INTEL, 6, 0x37},/* VLV */ > + {} > +}; > + > static int rapl_check_unit(struct rapl_package *rp, int cpu) > { > u64 msr_val; > @@ -853,8 +858,11 @@ static int rapl_check_unit(struct rapl_package *rp, int cpu) > * time unit: 1/time_unit_divisor Seconds > */ > value = (msr_val & ENERGY_UNIT_MASK) >> ENERGY_UNIT_OFFSET; > - rp->energy_unit_divisor = 1 << value; > - > + /* some CPUs have different way to calculate energy unit */ > + if (x86_match_cpu(energy_unit_quirk_ids)) > + rp->energy_unit_divisor = 1000000 / (1 << value); > + else > + rp->energy_unit_divisor = 1 << value; > > value = (msr_val & POWER_UNIT_MASK) >> POWER_UNIT_OFFSET; > rp->power_unit_divisor = 1 << value; > @@ -941,6 +949,7 @@ static void package_power_limit_irq_restore(int package_id) > static const struct x86_cpu_id rapl_ids[] = { > { X86_VENDOR_INTEL, 6, 0x2a},/* SNB */ > { X86_VENDOR_INTEL, 6, 0x2d},/* SNB EP */ > + { X86_VENDOR_INTEL, 6, 0x37},/* VLV */ > { X86_VENDOR_INTEL, 6, 0x3a},/* IVB */ > { X86_VENDOR_INTEL, 6, 0x45},/* HSW */ > /* TODO: Add more CPU IDs after testing */ > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.