dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Robin Murphy <robin.murphy@arm.com>
To: Marek Szyprowski <m.szyprowski@samsung.com>,
	dri-devel@lists.freedesktop.org,
	iommu@lists.linux-foundation.org, linaro-mm-sig@lists.linaro.org,
	linux-kernel@vger.kernel.org
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
	David Airlie <airlied@linux.ie>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Christoph Hellwig <hch@lst.de>,
	linux-arm-kernel@lists.infradead.org,
	linux-media@vger.kernel.org
Subject: Re: [PATCH v9 31/32] media: pci: fix common ALSA DMA-mapping related codes
Date: Tue, 1 Sep 2020 21:24:46 +0100	[thread overview]
Message-ID: <925232f3-7371-c7eb-ad31-4b041cbbca4f@arm.com> (raw)
In-Reply-To: <20200826063316.23486-32-m.szyprowski@samsung.com>

On 2020-08-26 07:33, Marek Szyprowski wrote:
> The Documentation/DMA-API-HOWTO.txt states that dma_map_sg returns the
> numer of the created entries in the DMA address space. However the
> subsequent calls to dma_sync_sg_for_{device,cpu} and dma_unmap_sg must be
> called with the original number of entries passed to dma_map_sg. The
> sg_table->nents in turn holds the result of the dma_map_sg call as stated
> in include/linux/scatterlist.h. Adapt the code to obey those rules.
> 
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>   drivers/media/pci/cx23885/cx23885-alsa.c | 2 +-
>   drivers/media/pci/cx25821/cx25821-alsa.c | 2 +-
>   drivers/media/pci/cx88/cx88-alsa.c       | 2 +-
>   drivers/media/pci/saa7134/saa7134-alsa.c | 2 +-
>   4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/media/pci/cx23885/cx23885-alsa.c b/drivers/media/pci/cx23885/cx23885-alsa.c
> index df44ed7393a0..3f366e4e4685 100644
> --- a/drivers/media/pci/cx23885/cx23885-alsa.c
> +++ b/drivers/media/pci/cx23885/cx23885-alsa.c
> @@ -129,7 +129,7 @@ static int cx23885_alsa_dma_unmap(struct cx23885_audio_dev *dev)
>   	if (!buf->sglen)
>   		return 0;
>   
> -	dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->sglen, PCI_DMA_FROMDEVICE);
> +	dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->nr_pages, PCI_DMA_FROMDEVICE);

If we're touching these lines anyway, we should update them to use the 
modern DMA_FROM_DEVICE definitions too.

Robin.

>   	buf->sglen = 0;
>   	return 0;
>   }
> diff --git a/drivers/media/pci/cx25821/cx25821-alsa.c b/drivers/media/pci/cx25821/cx25821-alsa.c
> index 301616426d8a..c40304d33776 100644
> --- a/drivers/media/pci/cx25821/cx25821-alsa.c
> +++ b/drivers/media/pci/cx25821/cx25821-alsa.c
> @@ -193,7 +193,7 @@ static int cx25821_alsa_dma_unmap(struct cx25821_audio_dev *dev)
>   	if (!buf->sglen)
>   		return 0;
>   
> -	dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->sglen, PCI_DMA_FROMDEVICE);
> +	dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->nr_pages, PCI_DMA_FROMDEVICE);
>   	buf->sglen = 0;
>   	return 0;
>   }
> diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
> index 7d7aceecc985..3c6fe6ceb0b7 100644
> --- a/drivers/media/pci/cx88/cx88-alsa.c
> +++ b/drivers/media/pci/cx88/cx88-alsa.c
> @@ -332,7 +332,7 @@ static int cx88_alsa_dma_unmap(struct cx88_audio_dev *dev)
>   	if (!buf->sglen)
>   		return 0;
>   
> -	dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->sglen,
> +	dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->nr_pages,
>   		     PCI_DMA_FROMDEVICE);
>   	buf->sglen = 0;
>   	return 0;
> diff --git a/drivers/media/pci/saa7134/saa7134-alsa.c b/drivers/media/pci/saa7134/saa7134-alsa.c
> index 544ca57eee75..398c47ff473d 100644
> --- a/drivers/media/pci/saa7134/saa7134-alsa.c
> +++ b/drivers/media/pci/saa7134/saa7134-alsa.c
> @@ -313,7 +313,7 @@ static int saa7134_alsa_dma_unmap(struct saa7134_dev *dev)
>   	if (!dma->sglen)
>   		return 0;
>   
> -	dma_unmap_sg(&dev->pci->dev, dma->sglist, dma->sglen, PCI_DMA_FROMDEVICE);
> +	dma_unmap_sg(&dev->pci->dev, dma->sglist, dma->nr_pages, PCI_DMA_FROMDEVICE);
>   	dma->sglen = 0;
>   	return 0;
>   }
> 
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2020-09-01 20:24 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20200826063527eucas1p21ab50cf46bad1d9ea5d7f202dd6ec722@eucas1p2.samsung.com>
2020-08-26  6:32 ` [PATCH v9 00/32] DRM: fix struct sg_table nents vs. orig_nents misuse Marek Szyprowski
2020-08-26  6:32   ` [PATCH v9 01/32] drm: prime: add common helper to check scatterlist contiguity Marek Szyprowski
2020-09-01 17:23     ` Robin Murphy
2020-08-26  6:32   ` [PATCH v9 02/32] drm: prime: use sgtable iterators in drm_prime_sg_to_page_addr_arrays() Marek Szyprowski
2020-09-01 17:24     ` Robin Murphy
2020-08-26  6:32   ` [PATCH v9 03/32] drm: core: fix common struct sg_table related issues Marek Szyprowski
2020-09-01 17:46     ` Robin Murphy
2020-08-26  6:32   ` [PATCH v9 04/32] drm: armada: " Marek Szyprowski
2020-09-01 18:26     ` Robin Murphy
2020-08-26  6:32   ` [PATCH v9 05/32] drm: etnaviv: " Marek Szyprowski
2020-09-01 18:39     ` Robin Murphy
2020-08-26  6:32   ` [PATCH v9 06/32] drm: exynos: use common helper for a scatterlist contiguity check Marek Szyprowski
2020-08-26  6:32   ` [PATCH v9 07/32] drm: exynos: fix common struct sg_table related issues Marek Szyprowski
2020-08-26  6:32   ` [PATCH v9 08/32] drm: i915: " Marek Szyprowski
2020-09-01 18:42     ` Robin Murphy
2020-09-01 19:38     ` [Intel-gfx] " Ruhl, Michael J
2020-09-01 19:54       ` Robin Murphy
2020-09-01 20:32         ` Ruhl, Michael J
2020-08-26  6:32   ` [PATCH v9 09/32] drm: lima: " Marek Szyprowski
2020-08-26  6:32   ` [PATCH v9 10/32] drm: mediatek: use common helper for a scatterlist contiguity check Marek Szyprowski
2020-09-01 18:44     ` Robin Murphy
2020-09-01 22:59     ` Chun-Kuang Hu
2020-08-26  6:32   ` [PATCH v9 11/32] drm: mediatek: use common helper for extracting pages array Marek Szyprowski
2020-09-01 18:54     ` Robin Murphy
2020-09-01 23:16       ` Chun-Kuang Hu
2020-08-26  6:32   ` [PATCH v9 12/32] drm: msm: fix common struct sg_table related issues Marek Szyprowski
2020-08-26 13:26     ` kernel test robot
2020-09-01 19:14     ` Robin Murphy
2020-09-01 23:48       ` Rob Clark
2020-08-26  6:32   ` [PATCH v9 13/32] drm: omapdrm: use common helper for extracting pages array Marek Szyprowski
2020-09-01 19:17     ` Robin Murphy
2020-08-26  6:32   ` [PATCH v9 14/32] drm: omapdrm: fix common struct sg_table related issues Marek Szyprowski
2020-09-01 19:33     ` Robin Murphy
2020-09-02  8:00       ` Tomi Valkeinen
2020-09-04 12:06         ` Marek Szyprowski
2020-09-04 12:27           ` Marek Szyprowski
2020-08-26  6:32   ` [PATCH v9 15/32] drm: panfrost: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 16/32] drm: rockchip: use common helper for a scatterlist contiguity check Marek Szyprowski
2020-09-01 19:34     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 17/32] drm: rockchip: fix common struct sg_table related issues Marek Szyprowski
2020-09-01 20:00     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 18/32] drm: tegra: " Marek Szyprowski
2020-09-01 20:11     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 19/32] drm: v3d: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 20/32] drm: virtio: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 21/32] drm: vmwgfx: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 22/32] drm: xen: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 23/32] xen: gntdev: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 24/32] drm: host1x: " Marek Szyprowski
2020-09-01 20:13     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 25/32] drm: rcar-du: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 26/32] dmabuf: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 27/32] staging: tegra-vde: " Marek Szyprowski
2020-08-26  6:33   ` [PATCH v9 28/32] misc: fastrpc: " Marek Szyprowski
2020-09-01 20:14     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 29/32] rapidio: " Marek Szyprowski
2020-09-01 20:15     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 30/32] samples: vfio-mdev/mbochs: " Marek Szyprowski
2020-09-01 20:16     ` Robin Murphy
2020-08-26  6:33   ` [PATCH v9 31/32] media: pci: fix common ALSA DMA-mapping related codes Marek Szyprowski
2020-09-01 20:24     ` Robin Murphy [this message]
2020-08-26  6:33   ` [PATCH v9 32/32] videobuf2: use sgtable-based scatterlist wrappers Marek Szyprowski
2020-09-01 20:19     ` Robin Murphy

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=925232f3-7371-c7eb-ad31-4b041cbbca4f@arm.com \
    --to=robin.murphy@arm.com \
    --cc=airlied@linux.ie \
    --cc=b.zolnierkie@samsung.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=hch@lst.de \
    --cc=iommu@lists.linux-foundation.org \
    --cc=linaro-mm-sig@lists.linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=mchehab@kernel.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