Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc6d4c3b authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by James Bottomley
Browse files

[SCSI] mpt2sas: when Async scanning is enabled then while scanning, devices... 


[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: default avatarSreekanth Reddy <Sreekanth.Reddy@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 1c50e8d2

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+13 −10
Original line number Diff line number Diff line
@@ -628,13 +628,14 @@ _scsih_sas_device_add(struct MPT2SAS_ADAPTER *ioc, 
		 * devices while scanning is turned on due to an oops in

		 * scsi_sysfs_add_sdev()->add_device()->sysfs_addrm_start()

		 */

		if (!ioc->is_driver_loading)

		if (!ioc->is_driver_loading) {

			mpt2sas_transport_port_remove(ioc,

			sas_device->sas_address,

			sas_device->sas_address_parent);

			_scsih_sas_device_remove(ioc, sas_device);

		}

	}

}



/**

 * _scsih_sas_device_init_add - insert sas_device to the list.
@@ -7916,13 +7917,15 @@ _scsih_probe_boot_devices(struct MPT2SAS_ADAPTER *ioc) 
		    sas_device->sas_address_parent)) {

			_scsih_sas_device_remove(ioc, sas_device);

		} else if (!sas_device->starget) {

			if (!ioc->is_driver_loading)

				mpt2sas_transport_port_remove(ioc, sas_address,

			if (!ioc->is_driver_loading) {

				mpt2sas_transport_port_remove(ioc,

					sas_address,

					sas_address_parent);

				_scsih_sas_device_remove(ioc, sas_device);

			}

		}

	}

}



/**

 * _scsih_probe_raid - reporting raid volumes to scsi-ml
@@ -7972,14 +7975,14 @@ _scsih_probe_sas(struct MPT2SAS_ADAPTER *ioc) 
			kfree(sas_device);

			continue;

		} else if (!sas_device->starget) {

			if (!ioc->is_driver_loading)

			if (!ioc->is_driver_loading) {

				mpt2sas_transport_port_remove(ioc,

					sas_device->sas_address,

					sas_device->sas_address_parent);

				list_del(&sas_device->list);

				kfree(sas_device);

				continue;



			}

		}

		spin_lock_irqsave(&ioc->sas_device_lock, flags);

		list_move_tail(&sas_device->list, &ioc->sas_device_list);