FAILED: patch "[PATCH] scsi: aacraid: Fix sync fibs time out on controller reset" failed to apply to 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 8, 2017

Subsystems (3)

Stable branch SCSI Aacraid SCSI RAID driver

lore

Share & tools

lore

[email protected]

author maintainer

2017-03-08 13:12 UTC #0 lore raw

The patch below does not apply to the 4.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From a7e2c642844cfefd570cb54a8d9fe7b85605311b Mon Sep 17 00:00:00 2001

From: Raghava Aditya Renukunta <[email protected]>
Date: Thu, 16 Feb 2017 12:51:16 -0800
Subject: [PATCH] scsi: aacraid: Fix sync fibs time out on controller reset

After controller shutdown, all sync fibs time out due to not knowing about the switch to INT-x mode

Fixed by replacing aac_src_access_devreg() to aac_set_intx_mode() call.

Cc [email protected]

Fixes 495c021767bd78c998 (aacraid: MSI-x support)

Signed-off-by Raghava Aditya Renukunta <[email protected]>

Reviewed-by David Carroll <[email protected]>

Reviewed-by Johannes Thumshirn <[email protected]>

Signed-off-by Martin K. Petersen <[email protected]>

drivers/scsi/aacraid/aacraid.h +1 -0

index b5a2c87f289b..9281e7295480 100644
@@ -2639,6 +2639,7 @@ void aac_hba_callback(void *context, struct fib *fibptr);
 #define fib_data(fibctx) ((void *)(fibctx)->hw_fib_va->data)
 struct aac_dev *aac_init_adapter(struct aac_dev *dev);
 void aac_src_access_devreg(struct aac_dev *dev, int mode);
+void aac_set_intx_mode(struct aac_dev *dev);
 int aac_get_config_status(struct aac_dev *dev, int commit_flag);
 int aac_get_containers(struct aac_dev *dev);
 int aac_scsi_cmd(struct scsi_cmnd *cmd);

drivers/scsi/aacraid/comminit.c +1 -1

index 40bfc57b6849..35607005f7e1 100644
@@ -330,7 +330,7 @@ int aac_send_shutdown(struct aac_dev * dev)
 	     dev->pdev->device == PMC_DEVICE_S8 ||
 	     dev->pdev->device == PMC_DEVICE_S9) &&
 	     dev->msi_enabled)
-		aac_src_access_devreg(dev, AAC_ENABLE_INTX);
+		aac_set_intx_mode(dev);
 	return status;
 }

drivers/scsi/aacraid/src.c +1 -1

index c17b0603749c..b23c818adbf6 100644
@@ -657,7 +657,7 @@ static int aac_srcv_ioremap(struct aac_dev *dev, u32 size)
 	return 0;
 }
 
-static void aac_set_intx_mode(struct aac_dev *dev)
+void aac_set_intx_mode(struct aac_dev *dev)
 {
 	if (dev->msi_enabled) {
 		aac_src_access_devreg(dev, AAC_ENABLE_INTX);