]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
powercap / RAPL: fix BIOS lock check
authorPrarit Bhargava <prarit@redhat.com>
Wed, 9 Dec 2015 13:31:12 +0000 (08:31 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Mar 2016 23:06:50 +0000 (15:06 -0800)
commitc1a968eced547b68eb6a584b4808fb5990c7eaa7
treec53c8c6c865c1c51a300781c9876555ea1ac07e5
parent59caef576e710b7fd43adca93113477511a6e944
powercap / RAPL: fix BIOS lock check

commit 79a21dbfae3cd40d5a801778071a9967b79c2c20 upstream.

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.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Acked-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/powercap/intel_rapl.c