lkml.org 
[lkml]   [2016]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 083/130] powercap / RAPL: fix BIOS lock check
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Prarit Bhargava <prarit@redhat.com>

    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 | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/powercap/intel_rapl.c
    +++ b/drivers/powercap/intel_rapl.c
    @@ -1194,10 +1194,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;
    }
    }
    \
     
     \ /
      Last update: 2016-03-02 03:41    [W:4.406 / U:0.192 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site