UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

qla2xxx: Schedule board_disable only once 

There are various callers of qla2x00_check_reg{32,16}_for_disconnect
that may schedule board removal on PCI-disconnect. Test-and-set a
dedicated flag before scheduling board_disable so it is invoked only
once.

Signed-off-by: Joe Lawrence <joe.lawrence@stratus.com>
Acked-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Joe Lawrence 2014-08-26 17:12:01 -04:00 committed by Christoph Hellwig
parent c821e0d5b2
commit 232792b6b4
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/qla2xxx/qla_def.h
View File

@ -3402,6 +3402,9 @@ typedef struct scsi_qla_host {
#define FX00_CRITEMP_RECOVERY 25 #define FX00_CRITEMP_RECOVERY 25
#define FX00_HOST_INFO_RESEND 26 #define FX00_HOST_INFO_RESEND 26
unsigned long pci_flags;
#define PFLG_DISCONNECTED 0 /* PCI device removed */
uint32_t device_flags; uint32_t device_flags;
#define SWITCH_FOUND BIT_0 #define SWITCH_FOUND BIT_0
#define DFLG_NO_CABLE BIT_1 #define DFLG_NO_CABLE BIT_1

14
drivers/scsi/qla2xxx/qla_isr.c
View File

@ -117,12 +117,14 @@ qla2x00_check_reg32_for_disconnect(scsi_qla_host_t *vha, uint32_t reg)
{ {
/* Check for PCI disconnection */ /* Check for PCI disconnection */
if (reg == 0xffffffff) { if (reg == 0xffffffff) {
/* if (!test_and_set_bit(PFLG_DISCONNECTED, &vha->pci_flags)) {
* Schedule this on the default system workqueue so that all the /*
* adapter workqueues and the DPC thread can be shutdown * Schedule this (only once) on the default system
* cleanly. * workqueue so that all the adapter workqueues and the
*/ * DPC thread can be shutdown cleanly.
schedule_work(&vha->hw->board_disable); */
schedule_work(&vha->hw->board_disable);
}
return true; return true;
} else } else
return false; return false;