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

Commit fbd18598 authored by Raghava Aditya Renukunta's avatar Raghava Aditya Renukunta Committed by Martin K. Petersen
Browse files

aacraid: Fix AIF triggered IOP_RESET 



while driver removal is in progress or PCI shutdown is invoked, driver
kills AIF aacraid thread, but IOCTL requests from the management tools
re-start AIF thread leading to IOP_RESET.

Fixed by setting adapter_shutdown flag when PCI shutdown is invoked.

Signed-off-by: default avatarRaghava Aditya Renukunta <raghavaaditya.renukunta@pmcs.com>
Reviewed-by: default avatarShane Seymour <shane.seymour@hpe.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 222a9fb3

drivers/scsi/aacraid/commctrl.c

+5 −0
Original line number Diff line number Diff line
@@ -857,6 +857,11 @@ int aac_do_ioctl(struct aac_dev * dev, int cmd, void __user *arg) 


	mutex_lock(&dev->ioctl_mutex);



	if (dev->adapter_shutdown) {

		status = -EACCES;

		goto cleanup;

	}



	/*

	 *	HBA gets first crack

	 */

drivers/scsi/aacraid/comminit.c

+4 −2
Original line number Diff line number Diff line
@@ -212,8 +212,11 @@ int aac_send_shutdown(struct aac_dev * dev) 
		return -ENOMEM;

	aac_fib_init(fibctx);



	cmd = (struct aac_close *) fib_data(fibctx);

	mutex_lock(&dev->ioctl_mutex);

	dev->adapter_shutdown = 1;

	mutex_unlock(&dev->ioctl_mutex);



	cmd = (struct aac_close *) fib_data(fibctx);

	cmd->command = cpu_to_le32(VM_CloseAll);

	cmd->cid = cpu_to_le32(0xfffffffe);
@@ -229,7 +232,6 @@ int aac_send_shutdown(struct aac_dev * dev) 
	/* FIB should be freed only after getting the response from the F/W */

	if (status != -ERESTARTSYS)

		aac_fib_free(fibctx);

	dev->adapter_shutdown = 1;

	if ((dev->pdev->device == PMC_DEVICE_S7 ||

	     dev->pdev->device == PMC_DEVICE_S8 ||

	     dev->pdev->device == PMC_DEVICE_S9) &&

drivers/scsi/aacraid/linit.c

+3 −2
Original line number Diff line number Diff line
@@ -705,7 +705,7 @@ static long aac_cfg_ioctl(struct file *file, 
{

	struct aac_dev *aac = (struct aac_dev *)file->private_data;



	if (!capable(CAP_SYS_RAWIO) || aac->adapter_shutdown)

	if (!capable(CAP_SYS_RAWIO))

		return -EPERM;



	return aac_do_ioctl(aac, cmd, (void __user *)arg);
@@ -1072,6 +1072,8 @@ static void __aac_shutdown(struct aac_dev * aac) 
	int i;

	int cpu;



	aac_send_shutdown(aac);



	if (aac->aif_thread) {

		int i;

		/* Clear out events first */
@@ -1083,7 +1085,6 @@ static void __aac_shutdown(struct aac_dev * aac) 
		}

		kthread_stop(aac->thread);

	}

	aac_send_shutdown(aac);

	aac_adapter_disable_int(aac);

	cpu = cpumask_first(cpu_online_mask);

	if (aac->pdev->device == PMC_DEVICE_S6 ||