From aebdc73ce63f68691079f807d1473745fcae3a56 Mon Sep 17 00:00:00 2001 From: Stefan Kalscheuer Date: Thu, 30 Nov 2023 09:30:56 +0100 Subject: [PATCH] mwlwifi: update to version 10.4.10-20231129 Remove upstreamed patches: * replace usage of the deprecated "pci-dma-compat.h" API (6c03b27) * remove uaccess and get_fs calls from PCIe for Kenel >= 5.18 (1d0d08c) Signed-off-by: Stefan Kalscheuer --- package/kernel/mwlwifi/Makefile | 6 +- ...mpilation-warning-with-64-bit-system.patch | 10 +- ...nd-get_fs-calls-from-PCIe-for-Kenel-.patch | 51 --- ...-the-deprecated-pci-dma-compat.h-API.patch | 352 ------------------ 4 files changed, 8 insertions(+), 411 deletions(-) delete mode 100644 package/kernel/mwlwifi/patches/006-remove-uaccess-and-get_fs-calls-from-PCIe-for-Kenel-.patch delete mode 100644 package/kernel/mwlwifi/patches/007-replace-usage-of-the-deprecated-pci-dma-compat.h-API.patch diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile index 9244f656c8f0..2e6cd3a31e52 100644 --- a/package/kernel/mwlwifi/Makefile +++ b/package/kernel/mwlwifi/Makefile @@ -15,9 +15,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2023-11-20 -PKG_SOURCE_VERSION:=2a5a4ae31a2ad1b432a1dcb6ef6c3298e3330b2c -PKG_MIRROR_HASH:=b1151051ed6eba063c05916d8dbc4f03f804772d217e8c65b7baa263ded7a961 +PKG_SOURCE_DATE:=2023-11-29 +PKG_SOURCE_VERSION:=ebf3167445f108346dcff9a31a708534c0bd7cc5 +PKG_MIRROR_HASH:=1d39ad25f4ad1fafff03a70341c2dabde8db4075f56163d40f8ae8aef2e2bb2d PKG_MAINTAINER:=Imre Kaloz PKG_BUILD_PARALLEL:=1 diff --git a/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch b/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch index 80e708a5e18a..ee64e050473a 100644 --- a/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch +++ b/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch @@ -111,10 +111,10 @@ cc1: all warnings being treated as errors Signed-off-by: Christian Marangi --- - debugfs.c | 2 +- - hif/fwcmd.c | 2 +- - hif/pcie/pcie.c | 4 ++-- - hif/pcie/tx_ndp.c | 2 +- + debugfs.c | 2 +- + hif/fwcmd.c | 2 +- + hif/pcie/8964/tx_ndp.c | 2 +- + hif/pcie/pcie.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) --- a/debugfs.c @@ -152,7 +152,7 @@ Signed-off-by: Christian Marangi return -ENOMEM; --- a/hif/pcie/pcie.c +++ b/hif/pcie/pcie.c -@@ -1464,8 +1464,8 @@ static void pcie_bf_mimo_ctrl_decode(str +@@ -1466,8 +1466,8 @@ static void pcie_bf_mimo_ctrl_decode(struct mwl_priv *priv, &fp_data->f_pos); filp_close(fp_data, current->files); } else { diff --git a/package/kernel/mwlwifi/patches/006-remove-uaccess-and-get_fs-calls-from-PCIe-for-Kenel-.patch b/package/kernel/mwlwifi/patches/006-remove-uaccess-and-get_fs-calls-from-PCIe-for-Kenel-.patch deleted file mode 100644 index 2a49daa94321..000000000000 --- a/package/kernel/mwlwifi/patches/006-remove-uaccess-and-get_fs-calls-from-PCIe-for-Kenel-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ad911365cac3723d1c00d048905a5e22ff4a10f3 Mon Sep 17 00:00:00 2001 -From: Stefan Kalscheuer -Date: Sun, 18 Jun 2023 17:53:27 +0200 -Subject: [PATCH 1/2] remove uaccess and get_fs calls from PCIe for Kenel >= - 5.18 - -Remove the calls to deprecated get_fs and force_uaccess_* API for modern -kernels. - -The get_fs functionality and the transitional force_uaccess_* calls have -been removed Kernel 5.18 [1] while read and write operations have been -refactored, so the code can work on kernel- and userspace data without -the need to shifting the boundary using set_fs(). - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=967747bbc084b93b54e66f9047d342232314cd25 - -Signed-off-by: Stefan Kalscheuer ---- - hif/pcie/pcie.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/hif/pcie/pcie.c -+++ b/hif/pcie/pcie.c -@@ -1439,7 +1439,9 @@ static void pcie_bf_mimo_ctrl_decode(str - const char filename[] = "/tmp/BF_MIMO_Ctrl_Field_Output.txt"; - char str_buf[256]; - char *buf = &str_buf[0]; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - mm_segment_t oldfs; -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) - oldfs = get_fs(); -@@ -1447,7 +1449,7 @@ static void pcie_bf_mimo_ctrl_decode(str - #elif LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) - oldfs = get_fs(); - set_fs(KERNEL_DS); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - oldfs = force_uaccess_begin(); - #endif - -@@ -1471,7 +1473,7 @@ static void pcie_bf_mimo_ctrl_decode(str - - #if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0) - set_fs(oldfs); --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(5,18,0) - force_uaccess_end(oldfs); - #endif - } diff --git a/package/kernel/mwlwifi/patches/007-replace-usage-of-the-deprecated-pci-dma-compat.h-API.patch b/package/kernel/mwlwifi/patches/007-replace-usage-of-the-deprecated-pci-dma-compat.h-API.patch deleted file mode 100644 index b752d72f782b..000000000000 --- a/package/kernel/mwlwifi/patches/007-replace-usage-of-the-deprecated-pci-dma-compat.h-API.patch +++ /dev/null @@ -1,352 +0,0 @@ -From 61c75dce424c180b633c64613a1948df5a41cf1e Mon Sep 17 00:00:00 2001 -From: Stefan Kalscheuer -Date: Sun, 18 Jun 2023 17:59:07 +0200 -Subject: [PATCH 2/2] replace usage of the deprecated "pci-dma-compat.h" API - -The pci-dma-compat API has been legacy for quite a while and was removed -with 5.18 [1]. Migrate all calls, so the module can be compiled against -modern kernel versions. - -Replace some compat calls: -* pci_set_dma_mask with dma_set_mask -* pci_(un)map_single with dma_(un)map_single -* pci_dma_mapping_error with dma_mapping_error -* PCI_DMA_{FROM,TO}DEVICE with DMA_{FOM,TO}_DEVICE - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7968778914e53788a01c2dee2692cab157de9ac0 - -Signed-off-by: Stefan Kalscheuer ---- - hif/pcie/pcie.c | 2 +- - hif/pcie/rx.c | 20 ++++++++++---------- - hif/pcie/rx_ndp.c | 20 ++++++++++---------- - hif/pcie/tx.c | 22 +++++++++++----------- - hif/pcie/tx_ndp.c | 14 +++++++------- - 5 files changed, 39 insertions(+), 39 deletions(-) - ---- a/hif/pcie/pcie.c -+++ b/hif/pcie/pcie.c -@@ -1701,7 +1701,7 @@ static int pcie_probe(struct pci_dev *pd - return rc; - } - -- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); -+ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (rc) { - pr_err("%s: 32-bit PCI DMA not supported\n", - PCIE_DRV_NAME); ---- a/hif/pcie/8864/rx.c -+++ b/hif/pcie/8864/rx.c -@@ -107,11 +107,11 @@ static int pcie_rx_ring_init(struct mwl_ - desc->prx_ring[i].rssi = 0x00; - desc->prx_ring[i].pkt_len = - cpu_to_le16(SYSADPT_MAX_AGGR_SIZE); -- dma = pci_map_single(pcie_priv->pdev, -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, - rx_hndl->psk_buff->data, - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ DMA_FROM_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); - return -ENOMEM; -@@ -153,11 +153,11 @@ static void pcie_rx_ring_cleanup(struct - if (!rx_hndl->psk_buff) - continue; - -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu - (rx_hndl->pdesc->pphys_buff_data), - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -+ DMA_FROM_DEVICE); - - dev_kfree_skb_any(rx_hndl->psk_buff); - -@@ -332,11 +332,11 @@ static inline int pcie_rx_refill(struct - rx_hndl->pdesc->rssi = 0x00; - rx_hndl->pdesc->pkt_len = cpu_to_le16(desc->rx_buf_size); - -- dma = pci_map_single(pcie_priv->pdev, -+ dma = dma_map_single(&pcie_priv->pdev->dev, - rx_hndl->psk_buff->data, - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ DMA_FROM_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - dev_kfree_skb_any(rx_hndl->psk_buff); - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); -@@ -410,10 +410,10 @@ void pcie_8864_rx_recv(unsigned long dat - prx_skb = curr_hndl->psk_buff; - if (!prx_skb) - goto out; -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu(curr_hndl->pdesc->pphys_buff_data), - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -+ DMA_FROM_DEVICE); - pkt_len = le16_to_cpu(curr_hndl->pdesc->pkt_len); - - if (skb_tailroom(prx_skb) < pkt_len) { ---- a/hif/pcie/8864/tx.c -+++ b/hif/pcie/8864/tx.c -@@ -171,11 +171,11 @@ static void pcie_tx_ring_cleanup(struct - desc->tx_hndl[i].psk_buff->data, - le32_to_cpu( - desc->ptx_ring[i].pkt_ptr)); -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu( - desc->ptx_ring[i].pkt_ptr), - desc->tx_hndl[i].psk_buff->len, -- PCI_DMA_TODEVICE); -+ DMA_TO_DEVICE); - dev_kfree_skb_any(desc->tx_hndl[i].psk_buff); - desc->ptx_ring[i].status = - cpu_to_le32(EAGLE_TXD_STATUS_IDLE); -@@ -291,9 +291,9 @@ static inline void pcie_tx_skb(struct mw - tx_desc->type = tx_ctrl->type; - tx_desc->xmit_control = tx_ctrl->xmit_control; - tx_desc->sap_pkt_info = 0; -- dma = pci_map_single(pcie_priv->pdev, tx_skb->data, -- tx_skb->len, PCI_DMA_TODEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, tx_skb->data, -+ tx_skb->len, DMA_TO_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - dev_kfree_skb_any(tx_skb); - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); -@@ -447,10 +447,10 @@ static void pcie_non_pfu_tx_done(struct - (tx_desc->status & cpu_to_le32(EAGLE_TXD_STATUS_OK)) && - (!(tx_desc->status & - cpu_to_le32(EAGLE_TXD_STATUS_FW_OWNED)))) { -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu(tx_desc->pkt_ptr), - le16_to_cpu(tx_desc->pkt_len), -- PCI_DMA_TODEVICE); -+ DMA_TO_DEVICE); - done_skb = tx_hndl->psk_buff; - rate = le32_to_cpu(tx_desc->rate_info); - tx_desc->pkt_ptr = 0; -@@ -925,4 +925,4 @@ void pcie_8864_tx_del_sta_amsdu_pkts(str - } - } - spin_unlock_bh(&sta_info->amsdu_lock); --} -\ No newline at end of file -+} ---- a/hif/pcie/8964/rx_ndp.c -+++ b/hif/pcie/8964/rx_ndp.c -@@ -86,11 +86,11 @@ static int pcie_rx_ring_init_ndp(struct - } - skb_reserve(psk_buff, MIN_BYTES_RX_HEADROOM); - -- dma = pci_map_single(pcie_priv->pdev, -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, - psk_buff->data, - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ DMA_FROM_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); - return -ENOMEM; -@@ -120,11 +120,11 @@ static void pcie_rx_ring_cleanup_ndp(str - if (desc->prx_ring) { - for (i = 0; i < MAX_NUM_RX_DESC; i++) { - if (desc->rx_vbuflist[i]) { -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu( - desc->prx_ring[i].data), - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -+ DMA_FROM_DEVICE); - desc->rx_vbuflist[i] = NULL; - } - } -@@ -411,11 +411,11 @@ static inline int pcie_rx_refill_ndp(str - return -ENOMEM; - skb_reserve(psk_buff, MIN_BYTES_RX_HEADROOM); - -- dma = pci_map_single(pcie_priv->pdev, -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, - psk_buff->data, - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ DMA_FROM_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - wiphy_err(priv->hw->wiphy, - "refill: failed to map pci memory!\n"); - return -ENOMEM; -@@ -520,10 +520,10 @@ recheck: - break; - } - -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu(prx_desc->data), - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -+ DMA_FROM_DEVICE); - - bad_mic = false; - ctrl = le32_to_cpu(prx_ring_done->ctrl); ---- a/hif/pcie/8964/tx_ndp.c -+++ b/hif/pcie/8964/tx_ndp.c -@@ -132,10 +132,10 @@ static void pcie_tx_ring_cleanup_ndp(str - for (i = 0; i < MAX_TX_RING_SEND_SIZE; i++) { - tx_skb = desc->tx_vbuflist[i]; - if (tx_skb) { -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - desc->pphys_tx_buflist[i], - tx_skb->len, -- PCI_DMA_TODEVICE); -+ DMA_TO_DEVICE); - dev_kfree_skb_any(tx_skb); - desc->pphys_tx_buflist[i] = 0; - desc->tx_vbuflist[i] = NULL; -@@ -267,9 +267,9 @@ static inline int pcie_tx_skb_ndp(struct - (TXRING_CTRL_TAG_MGMT << TXRING_CTRL_TAG_SHIFT)); - } - -- dma = pci_map_single(pcie_priv->pdev, tx_skb->data, -- tx_skb->len, PCI_DMA_TODEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, tx_skb->data, -+ tx_skb->len, DMA_TO_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - dev_kfree_skb_any(tx_skb); - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); -@@ -451,10 +451,10 @@ void pcie_tx_done_ndp(struct ieee80211_h - "buffer is NULL for tx done ring\n"); - break; - } -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - desc->pphys_tx_buflist[index], - skb->len, -- PCI_DMA_TODEVICE); -+ DMA_TO_DEVICE); - desc->pphys_tx_buflist[index] = 0; - desc->tx_vbuflist[index] = NULL; - ---- a/hif/pcie/8997/rx.c -+++ b/hif/pcie/8997/rx.c -@@ -107,11 +107,11 @@ static int pcie_rx_ring_init(struct mwl_ - desc->prx_ring[i].rssi = 0x00; - desc->prx_ring[i].pkt_len = - cpu_to_le16(SYSADPT_MAX_AGGR_SIZE); -- dma = pci_map_single(pcie_priv->pdev, -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, - rx_hndl->psk_buff->data, - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ DMA_FROM_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); - return -ENOMEM; -@@ -153,11 +153,11 @@ static void pcie_rx_ring_cleanup(struct - if (!rx_hndl->psk_buff) - continue; - -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu - (rx_hndl->pdesc->pphys_buff_data), - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -+ DMA_FROM_DEVICE); - - dev_kfree_skb_any(rx_hndl->psk_buff); - -@@ -332,11 +332,11 @@ static inline int pcie_rx_refill(struct - rx_hndl->pdesc->rssi = 0x00; - rx_hndl->pdesc->pkt_len = cpu_to_le16(desc->rx_buf_size); - -- dma = pci_map_single(pcie_priv->pdev, -+ dma = dma_map_single(&pcie_priv->pdev->dev, - rx_hndl->psk_buff->data, - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ DMA_FROM_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - dev_kfree_skb_any(rx_hndl->psk_buff); - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); -@@ -410,10 +410,10 @@ void pcie_8997_rx_recv(unsigned long dat - prx_skb = curr_hndl->psk_buff; - if (!prx_skb) - goto out; -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu(curr_hndl->pdesc->pphys_buff_data), - desc->rx_buf_size, -- PCI_DMA_FROMDEVICE); -+ DMA_FROM_DEVICE); - pkt_len = le16_to_cpu(curr_hndl->pdesc->pkt_len); - - if (skb_tailroom(prx_skb) < pkt_len) { ---- a/hif/pcie/8997/tx.c -+++ b/hif/pcie/8997/tx.c -@@ -139,10 +139,10 @@ static void pcie_txbd_ring_delete(struct - skb = pcie_priv->tx_buf_list[num]; - tx_desc = (struct pcie_tx_desc *)skb->data; - -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu(tx_desc->pkt_ptr), - skb->len, -- PCI_DMA_TODEVICE); -+ DMA_TO_DEVICE); - dev_kfree_skb_any(skb); - } - pcie_priv->tx_buf_list[num] = NULL; -@@ -222,9 +222,9 @@ static inline void pcie_tx_skb(struct mw - tx_desc->type = tx_ctrl->type; - tx_desc->xmit_control = tx_ctrl->xmit_control; - tx_desc->sap_pkt_info = 0; -- dma = pci_map_single(pcie_priv->pdev, tx_skb->data, -- tx_skb->len, PCI_DMA_TODEVICE); -- if (pci_dma_mapping_error(pcie_priv->pdev, dma)) { -+ dma = dma_map_single(&(pcie_priv->pdev)->dev, tx_skb->data, -+ tx_skb->len, DMA_TO_DEVICE); -+ if (dma_mapping_error(&(pcie_priv->pdev)->dev, dma)) { - dev_kfree_skb_any(tx_skb); - wiphy_err(priv->hw->wiphy, - "failed to map pci memory!\n"); -@@ -401,10 +401,10 @@ static void pcie_pfu_tx_done(struct mwl_ - pfu_dma = (struct pcie_pfu_dma_data *)done_skb->data; - tx_desc = &pfu_dma->tx_desc; - dma_data = &pfu_dma->dma_data; -- pci_unmap_single(pcie_priv->pdev, -+ dma_unmap_single(&(pcie_priv->pdev)->dev, - le32_to_cpu(data_buf->paddr), - le16_to_cpu(data_buf->len), -- PCI_DMA_TODEVICE); -+ DMA_TO_DEVICE); - tx_desc->pkt_ptr = 0; - tx_desc->pkt_len = 0; - tx_desc->status = cpu_to_le32(EAGLE_TXD_STATUS_IDLE); -@@ -875,4 +875,4 @@ void pcie_8997_tx_del_sta_amsdu_pkts(str - } - } - spin_unlock_bh(&sta_info->amsdu_lock); --} -\ No newline at end of file -+} -- 2.30.2