From: Joerg Roedel Date: Fri, 19 Dec 2008 13:42:14 +0000 (+0100) Subject: AMD IOMMU: initialize phys_addr correctly in iommu_page_map X-Git-Tag: v2.6.27.11~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d624f54bd2bb311501c33ac0e17aec45ea91d2c;p=thirdparty%2Fkernel%2Fstable.git AMD IOMMU: initialize phys_addr correctly in iommu_page_map Upstream commit bb9d4ff80bc032d7961815c2ff5eaf458ae3adff Due to this bug mappings for devices requested by the ACPI table are incorrect. Signed-off-by: Joerg Roedel Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 042fdc27bc925..a1493bb3ed9e2 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c @@ -235,7 +235,7 @@ static int iommu_map(struct protection_domain *dom, u64 __pte, *pte, *page; bus_addr = PAGE_ALIGN(bus_addr); - phys_addr = PAGE_ALIGN(bus_addr); + phys_addr = PAGE_ALIGN(phys_addr); /* only support 512GB address spaces for now */ if (bus_addr > IOMMU_MAP_SIZE_L3 || !(prot & IOMMU_PROT_MASK))