From: Damien Le Moal <dlemoal@kernel.org>
To: "Martin K . Petersen" <martin.petersen@oracle.com>,
"James E . J . Bottomley" <James.Bottomley@HansenPartnership.com>,
linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
Niklas Cassel <cassel@kernel.org>,
linux-usb@vger.kernel.org, Alan Stern <stern@rowland.harvard.edu>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-s390@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>
Subject: [PATCH v3 22/40] scsi: myrX: use 16-bits defined sense codes
Date: Fri, 4 Sep 2026 09:26:26 +0900 [thread overview]
Message-ID: <20260904002644.157668-23-dlemoal@kernel.org> (raw)
In-Reply-To: <20260904002644.157668-1-dlemoal@kernel.org>
Refactor the Mylex RAID controller driver to use scsi_set_sense() and the
16-bits sense_code field of struct scsi_sense_hdr and replace all
hard-coded additional sense codes and additional sense code qualifiers
with the enum values defined in include/scsi/scsi_sense.h. This helps with
code clarity as the sense codes being processed are easier to test and
self-documented.
No functional change intended.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
drivers/scsi/myrb.c | 67 +++++++++++++++++++++++----------------------
drivers/scsi/myrs.c | 23 ++++++++++------
2 files changed, 48 insertions(+), 42 deletions(-)
diff --git a/drivers/scsi/myrb.c b/drivers/scsi/myrb.c
index 3678b66310ed..e7d796add986 100644
--- a/drivers/scsi/myrb.c
+++ b/drivers/scsi/myrb.c
@@ -314,17 +314,19 @@ static void myrb_get_event(struct myrb_hba *cb, unsigned int event)
scsi_normalize_sense(ev_buf->sense, 32, &sshdr);
if (sshdr.sense_key == VENDOR_SPECIFIC &&
- sshdr.asc == 0x80 &&
- sshdr.ascq < ARRAY_SIZE(myrb_event_msg))
+ scsi_sense_asc(&sshdr) == 0x80 &&
+ scsi_sense_ascq(&sshdr) < ARRAY_SIZE(myrb_event_msg))
shost_printk(KERN_CRIT, cb->host,
"Physical drive %d:%d: %s\n",
ev_buf->channel, ev_buf->target,
- myrb_event_msg[sshdr.ascq]);
+ myrb_event_msg[scsi_sense_ascq(&sshdr)]);
else
shost_printk(KERN_CRIT, cb->host,
"Physical drive %d:%d: Sense: %X/%02X/%02X\n",
ev_buf->channel, ev_buf->target,
- sshdr.sense_key, sshdr.asc, sshdr.ascq);
+ sshdr.sense_key,
+ scsi_sense_asc(&sshdr),
+ scsi_sense_ascq(&sshdr));
}
dma_free_coherent(&cb->pdev->dev, sizeof(struct myrb_log_entry),
@@ -1398,7 +1400,7 @@ myrb_mode_sense(struct myrb_hba *cb, struct scsi_cmnd *scmd,
static void myrb_request_sense(struct myrb_hba *cb,
struct scsi_cmnd *scmd)
{
- scsi_build_sense(scmd, 0, NO_SENSE, 0, 0);
+ scsi_set_sense(scmd, 0, NO_SENSE, NO_ADDITIONAL_SENSE_INFORMATION);
scsi_sg_copy_from_buffer(scmd, scmd->sense_buffer,
SCSI_SENSE_BUFFERSIZE);
}
@@ -1446,8 +1448,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
return 0;
case INQUIRY:
if (scmd->cmnd[1] & 1) {
- /* Illegal request, invalid field in CDB */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_CDB);
} else {
myrb_inquiry(cb, scmd);
scmd->result = (DID_OK << 16);
@@ -1461,8 +1463,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
case MODE_SENSE:
if ((scmd->cmnd[2] & 0x3F) != 0x3F &&
(scmd->cmnd[2] & 0x3F) != 0x08) {
- /* Illegal request, invalid field in CDB */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_CDB);
} else {
myrb_mode_sense(cb, scmd, ldev_info);
scmd->result = (DID_OK << 16);
@@ -1472,15 +1474,15 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
case READ_CAPACITY:
if ((scmd->cmnd[1] & 1) ||
(scmd->cmnd[8] & 1)) {
- /* Illegal request, invalid field in CDB */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_CDB);
scsi_done(scmd);
return 0;
}
lba = get_unaligned_be32(&scmd->cmnd[2]);
if (lba) {
- /* Illegal request, invalid field in CDB */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_CDB);
scsi_done(scmd);
return 0;
}
@@ -1493,8 +1495,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
return 0;
case SEND_DIAGNOSTIC:
if (scmd->cmnd[1] != 0x04) {
- /* Illegal request, invalid field in CDB */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_CDB);
} else {
/* Assume good status */
scmd->result = (DID_OK << 16);
@@ -1503,8 +1505,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
return 0;
case READ_6:
if (ldev_info->state == MYRB_DEVICE_WO) {
- /* Data protect, attempt to read invalid data */
- scsi_build_sense(scmd, 0, DATA_PROTECT, 0x21, 0x06);
+ scsi_set_sense(scmd, 0, DATA_PROTECT,
+ ATTEMPT_TO_READ_INVALID_DATA);
scsi_done(scmd);
return 0;
}
@@ -1517,8 +1519,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
break;
case READ_10:
if (ldev_info->state == MYRB_DEVICE_WO) {
- /* Data protect, attempt to read invalid data */
- scsi_build_sense(scmd, 0, DATA_PROTECT, 0x21, 0x06);
+ scsi_set_sense(scmd, 0, DATA_PROTECT,
+ ATTEMPT_TO_READ_INVALID_DATA);
scsi_done(scmd);
return 0;
}
@@ -1531,8 +1533,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
break;
case READ_12:
if (ldev_info->state == MYRB_DEVICE_WO) {
- /* Data protect, attempt to read invalid data */
- scsi_build_sense(scmd, 0, DATA_PROTECT, 0x21, 0x06);
+ scsi_set_sense(scmd, 0, DATA_PROTECT,
+ ATTEMPT_TO_READ_INVALID_DATA);
scsi_done(scmd);
return 0;
}
@@ -1544,8 +1546,8 @@ static enum scsi_qc_status myrb_ldev_queuecommand(struct Scsi_Host *shost,
block_cnt = get_unaligned_be32(&scmd->cmnd[6]);
break;
default:
- /* Illegal request, invalid opcode */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x20, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_COMMAND_OP_CODE);
scsi_done(scmd);
return 0;
}
@@ -2328,20 +2330,19 @@ static void myrb_handle_scsi(struct myrb_hba *cb, struct myrb_cmdblk *cmd_blk,
dev_dbg(&scmd->device->sdev_gendev,
"Bad Data Encountered\n");
if (scmd->sc_data_direction == DMA_FROM_DEVICE)
- /* Unrecovered read error */
- scsi_build_sense(scmd, 0, MEDIUM_ERROR, 0x11, 0);
+ scsi_set_sense(scmd, 0, MEDIUM_ERROR,
+ UNRECOVERED_READ_ERROR);
else
- /* Write error */
- scsi_build_sense(scmd, 0, MEDIUM_ERROR, 0x0C, 0);
+ scsi_set_sense(scmd, 0, MEDIUM_ERROR, WRITE_ERROR);
break;
case MYRB_STATUS_IRRECOVERABLE_DATA_ERROR:
scmd_printk(KERN_ERR, scmd, "Irrecoverable Data Error\n");
if (scmd->sc_data_direction == DMA_FROM_DEVICE)
- /* Unrecovered read error, auto-reallocation failed */
- scsi_build_sense(scmd, 0, MEDIUM_ERROR, 0x11, 0x04);
+ scsi_set_sense(scmd, 0, MEDIUM_ERROR,
+ UNRECOVERED_READ_ERROR_AUTO_REALLOCATE_FAILED);
else
- /* Write error, auto-reallocation failed */
- scsi_build_sense(scmd, 0, MEDIUM_ERROR, 0x0C, 0x02);
+ scsi_set_sense(scmd, 0, MEDIUM_ERROR,
+ WRITE_ERROR_AUTO_REALLOCATION_FAILED);
break;
case MYRB_STATUS_LDRV_NONEXISTENT_OR_OFFLINE:
dev_dbg(&scmd->device->sdev_gendev,
@@ -2351,8 +2352,8 @@ static void myrb_handle_scsi(struct myrb_hba *cb, struct myrb_cmdblk *cmd_blk,
case MYRB_STATUS_ACCESS_BEYOND_END_OF_LDRV:
dev_dbg(&scmd->device->sdev_gendev,
"Attempt to Access Beyond End of Logical Drive");
- /* Logical block address out of range */
- scsi_build_sense(scmd, 0, NOT_READY, 0x21, 0);
+ scsi_set_sense(scmd, 0, NOT_READY,
+ LOGICAL_BLOCK_ADDRESS_OUT_OF_RANGE);
break;
case MYRB_STATUS_DEVICE_NONRESPONSIVE:
dev_dbg(&scmd->device->sdev_gendev, "Device nonresponsive\n");
diff --git a/drivers/scsi/myrs.c b/drivers/scsi/myrs.c
index afd68225221a..1192b01fab8e 100644
--- a/drivers/scsi/myrs.c
+++ b/drivers/scsi/myrs.c
@@ -816,7 +816,7 @@ static void myrs_log_event(struct myrs_hba *cs, struct myrs_event *ev)
struct Scsi_Host *shost = cs->host;
struct scsi_device *sdev;
struct scsi_sense_hdr sshdr = {0};
- unsigned char sense_info[4];
+ unsigned char asc, sense_info[4];
unsigned char cmd_specific[4];
if (ev->ev_code == 0x1C) {
@@ -829,9 +829,11 @@ static void myrs_log_event(struct myrs_hba *cs, struct myrs_event *ev)
memcpy(cmd_specific, &ev->sense_data[7], 4);
}
}
+ asc = scsi_sense_asc(&sshdr);
if (sshdr.sense_key == VENDOR_SPECIFIC &&
- (sshdr.asc == 0x80 || sshdr.asc == 0x81))
- ev->ev_code = ((sshdr.asc - 0x80) << 8 | sshdr.ascq);
+ (asc == 0x80 || asc == 0x81))
+ ev->ev_code = scsi_sense_code(asc - 0x80,
+ scsi_sense_ascq(&sshdr));
while (true) {
ev_code = myrs_ev_list[ev_idx].ev_code;
if (ev_code == ev->ev_code || ev_code == 0)
@@ -891,8 +893,9 @@ static void myrs_log_event(struct myrs_hba *cs, struct myrs_event *ev)
case 'S':
if (sshdr.sense_key == NO_SENSE ||
(sshdr.sense_key == NOT_READY &&
- sshdr.asc == 0x04 && (sshdr.ascq == 0x01 ||
- sshdr.ascq == 0x02)))
+ (sshdr.sense_code == LU_IS_IN_PROCESS_OF_BECOMING_READY ||
+ sshdr.sense_code ==
+ LU_NOT_READY_INITIALIZING_COMMAND_REQUIRED)))
break;
shost_printk(KERN_INFO, shost,
"event %d: Physical Device %d:%d %s\n",
@@ -900,7 +903,8 @@ static void myrs_log_event(struct myrs_hba *cs, struct myrs_event *ev)
shost_printk(KERN_INFO, shost,
"Physical Device %d:%d Sense Key = %X, ASC = %02X, ASCQ = %02X\n",
ev->channel, ev->target,
- sshdr.sense_key, sshdr.asc, sshdr.ascq);
+ sshdr.sense_key, scsi_sense_asc(&sshdr),
+ scsi_sense_ascq(&sshdr));
shost_printk(KERN_INFO, shost,
"Physical Device %d:%d Sense Information = %02X%02X%02X%02X %02X%02X%02X%02X\n",
ev->channel, ev->target,
@@ -1603,7 +1607,8 @@ static enum scsi_qc_status myrs_queuecommand(struct Scsi_Host *shost,
switch (scmd->cmnd[0]) {
case REPORT_LUNS:
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x20, 0x0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_COMMAND_OP_CODE);
scsi_done(scmd);
return 0;
case MODE_SENSE:
@@ -1612,8 +1617,8 @@ static enum scsi_qc_status myrs_queuecommand(struct Scsi_Host *shost,
if ((scmd->cmnd[2] & 0x3F) != 0x3F &&
(scmd->cmnd[2] & 0x3F) != 0x08) {
- /* Illegal request, invalid field in CDB */
- scsi_build_sense(scmd, 0, ILLEGAL_REQUEST, 0x24, 0);
+ scsi_set_sense(scmd, 0, ILLEGAL_REQUEST,
+ INVALID_FIELD_IN_CDB);
} else {
myrs_mode_sense(cs, scmd, ldev_info);
scmd->result = (DID_OK << 16);
--
2.55.0
next prev parent reply other threads:[~2026-09-04 0:27 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-04 0:26 [PATCH v3 00/40] Use defined 16-bits ASC/ASCQ combinations Damien Le Moal
2026-09-04 0:26 ` [PATCH v3 01/40] scsi: define all additional sense codes and their qualifiers Damien Le Moal
2026-09-04 0:38 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 02/40] scsi: constants: use defined sense codes Damien Le Moal
2026-09-04 0:36 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 03/40] scsi: constants: rename internal struct field names Damien Le Moal
2026-09-04 0:38 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 04/40] scsi: rename sense field of struct scsi_failure Damien Le Moal
2026-09-04 0:43 ` sashiko-bot
2026-09-04 10:08 ` Johannes Thumshirn
2026-09-04 0:26 ` [PATCH v3 05/40] scsi: prepare for using 16-bits defined sense codes Damien Le Moal
2026-09-04 0:45 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 06/40] scsi: use struct scsi_sense_hdr to log sense keys and codes Damien Le Moal
2026-09-04 0:48 ` sashiko-bot
2026-09-04 10:11 ` Johannes Thumshirn
2026-09-04 0:26 ` [PATCH v3 07/40] scsi: core: use 16-bits defined sense codes Damien Le Moal
2026-09-04 0:53 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 08/40] scsi: sd: " Damien Le Moal
2026-09-04 1:04 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 09/40] scsi: sr: " Damien Le Moal
2026-09-04 1:02 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 10/40] scsi: ses: " Damien Le Moal
2026-09-04 1:06 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 11/40] scsi: ch: " Damien Le Moal
2026-09-04 1:09 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 12/40] scsi: st: " Damien Le Moal
2026-09-04 1:11 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 13/40] scsi: device_handlers: hp_sw: " Damien Le Moal
2026-09-04 1:13 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 14/40] scsi: device_handlers: rdac: " Damien Le Moal
2026-09-04 1:15 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 15/40] scsi: device_handlers: emc: " Damien Le Moal
2026-09-04 1:20 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 16/40] scsi: device_handlers: alua: " Damien Le Moal
2026-09-04 1:27 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 17/40] scsi: mpt3sas: " Damien Le Moal
2026-09-04 1:26 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 18/40] scsi: mpi3mr: " Damien Le Moal
2026-09-04 1:32 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 19/40] scsi: 3w-xxxx: " Damien Le Moal
2026-09-04 1:33 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 20/40] scsi: leapraid: " Damien Le Moal
2026-09-04 1:39 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 21/40] scsi: megaraid: " Damien Le Moal
2026-09-04 1:42 ` sashiko-bot
2026-09-04 0:26 ` Damien Le Moal [this message]
2026-09-04 1:53 ` [PATCH v3 22/40] scsi: myrX: " sashiko-bot
2026-09-04 0:26 ` [PATCH v3 23/40] scsi: smartpqi: " Damien Le Moal
2026-09-04 1:48 ` sashiko-bot
2026-09-04 15:15 ` Don.Brace
2026-09-04 0:26 ` [PATCH v3 24/40] scsi: qla2xxx: " Damien Le Moal
2026-09-04 1:52 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 25/40] scsi: ps3rom: " Damien Le Moal
2026-09-04 2:00 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 26/40] scsi: lpfc: " Damien Le Moal
2026-09-04 2:00 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 27/40] scsi: stex: " Damien Le Moal
2026-09-04 2:08 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 28/40] scsi: mvumi: " Damien Le Moal
2026-09-04 2:12 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 29/40] scsi: libiscsi: " Damien Le Moal
2026-09-04 2:12 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 30/40] scsi: ibmvscsi_tgt: " Damien Le Moal
2026-09-04 2:20 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 31/40] scsi: scsi_debug: " Damien Le Moal
2026-09-04 2:23 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 32/40] scsi: hpsa: " Damien Le Moal
2026-09-04 2:27 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 33/40] scsi: storvsc: " Damien Le Moal
2026-09-04 2:41 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 34/40] target: " Damien Le Moal
2026-09-04 2:37 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 35/40] usb: storage: " Damien Le Moal
2026-09-04 2:43 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 36/40] cdrom: " Damien Le Moal
2026-09-04 2:46 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 37/40] ata: libata: " Damien Le Moal
2026-09-04 2:49 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 38/40] s390: scsi: " Damien Le Moal
2026-09-04 2:50 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 39/40] scsi: cleanup scsi_proto.h Damien Le Moal
2026-09-04 2:56 ` sashiko-bot
2026-09-04 0:26 ` [PATCH v3 40/40] scsi: remove scsi_build_sense() and scsi_build_sense_buffer() Damien Le Moal
2026-09-04 2:53 ` sashiko-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260904002644.157668-23-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=James.Bottomley@HansenPartnership.com \
--cc=cassel@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=hca@linux.ibm.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.