Skip to content

Commit ec027bf

Browse files
LuBaolujoergroedel
authored andcommitted
uacce: Remove unnecessary IOMMU_DEV_FEAT_IOPF
None of the drivers implement anything for IOMMU_DEV_FEAT_IOPF anymore, remove it to avoid dead code. Signed-off-by: Lu Baolu <[email protected]> Reviewed-by: Jason Gunthorpe <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Acked-by: Zhangfei Gao <[email protected]> Tested-by: Zhangfei Gao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 853b01b commit ec027bf

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

drivers/misc/uacce/uacce.c

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -465,31 +465,6 @@ static void uacce_release(struct device *dev)
465465
kfree(uacce);
466466
}
467467

468-
static unsigned int uacce_enable_sva(struct device *parent, unsigned int flags)
469-
{
470-
int ret;
471-
472-
if (!(flags & UACCE_DEV_SVA))
473-
return flags;
474-
475-
flags &= ~UACCE_DEV_SVA;
476-
477-
ret = iommu_dev_enable_feature(parent, IOMMU_DEV_FEAT_IOPF);
478-
if (ret) {
479-
dev_err(parent, "failed to enable IOPF feature! ret = %pe\n", ERR_PTR(ret));
480-
return flags;
481-
}
482-
return flags | UACCE_DEV_SVA;
483-
}
484-
485-
static void uacce_disable_sva(struct uacce_device *uacce)
486-
{
487-
if (!(uacce->flags & UACCE_DEV_SVA))
488-
return;
489-
490-
iommu_dev_disable_feature(uacce->parent, IOMMU_DEV_FEAT_IOPF);
491-
}
492-
493468
/**
494469
* uacce_alloc() - alloc an accelerator
495470
* @parent: pointer of uacce parent device
@@ -509,8 +484,6 @@ struct uacce_device *uacce_alloc(struct device *parent,
509484
if (!uacce)
510485
return ERR_PTR(-ENOMEM);
511486

512-
flags = uacce_enable_sva(parent, flags);
513-
514487
uacce->parent = parent;
515488
uacce->flags = flags;
516489
uacce->ops = interface->ops;
@@ -533,7 +506,6 @@ struct uacce_device *uacce_alloc(struct device *parent,
533506
return uacce;
534507

535508
err_with_uacce:
536-
uacce_disable_sva(uacce);
537509
kfree(uacce);
538510
return ERR_PTR(ret);
539511
}
@@ -596,9 +568,6 @@ void uacce_remove(struct uacce_device *uacce)
596568
unmap_mapping_range(q->mapping, 0, 0, 1);
597569
}
598570

599-
/* disable sva now since no opened queues */
600-
uacce_disable_sva(uacce);
601-
602571
if (uacce->cdev)
603572
cdev_device_del(uacce->cdev, &uacce->dev);
604573
xa_erase(&uacce_xa, uacce->dev_id);

0 commit comments

Comments
 (0)