diff options
author | Tomas Winkler | 2013-01-08 22:07:28 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-01-09 01:40:47 +0100 |
commit | 9ea73ddd4f144952b8f69fac93dc592ea48e4113 (patch) | |
tree | ab3457d01984e76e5c5f94306afeddcbc4e841a2 /drivers/misc/mei/hw-me.c | |
parent | mei: don't use cached value for hcsr in mei_hw_reset (diff) | |
download | kernel-qcow2-linux-9ea73ddd4f144952b8f69fac93dc592ea48e4113.tar.gz kernel-qcow2-linux-9ea73ddd4f144952b8f69fac93dc592ea48e4113.tar.xz kernel-qcow2-linux-9ea73ddd4f144952b8f69fac93dc592ea48e4113.zip |
mei: use non cached hcsr for interrupt enablement
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hw-me.c')
-rw-r--r-- | drivers/misc/mei/hw-me.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index ec4ab895f03d..ed61659fd388 100644 --- a/drivers/misc/mei/hw-me.c +++ b/drivers/misc/mei/hw-me.c @@ -106,8 +106,9 @@ void mei_hcsr_set(struct mei_device *dev) */ void mei_clear_interrupts(struct mei_device *dev) { - if ((dev->host_hw_state & H_IS) == H_IS) - mei_reg_write(dev, H_CSR, dev->host_hw_state); + u32 hcsr = mei_hcsr_read(dev); + if ((hcsr & H_IS) == H_IS) + mei_reg_write(dev, H_CSR, hcsr); } /** @@ -117,8 +118,10 @@ void mei_clear_interrupts(struct mei_device *dev) */ void mei_enable_interrupts(struct mei_device *dev) { - dev->host_hw_state |= H_IE; - mei_hcsr_set(dev); + u32 hcsr = mei_hcsr_read(dev); + hcsr |= H_IE; + hcsr &= ~H_IS; + mei_reg_write(dev, H_CSR, hcsr); } /** @@ -128,8 +131,10 @@ void mei_enable_interrupts(struct mei_device *dev) */ void mei_disable_interrupts(struct mei_device *dev) { - dev->host_hw_state &= ~H_IE; - mei_hcsr_set(dev); + u32 hcsr = mei_hcsr_read(dev); + hcsr &= ~H_IE; + hcsr &= ~H_IS; + mei_reg_write(dev, H_CSR, hcsr); } /** |