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

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

scsi: cxlflash: Refactor context reset to share reset logic 



As staging for supporting hardware with different context reset
registers but a similar reset procedure, refactor the existing context
reset routine to move the reset logic to a common routine. This will
allow hardware with a different reset register to leverage existing
code.

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 73eba2be

drivers/scsi/cxlflash/main.c

+16 −4
Original line number Diff line number Diff line
@@ -188,10 +188,11 @@ static void cmd_complete(struct afu_cmd *cmd) 
}



/**

 * context_reset_ioarrin() - reset command owner context via IOARRIN register

 * context_reset() - reset command owner context via specified register

 * @cmd:	AFU command that timed out.

 * @reset_reg:	MMIO register to perform reset.

 */

static void context_reset_ioarrin(struct afu_cmd *cmd)

static void context_reset(struct afu_cmd *cmd, __be64 __iomem *reset_reg)

{

	int nretry = 0;

	u64 rrin = 0x1;
@@ -201,9 +202,9 @@ static void context_reset_ioarrin(struct afu_cmd *cmd) 


	pr_debug("%s: cmd=%p\n", __func__, cmd);



	writeq_be(rrin, &afu->host_map->ioarrin);

	writeq_be(rrin, reset_reg);

	do {

		rrin = readq_be(&afu->host_map->ioarrin);

		rrin = readq_be(reset_reg);

		if (rrin != 0x1)

			break;

		/* Double delay each time */
@@ -214,6 +215,17 @@ static void context_reset_ioarrin(struct afu_cmd *cmd) 
		__func__, rrin, nretry);

}



/**

 * context_reset_ioarrin() - reset command owner context via IOARRIN register

 * @cmd:	AFU command that timed out.

 */

static void context_reset_ioarrin(struct afu_cmd *cmd)

{

	struct afu *afu = cmd->parent;



	context_reset(cmd, &afu->host_map->ioarrin);

}



/**

 * send_cmd_ioarrin() - sends an AFU command via IOARRIN register

 * @afu:	AFU associated with the host.