The patch titled
qla2xxx lock ordering fix
has been added to the -mm tree. Its filename is
qla2xxx-lock-ordering-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
In qla2x00_reset_chip the driver first takes the hardware lock, and then
later on takes the mbx lock.
In the mailbox_command code.. it goes the other way around.
Discovered with the lock validator.
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/scsi/qla2xxx/qla_init.c | 14 +-------------
1 files changed, 1 insertion(+), 13 deletions(-)
diff -puN drivers/scsi/qla2xxx/qla_init.c~qla2xxx-lock-ordering-fix drivers/scsi/qla2xxx/qla_init.c
--- 25/drivers/scsi/qla2xxx/qla_init.c~qla2xxx-lock-ordering-fix Mon May 8 14:58:30 2006
+++ 25-akpm/drivers/scsi/qla2xxx/qla_init.c Mon May 8 14:58:30 2006
@@ -519,20 +519,8 @@ qla2x00_reset_chip(scsi_qla_host_t *ha)
if (IS_QLA2100(ha) || IS_QLA2200(ha) || IS_QLA2300(ha)) {
for (cnt = 0; cnt < 30000; cnt++) {
- if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)))
- spin_lock_irqsave(&ha->mbx_reg_lock, mbx_flags);
-
- if (RD_MAILBOX_REG(ha, reg, 0) != MBS_BUSY) {
- if (!(test_bit(ABORT_ISP_ACTIVE,
- &ha->dpc_flags)))
- spin_unlock_irqrestore(
- &ha->mbx_reg_lock, mbx_flags);
+ if (RD_MAILBOX_REG(ha, reg, 0) != MBS_BUSY)
break;
- }
-
- if (!(test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags)))
- spin_unlock_irqrestore(&ha->mbx_reg_lock,
- mbx_flags);
udelay(100);
}
_
Patches currently in -mm which might be from andrew.vasquez@xxxxxxxxxx are
git-scsi-rc-fixes.patch
small-whitespace-cleanup-for-qlogic-driver.patch
qla2xxx-lock-ordering-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
