mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

scsi: cxlflash: Refactor context reset to share reset logic

Browse source 
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: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Matthew R. Ochs 2017-01-11 19:19:08 -06:00 committed by Martin K. Petersen
parent 73eba2be92
commit 9c7d1ee5f1
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/scsi/cxlflash/main.c
View file

@ -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. * @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; int nretry = 0;
u64 rrin = 0x1; u64 rrin = 0x1;
@ -201,9 +202,9 @@ static void context_reset_ioarrin(struct afu_cmd *cmd)
pr_debug("%s: cmd=%p\n", __func__, cmd); pr_debug("%s: cmd=%p\n", __func__, cmd);
writeq_be(rrin, &afu->host_map->ioarrin); writeq_be(rrin, reset_reg);
do { do {
rrin = readq_be(&afu->host_map->ioarrin); rrin = readq_be(reset_reg);
if (rrin != 0x1) if (rrin != 0x1)
break; break;
/* Double delay each time */ /* Double delay each time */
@ -214,6 +215,17 @@ static void context_reset_ioarrin(struct afu_cmd *cmd)
__func__, rrin, nretry); __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 * send_cmd_ioarrin() - sends an AFU command via IOARRIN register
* @afu: AFU associated with the host. * @afu: AFU associated with the host.