dmaengine: idxd: refactor wq driver enable/disable operations

Move the core driver operations from wq driver to the drv_enable_wq() and
drv_disable_wq() functions. The move should reduce the wq driver's
knowledge of the core driver operations and prevent code confusion for
future wq drivers.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/165047301643.3841827.11222723219862233060.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/idxd/cdev.c b/drivers/dma/idxd/cdev.c
index b9b2b4a4124eee75dd04720c082023cd8a875177..b670b75885ad4461731ca46689db339b5d495d2e 100644 (file)
--- a/drivers/dma/idxd/cdev.c
+++ b/drivers/dma/idxd/cdev.c
@@ -314,7 +314,7 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
 
        mutex_lock(&wq->wq_lock);
        wq->type = IDXD_WQT_USER;
-       rc = __drv_enable_wq(wq);
+       rc = drv_enable_wq(wq);
        if (rc < 0)
                goto err;
 
@@ -329,7 +329,7 @@ static int idxd_user_drv_probe(struct idxd_dev *idxd_dev)
        return 0;
 
 err_cdev:
-       __drv_disable_wq(wq);
+       drv_disable_wq(wq);
 err:
        wq->type = IDXD_WQT_NONE;
        mutex_unlock(&wq->wq_lock);
@@ -342,7 +342,7 @@ static void idxd_user_drv_remove(struct idxd_dev *idxd_dev)
 
        mutex_lock(&wq->wq_lock);
        idxd_wq_del_cdev(wq);
-       __drv_disable_wq(wq);
+       drv_disable_wq(wq);
        wq->type = IDXD_WQT_NONE;
        mutex_unlock(&wq->wq_lock);
 }

diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c
index 4f5c2367ec937bea5873a7985ca5d98f4019a735..22ad9ee383e224dfb660710d3d1cf7f0791257da 100644 (file)
--- a/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@ -1196,6 +1196,9 @@ int idxd_wq_request_irq(struct idxd_wq *wq)
        struct idxd_irq_entry *ie;
        int rc;
 
+       if (wq->type != IDXD_WQT_KERNEL)
+               return 0;
+
        ie = &wq->ie;
        ie->vector = pci_irq_vector(pdev, ie->id);
        ie->pasid = device_pasid_enabled(idxd) ? idxd->pasid : INVALID_IOASID;
@@ -1227,7 +1230,7 @@ err_irq:
        return rc;
 }
 
-int __drv_enable_wq(struct idxd_wq *wq)
+int drv_enable_wq(struct idxd_wq *wq)
 {
        struct idxd_device *idxd = wq->idxd;
        struct device *dev = &idxd->pdev->dev;
@@ -1328,8 +1331,36 @@ int __drv_enable_wq(struct idxd_wq *wq)
        }
 
        wq->client_count = 0;
+
+       rc = idxd_wq_request_irq(wq);
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_WQ_IRQ_ERR;
+               dev_dbg(dev, "WQ %d irq setup failed: %d\n", wq->id, rc);
+               goto err_irq;
+       }
+
+       rc = idxd_wq_alloc_resources(wq);
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_WQ_RES_ALLOC_ERR;
+               dev_dbg(dev, "WQ resource alloc failed\n");
+               goto err_res_alloc;
+       }
+
+       rc = idxd_wq_init_percpu_ref(wq);
+       if (rc < 0) {
+               idxd->cmd_status = IDXD_SCMD_PERCPU_ERR;
+               dev_dbg(dev, "percpu_ref setup failed\n");
+               goto err_ref;
+       }
+
        return 0;
 
+err_ref:
+       idxd_wq_free_resources(wq);
+err_res_alloc:
+       idxd_wq_free_irq(wq);
+err_irq:
+       idxd_wq_unmap_portal(wq);
 err_map_portal:
        rc = idxd_wq_disable(wq, false);
        if (rc < 0)
@@ -1338,17 +1369,7 @@ err:
        return rc;
 }
 
-int drv_enable_wq(struct idxd_wq *wq)
-{
-       int rc;
-
-       mutex_lock(&wq->wq_lock);
-       rc = __drv_enable_wq(wq);
-       mutex_unlock(&wq->wq_lock);
-       return rc;
-}
-
-void __drv_disable_wq(struct idxd_wq *wq)
+void drv_disable_wq(struct idxd_wq *wq)
 {
        struct idxd_device *idxd = wq->idxd;
        struct device *dev = &idxd->pdev->dev;
@@ -1359,21 +1380,16 @@ void __drv_disable_wq(struct idxd_wq *wq)
                dev_warn(dev, "Clients has claim on wq %d: %d\n",
                         wq->id, idxd_wq_refcount(wq));
 
+       idxd_wq_free_resources(wq);
        idxd_wq_unmap_portal(wq);
-
        idxd_wq_drain(wq);
        idxd_wq_reset(wq);
-
+       percpu_ref_exit(&wq->wq_active);
+       idxd_wq_free_irq(wq);
+       wq->type = IDXD_WQT_NONE;
        wq->client_count = 0;
 }
 
-void drv_disable_wq(struct idxd_wq *wq)
-{
-       mutex_lock(&wq->wq_lock);
-       __drv_disable_wq(wq);
-       mutex_unlock(&wq->wq_lock);
-}
-
 int idxd_device_drv_probe(struct idxd_dev *idxd_dev)
 {
        struct idxd_device *idxd = idxd_dev_to_idxd(idxd_dev);

diff --git a/drivers/dma/idxd/dma.c b/drivers/dma/idxd/dma.c
index 644114465b33d5e0cb85c6dad4eed86ec704c313..950f06c8aad5a31fe3063bb043f9779a2047be2c 100644 (file)
--- a/drivers/dma/idxd/dma.c
+++ b/drivers/dma/idxd/dma.c
@@ -291,34 +291,13 @@ static int idxd_dmaengine_drv_probe(struct idxd_dev *idxd_dev)
        mutex_lock(&wq->wq_lock);
        wq->type = IDXD_WQT_KERNEL;
 
-       rc = __drv_enable_wq(wq);
+       rc = drv_enable_wq(wq);
        if (rc < 0) {
                dev_dbg(dev, "Enable wq %d failed: %d\n", wq->id, rc);
                rc = -ENXIO;
                goto err;
        }
 
-       rc = idxd_wq_request_irq(wq);
-       if (rc < 0) {
-               idxd->cmd_status = IDXD_SCMD_WQ_IRQ_ERR;
-               dev_dbg(dev, "WQ %d irq setup failed: %d\n", wq->id, rc);
-               goto err_irq;
-       }
-
-       rc = idxd_wq_alloc_resources(wq);
-       if (rc < 0) {
-               idxd->cmd_status = IDXD_SCMD_WQ_RES_ALLOC_ERR;
-               dev_dbg(dev, "WQ resource alloc failed\n");
-               goto err_res_alloc;
-       }
-
-       rc = idxd_wq_init_percpu_ref(wq);
-       if (rc < 0) {
-               idxd->cmd_status = IDXD_SCMD_PERCPU_ERR;
-               dev_dbg(dev, "percpu_ref setup failed\n");
-               goto err_ref;
-       }
-
        rc = idxd_register_dma_channel(wq);
        if (rc < 0) {
                idxd->cmd_status = IDXD_SCMD_DMA_CHAN_ERR;
@@ -331,14 +310,7 @@ static int idxd_dmaengine_drv_probe(struct idxd_dev *idxd_dev)
        return 0;
 
 err_dma:
-       __idxd_wq_quiesce(wq);
-       percpu_ref_exit(&wq->wq_active);
-err_ref:
-       idxd_wq_free_resources(wq);
-err_res_alloc:
-       idxd_wq_free_irq(wq);
-err_irq:
-       __drv_disable_wq(wq);
+       drv_disable_wq(wq);
 err:
        wq->type = IDXD_WQT_NONE;
        mutex_unlock(&wq->wq_lock);
@@ -352,11 +324,7 @@ static void idxd_dmaengine_drv_remove(struct idxd_dev *idxd_dev)
        mutex_lock(&wq->wq_lock);
        __idxd_wq_quiesce(wq);
        idxd_unregister_dma_channel(wq);
-       idxd_wq_free_resources(wq);
-       __drv_disable_wq(wq);
-       percpu_ref_exit(&wq->wq_active);
-       idxd_wq_free_irq(wq);
-       wq->type = IDXD_WQT_NONE;
+       drv_disable_wq(wq);
        mutex_unlock(&wq->wq_lock);
 }
 

diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
index da72eb15f610662cbf2168f76290d344509e4666..8e03fb548d13a9f9e157810bf842a5ffd4e600b9 100644 (file)
--- a/drivers/dma/idxd/idxd.h
+++ b/drivers/dma/idxd/idxd.h
@@ -559,9 +559,7 @@ void idxd_unregister_idxd_drv(void);
 int idxd_device_drv_probe(struct idxd_dev *idxd_dev);
 void idxd_device_drv_remove(struct idxd_dev *idxd_dev);
 int drv_enable_wq(struct idxd_wq *wq);
-int __drv_enable_wq(struct idxd_wq *wq);
 void drv_disable_wq(struct idxd_wq *wq);
-void __drv_disable_wq(struct idxd_wq *wq);
 int idxd_device_init_reset(struct idxd_device *idxd);
 int idxd_device_enable(struct idxd_device *idxd);
 int idxd_device_disable(struct idxd_device *idxd);