* [PATCH 1/1] arm: mm: Fix comments in sg_sync functions
@ 2015-09-28 20:20 Sakari Ailus
2015-09-29 10:48 ` Robin Murphy
0 siblings, 1 reply; 4+ messages in thread
From: Sakari Ailus @ 2015-09-28 20:20 UTC (permalink / raw)
To: linux-arm-kernel
The comment on the usage of arm_dma_sync_sg_for_cpu(),
arm_dma_sync_sg_for_device(), arm_iommu_sync_sg_for_cpu() and
arm_iommu_sync_sg_for_device() functions wrongly noted that the "nelems"
parameter is the number of sglist entries returned by dma_map_sg(), while
this must be the number of entiries passed to dma_map_sg() instead.
Suggested-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
Hi folks,
This related patch was applied to Jonathan Corbet's tree:
<URL:http://www.spinics.net/lists/linux-doc/msg31801.html>
The comments were indeed wrong. This may have contributed to a related
videobuf2 bug:
<URL:http://www.spinics.net/lists/linux-media/msg93765.html>
arch/arm/mm/dma-mapping.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index e626043..1c0154a 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -958,7 +958,7 @@ void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
* arm_dma_sync_sg_for_cpu
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
* @sg: list of buffers
- * @nents: number of buffers to map (returned from dma_map_sg)
+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
* @dir: DMA transfer direction (same as was passed to dma_map_sg)
*/
void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
@@ -977,7 +977,7 @@ void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
* arm_dma_sync_sg_for_device
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
* @sg: list of buffers
- * @nents: number of buffers to map (returned from dma_map_sg)
+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
* @dir: DMA transfer direction (same as was passed to dma_map_sg)
*/
void arm_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
@@ -1672,7 +1672,7 @@ void arm_iommu_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
* arm_iommu_sync_sg_for_cpu
* @dev: valid struct device pointer
* @sg: list of buffers
- * @nents: number of buffers to map (returned from dma_map_sg)
+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
* @dir: DMA transfer direction (same as was passed to dma_map_sg)
*/
void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
@@ -1690,7 +1690,7 @@ void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
* arm_iommu_sync_sg_for_device
* @dev: valid struct device pointer
* @sg: list of buffers
- * @nents: number of buffers to map (returned from dma_map_sg)
+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
* @dir: DMA transfer direction (same as was passed to dma_map_sg)
*/
void arm_iommu_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
--
2.1.0.231.g7484e3b
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/1] arm: mm: Fix comments in sg_sync functions
2015-09-28 20:20 [PATCH 1/1] arm: mm: Fix comments in sg_sync functions Sakari Ailus
@ 2015-09-29 10:48 ` Robin Murphy
2016-12-12 11:30 ` Sakari Ailus
0 siblings, 1 reply; 4+ messages in thread
From: Robin Murphy @ 2015-09-29 10:48 UTC (permalink / raw)
To: linux-arm-kernel
Hi Sakari,
On 28/09/15 21:20, Sakari Ailus wrote:
> The comment on the usage of arm_dma_sync_sg_for_cpu(),
> arm_dma_sync_sg_for_device(), arm_iommu_sync_sg_for_cpu() and
> arm_iommu_sync_sg_for_device() functions wrongly noted that the "nelems"
> parameter is the number of sglist entries returned by dma_map_sg(), while
> this must be the number of entiries passed to dma_map_sg() instead.
Oops, I somehow missed you off cc when I posted [0] last week,
apologies. I was planning to stick that in Russell's patch system today,
but since you've done a slightly more thorough job with s/map/sync/ than
I managed, I'm happy for this version to take precedence over mine:
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
I'd hope that the lack of objections to my patch so far (and Dan's
approval) also apply transitively to this one ;)
Robin.
[0]:http://thread.gmane.org/gmane.linux.ports.arm.kernel/441862
> Suggested-by: Daniel Kurtz <djkurtz@chromium.org>
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> Hi folks,
>
> This related patch was applied to Jonathan Corbet's tree:
>
> <URL:http://www.spinics.net/lists/linux-doc/msg31801.html>
>
> The comments were indeed wrong. This may have contributed to a related
> videobuf2 bug:
>
> <URL:http://www.spinics.net/lists/linux-media/msg93765.html>
>
> arch/arm/mm/dma-mapping.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> index e626043..1c0154a 100644
> --- a/arch/arm/mm/dma-mapping.c
> +++ b/arch/arm/mm/dma-mapping.c
> @@ -958,7 +958,7 @@ void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
> * arm_dma_sync_sg_for_cpu
> * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
> * @sg: list of buffers
> - * @nents: number of buffers to map (returned from dma_map_sg)
> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> */
> void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> @@ -977,7 +977,7 @@ void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> * arm_dma_sync_sg_for_device
> * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
> * @sg: list of buffers
> - * @nents: number of buffers to map (returned from dma_map_sg)
> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> */
> void arm_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
> @@ -1672,7 +1672,7 @@ void arm_iommu_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
> * arm_iommu_sync_sg_for_cpu
> * @dev: valid struct device pointer
> * @sg: list of buffers
> - * @nents: number of buffers to map (returned from dma_map_sg)
> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> */
> void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> @@ -1690,7 +1690,7 @@ void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> * arm_iommu_sync_sg_for_device
> * @dev: valid struct device pointer
> * @sg: list of buffers
> - * @nents: number of buffers to map (returned from dma_map_sg)
> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> */
> void arm_iommu_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] arm: mm: Fix comments in sg_sync functions
2015-09-29 10:48 ` Robin Murphy
@ 2016-12-12 11:30 ` Sakari Ailus
2016-12-12 12:22 ` Robin Murphy
0 siblings, 1 reply; 4+ messages in thread
From: Sakari Ailus @ 2016-12-12 11:30 UTC (permalink / raw)
To: linux-arm-kernel
Hi Robin and others,
On Tue, Sep 29, 2015 at 11:48:32AM +0100, Robin Murphy wrote:
> Hi Sakari,
>
> On 28/09/15 21:20, Sakari Ailus wrote:
> >The comment on the usage of arm_dma_sync_sg_for_cpu(),
> >arm_dma_sync_sg_for_device(), arm_iommu_sync_sg_for_cpu() and
> >arm_iommu_sync_sg_for_device() functions wrongly noted that the "nelems"
> >parameter is the number of sglist entries returned by dma_map_sg(), while
> >this must be the number of entiries passed to dma_map_sg() instead.
>
> Oops, I somehow missed you off cc when I posted [0] last week, apologies. I
> was planning to stick that in Russell's patch system today, but since you've
> done a slightly more thorough job with s/map/sync/ than I managed, I'm happy
> for this version to take precedence over mine:
>
> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
I was cleaning up my old branches and noticed this patch isn't merged yet.
It still applies cleanly though. How shall we proceed, should I send a pull
request?
>
> I'd hope that the lack of objections to my patch so far (and Dan's approval)
> also apply transitively to this one ;)
>
> Robin.
>
> [0]:http://thread.gmane.org/gmane.linux.ports.arm.kernel/441862
>
> >Suggested-by: Daniel Kurtz <djkurtz@chromium.org>
> >Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> >---
> >Hi folks,
> >
> >This related patch was applied to Jonathan Corbet's tree:
> >
> ><URL:http://www.spinics.net/lists/linux-doc/msg31801.html>
> >
> >The comments were indeed wrong. This may have contributed to a related
> >videobuf2 bug:
> >
> ><URL:http://www.spinics.net/lists/linux-media/msg93765.html>
> >
> > arch/arm/mm/dma-mapping.c | 8 ++++----
> > 1 file changed, 4 insertions(+), 4 deletions(-)
> >
> >diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
> >index e626043..1c0154a 100644
> >--- a/arch/arm/mm/dma-mapping.c
> >+++ b/arch/arm/mm/dma-mapping.c
> >@@ -958,7 +958,7 @@ void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
> > * arm_dma_sync_sg_for_cpu
> > * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
> > * @sg: list of buffers
> >- * @nents: number of buffers to map (returned from dma_map_sg)
> >+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> > * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> > */
> > void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> >@@ -977,7 +977,7 @@ void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> > * arm_dma_sync_sg_for_device
> > * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
> > * @sg: list of buffers
> >- * @nents: number of buffers to map (returned from dma_map_sg)
> >+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> > * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> > */
> > void arm_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
> >@@ -1672,7 +1672,7 @@ void arm_iommu_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
> > * arm_iommu_sync_sg_for_cpu
> > * @dev: valid struct device pointer
> > * @sg: list of buffers
> >- * @nents: number of buffers to map (returned from dma_map_sg)
> >+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> > * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> > */
> > void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> >@@ -1690,7 +1690,7 @@ void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
> > * arm_iommu_sync_sg_for_device
> > * @dev: valid struct device pointer
> > * @sg: list of buffers
> >- * @nents: number of buffers to map (returned from dma_map_sg)
> >+ * @nents: number of buffers to sync (same as was passed to dma_map_sg)
> > * @dir: DMA transfer direction (same as was passed to dma_map_sg)
> > */
> > void arm_iommu_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
> >
>
>
--
Kind regards,
Sakari Ailus
e-mail: sakari.ailus at iki.fi XMPP: sailus at retiisi.org.uk
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/1] arm: mm: Fix comments in sg_sync functions
2016-12-12 11:30 ` Sakari Ailus
@ 2016-12-12 12:22 ` Robin Murphy
0 siblings, 0 replies; 4+ messages in thread
From: Robin Murphy @ 2016-12-12 12:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Sakari,
On 12/12/16 11:30, Sakari Ailus wrote:
> Hi Robin and others,
>
> On Tue, Sep 29, 2015 at 11:48:32AM +0100, Robin Murphy wrote:
>> Hi Sakari,
>>
>> On 28/09/15 21:20, Sakari Ailus wrote:
>>> The comment on the usage of arm_dma_sync_sg_for_cpu(),
>>> arm_dma_sync_sg_for_device(), arm_iommu_sync_sg_for_cpu() and
>>> arm_iommu_sync_sg_for_device() functions wrongly noted that the "nelems"
>>> parameter is the number of sglist entries returned by dma_map_sg(), while
>>> this must be the number of entiries passed to dma_map_sg() instead.
>>
>> Oops, I somehow missed you off cc when I posted [0] last week, apologies. I
>> was planning to stick that in Russell's patch system today, but since you've
>> done a slightly more thorough job with s/map/sync/ than I managed, I'm happy
>> for this version to take precedence over mine:
>>
>> Reviewed-by: Robin Murphy <robin.murphy@arm.com>
>
> I was cleaning up my old branches and noticed this patch isn't merged yet.
> It still applies cleanly though. How shall we proceed, should I send a pull
> request?
I guess it should probably go through the ARM tree, so the best course
of action would be to submit it to Russell's patch system[1] for him to
pick up.
Robin.
[1]:http://www.armlinux.org.uk/developer/patches/
>>
>> I'd hope that the lack of objections to my patch so far (and Dan's approval)
>> also apply transitively to this one ;)
>>
>> Robin.
>>
>> [0]:http://thread.gmane.org/gmane.linux.ports.arm.kernel/441862
>>
>>> Suggested-by: Daniel Kurtz <djkurtz@chromium.org>
>>> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
>>> ---
>>> Hi folks,
>>>
>>> This related patch was applied to Jonathan Corbet's tree:
>>>
>>> <URL:http://www.spinics.net/lists/linux-doc/msg31801.html>
>>>
>>> The comments were indeed wrong. This may have contributed to a related
>>> videobuf2 bug:
>>>
>>> <URL:http://www.spinics.net/lists/linux-media/msg93765.html>
>>>
>>> arch/arm/mm/dma-mapping.c | 8 ++++----
>>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
>>> index e626043..1c0154a 100644
>>> --- a/arch/arm/mm/dma-mapping.c
>>> +++ b/arch/arm/mm/dma-mapping.c
>>> @@ -958,7 +958,7 @@ void arm_dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
>>> * arm_dma_sync_sg_for_cpu
>>> * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
>>> * @sg: list of buffers
>>> - * @nents: number of buffers to map (returned from dma_map_sg)
>>> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
>>> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
>>> */
>>> void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
>>> @@ -977,7 +977,7 @@ void arm_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
>>> * arm_dma_sync_sg_for_device
>>> * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
>>> * @sg: list of buffers
>>> - * @nents: number of buffers to map (returned from dma_map_sg)
>>> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
>>> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
>>> */
>>> void arm_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
>>> @@ -1672,7 +1672,7 @@ void arm_iommu_unmap_sg(struct device *dev, struct scatterlist *sg, int nents,
>>> * arm_iommu_sync_sg_for_cpu
>>> * @dev: valid struct device pointer
>>> * @sg: list of buffers
>>> - * @nents: number of buffers to map (returned from dma_map_sg)
>>> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
>>> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
>>> */
>>> void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
>>> @@ -1690,7 +1690,7 @@ void arm_iommu_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
>>> * arm_iommu_sync_sg_for_device
>>> * @dev: valid struct device pointer
>>> * @sg: list of buffers
>>> - * @nents: number of buffers to map (returned from dma_map_sg)
>>> + * @nents: number of buffers to sync (same as was passed to dma_map_sg)
>>> * @dir: DMA transfer direction (same as was passed to dma_map_sg)
>>> */
>>> void arm_iommu_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
>>>
>>
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-12-12 12:22 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-28 20:20 [PATCH 1/1] arm: mm: Fix comments in sg_sync functions Sakari Ailus
2015-09-29 10:48 ` Robin Murphy
2016-12-12 11:30 ` Sakari Ailus
2016-12-12 12:22 ` Robin Murphy
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).