Commit 69e4f8be authored by Dave Jiang's avatar Dave Jiang Committed by Vinod Koul
Browse files

dmaengine: idxd: move wq_disable() to device.c 



Move the wq_disable() function to device.c in preparation of setting up the
idxd internal sub-driver framework. No logic changes.

Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/162637461775.744545.9644048686618957886.stgit@djiang5-desk3.ch.intel.com


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

drivers/dma/idxd/device.c

+37 −0
Original line number Diff line number Diff line
@@ -1253,3 +1253,40 @@ int drv_enable_wq(struct idxd_wq *wq) 
	mutex_unlock(&wq->wq_lock);

	return rc;

}



static void __drv_disable_wq(struct idxd_wq *wq)

{

	struct idxd_device *idxd = wq->idxd;

	struct device *dev = &idxd->pdev->dev;



	lockdep_assert_held(&wq->wq_lock);



	if (wq->type == IDXD_WQT_KERNEL)

		idxd_wq_quiesce(wq);



	if (is_idxd_wq_dmaengine(wq))

		idxd_unregister_dma_channel(wq);

	else if (is_idxd_wq_cdev(wq))

		idxd_wq_del_cdev(wq);



	if (idxd_wq_refcount(wq))

		dev_warn(dev, "Clients has claim on wq %d: %d\n",

			 wq->id, idxd_wq_refcount(wq));



	idxd_wq_unmap_portal(wq);



	idxd_wq_drain(wq);

	idxd_wq_reset(wq);



	idxd_wq_free_resources(wq);

	wq->client_count = 0;



	dev_info(dev, "wq %s disabled\n", dev_name(wq_confdev(wq)));

}



void drv_disable_wq(struct idxd_wq *wq)

{

	mutex_lock(&wq->wq_lock);

	__drv_disable_wq(wq);

	mutex_unlock(&wq->wq_lock);

}

drivers/dma/idxd/idxd.h

+1 −0
Original line number Diff line number Diff line
@@ -496,6 +496,7 @@ void idxd_unmask_msix_vector(struct idxd_device *idxd, int vec_id); 


/* device control */

int drv_enable_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);

drivers/dma/idxd/sysfs.c

+1 −37
Original line number Diff line number Diff line
@@ -89,42 +89,6 @@ static int idxd_config_bus_probe(struct device *dev) 
	return -ENODEV;

}



static void disable_wq(struct idxd_wq *wq)

{

	struct idxd_device *idxd = wq->idxd;

	struct device *dev = &idxd->pdev->dev;



	mutex_lock(&wq->wq_lock);

	dev_dbg(dev, "%s removing WQ %s\n", __func__, dev_name(wq_confdev(wq)));

	if (wq->state == IDXD_WQ_DISABLED) {

		mutex_unlock(&wq->wq_lock);

		return;

	}



	if (wq->type == IDXD_WQT_KERNEL)

		idxd_wq_quiesce(wq);



	if (is_idxd_wq_dmaengine(wq))

		idxd_unregister_dma_channel(wq);

	else if (is_idxd_wq_cdev(wq))

		idxd_wq_del_cdev(wq);



	if (idxd_wq_refcount(wq))

		dev_warn(dev, "Clients has claim on wq %d: %d\n",

			 wq->id, idxd_wq_refcount(wq));



	idxd_wq_unmap_portal(wq);



	idxd_wq_drain(wq);

	idxd_wq_reset(wq);



	idxd_wq_free_resources(wq);

	wq->client_count = 0;

	mutex_unlock(&wq->wq_lock);



	dev_info(dev, "wq %s disabled\n", dev_name(wq_confdev(wq)));

}



static int idxd_config_bus_remove(struct device *dev)

{

	dev_dbg(dev, "%s called for %s\n", __func__, dev_name(dev));
@@ -133,7 +97,7 @@ static int idxd_config_bus_remove(struct device *dev) 
	if (is_idxd_wq_dev(dev)) {

		struct idxd_wq *wq = confdev_to_wq(dev);



		disable_wq(wq);

		drv_disable_wq(wq);

	} else if (is_idxd_dev(dev)) {

		struct idxd_device *idxd = confdev_to_idxd(dev);

		int i;