diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-01-08 23:07:28 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-08 16:40:47 -0800 |
| commit | 9ea73ddd4f144952b8f69fac93dc592ea48e4113 (patch) | |
| tree | ab3457d01984e76e5c5f94306afeddcbc4e841a2 /drivers/misc | |
| parent | adfba3220b625ce4bee08e7e6f48c8a27aac23bb (diff) | |
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')
| -rw-r--r-- | drivers/misc/mei/hw-me.c | 17 | ||||
| -rw-r--r-- | drivers/misc/mei/interrupt.c | 2 | ||||
| -rw-r--r-- | drivers/misc/mei/main.c | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c index ec4ab895f03..ed61659fd38 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); } /** diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index d1ef92617c1..d7e1b797e87 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -691,7 +691,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id) /* initialize our complete list */ mutex_lock(&dev->device_lock); mei_io_list_init(&complete_list); - dev->host_hw_state = mei_hcsr_read(dev); /* Ack the interrupt here * In case of MSI we don't go through the quick handler */ @@ -710,6 +709,7 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id) return IRQ_HANDLED; } + dev->host_hw_state = mei_hcsr_read(dev); /* check if we need to start the dev */ if ((dev->host_hw_state & H_RDY) == 0) { if ((dev->me_hw_state & ME_RDY_HRA) == ME_RDY_HRA) { diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index ec5fd7a0e28..f72bb77fc27 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -915,8 +915,6 @@ static int mei_probe(struct pci_dev *pdev, return 0; release_irq: - /* disable interrupts */ - dev->host_hw_state = mei_hcsr_read(dev); mei_disable_interrupts(dev); flush_scheduled_work(); free_irq(pdev->irq, dev); |