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

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

scsi: cxlflash: Remove private command pool 



Clean up and remove the remaining private command pool infrastructure
that is no longer required.

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

drivers/scsi/cxlflash/common.h

+0 −7
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ struct afu_cmd { 
	spinlock_t slock;

	struct completion cevent;

	struct afu *parent;

	int slot;

	atomic_t free;



	u8 cmd_tmf:1;
@@ -164,10 +162,6 @@ struct afu { 
	/* Stuff requiring alignment go first. */



	u64 rrq_entry[NUM_RRQ_ENTRY];	/* 2K RRQ */

	/*

	 * Command & data for AFU commands.

	 */

	struct afu_cmd cmd[CXLFLASH_NUM_CMDS];



	/* Beware of alignment till here. Preferably introduce new

	 * fields after this point
@@ -189,7 +183,6 @@ struct afu { 
	s64 room;

	spinlock_t rrin_slock; /* Lock to rrin queuing and cmd_room updates */

	u64 hb;

	u32 cmd_couts;		/* Number of command checkouts */

	u32 internal_lun;	/* User-desired LUN mode for this AFU */



	char version[16];

drivers/scsi/cxlflash/main.c

+0 −68
Original line number Diff line number Diff line
@@ -34,33 +34,6 @@ MODULE_AUTHOR("Manoj N. Kumar <manoj@linux.vnet.ibm.com>"); 
MODULE_AUTHOR("Matthew R. Ochs <mrochs@linux.vnet.ibm.com>");

MODULE_LICENSE("GPL");



/**

 * cmd_checkin() - checks in an AFU command

 * @cmd:	AFU command to checkin.

 *

 * Safe to pass commands that have already been checked in. Several

 * internal tracking fields are reset as part of the checkin. Note

 * that these are intentionally reset prior to toggling the free bit

 * to avoid clobbering values in the event that the command is checked

 * out right away.

 */

static void cmd_checkin(struct afu_cmd *cmd)

{

	cmd->rcb.scp = NULL;

	cmd->rcb.timeout = 0;

	cmd->sa.ioasc = 0;

	cmd->cmd_tmf = false;

	cmd->sa.host_use[0] = 0; /* clears both completion and retry bytes */



	if (unlikely(atomic_inc_return(&cmd->free) != 1)) {

		pr_err("%s: Freeing cmd (%d) that is not in use!\n",

		       __func__, cmd->slot);

		return;

	}



	pr_devel("%s: released cmd %p index=%d\n", __func__, cmd, cmd->slot);

}



/**

 * process_cmd_err() - command error handler

 * @cmd:	AFU command that experienced the error.
@@ -560,28 +533,12 @@ static void free_mem(struct cxlflash_cfg *cfg) 
 *

 * Cleans up all state associated with the command queue, and unmaps

 * the MMIO space.

 *

 *  - complete() will take care of commands we initiated (they'll be checked

 *  in as part of the cleanup that occurs after the completion)

 *

 *  - cmd_checkin() will take care of entries that we did not initiate and that

 *  have not (and will not) complete because they are sitting on a [now stale]

 *  hardware queue

 */

static void stop_afu(struct cxlflash_cfg *cfg)

{

	int i;

	struct afu *afu = cfg->afu;

	struct afu_cmd *cmd;



	if (likely(afu)) {

		for (i = 0; i < CXLFLASH_NUM_CMDS; i++) {

			cmd = &afu->cmd[i];

			complete(&cmd->cevent);

			if (!atomic_read(&cmd->free))

				cmd_checkin(cmd);

		}



		if (likely(afu->afu_map)) {

			cxl_psa_unmap((void __iomem *)afu->afu_map);

			afu->afu_map = NULL;
@@ -794,7 +751,6 @@ static void cxlflash_remove(struct pci_dev *pdev) 
static int alloc_mem(struct cxlflash_cfg *cfg)

{

	int rc = 0;

	int i;

	struct device *dev = &cfg->dev->dev;



	/* AFU is ~12k, i.e. only one 64k page or up to four 4k pages */
@@ -808,12 +764,6 @@ static int alloc_mem(struct cxlflash_cfg *cfg) 
	}

	cfg->afu->parent = cfg;

	cfg->afu->afu_map = NULL;



	for (i = 0; i < CXLFLASH_NUM_CMDS; i++) {

		atomic_set(&cfg->afu->cmd[i].free, 1);

		cfg->afu->cmd[i].slot = i;

	}



out:

	return rc;

}
@@ -1443,13 +1393,6 @@ static void init_pcr(struct cxlflash_cfg *cfg) 


	/* Program the Endian Control for the master context */

	writeq_be(SISL_ENDIAN_CTRL, &afu->host_map->endian_ctrl);



	/* Initialize cmd fields that never change */

	for (i = 0; i < CXLFLASH_NUM_CMDS; i++) {

		afu->cmd[i].rcb.ctx_id = afu->ctx_hndl;

		afu->cmd[i].rcb.msi = SISL_MSI_RRQ_UPDATED;

		afu->cmd[i].rcb.rrq = 0x0;

	}

}



/**
@@ -1538,19 +1481,8 @@ static int init_global(struct cxlflash_cfg *cfg) 
static int start_afu(struct cxlflash_cfg *cfg)

{

	struct afu *afu = cfg->afu;

	struct afu_cmd *cmd;



	int i = 0;

	int rc = 0;



	for (i = 0; i < CXLFLASH_NUM_CMDS; i++) {

		cmd = &afu->cmd[i];



		init_completion(&cmd->cevent);

		spin_lock_init(&cmd->slock);

		cmd->parent = afu;

	}



	init_pcr(cfg);



	/* After an AFU reset, RRQ entries are stale, clear them */