From: Denis Efremov <yefremov.denis@gmail.com>
To: Kurt Garloff <garloff@suse.de>
Cc: Denis Efremov <yefremov.denis@gmail.com>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
"James E.J. Bottomley" <JBottomley@parallels.com>,
linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] tmscsim: spin_unlock_irq in interrupt handler fix
Date: Tue, 31 Jul 2012 15:53:33 +0400 [thread overview]
Message-ID: <1343735613-28392-1-git-send-email-yefremov.denis@gmail.com> (raw)
In-Reply-To: <1342853283-32549-1-git-send-email-yefremov.denis@gmail.com>
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 <yefremov.denis@gmail.com>
---
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
next prev parent reply other threads:[~2012-07-31 11:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-21 6:48 [PATCH] tmscsim: spin_unlock_irq in interrupt handler fix Denis Efremov
2012-07-31 8:21 ` Guennadi Liakhovetski
2012-07-31 11:53 ` Denis Efremov [this message]
2012-08-03 23:23 ` [PATCH v2] " Guennadi Liakhovetski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343735613-28392-1-git-send-email-yefremov.denis@gmail.com \
--to=yefremov.denis@gmail.com \
--cc=JBottomley@parallels.com \
--cc=g.liakhovetski@gmx.de \
--cc=garloff@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).