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

dmaengine: idxd: use ida for device instance enumeration

The idr is only used for an device id, never to lookup context from that
id. Switch to plain ida.

Fixes: bfe1d560 ("dmaengine: idxd: Init and probe for Intel data accelerators")
Reported-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/161852984730.2203940.15032482460902003819.stgit@djiang5-desk3.ch.intel.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent a39c7cd0
...@@ -34,8 +34,7 @@ MODULE_PARM_DESC(sva, "Toggle SVA support on/off"); ...@@ -34,8 +34,7 @@ MODULE_PARM_DESC(sva, "Toggle SVA support on/off");
bool support_enqcmd; bool support_enqcmd;
static struct idr idxd_idrs[IDXD_TYPE_MAX]; static struct ida idxd_idas[IDXD_TYPE_MAX];
static DEFINE_MUTEX(idxd_idr_lock);
static struct pci_device_id idxd_pci_tbl[] = { static struct pci_device_id idxd_pci_tbl[] = {
/* DSA ver 1.0 platforms */ /* DSA ver 1.0 platforms */
...@@ -348,12 +347,10 @@ static int idxd_probe(struct idxd_device *idxd) ...@@ -348,12 +347,10 @@ static int idxd_probe(struct idxd_device *idxd)
dev_dbg(dev, "IDXD interrupt setup complete.\n"); dev_dbg(dev, "IDXD interrupt setup complete.\n");
mutex_lock(&idxd_idr_lock); idxd->id = ida_alloc(&idxd_idas[idxd->type], GFP_KERNEL);
idxd->id = idr_alloc(&idxd_idrs[idxd->type], idxd, 0, 0, GFP_KERNEL);
mutex_unlock(&idxd_idr_lock);
if (idxd->id < 0) { if (idxd->id < 0) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_idr_fail; goto err_ida_fail;
} }
idxd->major = idxd_cdev_get_major(idxd); idxd->major = idxd_cdev_get_major(idxd);
...@@ -361,7 +358,7 @@ static int idxd_probe(struct idxd_device *idxd) ...@@ -361,7 +358,7 @@ static int idxd_probe(struct idxd_device *idxd)
dev_dbg(dev, "IDXD device %d probed successfully\n", idxd->id); dev_dbg(dev, "IDXD device %d probed successfully\n", idxd->id);
return 0; return 0;
err_idr_fail: err_ida_fail:
idxd_mask_error_interrupts(idxd); idxd_mask_error_interrupts(idxd);
idxd_mask_msix_vectors(idxd); idxd_mask_msix_vectors(idxd);
err_setup: err_setup:
...@@ -518,9 +515,7 @@ static void idxd_remove(struct pci_dev *pdev) ...@@ -518,9 +515,7 @@ static void idxd_remove(struct pci_dev *pdev)
idxd_shutdown(pdev); idxd_shutdown(pdev);
if (device_pasid_enabled(idxd)) if (device_pasid_enabled(idxd))
idxd_disable_system_pasid(idxd); idxd_disable_system_pasid(idxd);
mutex_lock(&idxd_idr_lock); ida_free(&idxd_idas[idxd->type], idxd->id);
idr_remove(&idxd_idrs[idxd->type], idxd->id);
mutex_unlock(&idxd_idr_lock);
} }
static struct pci_driver idxd_pci_driver = { static struct pci_driver idxd_pci_driver = {
...@@ -550,7 +545,7 @@ static int __init idxd_init_module(void) ...@@ -550,7 +545,7 @@ static int __init idxd_init_module(void)
support_enqcmd = true; support_enqcmd = true;
for (i = 0; i < IDXD_TYPE_MAX; i++) for (i = 0; i < IDXD_TYPE_MAX; i++)
idr_init(&idxd_idrs[i]); ida_init(&idxd_idas[i]);
err = idxd_register_bus_type(); err = idxd_register_bus_type();
if (err < 0) if (err < 0)
......
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