Commit 8e527aac authored by Jerry Snitselaar's avatar Jerry Snitselaar Committed by Vinod Koul
Browse files

dmaengine: idxd: Set wq state to disabled in idxd_wq_disable_cleanup() 



If we are calling idxd_wq_disable_cleanup(), the workqueue should be
in a disabled state. So set the workqueue state to IDXD_WQ_DISABLED so
that the state reflects that. Currently if there is a device failure,
and a software reset is attempted the workqueues will not be
re-enabled due to idxd_wq_enable() seeing that state as already being
IDXD_WQ_ENABLED.

Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Vinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/20220928154856.623545-2-jsnitsel@redhat.com


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

drivers/dma/idxd/device.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ void idxd_wq_reset(struct idxd_wq *wq) 
	operand = BIT(wq->id % 16) | ((wq->id / 16) << 16);

	idxd_cmd_exec(idxd, IDXD_CMD_RESET_WQ, operand, NULL);

	idxd_wq_disable_cleanup(wq);

	wq->state = IDXD_WQ_DISABLED;

}



int idxd_wq_map_portal(struct idxd_wq *wq)
@@ -378,6 +377,7 @@ static void idxd_wq_disable_cleanup(struct idxd_wq *wq) 
	struct idxd_device *idxd = wq->idxd;



	lockdep_assert_held(&wq->wq_lock);

	wq->state = IDXD_WQ_DISABLED;

	memset(wq->wqcfg, 0, idxd->wqcfg_size);

	wq->type = IDXD_WQT_NONE;

	wq->threshold = 0;