Skip to content

Commit e1b9194

Browse files
Mahesh Rajashekharamartinkpetersen
authored andcommitted
scsi: smartpqi: Enhance error messages
Add more detail to some TMF messages. Reviewed-by: Scott Benesh <scott.benesh@microchip.com> Reviewed-by: Mike McGowen <mike.mcgowen@microchip.com> Reviewed-by: Kevin Barnett <kevin.barnett@microchip.com> Signed-off-by: Mahesh Rajashekhara <Mahesh.Rajashekhara@microchip.com> Signed-off-by: Don Brace <don.brace@microchip.com> Link: https://lore.kernel.org/r/20230824155812.789913-8-don.brace@microchip.com Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 72b737f commit e1b9194

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

drivers/scsi/smartpqi/smartpqi_init.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6358,10 +6358,8 @@ static int pqi_device_reset_handler(struct pqi_ctrl_info *ctrl_info, struct pqi_
63586358
mutex_lock(&ctrl_info->lun_reset_mutex);
63596359

63606360
dev_err(&ctrl_info->pci_dev->dev,
6361-
"resetting scsi %d:%d:%d:%d due to cmd 0x%02x\n",
6362-
ctrl_info->scsi_host->host_no,
6363-
device->bus, device->target, lun,
6364-
scmd->cmd_len > 0 ? scmd->cmnd[0] : 0xff);
6361+
"resetting scsi %d:%d:%d:%u SCSI cmd at %p due to cmd opcode 0x%02x\n",
6362+
ctrl_info->scsi_host->host_no, device->bus, device->target, lun, scmd, scsi_opcode);
63656363

63666364
pqi_check_ctrl_health(ctrl_info);
63676365
if (pqi_ctrl_offline(ctrl_info))
@@ -6415,18 +6413,20 @@ static int pqi_eh_abort_handler(struct scsi_cmnd *scmd)
64156413

64166414
shost = scmd->device->host;
64176415
ctrl_info = shost_to_hba(shost);
6416+
device = scmd->device->hostdata;
64186417

64196418
dev_err(&ctrl_info->pci_dev->dev,
6420-
"attempting TASK ABORT on SCSI cmd at %p\n", scmd);
6419+
"attempting TASK ABORT on scsi %d:%d:%d:%d for SCSI cmd at %p\n",
6420+
shost->host_no, device->bus, device->target, (int)scmd->device->lun, scmd);
64216421

64226422
if (cmpxchg(&scmd->host_scribble, PQI_NO_COMPLETION, (void *)&wait) == NULL) {
64236423
dev_err(&ctrl_info->pci_dev->dev,
6424-
"SCSI cmd at %p already completed\n", scmd);
6424+
"scsi %d:%d:%d:%d for SCSI cmd at %p already completed\n",
6425+
shost->host_no, device->bus, device->target, (int)scmd->device->lun, scmd);
64256426
scmd->result = DID_RESET << 16;
64266427
goto out;
64276428
}
64286429

6429-
device = scmd->device->hostdata;
64306430
tmf_work = &device->tmf_work[scmd->device->lun];
64316431

64326432
if (cmpxchg(&tmf_work->scmd, NULL, scmd) == NULL) {
@@ -6440,7 +6440,8 @@ static int pqi_eh_abort_handler(struct scsi_cmnd *scmd)
64406440
wait_for_completion(&wait);
64416441

64426442
dev_err(&ctrl_info->pci_dev->dev,
6443-
"TASK ABORT on SCSI cmd at %p: SUCCESS\n", scmd);
6443+
"TASK ABORT on scsi %d:%d:%d:%d for SCSI cmd at %p: SUCCESS\n",
6444+
shost->host_no, device->bus, device->target, (int)scmd->device->lun, scmd);
64446445

64456446
out:
64466447

0 commit comments

Comments
 (0)