diff options
| author | Joerg Roedel | 2019-04-12 12:50:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-10 17:54:10 +0200 |
| commit | 29184cbaaec0f3fe37bfab07a9d141935f98ec8d (patch) | |
| tree | 04286092f9b1ce2abb929b2202bb6bdd4eb4f5f2 /drivers/iommu | |
| parent | perf/core: Fix perf_event_disable_inatomic() race (diff) | |
| download | kernel-qcow2-linux-29184cbaaec0f3fe37bfab07a9d141935f98ec8d.tar.gz kernel-qcow2-linux-29184cbaaec0f3fe37bfab07a9d141935f98ec8d.tar.xz kernel-qcow2-linux-29184cbaaec0f3fe37bfab07a9d141935f98ec8d.zip | |
iommu/amd: Set exclusion range correctly
[ Upstream commit 3c677d206210f53a4be972211066c0f1cd47fe12 ]
The exlcusion range limit register needs to contain the
base-address of the last page that is part of the range, as
bits 0-11 of this register are treated as 0xfff by the
hardware for comparisons.
So correctly set the exclusion range in the hardware to the
last page which is _in_ the range.
Fixes: b2026aa2dce44 ('x86, AMD IOMMU: add functions for programming IOMMU MMIO space')
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/amd_iommu_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index be3801d43d48..3a1d30304f7e 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -356,7 +356,7 @@ static void iommu_write_l2(struct amd_iommu *iommu, u8 address, u32 val) static void iommu_set_exclusion_range(struct amd_iommu *iommu) { u64 start = iommu->exclusion_start & PAGE_MASK; - u64 limit = (start + iommu->exclusion_length) & PAGE_MASK; + u64 limit = (start + iommu->exclusion_length - 1) & PAGE_MASK; u64 entry; if (!iommu->exclusion_start) |