[PATCH v2] tmscsim: spin_unlock_irq in interrupt handler fix
From: Denis Efremov <hidden>
Date: 2012-07-31 11:51:01
Also in:
lkml
Subsystem:
scsi subsystem, the rest · Maintainers:
"James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
The replacement of spin_lock_irq/spin_unlock_irq pairs which can be called from interrupt handler by irqsave/irqrestore versions. Found by Linux Driver Verification project (linuxtesting.org). Signed-off-by: Denis Efremov <redacted> --- drivers/scsi/tmscsim.c | 12 ++++++------ drivers/scsi/tmscsim.h | 1 + 2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c
index a1baccc..e9b7148 100644
--- a/drivers/scsi/tmscsim.c
+++ b/drivers/scsi/tmscsim.c@@ -665,7 +665,7 @@ DC390_Interrupt(void *dev_id) //dstatus = DC390_read8 (DMA_Status); //DC390_write32 (DMA_ScsiBusCtrl, EN_INT_ON_PCI_ABORT); - spin_lock_irq(pACB->pScsiHost->host_lock); + spin_lock_irqsave(pACB->pScsiHost->host_lock, pACB->hlock_flags); istate = DC390_read8 (Intern_State); istatus = DC390_read8 (INT_Status); /* This clears Scsi_Status, Intern_State and INT_Status ! */
@@ -736,7 +736,7 @@ DC390_Interrupt(void *dev_id) } unlock: - spin_unlock_irq(pACB->pScsiHost->host_lock); + spin_unlock_irqrestore(pACB->pScsiHost->host_lock, pACB->hlock_flags); return IRQ_HANDLED; }
@@ -771,9 +771,9 @@ dc390_DataOut_0(struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus) /* Function called from the ISR with the host_lock held and interrupts disabled */ if (pSRB->SGToBeXferLen) while (time_before(jiffies, timeout) && !((dstate = DC390_read8 (DMA_Status)) & DMA_XFER_DONE)) { - spin_unlock_irq(pACB->pScsiHost->host_lock); + spin_unlock_irqrestore(pACB->pScsiHost->host_lock, pACB->hlock_flags); udelay(50); - spin_lock_irq(pACB->pScsiHost->host_lock); + spin_lock_irqsave(pACB->pScsiHost->host_lock, pACB->hlock_flags); } if (!time_before(jiffies, timeout)) printk (KERN_CRIT "DC390: Deadlock in DataOut_0: DMA aborted unfinished: %06x bytes remain!!\n",
@@ -830,9 +830,9 @@ dc390_DataIn_0(struct dc390_acb* pACB, struct dc390_srb* pSRB, u8 *psstatus) /* Function called from the ISR with the host_lock held and interrupts disabled */ if (pSRB->SGToBeXferLen) while (time_before(jiffies, timeout) && !((dstate = DC390_read8 (DMA_Status)) & DMA_XFER_DONE)) { - spin_unlock_irq(pACB->pScsiHost->host_lock); + spin_unlock_irqrestore(pACB->pScsiHost->host_lock, pACB->hlock_flags); udelay(50); - spin_lock_irq(pACB->pScsiHost->host_lock); + spin_lock_irqsave(pACB->pScsiHost->host_lock, pACB->hlock_flags); } if (!time_before(jiffies, timeout)) { printk (KERN_CRIT "DC390: Deadlock in DataIn_0: DMA aborted unfinished: %06x bytes remain!!\n",
diff --git a/drivers/scsi/tmscsim.h b/drivers/scsi/tmscsim.h
index 77adc54..3f9ea2b 100644
--- a/drivers/scsi/tmscsim.h
+++ b/drivers/scsi/tmscsim.h@@ -107,6 +107,7 @@ u8 SyncOffset; /*;for reg. and nego.(low nibble) */ struct dc390_acb { struct Scsi_Host *pScsiHost; +unsigned long hlock_flags; u16 IOPortBase; u8 IRQLevel; u8 status;
--
1.7.7