@@ -586,7 +586,7 @@ int idxd_device_disable(struct idxd_device *idxd)
spin_lock_irqsave(&idxd->dev_lock, flags);
idxd_device_wqs_clear_state(idxd);
- idxd->state = IDXD_DEV_CONF_READY;
+ idxd->state = IDXD_DEV_DISABLED;
spin_unlock_irqrestore(&idxd->dev_lock, flags);
return 0;
}
@@ -598,7 +598,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_wqs_clear_state(idxd);
- idxd->state = IDXD_DEV_CONF_READY;
+ idxd->state = IDXD_DEV_DISABLED;
spin_unlock_irqrestore(&idxd->dev_lock, flags);
}
@@ -211,7 +211,6 @@ struct idxd_hw {
enum idxd_device_state {
IDXD_DEV_HALTED = -1,
IDXD_DEV_DISABLED = 0,
- IDXD_DEV_CONF_READY,
IDXD_DEV_ENABLED,
};
@@ -633,8 +633,6 @@ static int idxd_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto err;
}
- idxd->state = IDXD_DEV_CONF_READY;
-
dev_info(&pdev->dev, "Intel(R) Accelerator Device (v%x)\n",
idxd->hw.version);
@@ -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;
@@ -1423,7 +1410,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");