[PATCH 15/20] iommu/amd: Introduce dir2prot() helper

Path	csiph.com!news.mixmin.net!news.unit0.net!news.panservice.it!bofh.it!news.nic.it!robomod
From	Joerg Roedel <joro@8bytes.org>
Newsgroups	linux.kernel
Subject	[PATCH 15/20] iommu/amd: Introduce dir2prot() helper
Date	Fri, 08 Jul 2016 13:50:01 +0200
Message-ID	<rSCs9-4e3-1@gated-at.bofh.it> (permalink)
References	<rSCs9-4e3-3@gated-at.bofh.it>
X-Original-To	iommu@lists.linux-foundation.org
Dkim-Signature	v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1467978325; bh=pMOXV+neQHkqcom0NO7uLB3mrf7ugwusOFquwfWDMU8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T8bn/UlXVuWhj/UKMi5ttka/Fmb6bwK361rldXx6nCliJqERfHgH8HtD+XQ0dpZOZ ZSSCyWbSRoMqfoqS6hquzSV/TyW8ZbtRKSG3UK7YBSv8xjh2ORUjg+2qwDM0wvU1RC v95DLkzJ/RPaBiiF29/0JF5B6BVwtuWYrnZ296SKKLiAalX5lbFpop0PYFqESw5u47 RqUfpv+c3kdHwv6pTJDDToAYWBzmPVXlTZZfsdXxeS1H+hBuJKTMWqmlQCFJuhyJ4B r3H91DAfwJTGZzNFbVdXLgpwGxXzFxRdXP4oHYsD3cMsrzgEVTIx1mqQTgchRmrzVG OMa9yo372YiSw==
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	58
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>, Vincent.Wan@amd.com, Joerg Roedel <jroedel@suse.de>
X-Original-Date	Fri, 8 Jul 2016 13:45:06 +0200
X-Original-Message-ID	<1467978311-28322-16-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:1439337

Show key headers only | View raw

From: Joerg Roedel <jroedel@suse.de>

This function converts dma_data_direction to
iommu-protection flags. This will be needed on multiple
places in the code, so this will save some code.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/amd_iommu.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index 1bb003e..78b278b 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -2260,6 +2260,17 @@ static void update_domain(struct protection_domain *domain)
 	domain->updated = false;
 }
 
+static int dir2prot(enum dma_data_direction direction)
+{
+	if (direction == DMA_TO_DEVICE)
+		return IOMMU_PROT_IR;
+	else if (direction == DMA_FROM_DEVICE)
+		return IOMMU_PROT_IW;
+	else if (direction == DMA_BIDIRECTIONAL)
+		return IOMMU_PROT_IW | IOMMU_PROT_IR;
+	else
+		return 0;
+}
 /*
  * This function contains common code for mapping of a physically
  * contiguous memory region into DMA address space. It is used by all
@@ -2270,7 +2281,7 @@ static dma_addr_t __map_single(struct device *dev,
 			       struct dma_ops_domain *dma_dom,
 			       phys_addr_t paddr,
 			       size_t size,
-			       int direction,
+			       enum dma_data_direction direction,
 			       u64 dma_mask)
 {
 	dma_addr_t offset = paddr & ~PAGE_MASK;
@@ -2286,12 +2297,7 @@ static dma_addr_t __map_single(struct device *dev,
 	if (address == DMA_ERROR_CODE)
 		goto out;
 
-	if (direction == DMA_TO_DEVICE)
-		prot = IOMMU_PROT_IR;
-	else if (direction == DMA_FROM_DEVICE)
-		prot = IOMMU_PROT_IW;
-	else if (direction == DMA_BIDIRECTIONAL)
-		prot = IOMMU_PROT_IW | IOMMU_PROT_IR;
+	prot = dir2prot(direction);
 
 	start = address;
 	for (i = 0; i < pages; ++i) {
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 15/20] iommu/amd: Introduce dir2prot() helper Joerg Roedel <joro@8bytes.org> - 2016-07-08 13:50 +0200

csiph-web