Commit 53499d1f authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul
Browse files

dmaengine: idxd: have command status always set 



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: 0d5c10b4 ("dmaengine: idxd: add work queue drain support")
Reported-by: default avatarRamesh Thomas <ramesh.thomas@intel.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/162274329740.1822314.3443875665504707588.stgit@djiang5-desk3.ch.intel.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent e753a64b

drivers/dma/idxd/device.c

+5 −4
Original line number Diff line number Diff line
@@ -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 */