mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
intel-iommu: Mask physical address to correct page size in intel_map_single()
The physical address passed to domain_pfn_mapping() should be rounded down to the start of the MM page, not the VT-d page. This issue causes kernel panic on PAGE_SIZE>VTD_PAGE_SIZE platforms e.g. ia64 platforms. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
parent
f532959b77
commit
33041ec049
1 changed files with 2 additions and 1 deletions
|
@ -2551,6 +2551,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
|
|||
int prot = 0;
|
||||
int ret;
|
||||
struct intel_iommu *iommu;
|
||||
unsigned long paddr_pfn = paddr >> PAGE_SHIFT;
|
||||
|
||||
BUG_ON(dir == DMA_NONE);
|
||||
|
||||
|
@ -2585,7 +2586,7 @@ static dma_addr_t __intel_map_single(struct device *hwdev, phys_addr_t paddr,
|
|||
* is not a big problem
|
||||
*/
|
||||
ret = domain_pfn_mapping(domain, mm_to_dma_pfn(iova->pfn_lo),
|
||||
paddr >> VTD_PAGE_SHIFT, size, prot);
|
||||
mm_to_dma_pfn(paddr_pfn), size, prot);
|
||||
if (ret)
|
||||
goto error;
|
||||
|
||||
|
|
Loading…
Reference in a new issue