xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Ian.Campbell@citrix.com,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, konrad.wilk@oracle.com
Subject: [PATCH v3 02/10] swiotlb-xen: replace dma_length with sg_dma_len() macro
Date: Mon, 5 Aug 2013 17:30:48 +0100	[thread overview]
Message-ID: <1375720256-8014-2-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1308051503190.4893@kaball.uk.xensource.com>

swiotlb-xen has an implicit dependency on CONFIG_NEED_SG_DMA_LENGTH.
Remove it by replacing dma_length with sg_dma_len.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 drivers/xen/swiotlb-xen.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index aadffcf..1b2277c 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -506,13 +506,13 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
 				   to do proper error handling. */
 				xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,
 							   attrs);
-				sgl[0].dma_length = 0;
+				sg_dma_len(sgl) = 0;
 				return DMA_ERROR_CODE;
 			}
 			sg->dma_address = xen_phys_to_bus(map);
 		} else
 			sg->dma_address = dev_addr;
-		sg->dma_length = sg->length;
+		sg_dma_len(sg) = sg->length;
 	}
 	return nelems;
 }
@@ -533,7 +533,7 @@ xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
 	BUG_ON(dir == DMA_NONE);
 
 	for_each_sg(sgl, sg, nelems, i)
-		xen_unmap_single(hwdev, sg->dma_address, sg->dma_length, dir);
+		xen_unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir);
 
 }
 EXPORT_SYMBOL_GPL(xen_swiotlb_unmap_sg_attrs);
@@ -555,7 +555,7 @@ xen_swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
 
 	for_each_sg(sgl, sg, nelems, i)
 		xen_swiotlb_sync_single(hwdev, sg->dma_address,
-					sg->dma_length, dir, target);
+					sg_dma_len(sg), dir, target);
 }
 
 void
-- 
1.7.2.5

  parent reply	other threads:[~2013-08-05 16:30 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-05 16:29 [PATCH v3 0/10] enable swiotlb-xen on arm and arm64 Stefano Stabellini
2013-08-05 16:30 ` [PATCH v3 01/10] swiotlb: replace dma_length with sg_dma_len() macro Stefano Stabellini
2013-08-05 16:30 ` Stefano Stabellini [this message]
2013-08-05 16:30 ` [PATCH v3 03/10] arm: make SWIOTLB available Stefano Stabellini
2013-08-09 15:29   ` Konrad Rzeszutek Wilk
2013-08-05 16:30 ` [PATCH v3 04/10] arm: introduce a global dma_ops pointer Stefano Stabellini
2013-08-09 15:36   ` Konrad Rzeszutek Wilk
2013-08-05 16:30 ` [PATCH v3 05/10] arm64: do not initialize arm64_swiotlb if dma_ops is already set Stefano Stabellini
2013-08-05 16:30 ` [PATCH v3 06/10] xen/arm,arm64: move Xen initialization earlier Stefano Stabellini
2013-08-05 16:30 ` [PATCH v3 07/10] xen: introduce XENMEM_get_dma_buf and xen_put_dma_buf Stefano Stabellini
2013-08-09 15:36   ` Konrad Rzeszutek Wilk
2013-08-09 15:50     ` Konrad Rzeszutek Wilk
2013-08-14 16:41       ` Stefano Stabellini
2013-08-14 16:43     ` Stefano Stabellini
2013-08-05 16:30 ` [PATCH v3 08/10] xen: make xen_create_contiguous_region return the dma address Stefano Stabellini
2013-08-05 16:30 ` [PATCH v3 09/10] swiotlb-xen: support autotranslate guests Stefano Stabellini
2013-08-09 15:45   ` Konrad Rzeszutek Wilk
2013-08-14 13:01     ` Stefano Stabellini
2013-08-05 16:30 ` [PATCH v3 10/10] xen/arm,arm64: enable SWIOTLB_XEN Stefano Stabellini
2013-08-09 15:38   ` Konrad Rzeszutek Wilk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1375720256-8014-2-git-send-email-stefano.stabellini@eu.citrix.com \
    --to=stefano.stabellini@eu.citrix.com \
    --cc=Ian.Campbell@citrix.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).