Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752496AbbLIAY1 (ORCPT ); Tue, 8 Dec 2015 19:24:27 -0500 Received: from mgwkm04.jp.fujitsu.com ([202.219.69.171]:51821 "EHLO mgwkm04.jp.fujitsu.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751913AbbLIAY0 (ORCPT ); Tue, 8 Dec 2015 19:24:26 -0500 X-Greylist: delayed 607 seconds by postgrey-1.27 at vger.kernel.org; Tue, 08 Dec 2015 19:24:26 EST Subject: Re: [PATCH] powercap, intel_rapl.c, fix BIOS lock check To: Prarit Bhargava , References: <1449599602-4512-1-git-send-email-prarit@redhat.com> CC: "Rafael J. Wysocki" , Jacob Pan , Radivoje Jovanovic , Mathias Krause , Ajay Thomas From: Seiichi Ikarashi Organization: Fujitsu Limited Message-ID: <566771EC.2020201@jp.fujitsu.com> Date: Wed, 9 Dec 2015 09:12:28 +0900 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1449599602-4512-1-git-send-email-prarit@redhat.com> Content-Type: text/plain; charset="iso-2022-jp" Content-Transfer-Encoding: 7bit X-SecurityPolicyCheck-GC: OK by FENCE-Mail X-TM-AS-MML: disable Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2796 Lines: 71 On 2015-12-09 03:33, Prarit Bhargava wrote: > Intel RAPL initialized on several systems where the BIOS lock bit (msr > 0x610, bit 63) was set. This occured because the return value of > rapl_read_data_raw() was being checked, rather than the value of the variable > passed in, locked. > > This patch properly implments the rapl_read_data_raw() call to check the > variable locked, and now the Intel RAPL driver outputs the warning: > > intel_rapl: RAPL package 0 domain package locked by BIOS > > and does not initialize for the package. > > Cc: "Rafael J. Wysocki" > Cc: Jacob Pan > Cc: Radivoje Jovanovic > Cc: Seiichi Ikarashi > Cc: Mathias Krause > Cc: Ajay Thomas > Signed-off-by: Prarit Bhargava > --- > drivers/powercap/intel_rapl.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c > index cc97f08..0b0d09d 100644 > --- a/drivers/powercap/intel_rapl.c > +++ b/drivers/powercap/intel_rapl.c > @@ -1341,11 +1341,13 @@ static int rapl_detect_domains(struct rapl_package *rp, int cpu) > > for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { > /* check if the domain is locked by BIOS */ > - if (rapl_read_data_raw(rd, FW_LOCK, false, &locked)) { > + ret = rapl_read_data_raw(rd, FW_LOCK, false, &locked); > + if (ret) > + return ret; > + if (locked) > pr_info("RAPL package %d domain %s locked by BIOS\n", > rp->id, rd->name); > rd->state |= DOMAIN_STATE_BIOS_LOCKED; > - } > } A good spot! But this patch looks setting DOMAIN_STATE_BIOS_LOCKED bit to all package domains. I suppose what you are going to do is like below. --- a/drivers/powercap/intel_rapl.c 2015-11-02 09:05:25.000000000 +0900 +++ b/drivers/powercap/intel_rapl.c 2015-12-09 09:05:33.386142840 +0900 @@ -1340,10 +1340,13 @@ static int rapl_detect_domains(struct ra for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) { /* check if the domain is locked by BIOS */ - if (rapl_read_data_raw(rd, FW_LOCK, false, &locked)) { + ret = rapl_read_data_raw(rd, FW_LOCK, false, &locked); + if (ret) + return ret; + if (locked) { pr_info("RAPL package %d domain %s locked by BIOS\n", rp->id, rd->name); - rd->state |= DOMAIN_STATE_BIOS_LOCKED; + rd->state |= DOMAIN_STATE_BIOS_LOCKED; } } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/