scsi: cxlflash: Migrate scsi command pointer to AFU command

Currently, when sending a SCSI command, the pointer is stored in a
reserved field of the AFU command descriptor for retrieval once the
SCSI command has completed. In order to support new descriptor formats
that make use of the reserved field, the pointer is migrated to outside
the descriptor where it can still be found during completion processing.

Signed-off-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Acked-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/cxlflash/common.h b/drivers/scsi/cxlflash/common.h
index 6b8d1d3d45ee2c631920ba1388c6892d2c7c1a55..0e9de5d62da25f56bcb0645a35a98582896fc37b 100644 (file)
--- a/drivers/scsi/cxlflash/common.h
+++ b/drivers/scsi/cxlflash/common.h
@@ -129,6 +129,7 @@ struct afu_cmd {
        struct sisl_ioarcb rcb; /* IOARCB (cache line aligned) */
        struct sisl_ioasa sa;   /* IOASA must follow IOARCB */
        struct afu *parent;
+       struct scsi_cmnd *scp;
        struct completion cevent;
 
        u8 cmd_tmf:1;

diff --git a/drivers/scsi/cxlflash/main.c b/drivers/scsi/cxlflash/main.c
index d2d2d836c07908164b3bee4ad1d47853295e7ef7..b17ebf6d0a7e2b49b237ee244ce7c115487906af 100644 (file)
--- a/drivers/scsi/cxlflash/main.c
+++ b/drivers/scsi/cxlflash/main.c
@@ -151,7 +151,7 @@ static void process_cmd_err(struct afu_cmd *cmd, struct scsi_cmnd *scp)
  *
  * Prepares and submits command that has either completed or timed out to
  * the SCSI stack. Checks AFU command back into command pool for non-internal
- * (rcb.scp populated) commands.
+ * (cmd->scp populated) commands.
  */
 static void cmd_complete(struct afu_cmd *cmd)
 {
@@ -161,8 +161,8 @@ static void cmd_complete(struct afu_cmd *cmd)
        struct cxlflash_cfg *cfg = afu->parent;
        bool cmd_is_tmf;
 
-       if (cmd->rcb.scp) {
-               scp = cmd->rcb.scp;
+       if (cmd->scp) {
+               scp = cmd->scp;
                if (unlikely(cmd->sa.ioasc))
                        process_cmd_err(cmd, scp);
                else
@@ -315,7 +315,7 @@ static int send_tmf(struct afu *afu, struct scsi_cmnd *scp, u64 tmfcmd)
        cfg->tmf_active = true;
        spin_unlock_irqrestore(&cfg->tmf_slock, lock_flags);
 
-       cmd->rcb.scp = scp;
+       cmd->scp = scp;
        cmd->parent = afu;
        cmd->cmd_tmf = true;
 
@@ -445,7 +445,7 @@ static int cxlflash_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scp)
                cmd->rcb.data_ea = sg_dma_address(sg);
        }
 
-       cmd->rcb.scp = scp;
+       cmd->scp = scp;
        cmd->parent = afu;
 
        cmd->rcb.ctx_id = afu->ctx_hndl;

diff --git a/drivers/scsi/cxlflash/sislite.h b/drivers/scsi/cxlflash/sislite.h
index 347fc16719754e7a7db5db9a5f0f559ddb61f0bb..1a2d09c148b34a7bec8f9295eda4ec912fbdffce 100644 (file)
--- a/drivers/scsi/cxlflash/sislite.h
+++ b/drivers/scsi/cxlflash/sislite.h
@@ -72,7 +72,7 @@ struct sisl_ioarcb {
        u16 timeout;            /* in units specified by req_flags */
        u32 rsvd1;
        u8 cdb[16];             /* must be in big endian */
-       struct scsi_cmnd *scp;
+       u64 reserved;           /* Reserved area */
 } __packed;
 
 struct sisl_rc {