diff options
| author | Lu Baolu | 2019-03-20 02:58:33 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-20 09:15:59 +0200 |
| commit | cff04fad89b9de05350bc6bb607d8eb5835c89cc (patch) | |
| tree | f413275aeb0e630423b7cf47caafe3849ed62289 /drivers/iommu | |
| parent | drm/nouveau/debugfs: Fix check of pm_runtime_get_sync failure (diff) | |
| download | kernel-qcow2-linux-cff04fad89b9de05350bc6bb607d8eb5835c89cc.tar.gz kernel-qcow2-linux-cff04fad89b9de05350bc6bb607d8eb5835c89cc.tar.xz kernel-qcow2-linux-cff04fad89b9de05350bc6bb607d8eb5835c89cc.zip | |
iommu/vt-d: Check capability before disabling protected memory
[ Upstream commit 5bb71fc790a88d063507dc5d445ab8b14e845591 ]
The spec states in 10.4.16 that the Protected Memory Enable
Register should be treated as read-only for implementations
not supporting protected memory regions (PLMR and PHMR fields
reported as Clear in the Capability register).
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
Cc: mark gross <mgross@intel.com>
Suggested-by: Ashok Raj <ashok.raj@intel.com>
Fixes: f8bab73515ca5 ("intel-iommu: PMEN support")
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/intel-iommu.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 2b8f5ebae821..603bf5233a99 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1624,6 +1624,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; |