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

ide: Handle irq disabling consistently

ide_timer_expiry() disables interrupt at function entry when acquiring
hwif->lock. Before disabling the device interrupt it unlocks hwif->lock,
but interrupts stay disabled. After the call to disable_irq() interrupts
are disabled again, which is a pointless exercise.

After the device irq handler has been invoked with interrupts disabled,
hwif->lock is acquired again with spin_lock_irq() because the device irq
handler might have reenabled interrupts. This is not documented and
confusing for the casual reader.

Remove the redundant local_irq_disable() and add a comment which explains
why hwif->lock has to be reacquired with spin_lock_irq().

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Sebastian Andrzej Siewior and committed by
David S. Miller
56f0ddad 820ec411

+2 -2
+2 -2
drivers/ide/ide-io.c
··· 659 659 spin_unlock(&hwif->lock); 660 660 /* disable_irq_nosync ?? */ 661 661 disable_irq(hwif->irq); 662 - /* local CPU only, as if we were handling an interrupt */ 663 - local_irq_disable(); 662 + 664 663 if (hwif->polling) { 665 664 startstop = handler(drive); 666 665 } else if (drive_is_ready(drive)) { ··· 678 679 startstop = ide_error(drive, "irq timeout", 679 680 hwif->tp_ops->read_status(hwif)); 680 681 } 682 + /* Disable interrupts again, `handler' might have enabled it */ 681 683 spin_lock_irq(&hwif->lock); 682 684 enable_irq(hwif->irq); 683 685 if (startstop == ide_stopped && hwif->polling == 0) {