diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-02 16:20:47 +0700 |
| commit | 6d5e2bf9d203e4d9e08ca2e9420c6ff22ad190af (patch) | |
| tree | c2c20648773d3326f942e34ef73b06566f7a19ec /drivers/iommu/intel-iommu.c | |
| parent | b820d52e7eed7b30b2dfef5f4213a2bc3cbea6f3 (diff) | |
| parent | 257f9053c0204ea47491aa236004fd1226f75fa8 (diff) | |
Merge branch 'acpi-utils' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm into asoc-5.2
Diffstat (limited to 'drivers/iommu/intel-iommu.c')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 87274b54febd..28cb713d728c 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1538,6 +1538,9 @@ static void iommu_disable_protect_mem_regions(struct intel_iommu *iommu) u32 pmen; unsigned long flags; + if (!cap_plmr(iommu->cap) && !cap_phmr(iommu->cap)) + return; + raw_spin_lock_irqsave(&iommu->register_lock, flags); pmen = readl(iommu->reg + DMAR_PMEN_REG); pmen &= ~DMA_PMEN_EPM; @@ -5332,7 +5335,7 @@ int intel_iommu_enable_pasid(struct intel_iommu *iommu, struct intel_svm_dev *sd ctx_lo = context[0].lo; - sdev->did = domain->iommu_did[iommu->seq_id]; + sdev->did = FLPT_DEFAULT_DID; sdev->sid = PCI_DEVID(info->bus, info->devfn); if (!(ctx_lo & CONTEXT_PASIDE)) { |