Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mei: clean reset bit before reset

H_RST bit in H_CSR register may be found lit before reset is started,
for example if preceding reset flow hasn't completed.
In that case asserting H_RST will be ignored, therefore we need to clean
H_RST bit to start a successful reset sequence.

Cc: <stable@vger.kernel.org> #3.10+
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Alexander Usyskin and committed by
Greg Kroah-Hartman
b13a65ef b7392d22

+12
+12
drivers/misc/mei/hw-me.c
··· 234 234 struct mei_me_hw *hw = to_me_hw(dev); 235 235 u32 hcsr = mei_hcsr_read(hw); 236 236 237 + /* H_RST may be found lit before reset is started, 238 + * for example if preceding reset flow hasn't completed. 239 + * In that case asserting H_RST will be ignored, therefore 240 + * we need to clean H_RST bit to start a successful reset sequence. 241 + */ 242 + if ((hcsr & H_RST) == H_RST) { 243 + dev_warn(dev->dev, "H_RST is set = 0x%08X", hcsr); 244 + hcsr &= ~H_RST; 245 + mei_me_reg_write(hw, H_CSR, hcsr); 246 + hcsr = mei_hcsr_read(hw); 247 + } 248 + 237 249 hcsr |= H_RST | H_IG | H_IS; 238 250 239 251 if (intr_enable)