From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, konrad.wilk@oracle.com,
Stefano.Stabellini@eu.citrix.com, Ian.Campbell@citrix.com,
EUNBONG SONG <eunb.song@samsung.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH v3 01/10] swiotlb: replace dma_length with sg_dma_len() macro
Date: Mon, 5 Aug 2013 17:30:47 +0100 [thread overview]
Message-ID: <1375720256-8014-1-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.02.1308051503190.4893@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
next prev 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 ` Stefano Stabellini [this message]
2013-08-05 16:30 ` [PATCH v3 02/10] swiotlb-xen: replace dma_length with sg_dma_len() macro Stefano Stabellini
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-1-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=eunb.song@samsung.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).