Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1607478

[PATCH] iommu: use sg_phys()

Path csiph.com!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From Geliang Tang <geliangtang@gmail.com>
Newsgroups linux.kernel
Subject [PATCH] iommu: use sg_phys()
Date Thu, 23 Mar 2017 14:20:02 +0100
Message-ID <toaOK-2Hz-29@gated-at.bofh.it> (permalink)
References <toaOJ-2Hz-17@gated-at.bofh.it>
Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QqgBMd+BijwaTDTUyXHUzMT0w3IVg8Rdy1Mw1HQUKJ4=; b=Pyc1Vnhe1h4rp6/O3SHR17+ftpnp1eOuRmqndiSdb/fvMOZeqrHhWnuyDj3XKD47zp D8u3SI3fN0MBWuKQja6B1wLc/5mwnV43ZcuRT5/aAWJHQryoEIgNfMAjm+n9AblrlMS6 +OdroJCbAiXCAX9Fs7XIBmezijltCfi+UMjP/TDnNa9cu6nSt/lajs6Q5ptYAYH7YCaw Q1M4L7/V0u1n9SzaLydg6npcH4Vjf2jwb4XplrLyCfsmxKHKwTT5vaptVUNiwRyw2HaD 6/rZDjq7LUK09J/wGN4eOZPprmuwhuLia306BcM5GVdMhFMuJyAXDSUxJpmkI+eENvGe j61Q==
X-Google-Dkim-Signature v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QqgBMd+BijwaTDTUyXHUzMT0w3IVg8Rdy1Mw1HQUKJ4=; b=HL4Dl4mqduwhLCPy3hMuX2R+iBVsxPnJ3hujZwmEXoipcpqSwP/NKRBU5qR3lJ8ZwV udkuyKNBbUOOuGR8DA4wWUMK75qytWWPKGQmQ2xR1DPmRIRUTO7fLis//bSOMTrKQyCg 5fURohTzA5O0hAbPKrO/AXMKPlY9QfmtIvoafbi1A95JhubDOwFRulceMaGPol40W+7x X7Exv2trBCD3wpKsQ8wsm0oXnhmBKUbEiHsDAkhwq6dklz9ju5nsJUc8YZ2zFEd46Ang ExdH2SHkaF7KoCTZ1k8QuZnaBPW/3fReR2y2uVQOI0SFGc3tywUnOaCUC3n7385EJfDW je9A==
X-Gm-Message-State AFeK/H3FYCRVpEQWH+5tgq5anf0O8aErz4oY5d/dlNxrT/VPr60dfdRYAYFGntWs3al/pw==
X-Received by 10.99.65.67 with SMTP id o64mr2841470pga.119.1490275007436; Thu, 23 Mar 2017 06:16:47 -0700 (PDT)
X-Mailer git-send-email 2.9.3
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 36
Organization linux.* mail to news gateway
X-Original-Cc Geliang Tang <geliangtang@gmail.com>, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org
X-Original-Date Thu, 23 Mar 2017 21:16:31 +0800
X-Original-Message-ID <5d70b2e8ad624149bfa75436f62e96e1e485d36a.1490258587.git.geliangtang@gmail.com>
X-Original-References <a41fae798473b657f09859ae113403655b1717f9.1490258141.git.geliangtang@gmail.com>
X-Original-Sender linux-kernel-owner@vger.kernel.org
Xref csiph.com linux.kernel:1607478

Show key headers only | View raw


Use sg_phys() instead of open-coding it.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 drivers/iommu/intel-iommu.c | 2 +-
 drivers/iommu/iommu.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index d412a31..9d09a9e 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -3892,7 +3892,7 @@ static int intel_nontranslate_map_sg(struct device *hddev,
 
 	for_each_sg(sglist, sg, nelems, i) {
 		BUG_ON(!sg_page(sg));
-		sg->dma_address = page_to_phys(sg_page(sg)) + sg->offset;
+		sg->dma_address = sg_phys(sg);
 		sg->dma_length = sg->length;
 	}
 	return nelems;
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 3b67144..26f57b3 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -1603,7 +1603,7 @@ size_t default_iommu_map_sg(struct iommu_domain *domain, unsigned long iova,
 	min_pagesz = 1 << __ffs(domain->pgsize_bitmap);
 
 	for_each_sg(sg, s, nents, i) {
-		phys_addr_t phys = page_to_phys(sg_page(s)) + s->offset;
+		phys_addr_t phys = sg_phys(s);
 
 		/*
 		 * We are mapping on IOMMU page boundaries, so offset within
-- 
2.9.3

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


Thread

[PATCH] iommu: use sg_phys() Geliang Tang <geliangtang@gmail.com> - 2017-03-23 14:20 +0100

csiph-web