Path: csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod From: Joerg Roedel Newsgroups: linux.kernel Subject: [PATCH 06/20] iommu/amd: Pass gfp-flags to iommu_map_page() Date: Fri, 08 Jul 2016 13:50:02 +0200 Message-ID: References: Dkim-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1467978324; bh=VrUcBOhraQlAkr3aJxIYYUv+tlNxGqrF7kYegP+iUQA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aNo1BinMcZzOpqdO2xWm94KHXVcYDKQX+YPpZj0bD4mt0/2F20vwH05DR5JGQCOq7 EWhjgFrFmCoZnY68ISB4SVhD/B+ucOAbQRkSo2UBoNfyqKsA2Zu4QtrxYwrqOOS8m7 oAp5HXzT7xyA4cdUOUbRYk1Q1JtrF2akadrH249V5XvOG3W+HnPxhqpHixtk1QDWhM NqZcRwQD3oP4f7ZKG88qzPZe16ms2KANH3PXNuyux1fSn1QKFGf6lylIAZKqxuhaS6 V62ZYvA5lFrE6PV0PMK4otgWJ23xS2Epd+PiiRONBipSiS9bodnKxvvtPgF3MLpie2 H5/lYkLTo1nrQ== X-Mailer: git-send-email 1.9.1 Sender: robomod@news.nic.it List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 45 Organization: linux.* mail to news gateway X-Original-Cc: linux-kernel@vger.kernel.org, Suravee Suthikulpanit , Vincent.Wan@amd.com, Joerg Roedel X-Original-Date: Fri, 8 Jul 2016 13:44:57 +0200 X-Original-Message-ID: <1467978311-28322-7-git-send-email-joro@8bytes.org> X-Original-References: <1467978311-28322-1-git-send-email-joro@8bytes.org> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1439347 From: Joerg Roedel Make this function ready to be used in the DMA-API path. Reorder parameters a bit while at it. Signed-off-by: Joerg Roedel --- drivers/iommu/amd_iommu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index 5ea5679..e7c042b 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c @@ -1415,8 +1415,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; @@ -1428,7 +1429,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; @@ -3277,7 +3278,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; -- 1.9.1