projects / packages / wl.git / blame
| Commit | Line | Data |
|---|---|---|
| 052445a4 JR |
1 | --- wl-6.30.223.271/wl/src/shared/linux_osl.c.orig 2022-05-26 06:57:58.000000000 +0200 |
| 2 | +++ wl-6.30.223.271/wl/src/shared/linux_osl.c 2022-05-26 10:37:05.148803952 +0200 | |
| 3 | @@ -600,7 +600,11 @@ | |
| 4 | if (va) | |
| 5 | *pap = (ulong)__virt_to_phys(va); | |
| 6 | #else | |
| 7 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) | |
| 8 | va = pci_alloc_consistent(osh->pdev, size, (dma_addr_t*)pap); | |
| 9 | +#else | |
| 10 | + va = dma_alloc_coherent(&((struct pci_dev *)osh->pdev)->dev, size, (dma_addr_t*)pap, GFP_ATOMIC); | |
| 11 | +#endif | |
| 12 | #endif | |
| 13 | return va; | |
| 14 | } | |
| 15 | @@ -613,7 +617,11 @@ | |
| 16 | #ifdef __ARM_ARCH_7A__ | |
| 17 | kfree(va); | |
| 18 | #else | |
| 19 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) | |
| 20 | pci_free_consistent(osh->pdev, size, va, (dma_addr_t)pa); | |
| 21 | +#else | |
| 22 | + dma_free_coherent(&((struct pci_dev *)osh->pdev)->dev, size, va, (dma_addr_t)pa); | |
| 23 | +#endif | |
| 24 | #endif | |
| 25 | } | |
| 26 | ||
| 27 | @@ -623,7 +631,11 @@ | |
| 28 | int dir; | |
| 29 | ||
| 30 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); | |
| 31 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) | |
| 32 | dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE; | |
| 33 | +#else | |
| 34 | + dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE; | |
| 35 | +#endif | |
| 36 | ||
| 37 | #if defined(__ARM_ARCH_7A__) && defined(BCMDMASGLISTOSL) | |
| 38 | if (dmah != NULL) { | |
| 39 | @@ -641,7 +653,11 @@ | |
| 40 | ASSERT(totsegs + nsegs <= MAX_DMA_SEGS); | |
| 41 | sg->page_link = 0; | |
| 42 | sg_set_buf(sg, PKTDATA(osh, skb), PKTLEN(osh, skb)); | |
| 43 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) | |
| 44 | pci_map_single(osh->pdev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir); | |
| 45 | +#else | |
| 46 | + dma_map_single(&osh->pdev->dev, PKTDATA(osh, skb), PKTLEN(osh, skb), dir); | |
| 47 | +#endif | |
| 48 | } | |
| 49 | totsegs += nsegs; | |
| 50 | totlen += PKTLEN(osh, skb); | |
| 51 | @@ -656,7 +672,11 @@ | |
| 52 | } | |
| 53 | #endif | |
| 54 | ||
| 55 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) | |
| 56 | return (pci_map_single(osh->pdev, va, size, dir)); | |
| 57 | +#else | |
| 58 | + return (dma_map_single(&((struct pci_dev *)osh->pdev)->dev, va, size, dir)); | |
| 59 | +#endif | |
| 60 | } | |
| 61 | ||
| 62 | void BCMFASTPATH | |
| 63 | @@ -665,8 +685,13 @@ | |
| 64 | int dir; | |
| 65 | ||
| 66 | ASSERT((osh && (osh->magic == OS_HANDLE_MAGIC))); | |
| 67 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 18, 0) | |
| 68 | dir = (direction == DMA_TX)? PCI_DMA_TODEVICE: PCI_DMA_FROMDEVICE; | |
| 69 | pci_unmap_single(osh->pdev, (uint32)pa, size, dir); | |
| 70 | +#else | |
| 71 | + dir = (direction == DMA_TX)? DMA_TO_DEVICE: DMA_FROM_DEVICE; | |
| 72 | + dma_unmap_single(&((struct pci_dev *)osh->pdev)->dev, (uint32)pa, size, dir); | |
| 73 | +#endif | |
| 74 | } | |
| 75 | ||
| 76 | #if defined(BCMDBG_ASSERT) |