Skip to content

Commit

Permalink
Revert "AHCI: Do not acquire ata_host::lock from single IRQ handler"
Browse files Browse the repository at this point in the history
This reverts commit 33fb0d0.

18dcf43 ("AHCI: Optimize single IRQ interrupt processing") is
scheduled to be reverted.  This is an optimization dependent on the
mentioned commit.  Revert it first.

Signed-off-by: Tejun Heo <tj@kernel.org>
  • Loading branch information
Tejun Heo committed Oct 27, 2014
1 parent aa1cf25 commit 03e83cb
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/ata/libahci.c
Original file line number Diff line number Diff line change
Expand Up @@ -1875,6 +1875,8 @@ static irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)

irq_masked = irq_stat & hpriv->port_map;

spin_lock(&host->lock);

for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap;

Expand Down Expand Up @@ -1906,6 +1908,8 @@ static irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)
*/
writel(irq_stat, mmio + HOST_IRQ_STAT);

spin_unlock(&host->lock);

VPRINTK("EXIT\n");

return handled ? IRQ_WAKE_THREAD : IRQ_NONE;
Expand Down

0 comments on commit 03e83cb

Please sign in to comment.