Skip to content

Commit 9baed1c

Browse files
birkelundjoergroedel
authored andcommitted
iommu/vt-d: Drop pasid requirement for prq initialization
PASID support within the IOMMU is not required to enable the Page Request Queue, only the PRS capability. Signed-off-by: Klaus Jensen <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Signed-off-by: Joel Granados <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lu Baolu <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent cbeb1b7 commit 9baed1c

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

drivers/iommu/intel/iommu.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1329,10 +1329,8 @@ static void free_dmar_iommu(struct intel_iommu *iommu)
13291329
/* free context mapping */
13301330
free_context_table(iommu);
13311331

1332-
if (pasid_supported(iommu)) {
1333-
if (ecap_prs(iommu->ecap))
1334-
intel_iommu_finish_prq(iommu);
1335-
}
1332+
if (ecap_prs(iommu->ecap))
1333+
intel_iommu_finish_prq(iommu);
13361334
}
13371335

13381336
/*
@@ -2192,7 +2190,7 @@ static int __init init_dmars(void)
21922190

21932191
iommu_flush_write_buffer(iommu);
21942192

2195-
if (pasid_supported(iommu) && ecap_prs(iommu->ecap)) {
2193+
if (ecap_prs(iommu->ecap)) {
21962194
/*
21972195
* Call dmar_alloc_hwirq() with dmar_global_lock held,
21982196
* could cause possible lock race condition.
@@ -2616,7 +2614,7 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
26162614
intel_iommu_init_qi(iommu);
26172615
iommu_flush_write_buffer(iommu);
26182616

2619-
if (pasid_supported(iommu) && ecap_prs(iommu->ecap)) {
2617+
if (ecap_prs(iommu->ecap)) {
26202618
ret = intel_iommu_enable_prq(iommu);
26212619
if (ret)
26222620
goto disable_iommu;

0 commit comments

Comments
 (0)