openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: ngene: 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.

When memory is allocated, GFP_KERNEL can be used because in all cases,
it is called from a probe function and no lock is taken in the between.

The call chain is:
  ngene_probe                       (probe function, used in ngene-cards.c)
    --> ngene_get_buffers
      --> AllocCommonBuffers                  (call dma_alloc_coherent)
        --> create_ring_buffer                (call dma_alloc_coherent)
        --> AllocateRingBuffers               (call dma_alloc_coherent)

@@
@@
-    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>
This commit is contained in:
Christophe JAILLET 2021-01-30 07:32:00 +01:00 committed by Mauro Carvalho Chehab
parent 225d0dbdb2
commit efb8225ce6
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
drivers/media/pci/ngene/ngene-core.c
View File

@ -763,23 +763,22 @@ static void free_ringbuffer(struct ngene *dev, struct SRingBufferDescriptor *rb)
for (j = 0; j < rb->NumBuffers; j++, Cur = Cur->Next) { for (j = 0; j < rb->NumBuffers; j++, Cur = Cur->Next) {
if (Cur->Buffer1) if (Cur->Buffer1)
pci_free_consistent(dev->pci_dev, dma_free_coherent(&dev->pci_dev->dev,
rb->Buffer1Length, rb->Buffer1Length, Cur->Buffer1,
Cur->Buffer1, Cur->scList1->Address);
Cur->scList1->Address);
if (Cur->Buffer2) if (Cur->Buffer2)
pci_free_consistent(dev->pci_dev, dma_free_coherent(&dev->pci_dev->dev,
rb->Buffer2Length, rb->Buffer2Length, Cur->Buffer2,
Cur->Buffer2, Cur->scList2->Address);
Cur->scList2->Address);
} }
if (rb->SCListMem) if (rb->SCListMem)
pci_free_consistent(dev->pci_dev, rb->SCListMemSize, dma_free_coherent(&dev->pci_dev->dev, rb->SCListMemSize,
rb->SCListMem, rb->PASCListMem); rb->SCListMem, rb->PASCListMem);
pci_free_consistent(dev->pci_dev, rb->MemSize, rb->Head, rb->PAHead); dma_free_coherent(&dev->pci_dev->dev, rb->MemSize, rb->Head,
rb->PAHead);
} }
static void free_idlebuffer(struct ngene *dev, static void free_idlebuffer(struct ngene *dev,
@ -813,15 +812,13 @@ static void free_common_buffers(struct ngene *dev)
} }
if (dev->OverflowBuffer) if (dev->OverflowBuffer)
pci_free_consistent(dev->pci_dev, dma_free_coherent(&dev->pci_dev->dev, OVERFLOW_BUFFER_SIZE,
OVERFLOW_BUFFER_SIZE, dev->OverflowBuffer, dev->PAOverflowBuffer);
dev->OverflowBuffer, dev->PAOverflowBuffer);
if (dev->FWInterfaceBuffer) if (dev->FWInterfaceBuffer)
pci_free_consistent(dev->pci_dev, dma_free_coherent(&dev->pci_dev->dev, 4096,
4096, dev->FWInterfaceBuffer,
dev->FWInterfaceBuffer, dev->PAFWInterfaceBuffer);
dev->PAFWInterfaceBuffer);
} }
/****************************************************************************/ /****************************************************************************/
@ -848,7 +845,7 @@ static int create_ring_buffer(struct pci_dev *pci_dev,
if (MemSize < 4096) if (MemSize < 4096)
MemSize = 4096; MemSize = 4096;
Head = pci_alloc_consistent(pci_dev, MemSize, &tmp); Head = dma_alloc_coherent(&pci_dev->dev, MemSize, &tmp, GFP_KERNEL);
PARingBufferHead = tmp; PARingBufferHead = tmp;
if (!Head) if (!Head)
@ -899,7 +896,8 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev,
if (SCListMemSize < 4096) if (SCListMemSize < 4096)
SCListMemSize = 4096; SCListMemSize = 4096;
SCListMem = pci_alloc_consistent(pci_dev, SCListMemSize, &tmp); SCListMem = dma_alloc_coherent(&pci_dev->dev, SCListMemSize, &tmp,
GFP_KERNEL);
PASCListMem = tmp; PASCListMem = tmp;
if (SCListMem == NULL) if (SCListMem == NULL)
@ -918,8 +916,8 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev,
for (i = 0; i < pRingBuffer->NumBuffers; i += 1, Cur = Cur->Next) { for (i = 0; i < pRingBuffer->NumBuffers; i += 1, Cur = Cur->Next) {
u64 PABuffer; u64 PABuffer;
void *Buffer = pci_alloc_consistent(pci_dev, Buffer1Length, void *Buffer = dma_alloc_coherent(&pci_dev->dev,
&tmp); Buffer1Length, &tmp, GFP_KERNEL);
PABuffer = tmp; PABuffer = tmp;
if (Buffer == NULL) if (Buffer == NULL)
@ -951,7 +949,8 @@ static int AllocateRingBuffers(struct pci_dev *pci_dev,
if (!Buffer2Length) if (!Buffer2Length)
continue; continue;
Buffer = pci_alloc_consistent(pci_dev, Buffer2Length, &tmp); Buffer = dma_alloc_coherent(&pci_dev->dev, Buffer2Length,
&tmp, GFP_KERNEL);
PABuffer = tmp; PABuffer = tmp;
if (Buffer == NULL) if (Buffer == NULL)
@ -1040,17 +1039,18 @@ static int AllocCommonBuffers(struct ngene *dev)
{ {
int status = 0, i; int status = 0, i;
dev->FWInterfaceBuffer = pci_alloc_consistent(dev->pci_dev, 4096, dev->FWInterfaceBuffer = dma_alloc_coherent(&dev->pci_dev->dev, 4096,
&dev->PAFWInterfaceBuffer); &dev->PAFWInterfaceBuffer,
GFP_KERNEL);
if (!dev->FWInterfaceBuffer) if (!dev->FWInterfaceBuffer)
return -ENOMEM; return -ENOMEM;
dev->hosttongene = dev->FWInterfaceBuffer; dev->hosttongene = dev->FWInterfaceBuffer;
dev->ngenetohost = dev->FWInterfaceBuffer + 256; dev->ngenetohost = dev->FWInterfaceBuffer + 256;
dev->EventBuffer = dev->FWInterfaceBuffer + 512; dev->EventBuffer = dev->FWInterfaceBuffer + 512;
dev->OverflowBuffer = pci_zalloc_consistent(dev->pci_dev, dev->OverflowBuffer = dma_alloc_coherent(&dev->pci_dev->dev,
OVERFLOW_BUFFER_SIZE, OVERFLOW_BUFFER_SIZE,
&dev->PAOverflowBuffer); &dev->PAOverflowBuffer, GFP_KERNEL);
if (!dev->OverflowBuffer) if (!dev->OverflowBuffer)
return -ENOMEM; return -ENOMEM;