Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87623531 authored by Matthew R. Ochs's avatar Matthew R. Ochs Committed by Martin K. Petersen
Browse files

scsi: cxlflash: Remove embedded CXL work structures 



The CXL-specific work structure used to request the number of interrupts
currently resides as a nested member of both the context information and
hardware queue structures. It is used to cache values (specifically the
number of interrupts) required by the CXL layer when starting a context.

To facilitate staging that will ultimately allow the cxlflash core to
become agnostic of the underlying accelerator transport, remove these
embedded work structures.

Signed-off-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent af2047ec

drivers/scsi/cxlflash/common.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ struct hwq { 
	 */

	struct afu *afu;

	void *ctx_cookie;

	struct cxl_ioctl_start_work work;

	struct sisl_host_map __iomem *host_map;		/* MC host map */

	struct sisl_ctrl_map __iomem *ctrl_map;		/* MC control map */

	ctx_hndl_t ctx_hndl;	/* master's context handle */

drivers/scsi/cxlflash/main.c

+1 −3
Original line number Diff line number Diff line
@@ -1611,9 +1611,7 @@ static int start_context(struct cxlflash_cfg *cfg, u32 index) 
	struct hwq *hwq = get_hwq(cfg->afu, index);

	int rc = 0;



	rc = cxl_start_context(hwq->ctx_cookie,

			       hwq->work.work_element_descriptor,

			       NULL);

	rc = cxl_start_context(hwq->ctx_cookie, 0, NULL);



	dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);

	return rc;

drivers/scsi/cxlflash/superpipe.c

+9 −6
Original line number Diff line number Diff line
@@ -1309,7 +1309,7 @@ static int cxlflash_disk_attach(struct scsi_device *sdev, 
	struct afu *afu = cfg->afu;

	struct llun_info *lli = sdev->hostdata;

	struct glun_info *gli = lli->parent;

	struct cxl_ioctl_start_work *work;

	struct cxl_ioctl_start_work work = { 0 };

	struct ctx_info *ctxi = NULL;

	struct lun_access *lun_access = NULL;

	int rc = 0;
@@ -1405,11 +1405,10 @@ static int cxlflash_disk_attach(struct scsi_device *sdev, 
		goto err;

	}



	work = &ctxi->work;

	work->num_interrupts = irqs;

	work->flags = CXL_START_WORK_NUM_IRQS;

	work.num_interrupts = irqs;

	work.flags = CXL_START_WORK_NUM_IRQS;



	rc = cxl_start_work(ctx, work);

	rc = cxl_start_work(ctx, &work);

	if (unlikely(rc)) {

		dev_dbg(dev, "%s: Could not start context rc=%d\n",

			__func__, rc);
@@ -1534,6 +1533,7 @@ static int recover_context(struct cxlflash_cfg *cfg, 
	struct file *file;

	void *ctx;

	struct afu *afu = cfg->afu;

	struct cxl_ioctl_start_work work = { 0 };



	ctx = cxl_dev_context_init(cfg->dev);

	if (IS_ERR_OR_NULL(ctx)) {
@@ -1543,7 +1543,10 @@ static int recover_context(struct cxlflash_cfg *cfg, 
		goto out;

	}



	rc = cxl_start_work(ctx, &ctxi->work);

	work.num_interrupts = ctxi->irqs;

	work.flags = CXL_START_WORK_NUM_IRQS;



	rc = cxl_start_work(ctx, &work);

	if (unlikely(rc)) {

		dev_dbg(dev, "%s: Could not start context rc=%d\n",

			__func__, rc);

drivers/scsi/cxlflash/superpipe.h

+0 −1
Original line number Diff line number Diff line
@@ -96,7 +96,6 @@ struct ctx_info { 
	struct llun_info **rht_lun;       /* Mapping of RHT entries to LUNs */

	u8 *rht_needs_ws;	/* User-desired write-same function per RHTE */



	struct cxl_ioctl_start_work work;

	u64 ctxid;

	u64 irqs; /* Number of interrupts requested for context */

	pid_t pid;