scsi: megaraid_sas: Block zero-length ATA VPD inquiry

commit aad9945623ab4029ae7789609fb6166c97976c62 upstream.

A firmware bug was observed where ATA VPD inquiry commands with a
zero-length data payload were not handled and failed with a non-standard
status code of 0xf0.

Avoid sending ATA VPD inquiry commands without data payload by setting
the device no_vpd_size flag to 1. In addition, if the firmware returns a
status code of 0xf0, set scsi_cmnd->result to CHECK_CONDITION to
facilitate proper error handling.

Suggested-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Chandrakanth Patil <chandrakanth.patil@broadcom.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20250402193735.5098-1-chandrakanth.patil@broadcom.com
Tested-by: Ryan Lahfa <ryan@lahfa.xyz>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index f4b32ce45ce0930ff7946dde1e5fcb27f8c9f1df..247e84e989aa614f0cd7984a7518bb0fe179997d 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2101,6 +2101,9 @@ static int megasas_slave_configure(struct scsi_device *sdev)
        /* This sdev property may change post OCR */
        megasas_set_dynamic_target_properties(sdev, is_target_prop);
 
+       if (!MEGASAS_IS_LOGICAL(sdev))
+               sdev->no_vpd_size = 1;
+
        mutex_unlock(&instance->reset_mutex);
 
        return 0;
@@ -3661,8 +3664,10 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd,
 
                case MFI_STAT_SCSI_IO_FAILED:
                case MFI_STAT_LD_INIT_IN_PROGRESS:
-                       cmd->scmd->result =
-                           (DID_ERROR << 16) | hdr->scsi_status;
+                       if (hdr->scsi_status == 0xf0)
+                               cmd->scmd->result = (DID_ERROR << 16) | SAM_STAT_CHECK_CONDITION;
+                       else
+                               cmd->scmd->result = (DID_ERROR << 16) | hdr->scsi_status;
                        break;
 
                case MFI_STAT_SCSI_DONE_WITH_ERROR:

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 1475f3e259c10e1575fea33ec9f5b085fad64d91..4c79d699543eacddeb2308c68fac2865d7fa5aa0 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -2040,7 +2040,10 @@ map_cmd_status(struct fusion_context *fusion,
 
        case MFI_STAT_SCSI_IO_FAILED:
        case MFI_STAT_LD_INIT_IN_PROGRESS:
-               scmd->result = (DID_ERROR << 16) | ext_status;
+               if (ext_status == 0xf0)
+                       scmd->result = (DID_ERROR << 16) | SAM_STAT_CHECK_CONDITION;
+               else
+                       scmd->result = (DID_ERROR << 16) | ext_status;
                break;
 
        case MFI_STAT_SCSI_DONE_WITH_ERROR: