Commit df841b17 authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul

dmaengine: idxd: reset states after device disable or reset

The state for WQs should be reset to disabled when a device is reset or
disabled.

Fixes: da32b28c ("dmaengine: idxd: cleanup workqueue config after disabling")
Reported-by: default avatarMona Hossain <mona.hossain@intel.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/159586777684.27150.17589406415773568534.stgit@djiang5-desk3.ch.intel.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 7eb48dd0
...@@ -410,10 +410,27 @@ int idxd_device_enable(struct idxd_device *idxd) ...@@ -410,10 +410,27 @@ int idxd_device_enable(struct idxd_device *idxd)
return 0; return 0;
} }
void idxd_device_wqs_clear_state(struct idxd_device *idxd)
{
int i;
lockdep_assert_held(&idxd->dev_lock);
for (i = 0; i < idxd->max_wqs; i++) {
struct idxd_wq *wq = &idxd->wqs[i];
if (wq->state == IDXD_WQ_ENABLED) {
idxd_wq_disable_cleanup(wq);
wq->state = IDXD_WQ_DISABLED;
}
}
}
int idxd_device_disable(struct idxd_device *idxd) int idxd_device_disable(struct idxd_device *idxd)
{ {
struct device *dev = &idxd->pdev->dev; struct device *dev = &idxd->pdev->dev;
u32 status; u32 status;
unsigned long flags;
if (!idxd_is_enabled(idxd)) { if (!idxd_is_enabled(idxd)) {
dev_dbg(dev, "Device is not enabled\n"); dev_dbg(dev, "Device is not enabled\n");
...@@ -429,13 +446,22 @@ int idxd_device_disable(struct idxd_device *idxd) ...@@ -429,13 +446,22 @@ int idxd_device_disable(struct idxd_device *idxd)
return -ENXIO; return -ENXIO;
} }
spin_lock_irqsave(&idxd->dev_lock, flags);
idxd_device_wqs_clear_state(idxd);
idxd->state = IDXD_DEV_CONF_READY; idxd->state = IDXD_DEV_CONF_READY;
spin_unlock_irqrestore(&idxd->dev_lock, flags);
return 0; return 0;
} }
void idxd_device_reset(struct idxd_device *idxd) void idxd_device_reset(struct idxd_device *idxd)
{ {
unsigned long flags;
idxd_cmd_exec(idxd, IDXD_CMD_RESET_DEVICE, 0, NULL); idxd_cmd_exec(idxd, IDXD_CMD_RESET_DEVICE, 0, NULL);
spin_lock_irqsave(&idxd->dev_lock, flags);
idxd_device_wqs_clear_state(idxd);
idxd->state = IDXD_DEV_CONF_READY;
spin_unlock_irqrestore(&idxd->dev_lock, flags);
} }
/* Device configuration bits */ /* Device configuration bits */
......
...@@ -11,18 +11,6 @@ ...@@ -11,18 +11,6 @@
#include "idxd.h" #include "idxd.h"
#include "registers.h" #include "registers.h"
void idxd_device_wqs_clear_state(struct idxd_device *idxd)
{
int i;
lockdep_assert_held(&idxd->dev_lock);
for (i = 0; i < idxd->max_wqs; i++) {
struct idxd_wq *wq = &idxd->wqs[i];
wq->state = IDXD_WQ_DISABLED;
}
}
static void idxd_device_reinit(struct work_struct *work) static void idxd_device_reinit(struct work_struct *work)
{ {
struct idxd_device *idxd = container_of(work, struct idxd_device, work); struct idxd_device *idxd = container_of(work, struct idxd_device, work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment