Commit 00ae4ebc authored Jun 13, 2021 by Christophe JAILLET Committed by Mauro Carvalho Chehab Jun 17, 2021

media: pci: cx88: switch from 'pci_' to 'dma_' API



The wrappers in include/linux/pci-dma-compat.h should go away.

The patch has been generated with the coccinelle script below and has been
hand modified to replace GFP_ with a correct flag.
It has been compile tested.

Only 2 functions allocate some memory. They are both in cx88-core.c

When memory is allocated in 'cx88_risc_buffer()', GFP_KERNEL can be
used because its 2 callers end up to '.buf_prepare' functions in 'vb2_ops'
structures.
The call chains are:

  .buf_prepare                   (cx88-vbi.c)
    --> buffer_prepare           (cx88-vbi.c)
      --> cx88_risc_buffer

  .buf_prepare                   (cx88-video.c)
    --> buffer_prepare           (cx88-video.c)
      --> cx88_risc_buffer

When memory is allocated in 'cx88_risc_databuffer()', GFP_KERNEL can be
used because its 2 callers end up to 'snd_cx88_hw_params' which already
uses GFP_KERNEL and '.buf_prepare' functions in 'vb2_ops' structures.
The call chains are:

  snd_cx88_hw_params                   (cx88-alsa.c)
    --> cx88_risc_databuffer

  .buf_prepare                         (cx88-blackbird.c)
    --> buffer_prepare                 (cx88-blackbird.c)
      --> cx8802_buf_prepare           (cx88-mpeg.c)
        --> cx88_risc_databuffer

  .buf_prepare                         (cx88-dvb.c)
    --> buffer_prepare                 (cx88-dvb.c)
      --> cx8802_buf_prepare           (cx88-mpeg.c)
        --> cx88_risc_databuffer

@@ @@
-    PCI_DMA_BIDIRECTIONAL
+    DMA_BIDIRECTIONAL

@@ @@
-    PCI_DMA_TODEVICE
+    DMA_TO_DEVICE

@@ @@
-    PCI_DMA_FROMDEVICE
+    DMA_FROM_DEVICE

@@ @@
-    PCI_DMA_NONE
+    DMA_NONE

@@
expression e1, e2, e3;
@@
-    pci_alloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3;
@@
-    pci_zalloc_consistent(e1, e2, e3)
+    dma_alloc_coherent(&e1->dev, e2, e3, GFP_)

@@
expression e1, e2, e3, e4;
@@
-    pci_free_consistent(e1, e2, e3, e4)
+    dma_free_coherent(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_single(e1, e2, e3, e4)
+    dma_map_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_single(e1, e2, e3, e4)
+    dma_unmap_single(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4, e5;
@@
-    pci_map_page(e1, e2, e3, e4, e5)
+    dma_map_page(&e1->dev, e2, e3, e4, e5)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_page(e1, e2, e3, e4)
+    dma_unmap_page(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_map_sg(e1, e2, e3, e4)
+    dma_map_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_unmap_sg(e1, e2, e3, e4)
+    dma_unmap_sg(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_cpu(e1, e2, e3, e4)
+    dma_sync_single_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_single_for_device(e1, e2, e3, e4)
+    dma_sync_single_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_cpu(e1, e2, e3, e4)
+    dma_sync_sg_for_cpu(&e1->dev, e2, e3, e4)

@@
expression e1, e2, e3, e4;
@@
-    pci_dma_sync_sg_for_device(e1, e2, e3, e4)
+    dma_sync_sg_for_device(&e1->dev, e2, e3, e4)

@@
expression e1, e2;
@@
-    pci_dma_mapping_error(e1, e2)
+    dma_mapping_error(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_dma_mask(e1, e2)
+    dma_set_mask(&e1->dev, e2)

@@
expression e1, e2;
@@
-    pci_set_consistent_dma_mask(e1, e2)
+    dma_set_coherent_mask(&e1->dev, e2)

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

parent 7ec1c4a5

drivers/media/pci/cx88/cx88-alsa.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -357,8 +357,8 @@ static int dsp_buffer_free(struct cx88_audio_dev *chip)
		cx88_alsa_dma_unmap(chip);
		cx88_alsa_dma_free(chip->buf);
		if (risc->cpu)
		pci_free_consistent(chip->pci, risc->size,
		risc->cpu, risc->dma);
		dma_free_coherent(&chip->pci->dev, risc->size, risc->cpu,
		risc->dma);
		kfree(chip->buf);

		chip->buf = NULL;
		@@ -868,7 +868,7 @@ static int snd_cx88_create(struct snd_card card, struct pci_dev pci,
		return err;
		}

		err = pci_set_dma_mask(pci, DMA_BIT_MASK(32));
		err = dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
		if (err) {
		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n", core->name);
		cx88_core_put(core, pci);

drivers/media/pci/cx88/cx88-blackbird.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -685,7 +685,8 @@ static void buffer_finish(struct vb2_buffer *vb)
		struct cx88_riscmem *risc = &buf->risc;

		if (risc->cpu)
		pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
		dma_free_coherent(&dev->pci->dev, risc->size, risc->cpu,
		risc->dma);
		memset(risc, 0, sizeof(*risc));
		}

drivers/media/pci/cx88/cx88-core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -152,7 +152,8 @@ int cx88_risc_buffer(struct pci_dev pci, struct cx88_riscmem risc,
		instructions += 4;
		risc->size = instructions * 8;
		risc->dma = 0;
		risc->cpu = pci_zalloc_consistent(pci, risc->size, &risc->dma);
		risc->cpu = dma_alloc_coherent(&pci->dev, risc->size, &risc->dma,
		GFP_KERNEL);
		if (!risc->cpu)
		return -ENOMEM;

		@@ -190,7 +191,8 @@ int cx88_risc_databuffer(struct pci_dev pci, struct cx88_riscmem risc,
		instructions += 3;
		risc->size = instructions * 8;
		risc->dma = 0;
		risc->cpu = pci_zalloc_consistent(pci, risc->size, &risc->dma);
		risc->cpu = dma_alloc_coherent(&pci->dev, risc->size, &risc->dma,
		GFP_KERNEL);
		if (!risc->cpu)
		return -ENOMEM;

drivers/media/pci/cx88/cx88-dvb.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -103,7 +103,8 @@ static void buffer_finish(struct vb2_buffer *vb)
		struct cx88_riscmem *risc = &buf->risc;

		if (risc->cpu)
		pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
		dma_free_coherent(&dev->pci->dev, risc->size, risc->cpu,
		risc->dma);
		memset(risc, 0, sizeof(*risc));
		}

drivers/media/pci/cx88/cx88-mpeg.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ int cx8802_buf_prepare(struct vb2_queue q, struct cx8802_dev dev,
		dev->ts_packet_size, dev->ts_packet_count, 0);
		if (rc) {
		if (risc->cpu)
		pci_free_consistent(dev->pci, risc->size,
		dma_free_coherent(&dev->pci->dev, risc->size,
		risc->cpu, risc->dma);
		memset(risc, 0, sizeof(*risc));
		return rc;
		@@ -386,7 +386,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
		if (pci_enable_device(dev->pci))
		return -EIO;
		pci_set_master(dev->pci);
		err = pci_set_dma_mask(dev->pci, DMA_BIT_MASK(32));
		err = dma_set_mask(&dev->pci->dev, DMA_BIT_MASK(32));
		if (err) {
		pr_err("Oops: no 32bit PCI DMA ???\n");
		return -EIO;