powercap, intel_rapl.c, fix BIOS lock check
PATCH 1/1 powercap, intel_rapl.c, fix BIOS lock check
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.
--- drivers/powercap/intel_rapl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/powercap/intel_rapl.c +4 -2
@@ -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 ; - } }
Signature · 1 line
1.7.9.3
Quoted 5 lines · On Tue, 8 Dec 2015 13:33:22 -0500 Prarit Bhargava <[email protected]> wrote:
Intel RAPL initialized on several systems where the BIOS lock bit (msr
0x610, bit 63) was set. This occured because the return value ofrapl_read_data_raw()was being checked, rather than the value of the variable passed in, locked.
Quoted 7 lines
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 BIOSand does not initialize for the package.
Looks good to me.
Quoted 31 lines · Prarit Bhargava
Intel RAPL initialized on several systems where the BIOS lock bit (msr
0x610, bit 63) was set. This occured because the return value ofrapl_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 BIOSand does not initialize for the package.
Cc "Rafael J. Wysocki" <[email protected]>Cc Jacob Pan <[email protected]>Cc Radivoje Jovanovic <[email protected]>Cc Seiichi Ikarashi <[email protected]>Cc Mathias Krause <[email protected]>Cc Ajay Thomas <[email protected]>Signed-off-by Prarit Bhargava <[email protected]>--- drivers/powercap/intel_rapl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/powercap/intel_rapl.c +0
-0@@ -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 */
drivers/powercap/intel_rapl.c static int rapl_detect_domains(struct rapl_package *rp, int cpu) · line 1351
Quoted 10 lines
drivers/powercap/intel_rapl.c +4
-2-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.
drivers/powercap/intel_rapl.c +5 -2
@@ -1340,10 +1340,13 @@ static int rapl_detect_domains(struct rafor (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 ; } }
Quoted 54 lines · Seiichi Ikarashi
Quoted 31 lines · Prarit Bhargava
Intel RAPL initialized on several systems where the BIOS lock bit (msr
0x610, bit 63) was set. This occured because the return value ofrapl_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 BIOSand does not initialize for the package.
Cc "Rafael J. Wysocki" <[email protected]>Cc Jacob Pan <[email protected]>Cc Radivoje Jovanovic <[email protected]>Cc Seiichi Ikarashi <[email protected]>Cc Mathias Krause <[email protected]>Cc Ajay Thomas <[email protected]>Signed-off-by Prarit Bhargava <[email protected]>--- drivers/powercap/intel_rapl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/powercap/intel_rapl.c +0
-0@@ -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 */ drivers/powercap/intel_rapl.c static int rapl_detect_domains(struct rapl_package *rp, int cpu) · line 1351
Quoted 10 lines
drivers/powercap/intel_rapl.c +4
-2-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 settingDOMAIN_STATE_BIOS_LOCKEDbit to all package domains. I suppose what you are going to do is like below.drivers/powercap/intel_rapl.c +0
-1@@ -1340,10 +1340,13 @@ static int rapl_detect_domains(struct rafor (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)) {
drivers/powercap/intel_rapl.c static int rapl_detect_domains(struct ra · line 1351
Quoted 10 lines
drivers/powercap/intel_rapl.c +5
-1+ 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 ; } }
Oh geez :) Of course ... I'll resubmit shortly.
P.