diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-05-12 12:19:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-06-16 13:40:33 -0700 |
| commit | d27fb05d96cd11c2577ae89cbb0fe1778b1051d1 (patch) | |
| tree | edc01bdb9708fe357e5d49f582b6fa1018949df5 | |
| parent | b6ac0f888ae9b06b3d4092b8252d493b059d1ded (diff) | |
| download | linux-stable-d27fb05d96cd11c2577ae89cbb0fe1778b1051d1.tar.gz linux-stable-d27fb05d96cd11c2577ae89cbb0fe1778b1051d1.tar.bz2 linux-stable-d27fb05d96cd11c2577ae89cbb0fe1778b1051d1.zip | |
mei: me: read H_CSR after asserting reset
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>
| -rw-r--r-- | drivers/misc/mei/hw-me.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index f67c37ecf16d..fbc4a7bbdfa9 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -189,6 +189,18 @@ 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); + /* + * 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); |