dmaengine: idxd: remove IDXD_DEV_CONF_READY

The IDXD_DEV_CONF_READY state flag is no longer needed. The current
implementation uses this flag to stop the device from doing
configuration until the pci driver probe has completed. With the
driver architecture going towards multiple sub-driver attached to
the dsa_bus, this is no longer feasible. The sub-drivers will be
allowed to probe and return with failure when they are not ready
to complete the probe rather than using a state flag to gate the
probing.

There is no expectation that the devices auto-attach to a driver.
Userspace configuration is expected to setup the device before
enabling.

Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/162637460633.744545.8902095097471365420.stgit@djiang5-desk3.ch.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c
index c8cf1de721763570c93f7e3d329e9c83516a694a..4a2af979923963ceac140f8cd475b2ea7e5b92b7 100644 (file)
--- a/drivers/dma/idxd/device.c
+++ b/drivers/dma/idxd/device.c
@@ -576,7 +576,7 @@ int idxd_device_disable(struct idxd_device *idxd)
 
        spin_lock_irqsave(&idxd->dev_lock, flags);
        idxd_device_clear_state(idxd);
-       idxd->state = IDXD_DEV_CONF_READY;
+       idxd->state = IDXD_DEV_DISABLED;
        spin_unlock_irqrestore(&idxd->dev_lock, flags);
        return 0;
 }
@@ -588,7 +588,7 @@ void idxd_device_reset(struct idxd_device *idxd)
        idxd_cmd_exec(idxd, IDXD_CMD_RESET_DEVICE, 0, NULL);
        spin_lock_irqsave(&idxd->dev_lock, flags);
        idxd_device_clear_state(idxd);
-       idxd->state = IDXD_DEV_CONF_READY;
+       idxd->state = IDXD_DEV_DISABLED;
        spin_unlock_irqrestore(&idxd->dev_lock, flags);
 }
 

diff --git a/drivers/dma/idxd/idxd.h b/drivers/dma/idxd/idxd.h
index ae60fcc7b625ee6ad318f8aaf2b9f6c981f23fcb..9fc1a88f336d3c2957384138c3b0ecc179bb96cb 100644 (file)
--- a/drivers/dma/idxd/idxd.h
+++ b/drivers/dma/idxd/idxd.h
@@ -210,7 +210,6 @@ struct idxd_hw {
 enum idxd_device_state {
        IDXD_DEV_HALTED = -1,
        IDXD_DEV_DISABLED = 0,
-       IDXD_DEV_CONF_READY,
        IDXD_DEV_ENABLED,
 };
 

diff --git a/drivers/dma/idxd/init.c b/drivers/dma/idxd/init.c
index f500076882d2c61cb11d9720c677315960d2ebc3..c22225b14c5d70d684fda07cbcf21456d0fc3d25 100644 (file)
--- a/drivers/dma/idxd/init.c
+++ b/drivers/dma/idxd/init.c
@@ -682,8 +682,6 @@ static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                goto err_dev_register;
        }
 
-       idxd->state = IDXD_DEV_CONF_READY;
-
        dev_info(&pdev->dev, "Intel(R) Accelerator Device (v%x)\n",
                 idxd->hw.version);
 

diff --git a/drivers/dma/idxd/sysfs.c b/drivers/dma/idxd/sysfs.c
index f603b11141c4de71136e82d29bbbeeba5f8b7471..2a978055e22b5aeb248a7e195c062db6889ea240 100644 (file)
--- a/drivers/dma/idxd/sysfs.c
+++ b/drivers/dma/idxd/sysfs.c
@@ -22,17 +22,9 @@ static int idxd_config_bus_match(struct device *dev,
        int matched = 0;
 
        if (is_idxd_dev(dev)) {
-               struct idxd_device *idxd = confdev_to_idxd(dev);
-
-               if (idxd->state != IDXD_DEV_CONF_READY)
-                       return 0;
                matched = 1;
        } else if (is_idxd_wq_dev(dev)) {
                struct idxd_wq *wq = confdev_to_wq(dev);
-               struct idxd_device *idxd = wq->idxd;
-
-               if (idxd->state < IDXD_DEV_CONF_READY)
-                       return 0;
 
                if (wq->state != IDXD_WQ_DISABLED) {
                        dev_dbg(dev, "%s not disabled\n", dev_name(dev));
@@ -179,11 +171,6 @@ static int idxd_config_bus_probe(struct device *dev)
        if (is_idxd_dev(dev)) {
                struct idxd_device *idxd = confdev_to_idxd(dev);
 
-               if (idxd->state != IDXD_DEV_CONF_READY) {
-                       dev_warn(dev, "Device not ready for config\n");
-                       return -EBUSY;
-               }
-
                if (!try_module_get(THIS_MODULE))
                        return -ENXIO;
 
@@ -1430,7 +1417,6 @@ static ssize_t state_show(struct device *dev,
 
        switch (idxd->state) {
        case IDXD_DEV_DISABLED:
-       case IDXD_DEV_CONF_READY:
                return sysfs_emit(buf, "disabled\n");
        case IDXD_DEV_ENABLED:
                return sysfs_emit(buf, "enabled\n");