[3/5] smartpqi: revert propagate-the-multipath-failure-to-SML-quickly

Commit Message

Don Brace July 11, 2024, 7:47 p.m. UTC

From: Gilbert Wu <[e-mail]>

Correct a rare multipath failure issue by reverting:
commit 94a68c814328
("scsi: smartpqi: Quickly propagate path failures to SCSI midlayer")
Link: https://lore.kernel.org/all/[e-mail]/

Reason for revert: The patch propagated the path failure to SML
quickly when one of the path fails during IO and AIO path gets
disabled for a multipath device.

But it created a new issue: when creating a volume on an
encryption-enabled controller, the firmware reports the AIO path is
disabled, which cause the driver to report a path failure to SML for
a multipath device.

There will be a new fix to handle "Illegal request" and "Invalid field
in parameter list" on RAID path when the AIO path is disabled on a
multipath device.

Fixes: 94a68c814328 ("scsi: smartpqi: Quickly propagate path failures to SCSI midlayer")

Reviewed-by: Scott Benesh <[e-mail]>
Reviewed-by: Scott Teel <[e-mail]>
Reviewed-by: Mike McGowen <[e-mail]>
Signed-off-by: Gilbert Wu <[e-mail]>
Signed-off-by: Don Brace <[e-mail]>
---
 drivers/scsi/smartpqi/smartpqi_init.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

Patch

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index eaebe3cc00aa..d8df7440bbe1 100644
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -2365,14 +2365,6 @@  static inline void pqi_mask_device(u8 *scsi3addr)
 	scsi3addr[3] |= 0xc0;
 }
 
-static inline bool pqi_is_multipath_device(struct pqi_scsi_dev *device)
-{
-	if (pqi_is_logical_device(device))
-		return false;
-
-	return (device->path_map & (device->path_map - 1)) != 0;
-}
-
 static inline bool pqi_expose_device(struct pqi_scsi_dev *device)
 {
 	return !device->is_physical_device || !pqi_skip_device(device->scsi3addr);
@@ -3269,14 +3261,12 @@  static void pqi_process_aio_io_error(struct pqi_io_request *io_request)
 	int residual_count;
 	int xfer_count;
 	bool device_offline;
-	struct pqi_scsi_dev *device;
 
 	scmd = io_request->scmd;
 	error_info = io_request->error_info;
 	host_byte = DID_OK;
 	sense_data_length = 0;
 	device_offline = false;
-	device = scmd->device->hostdata;
 
 	switch (error_info->service_response) {
 	case PQI_AIO_SERV_RESPONSE_COMPLETE:
@@ -3301,14 +3291,8 @@  static void pqi_process_aio_io_error(struct pqi_io_request *io_request)
 			break;
 		case PQI_AIO_STATUS_AIO_PATH_DISABLED:
 			pqi_aio_path_disabled(io_request);
-			if (pqi_is_multipath_device(device)) {
-				pqi_device_remove_start(device);
-				host_byte = DID_NO_CONNECT;
-				scsi_status = SAM_STAT_CHECK_CONDITION;
-			} else {
-				scsi_status = SAM_STAT_GOOD;
-				io_request->status = -EAGAIN;
-			}
+			scsi_status = SAM_STAT_GOOD;
+			io_request->status = -EAGAIN;
 			break;
 		case PQI_AIO_STATUS_NO_PATH_TO_DEVICE:
 		case PQI_AIO_STATUS_INVALID_DEVICE: