diff options
| author | Joerg Roedel <jroedel@suse.de> | 2016-07-05 14:29:11 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2016-07-13 12:46:05 +0200 |
| commit | b911b89b6d0112b5e81b74ce25d894b03023344e (patch) | |
| tree | 478d4344163f12aba656937d3d48514b38dff82e | |
| parent | 8d54d6c8b8f3e40dadd15b1dad6f190c2ccf7473 (diff) | |
| download | blackbird-op-linux-b911b89b6d0112b5e81b74ce25d894b03023344e.tar.gz blackbird-op-linux-b911b89b6d0112b5e81b74ce25d894b03023344e.zip | |
iommu/amd: Pass gfp-flags to iommu_map_page()
Make this function ready to be used in the DMA-API path.
Reorder parameters a bit while at it.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 4c9063ae442a..c421c0605901 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1418,8 +1418,9 @@ static u64 *fetch_pte(struct protection_domain *domain, static int iommu_map_page(struct protection_domain *dom, unsigned long bus_addr, unsigned long phys_addr, + unsigned long page_size, int prot, - unsigned long page_size) + gfp_t gfp) { u64 __pte, *pte; int i, count; @@ -1431,7 +1432,7 @@ static int iommu_map_page(struct protection_domain *dom, return -EINVAL; count = PAGE_SIZE_PTE_COUNT(page_size); - pte = alloc_pte(dom, bus_addr, page_size, NULL, GFP_KERNEL); + pte = alloc_pte(dom, bus_addr, page_size, NULL, gfp); if (!pte) return -ENOMEM; @@ -3283,7 +3284,7 @@ static int amd_iommu_map(struct iommu_domain *dom, unsigned long iova, prot |= IOMMU_PROT_IW; mutex_lock(&domain->api_lock); - ret = iommu_map_page(domain, iova, paddr, prot, page_size); + ret = iommu_map_page(domain, iova, paddr, page_size, prot, GFP_KERNEL); mutex_unlock(&domain->api_lock); return ret; |
