hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SCSI] mpt2sas: when Async scanning is enabled then while scanning, devices are removed but their transport layer entries are not removed 

When Async scanning mode is enabled and device scanning is in progress then
devices should not be removed. But in actuality, devices are removed but
their transport layer entries are not removed. This causes error to add
the same device to the transport layer after host reset or diagnostic
reset.

So, in this patch, modified the code in such a way that device is not removed
when Async scanning mode is enabled and device scanning is in progress.

Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Sreekanth Reddy 2013-07-25 11:31:12 +05:30 committed by James Bottomley
parent 1c50e8d26e
commit bc6d4c3b78
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/scsi/mpt2sas/mpt2sas_scsih.c
View File

@ -628,11 +628,12 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc,
* devices while scanning is turned on due to an oops in * devices while scanning is turned on due to an oops in
* scsi_sysfs_add_sdev()->add_device()->sysfs_addrm_start() * scsi_sysfs_add_sdev()->add_device()->sysfs_addrm_start()
*/ */
if (!ioc->is_driver_loading) if (!ioc->is_driver_loading) {
mpt2sas_transport_port_remove(ioc, mpt2sas_transport_port_remove(ioc,
sas_device->sas_address, sas_device->sas_address,
sas_device->sas_address_parent); sas_device->sas_address_parent);
_scsih_sas_device_remove(ioc, sas_device); _scsih_sas_device_remove(ioc, sas_device);
}
} }
} }
@ -7916,10 +7917,12 @@ _scsih_probe_boot_devices(struct MPT2SAS_ADAPTER *ioc)
sas_device->sas_address_parent)) { sas_device->sas_address_parent)) {
_scsih_sas_device_remove(ioc, sas_device); _scsih_sas_device_remove(ioc, sas_device);
} else if (!sas_device->starget) { } else if (!sas_device->starget) {
if (!ioc->is_driver_loading) if (!ioc->is_driver_loading) {
mpt2sas_transport_port_remove(ioc, sas_address, mpt2sas_transport_port_remove(ioc,
sas_address,
sas_address_parent); sas_address_parent);
_scsih_sas_device_remove(ioc, sas_device); _scsih_sas_device_remove(ioc, sas_device);
}
} }
} }
} }
@ -7972,14 +7975,14 @@ _scsih_probe_sas(struct MPT2SAS_ADAPTER *ioc)
kfree(sas_device); kfree(sas_device);
continue; continue;
} else if (!sas_device->starget) { } else if (!sas_device->starget) {
if (!ioc->is_driver_loading) if (!ioc->is_driver_loading) {
mpt2sas_transport_port_remove(ioc, mpt2sas_transport_port_remove(ioc,
sas_device->sas_address, sas_device->sas_address,
sas_device->sas_address_parent); sas_device->sas_address_parent);
list_del(&sas_device->list); list_del(&sas_device->list);
kfree(sas_device); kfree(sas_device);
continue; continue;
}
} }
spin_lock_irqsave(&ioc->sas_device_lock, flags); spin_lock_irqsave(&ioc->sas_device_lock, flags);
list_move_tail(&sas_device->list, &ioc->sas_device_list); list_move_tail(&sas_device->list, &ioc->sas_device_list);