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

Commit 361ee9c3 authored by Ben Collins's avatar Ben Collins Committed by James Bottomley
Browse files

[SCSI] aacraid: Better handling of in-flight events on thread stop 



When an error occured that would shut down the driver, some in-flight
events were getting caught up, deadlocking a CPU or two.

Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
Acked-by: default avatarAchim Leubner <Achim_Leubner@pmc-sierra.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent ff08784b

drivers/scsi/aacraid/linit.c

+11 −1
Original line number Diff line number Diff line
@@ -1089,8 +1089,17 @@ static struct scsi_host_template aac_driver_template = { 


static void __aac_shutdown(struct aac_dev * aac)

{

	if (aac->aif_thread)

	if (aac->aif_thread) {

		int i;

		/* Clear out events first */

		for (i = 0; i < (aac->scsi_host_ptr->can_queue + AAC_NUM_MGT_FIB); i++) {

			struct fib *fib = &aac->fibs[i];

			if (!(fib->hw_fib_va->header.XferState & cpu_to_le32(NoResponseExpected | Async)) &&

			    (fib->hw_fib_va->header.XferState & cpu_to_le32(ResponseExpected)))

				up(&fib->event_wait);

		}

		kthread_stop(aac->thread);

	}

	aac_send_shutdown(aac);

	aac_adapter_disable_int(aac);

	free_irq(aac->pdev->irq, aac);
@@ -1191,6 +1200,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	if (IS_ERR(aac->thread)) {

		printk(KERN_ERR "aacraid: Unable to create command thread.\n");

		error = PTR_ERR(aac->thread);

		aac->thread = NULL;

		goto out_deinit;

	}