scsi: cxlflash: Update debug prints in reset handlers (5a4d9d77) · Commits · 戴 / test

The device and host reset handler contain debug prints to help identify the entities being reset. Today these reset handlers are based on a SCSI EH design that uses a SCSI command reference as a means of identifying the target entity. As such, the debug trace includes the SCSI command pointer and associated CDB. This is not necessary as the SCSI command is simply the messenger in these scenarios. Refactor the debug prints in the host and reset handlers to only present information that is applicable given the function scope. Signed-off-by:

Matthew R. Ochs <mrochs@linux.vnet.ibm.com> Reviewed-by:

Hannes Reinecke <hare@suse.com> Signed-off-by:

Martin K. Petersen <martin.petersen@oracle.com>

drivers/scsi/cxlflash/main.c

+3 −15

Original line number	Diff line number	Diff line
		@@ -2435,14 +2435,8 @@ static int cxlflash_eh_device_reset_handler(struct scsi_cmnd *scp)
		struct device *dev = &cfg->dev->dev;
		int rcr = 0;

		dev_dbg(dev, "%s: (scp=%p) %d/%d/%d/%llu "
		"cdb=(%08x-%08x-%08x-%08x)\n", __func__, scp, host->host_no,
		sdev->channel, sdev->id, sdev->lun,
		get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
		get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
		get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
		get_unaligned_be32(&((u32 *)scp->cmnd)[3]));

		dev_dbg(dev, "%s: %d/%d/%d/%llu\n", __func__,
		host->host_no, sdev->channel, sdev->id, sdev->lun);
		retry:
		switch (cfg->state) {
		case STATE_NORMAL:
		@@ -2483,13 +2477,7 @@ static int cxlflash_eh_host_reset_handler(struct scsi_cmnd *scp)
		struct cxlflash_cfg *cfg = shost_priv(host);
		struct device *dev = &cfg->dev->dev;

		dev_dbg(dev, "%s: (scp=%p) %d/%d/%d/%llu "
		"cdb=(%08x-%08x-%08x-%08x)\n", __func__, scp, host->host_no,
		scp->device->channel, scp->device->id, scp->device->lun,
		get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
		get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
		get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
		get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
		dev_dbg(dev, "%s: %d\n", __func__, host->host_no);

		switch (cfg->state) {
		case STATE_NORMAL:

Admin message