lkml.org 
[lkml]   [2014]   [Jul]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 065/198] mei: me: read H_CSR after asserting reset
    Date
    3.13.11.5 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Tomas Winkler <tomas.winkler@intel.com>

    commit c40765d919d25d2d44d99c4ce39e48808f137e1e upstream.

    According the spec the host should read H_CSR again
    after asserting reset H_RST to ensure that reset was
    read by the firmware

    Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
    Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [ kamal: backport to 3.13-stable: also includes mei_me_hw_reset() change from
    33ec082 mei: revamp mei reset state machine ]
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/misc/mei/hw-me.c | 14 +++++++++++++-
    1 file changed, 13 insertions(+), 1 deletion(-)

    diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
    index 4835edc..cbc9187 100644
    --- a/drivers/misc/mei/hw-me.c
    +++ b/drivers/misc/mei/hw-me.c
    @@ -189,7 +189,19 @@ static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable)
    dev->recvd_hw_ready = false;
    mei_me_reg_write(hw, H_CSR, hcsr);

    - if (dev->dev_state == MEI_DEV_POWER_DOWN)
    + /*
    + * Host reads the H_CSR once to ensure that the
    + * posted write to H_CSR completes.
    + */
    + hcsr = mei_hcsr_read(hw);
    +
    + if ((hcsr & H_RST) == 0)
    + dev_warn(&dev->pdev->dev, "H_RST is not set = 0x%08X", hcsr);
    +
    + if ((hcsr & H_RDY) == H_RDY)
    + dev_warn(&dev->pdev->dev, "H_RDY is not cleared 0x%08X", hcsr);
    +
    + if (intr_enable == false)
    mei_me_hw_reset_release(dev);

    return 0;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-07-18 14:21    [W:2.945 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site