Skip to content

Commit c220629

Browse files
LuBaolujoergroedel
authored andcommitted
iommu/vt-d: Remove iommu cap audit
The capability audit code was introduced by commit <ad3d19029979> "iommu/vt-d: Audit IOMMU Capabilities and add helper functions", aiming to verify the consistency of capabilities across all IOMMUs for supported features. Nowadays, all the kAPIs of the iommu subsystem have evolved to be device oriented, in preparation for supporting heterogeneous IOMMU architectures. There is no longer a need to require capability consistence among IOMMUs for any feature. Remove the iommu cap audit code to make the driver align with the design in the iommu core. Signed-off-by: Lu Baolu <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent de1dda7 commit c220629

File tree

5 files changed

+1
-366
lines changed

5 files changed

+1
-366
lines changed

drivers/iommu/intel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
obj-$(CONFIG_DMAR_TABLE) += dmar.o
33
obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o nested.o cache.o prq.o
4-
obj-$(CONFIG_DMAR_TABLE) += trace.o cap_audit.o
4+
obj-$(CONFIG_DMAR_TABLE) += trace.o
55
obj-$(CONFIG_DMAR_PERF) += perf.o
66
obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o
77
obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o

drivers/iommu/intel/cap_audit.c

Lines changed: 0 additions & 217 deletions
This file was deleted.

drivers/iommu/intel/cap_audit.h

Lines changed: 0 additions & 131 deletions
This file was deleted.

drivers/iommu/intel/iommu.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "../irq_remapping.h"
3030
#include "../iommu-pages.h"
3131
#include "pasid.h"
32-
#include "cap_audit.h"
3332
#include "perfmon.h"
3433

3534
#define ROOT_SIZE VTD_PAGE_SIZE
@@ -2118,10 +2117,6 @@ static int __init init_dmars(void)
21182117
struct intel_iommu *iommu;
21192118
int ret;
21202119

2121-
ret = intel_cap_audit(CAP_AUDIT_STATIC_DMAR, NULL);
2122-
if (ret)
2123-
goto free_iommu;
2124-
21252120
for_each_iommu(iommu, drhd) {
21262121
if (drhd->ignored) {
21272122
iommu_disable_translation(iommu);
@@ -2617,10 +2612,6 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
26172612
struct intel_iommu *iommu = dmaru->iommu;
26182613
int ret;
26192614

2620-
ret = intel_cap_audit(CAP_AUDIT_HOTPLUG_DMAR, iommu);
2621-
if (ret)
2622-
goto out;
2623-
26242615
/*
26252616
* Disable translation if already enabled prior to OS handover.
26262617
*/

0 commit comments

Comments
 (0)