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

Commit d7384b28 authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Delete volume before HBA detach. 



The driver hangs when doing `rmmod mpt2sas` if there are any
IR volumes present.The hang is due the scsi midlayer trying to access the
IR volumes after the driver releases controller resources.  Perhaps when
scsi_remove_host is called,the scsi mid layer is sending some request.
This doesn't occur for bare drives becuase the driver is already reporting
those drives deleted prior to calling mpt2sas_base_detach.
To solve this issue, we need to delete the volumes as well.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Reviewed-by: default avatarEric Moore <eric.moore@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 0f88009d

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+17 −0
Original line number Diff line number Diff line
@@ -5998,6 +5998,8 @@ _scsih_remove(struct pci_dev *pdev) 
	struct _sas_port *mpt2sas_port;

	struct _sas_device *sas_device;

	struct _sas_node *expander_sibling;

	struct _raid_device *raid_device, *next;

	struct MPT2SAS_TARGET *sas_target_priv_data;

	struct workqueue_struct	*wq;

	unsigned long flags;
@@ -6011,6 +6013,21 @@ _scsih_remove(struct pci_dev *pdev) 
	if (wq)

		destroy_workqueue(wq);



	/* release all the volumes */

	list_for_each_entry_safe(raid_device, next, &ioc->raid_device_list,

	    list) {

		if (raid_device->starget) {

			sas_target_priv_data =

			    raid_device->starget->hostdata;

			sas_target_priv_data->deleted = 1;

			scsi_remove_target(&raid_device->starget->dev);

		}

		printk(MPT2SAS_INFO_FMT "removing handle(0x%04x), wwid"

		    "(0x%016llx)\n", ioc->name,  raid_device->handle,

		    (unsigned long long) raid_device->wwid);

		_scsih_raid_device_remove(ioc, raid_device);

	}



	/* free ports attached to the sas_host */

 retry_again:

	list_for_each_entry(mpt2sas_port,