| From dda77a349e115959def95a77ec2f99c5517331ee Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 3 Jun 2021 11:01:37 -0700 |
| Subject: dmaengine: idxd: have command status always set |
| |
| From: Dave Jiang <dave.jiang@intel.com> |
| |
| [ Upstream commit 53499d1fc11267e078557fc68ce943c1eb3b7a37 ] |
| |
| The cached command status is only set when the write back status is |
| is passed in. Move the variable set outside of the check so it is |
| always set. |
| |
| Fixes: 0d5c10b4c84d ("dmaengine: idxd: add work queue drain support") |
| Reported-by: Ramesh Thomas <ramesh.thomas@intel.com> |
| Signed-off-by: Dave Jiang <dave.jiang@intel.com> |
| Link: https://lore.kernel.org/r/162274329740.1822314.3443875665504707588.stgit@djiang5-desk3.ch.intel.com |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/dma/idxd/device.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c |
| index 928c2c8817f0..c8cf1de72176 100644 |
| --- a/drivers/dma/idxd/device.c |
| +++ b/drivers/dma/idxd/device.c |
| @@ -486,6 +486,7 @@ static void idxd_cmd_exec(struct idxd_device *idxd, int cmd_code, u32 operand, |
| union idxd_command_reg cmd; |
| DECLARE_COMPLETION_ONSTACK(done); |
| unsigned long flags; |
| + u32 stat; |
| |
| if (idxd_device_is_halted(idxd)) { |
| dev_warn(&idxd->pdev->dev, "Device is HALTED!\n"); |
| @@ -518,11 +519,11 @@ static void idxd_cmd_exec(struct idxd_device *idxd, int cmd_code, u32 operand, |
| */ |
| spin_unlock_irqrestore(&idxd->cmd_lock, flags); |
| wait_for_completion(&done); |
| + stat = ioread32(idxd->reg_base + IDXD_CMDSTS_OFFSET); |
| spin_lock_irqsave(&idxd->cmd_lock, flags); |
| - if (status) { |
| - *status = ioread32(idxd->reg_base + IDXD_CMDSTS_OFFSET); |
| - idxd->cmd_status = *status & GENMASK(7, 0); |
| - } |
| + if (status) |
| + *status = stat; |
| + idxd->cmd_status = stat & GENMASK(7, 0); |
| |
| __clear_bit(IDXD_FLAG_CMD_RUNNING, &idxd->flags); |
| /* Wake up other pending commands */ |
| -- |
| 2.33.0 |
| |
