aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/interrupt.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-01-08 16:07:31 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 19:40:47 -0500
commite7e0c231aaa7a01df28634390381974cb76d3cb2 (patch)
treee6a2233958265dc3efc649563de50fc4e1605b38 /drivers/misc/mei/interrupt.c
parent88eb99f29c0026f4b7d7702652eb529f04c69073 (diff)
mei: make host csr and me csr internal to hw-me
Move csr reading into me hardware functional calls. Since we gave up on registers caching we remove some of the unnecessary queries in mei_hw_init ane mei_reset functions. We add mei_hw_config function to wrap up host buffer depth configuration. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/interrupt.c')
-rw-r--r--drivers/misc/mei/interrupt.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 27374b6b6424..b04ed9bdf758 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -697,8 +697,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id)
697 if (pci_dev_msi_enabled(dev->pdev)) 697 if (pci_dev_msi_enabled(dev->pdev))
698 mei_clear_interrupts(dev); 698 mei_clear_interrupts(dev);
699 699
700 dev->me_hw_state = mei_mecsr_read(dev);
701
702 /* check if ME wants a reset */ 700 /* check if ME wants a reset */
703 if (!mei_me_is_ready(dev) && 701 if (!mei_me_is_ready(dev) &&
704 dev->dev_state != MEI_DEV_RESETING && 702 dev->dev_state != MEI_DEV_RESETING &&
@@ -709,7 +707,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id)
709 return IRQ_HANDLED; 707 return IRQ_HANDLED;
710 } 708 }
711 709
712 dev->host_hw_state = mei_hcsr_read(dev);
713 /* check if we need to start the dev */ 710 /* check if we need to start the dev */
714 if (!mei_host_is_ready(dev)) { 711 if (!mei_host_is_ready(dev)) {
715 if (mei_me_is_ready(dev)) { 712 if (mei_me_is_ready(dev)) {
@@ -746,7 +743,6 @@ irqreturn_t mei_interrupt_thread_handler(int irq, void *dev_id)
746 rets = mei_irq_thread_write_handler(dev, &complete_list); 743 rets = mei_irq_thread_write_handler(dev, &complete_list);
747end: 744end:
748 dev_dbg(&dev->pdev->dev, "end of bottom half function.\n"); 745 dev_dbg(&dev->pdev->dev, "end of bottom half function.\n");
749 dev->host_hw_state = mei_hcsr_read(dev);
750 dev->mei_host_buffer_is_empty = mei_hbuf_is_empty(dev); 746 dev->mei_host_buffer_is_empty = mei_hbuf_is_empty(dev);
751 747
752 bus_message_received = false; 748 bus_message_received = false;