linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: stefano.stabellini@eu.citrix.com (Stefano Stabellini)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 01/10] swiotlb: replace dma_length with sg_dma_len() macro
Date: Thu, 15 Aug 2013 12:10:45 +0100	[thread overview]
Message-ID: <1376565054-24153-1-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1308151200580.4470@kaball.uk.xensource.com>

From: EUNBONG SONG <eunb.song@samsung.com>

This patch replace dma_length in "lib/swiotlb.c" to sg_dma_len() macro,
because the build error can occur if CONFIG_NEED_SG_DMA_LENGTH is not
set, and CONFIG_SWIOTLB is set.

Singed-off-by: EunBong Song <eunb.song@samsung.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---
 lib/swiotlb.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index d23762e..4e8686c 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -870,13 +870,13 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
 				swiotlb_full(hwdev, sg->length, dir, 0);
 				swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,
 						       attrs);
-				sgl[0].dma_length = 0;
+				sg_dma_len(sgl) = 0;
 				return 0;
 			}
 			sg->dma_address = phys_to_dma(hwdev, map);
 		} else
 			sg->dma_address = dev_addr;
-		sg->dma_length = sg->length;
+		sg_dma_len(sg) = sg->length;
 	}
 	return nelems;
 }
@@ -904,7 +904,7 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
 	BUG_ON(dir == DMA_NONE);
 
 	for_each_sg(sgl, sg, nelems, i)
-		unmap_single(hwdev, sg->dma_address, sg->dma_length, dir);
+		unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir);
 
 }
 EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);
@@ -934,7 +934,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
 
 	for_each_sg(sgl, sg, nelems, i)
 		swiotlb_sync_single(hwdev, sg->dma_address,
-				    sg->dma_length, dir, target);
+				    sg_dma_len(sg), dir, target);
 }
 
 void
-- 
1.7.2.5

  reply	other threads:[~2013-08-15 11:10 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-15 11:10 [PATCH v4 0/10] enable swiotlb-xen on arm and arm64 Stefano Stabellini
2013-08-15 11:10 ` Stefano Stabellini [this message]
2013-08-15 19:45   ` [PATCH v4 01/10] swiotlb: replace dma_length with sg_dma_len() macro Konrad Rzeszutek Wilk
2013-08-15 11:10 ` [PATCH v4 02/10] swiotlb-xen: " Stefano Stabellini
2013-08-15 19:45   ` Konrad Rzeszutek Wilk
2013-08-15 11:10 ` [PATCH v4 03/10] arm: make SWIOTLB available Stefano Stabellini
2013-08-15 11:10 ` [PATCH v4 04/10] arm: introduce a global dma_ops pointer Stefano Stabellini
2013-08-15 11:10 ` [PATCH v4 05/10] arm64: do not initialize arm64_swiotlb if dma_ops is already set Stefano Stabellini
2013-08-19 16:55   ` Catalin Marinas
2013-08-15 11:10 ` [PATCH v4 06/10] xen/arm,arm64: move Xen initialization earlier Stefano Stabellini
2013-08-19 16:55   ` Catalin Marinas
2013-08-28 19:52     ` Stefano Stabellini
2013-08-15 11:10 ` [PATCH v4 07/10] xen: introduce XENMEM_exchange_and_pin and XENMEM_unpin Stefano Stabellini
2013-08-15 19:50   ` Konrad Rzeszutek Wilk
2013-08-29 15:54     ` Stefano Stabellini
2013-08-15 11:10 ` [PATCH v4 08/10] xen: make xen_create_contiguous_region return the dma address Stefano Stabellini
2013-08-15 11:10 ` [PATCH v4 09/10] swiotlb-xen: support autotranslate guests Stefano Stabellini
2013-08-15 20:07   ` Konrad Rzeszutek Wilk
2013-08-29 16:05     ` Stefano Stabellini
2013-08-30 13:23       ` Konrad Rzeszutek Wilk
2013-08-15 11:10 ` [PATCH v4 10/10] xen/arm,arm64: enable SWIOTLB_XEN Stefano Stabellini
2013-08-15 20:58   ` Ian Campbell
2013-08-28 20:07     ` Stefano Stabellini
2013-08-29  8:40       ` Ian Campbell
2013-08-29 15:38         ` Stefano Stabellini
2013-08-30 13:22           ` 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=1376565054-24153-1-git-send-email-stefano.stabellini@eu.citrix.com \
    --to=stefano.stabellini@eu.citrix.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).