[packages/dahdi-linux] - updated to 3.3.0
qboosh
qboosh at pld-linux.org
Sun Dec 10 16:50:58 CET 2023
commit 0db30364beec6fd4e4c602bd3be5d1331f6e9a85
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Dec 10 16:14:54 2023 +0100
- updated to 3.3.0
dahdi-linux.spec | 18 ++---
kernel-4.14.patch | 16 ----
kernel-5.18.patch | 219 ------------------------------------------------------
kernel-6.1.patch | 28 -------
4 files changed, 6 insertions(+), 275 deletions(-)
---
diff --git a/dahdi-linux.spec b/dahdi-linux.spec
index 8d20563..d6fa986 100644
--- a/dahdi-linux.spec
+++ b/dahdi-linux.spec
@@ -3,10 +3,10 @@
# - IMPORTANT rename: http://www.asterisk.org/zaptel-to-dahdi
#
# Conditional build:
-%bcond_without kernel # don't build kernel modules
-%bcond_with oslec # with Open Source Line Echo Canceller
-%bcond_without xpp # without Astribank
-%bcond_without userspace # don't build userspace packages
+%bcond_without kernel # kernel modules
+%bcond_with oslec # Open Source Line Echo Canceller
+%bcond_without xpp # Xorcom Astribank support
+%bcond_without userspace # userspace packages
%bcond_with verbose
%ifarch alpha %{ix86}
@@ -31,12 +31,12 @@ exit 1
Summary: DAHDI telephony device support
Summary(pl.UTF-8): Obsługa urządzeń telefonicznych DAHDI
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 3.2.0
+Version: 3.3.0
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Base/Kernel
Source0: http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-%{version}.tar.gz
-# Source0-md5: f93e28f544e914abdc927a6287ff5091
+# Source0-md5: 650e2f9ccae7efb850ce1914c768af83
Source3: %{FIRMWARE_URL}/dahdi-fw-oct6114-064-1.05.01.tar.gz
# Source3-md5: 88db9b7a07d8392736171b1b3e6bcc66
Source4: %{FIRMWARE_URL}/dahdi-fw-oct6114-128-1.05.01.tar.gz
@@ -47,9 +47,6 @@ Source6: %{FIRMWARE_URL}/dahdi-fw-tc400m-MR6.12.tar.gz
# Source6-md5: 2ea860bb8a9d8ede2858b9557b74ee3c
Source7: %{FIRMWARE_URL}/dahdi-fw-hx8-2.06.tar.gz
# Source7-md5: a7f3886942bb3e9fed349a41b3390c9f
-Patch0: kernel-4.14.patch
-Patch1: kernel-5.18.patch
-Patch2: kernel-6.1.patch
Patch3: no-xpp.patch
URL: http://www.asterisk.org/
%{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -148,9 +145,6 @@ cd ../..\
%prep
%setup -q -n %{pname}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%if %{without xpp}
%patch3 -p1
%endif
diff --git a/kernel-4.14.patch b/kernel-4.14.patch
deleted file mode 100644
index 65a7760..0000000
--- a/kernel-4.14.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- dahdi-linux-3.0.0/include/dahdi/kernel.h~ 2018-11-15 15:03:40.000000000 +0100
-+++ dahdi-linux-3.0.0/include/dahdi/kernel.h 2019-03-10 20:14:29.249473418 +0100
-@@ -1406,9 +1406,13 @@
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 104)
- #ifndef TIMER_DATA_TYPE
- #define TIMER_DATA_TYPE unsigned long
- #endif
-+#else
-+#define TIMER_DATA_TYPE struct timer_list *
-+#endif
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0)
-
diff --git a/kernel-5.18.patch b/kernel-5.18.patch
deleted file mode 100644
index 448076f..0000000
--- a/kernel-5.18.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-diff -ur dahdi-linux-3.1.0/drivers/dahdi/voicebus/voicebus.c dahdi-linux-3.1.0-5.18/drivers/dahdi/voicebus/voicebus.c
---- dahdi-linux-3.1.0/drivers/dahdi/voicebus/voicebus.c 2019-10-03 16:48:09.000000000 +0200
-+++ dahdi-linux-3.1.0-5.18/drivers/dahdi/voicebus/voicebus.c 2022-05-25 16:18:38.185204828 +0200
-@@ -260,8 +260,13 @@
- dl->padding = 0;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dl->desc = dma_alloc_coherent(&vb->pdev->dev,
-+ (sizeof(*d) + dl->padding) * DRING_SIZE, &dl->desc_dma, GFP_ATOMIC);
-+#else
- dl->desc = pci_alloc_consistent(vb->pdev,
- (sizeof(*d) + dl->padding) * DRING_SIZE, &dl->desc_dma);
-+#endif
- if (!dl->desc)
- return -ENOMEM;
-
-@@ -311,9 +316,15 @@
- dl->padding = 0;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dl->desc = dma_alloc_coherent(&vb->pdev->dev,
-+ (sizeof(*d) + dl->padding) *
-+ DRING_SIZE, &dl->desc_dma, GFP_ATOMIC);
-+#else
- dl->desc = pci_alloc_consistent(vb->pdev,
- (sizeof(*d) + dl->padding) *
- DRING_SIZE, &dl->desc_dma);
-+#endif
- if (!dl->desc)
- return -ENOMEM;
-
-@@ -544,10 +555,17 @@
- return;
- }
- vb_cleanup_descriptors(vb, dl);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_free_coherent(
-+ &vb->pdev->dev,
-+ (sizeof(struct voicebus_descriptor)+dl->padding)*DRING_SIZE,
-+ dl->desc, dl->desc_dma);
-+#else
- pci_free_consistent(
- vb->pdev,
- (sizeof(struct voicebus_descriptor)+dl->padding)*DRING_SIZE,
- dl->desc, dl->desc_dma);
-+#endif
- while (!list_empty(&vb->free_rx)) {
- vbb = list_entry(vb->free_rx.next, struct vbb, entry);
- list_del(&vbb->entry);
-@@ -1783,7 +1801,11 @@
- /* ----------------------------------------------------------------
- Configure the hardware / kernel module interfaces.
- ---------------------------------------------------------------- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ if (dma_set_mask(&vb->pdev->dev, DMA_BIT_MASK(32))) {
-+#else
- if (pci_set_dma_mask(vb->pdev, DMA_BIT_MASK(32))) {
-+#endif
- dev_err(&vb->pdev->dev, "No suitable DMA available.\n");
- goto cleanup;
- }
-@@ -1826,7 +1848,11 @@
- /* ----------------------------------------------------------------
- Configure the hardware interface.
- ---------------------------------------------------------------- */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ if (dma_set_mask(&vb->pdev->dev, DMA_BIT_MASK(32))) {
-+#else
- if (pci_set_dma_mask(vb->pdev, DMA_BIT_MASK(32))) {
-+#endif
- dev_warn(&vb->pdev->dev, "No suitable DMA available.\n");
- goto cleanup;
- }
-diff -ur dahdi-linux-3.1.0/drivers/dahdi/wct4xxp/base.c dahdi-linux-3.1.0-5.18/drivers/dahdi/wct4xxp/base.c
---- dahdi-linux-3.1.0/drivers/dahdi/wct4xxp/base.c 2019-10-03 16:48:09.000000000 +0200
-+++ dahdi-linux-3.1.0-5.18/drivers/dahdi/wct4xxp/base.c 2022-05-25 16:07:49.747890034 +0200
-@@ -3849,8 +3849,13 @@
- dma_addr_t writedma;
-
- /* 32 channels, Double-buffer, Read/Write, 4 spans */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ alloc = dma_alloc_coherent(&wc->dev->dev, numbufs * T4_BASE_SIZE(wc) * 2,
-+ &writedma, GFP_ATOMIC);
-+#else
- alloc = pci_alloc_consistent(wc->dev, numbufs * T4_BASE_SIZE(wc) * 2,
- &writedma);
-+#endif
-
- if (!alloc) {
- dev_notice(&wc->dev->dev, "wct%dxxp: Unable to allocate "
-@@ -3928,8 +3933,13 @@
-
- spin_unlock_irqrestore(&wc->reglock, flags);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_free_coherent(&wc->dev->dev, T4_BASE_SIZE(wc) * oldbufs * 2,
-+ oldalloc, oldaddr);
-+#else
- pci_free_consistent(wc->dev, T4_BASE_SIZE(wc) * oldbufs * 2,
- oldalloc, oldaddr);
-+#endif
-
- dev_info(&wc->dev->dev, "Increased latency to %d\n", newlatency);
-
-@@ -5122,8 +5132,13 @@
- * up first */
- pci_iounmap(wc->dev, wc->membase);
- pci_release_regions(wc->dev);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_free_coherent(&wc->dev->dev, T4_BASE_SIZE(wc) * wc->numbufs * 2,
-+ wc->writechunk, wc->writedma);
-+#else
- pci_free_consistent(wc->dev, T4_BASE_SIZE(wc) * wc->numbufs * 2,
- wc->writechunk, wc->writedma);
-+#endif
- pci_set_drvdata(wc->dev, NULL);
- free_wc(wc);
- return res;
-@@ -5302,8 +5317,13 @@
- pci_release_regions(wc->dev);
-
- /* Immediately free resources */
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_free_coherent(&wc->dev->dev, T4_BASE_SIZE(wc) * wc->numbufs * 2,
-+ wc->writechunk, wc->writedma);
-+#else
- pci_free_consistent(wc->dev, T4_BASE_SIZE(wc) * wc->numbufs * 2,
- wc->writechunk, wc->writedma);
-+#endif
-
- order_index[wc->order]--;
-
-diff -ur dahdi-linux-3.1.0/drivers/dahdi/wctc4xxp/base.c dahdi-linux-3.1.0-5.18/drivers/dahdi/wctc4xxp/base.c
---- dahdi-linux-3.1.0/drivers/dahdi/wctc4xxp/base.c 2019-10-03 16:48:09.000000000 +0200
-+++ dahdi-linux-3.1.0-5.18/drivers/dahdi/wctc4xxp/base.c 2022-05-25 16:17:03.706798317 +0200
-@@ -822,8 +822,13 @@
- if (!dr->pending)
- return -ENOMEM;
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dr->desc = dma_alloc_coherent(&pdev->dev,
-+ (sizeof(*d)+dr->padding)*dr->size, &dr->desc_dma, GFP_ATOMIC);
-+#else
- dr->desc = pci_alloc_consistent(pdev,
- (sizeof(*d)+dr->padding)*dr->size, &dr->desc_dma);
-+#endif
- if (!dr->desc) {
- kfree(dr->pending);
- return -ENOMEM;
-@@ -873,8 +878,13 @@
- }
- d->des1 &= cpu_to_le32(~(BUFFER1_SIZE_MASK));
- d->des1 |= cpu_to_le32(len & BUFFER1_SIZE_MASK);
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ d->buffer1 = cpu_to_le32(dma_map_single(&dr->pdev->dev, c->data,
-+ SFRAME_SIZE, dr->direction));
-+#else
- d->buffer1 = cpu_to_le32(pci_map_single(dr->pdev, c->data,
- SFRAME_SIZE, dr->direction));
-+#endif
-
- SET_OWNED(d); /* That's it until the hardware is done with it. */
- dr->pending[dr->tail] = c;
-@@ -895,8 +905,13 @@
- spin_lock_irqsave(&dr->lock, flags);
- d = wctc4xxp_descriptor(dr, head);
- if (d->buffer1 && !OWNED(d)) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_unmap_single(&dr->pdev->dev, le32_to_cpu(d->buffer1),
-+ SFRAME_SIZE, dr->direction);
-+#else
- pci_unmap_single(dr->pdev, le32_to_cpu(d->buffer1),
- SFRAME_SIZE, dr->direction);
-+#endif
- c = dr->pending[head];
- WARN_ON(!c);
- dr->head = (++head) & (dr->size-1);
-@@ -1575,8 +1590,13 @@
- for (i = 0; i < dr->size; ++i) {
- d = wctc4xxp_descriptor(dr, i);
- if (d->buffer1) {
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_unmap_single(&dr->pdev->dev, d->buffer1,
-+ SFRAME_SIZE, dr->direction);
-+#else
- pci_unmap_single(dr->pdev, d->buffer1,
- SFRAME_SIZE, dr->direction);
-+#endif
- d->buffer1 = 0;
- /* Commands will also be sitting on the waiting for
- * response list, so we want to make sure to delete
-@@ -1589,8 +1609,13 @@
- dr->head = 0;
- dr->tail = 0;
- dr->count = 0;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ dma_free_coherent(&dr->pdev->dev, (sizeof(*d)+dr->padding) * dr->size,
-+ dr->desc, dr->desc_dma);
-+#else
- pci_free_consistent(dr->pdev, (sizeof(*d)+dr->padding) * dr->size,
- dr->desc, dr->desc_dma);
-+#endif
- kfree(dr->pending);
- }
-
-@@ -3940,7 +3965,11 @@
- INIT_WORK(&wc->deferred_work, deferred_work_func);
- init_waitqueue_head(&wc->waitq);
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
-+ if (dma_set_mask(&wc->pdev->dev, DMA_BIT_MASK(32))) {
-+#else
- if (pci_set_dma_mask(wc->pdev, DMA_BIT_MASK(32))) {
-+#endif
- release_mem_region(pci_resource_start(wc->pdev, 1),
- pci_resource_len(wc->pdev, 1));
- if (wc->iobase)
diff --git a/kernel-6.1.patch b/kernel-6.1.patch
deleted file mode 100644
index 3fbe021..0000000
--- a/kernel-6.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- dahdi-linux-3.2.0/drivers/dahdi/voicebus/voicebus_net.c~ 2022-09-22 14:23:24.000000000 +0200
-+++ dahdi-linux-3.2.0/drivers/dahdi/voicebus/voicebus_net.c 2022-12-17 18:55:22.078293527 +0100
-@@ -202,7 +202,11 @@
-
- netdev->promiscuity = 0;
- netdev->flags |= IFF_NOARP;
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
- netif_napi_add(netdev, &vb->napi, vb_net_poll, 64);
-+#else
-+ netif_napi_add(netdev, &vb->napi, vb_net_poll);
-+#endif
-
- skb_queue_head_init(&vb->captured_packets);
- res = register_netdev(netdev);
---- dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c~ 2022-12-17 18:53:16.000000000 +0100
-+++ dahdi-linux-3.2.0/drivers/dahdi/wctc4xxp/base.c 2022-12-17 18:56:24.751889607 +0100
-@@ -658,7 +658,11 @@
- netdev->promiscuity = 0;
- netdev->flags |= IFF_NOARP;
-
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)
- netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll, 64);
-+#else
-+ netif_napi_add(netdev, &wc->napi, &wctc4xxp_poll);
-+#endif
-
- res = register_netdev(netdev);
- if (res) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dahdi-linux.git/commitdiff/0db30364beec6fd4e4c602bd3be5d1331f6e9a85
More information about the pld-cvs-commit
mailing list