diff options
author | Joerg Roedel <jroedel@suse.de> | 2019-04-12 12:50:31 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-16 09:17:21 +0200 |
commit | 17f93dcb6222d9116ed4713050e0e40e856a8ea4 (patch) | |
tree | cd82c0840a5e96ddeb8e4dad281605f0157df6e0 | |
parent | 47ebd4007edc562723695b93d310bd295b0c652f (diff) | |
download | linux-stable-17f93dcb6222d9116ed4713050e0e40e856a8ea4.tar.gz linux-stable-17f93dcb6222d9116ed4713050e0e40e856a8ea4.tar.bz2 linux-stable-17f93dcb6222d9116ed4713050e0e40e856a8ea4.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>
-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 2f3475247f0f..127f9cc563e9 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -294,7 +294,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) |