swiotlb: Replace dma_length to sg_dma_len() macro
PATCH 1/1 swiotlb: Replace dma_length to sg_dma_len() macro
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.
I confirmed compile only.
--- lib/swiotlb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
lib/swiotlb.c +4 -4
@@ -859,13 +859,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; }
@@ -893,7 +893,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);
@@ -923,7 +923,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
Signature · 2 lines
1.7.0.4
�淸�{.n�+돴윯돪�+%듚�깁負쪐w��{.n�+돴쪐{깸G쳺��{ay����,j�f"톒쉹��묎�z_溫(�쉸듶줷"얎�m����G쳺�◀?솳鈺�&x�~뤳턨O뺞촾퇉v�^�m����띠�◀?뻀�Quoted 4 lines · EUNBONG SONG
This patch replace
dma_lengthin "lib/swiotlb.c" tosg_dma_len()macro, because the build error can occur ifCONFIG_NEED_SG_DMA_LENGTHis not set, andCONFIG_SWIOTLBis set.
I confirmed compile only.
Stefano, This patch should fix the ARM issues, but when I tried to apply it would go all wonky.
Quoted 47 lines
Singed-off-by EunBong Song <[email protected]>--- lib/swiotlb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)lib/swiotlb.c +4
-4@@ -859,13 +859,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; }@@ -893,7 +893,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);@@ -923,7 +923,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 Signature · 1 line
1.7.0.4
Quoted 7 lines · Konrad Rzeszutek Wilk
Quoted 4 lines · EUNBONG SONG
This patch replace
dma_lengthin "lib/swiotlb.c" tosg_dma_len()macro, because the build error can occur ifCONFIG_NEED_SG_DMA_LENGTHis not set, andCONFIG_SWIOTLBis set.
I confirmed compile only.Stefano, This patch should fix the ARM issues,
Thanks!!
Quoted 2 lines
but when I tried to apply it
would go all wonky.
no problems, I can rebase it
Quoted 48 lines
Quoted 47 lines
Singed-off-by EunBong Song <[email protected]>--- lib/swiotlb.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)lib/swiotlb.c +4
-4@@ -859,13 +859,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; }@@ -893,7 +893,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);@@ -923,7 +923,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 Signature · 1 line
1.7.0.4