[openwrt/openwrt] mwlwifi: fix compilation with 6.6 and 64-bit
LEDE Commits
lede-commits at lists.infradead.org
Sat Oct 19 09:58:42 PDT 2024
hauke pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/2d6e433e1d2a3884ed6767ba00f5ed97472c8c3d
commit 2d6e433e1d2a3884ed6767ba00f5ed97472c8c3d
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Fri May 10 15:55:25 2024 -0700
mwlwifi: fix compilation with 6.6 and 64-bit
Upstream patch updated to fix kernel 6.6 compilation. It was also split
up into 5. Do the same here.
The patches are taken from this upstreasm PR:
https://github.com/kaloz/mwlwifi/pull/413
Renamed other patches so as to not overlap.
Signed-off-by: Rosen Penev <rosenp at gmail.com>
Link: https://github.com/openwrt/openwrt/pull/15452
Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
package/kernel/mwlwifi/Makefile | 2 +-
...ix-compilation-warning-with-64-bit-system.patch | 165 ---------------------
...dump-memcpy-in-mwl_fwcmd_get_fw_core_dump.patch | 35 +++++
...y-use-PTR_ERR-in-pcie_bf_mimo_ctrl_decode.patch | 32 ++++
.../003-Use-zu-and-zd-for-ssize_t-and-size_t.patch | 36 +++++
...pilation-warning-in-mwl_debugfs_info_read.patch | 28 ++++
.../mwlwifi/patches/005-Use-BUILD_BUG_ON.patch | 32 ++++
...ix-PCIe-DT-node-null-pointer-dereference.patch} | 0
...0211_update.patch => 020-mac80211_update.patch} | 4 +-
9 files changed, 166 insertions(+), 168 deletions(-)
diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
index 94e687ce4a..3f2d5e0949 100644
--- a/package/kernel/mwlwifi/Makefile
+++ b/package/kernel/mwlwifi/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=mwlwifi
-PKG_RELEASE=1
+PKG_RELEASE=2
PKG_LICENSE:=ISC
PKG_LICENSE_FILES:=
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
deleted file mode 100644
index ee64e05047..0000000000
--- a/package/kernel/mwlwifi/patches/001-Fix-compilation-warning-with-64-bit-system.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From ed4422e98ababf956674da3438ac42b3aa32c66e Mon Sep 17 00:00:00 2001
-From: Christian Marangi <ansuelsmth at gmail.com>
-Date: Wed, 10 May 2023 00:41:06 +0200
-Subject: [PATCH] Fix compilation warning with 64 bit system
-
-Use %zu and %zd where possible for ssize_t and size_t.
-Use PTR_ERR to correctly convert to negative error.
-Use universal pointer to support both 32 and 64bit systems.
-
-Fix compilation warning:
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/fwcmd.c: In function 'mwl_fwcmd_get_fw_core_dump':
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/fwcmd.c:3608:31: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
- 3608 | (const void *)((u32)pcmd +
- | ^
-In file included from ./include/linux/device.h:15,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/device.h:3,
- from ./include/linux/dma-mapping.h:7,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/dma-mapping.h:3,
- from ./include/linux/skbuff.h:31,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/skbuff.h:3,
- from ./include/linux/if_ether.h:19,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/if_ether.h:3,
- from ./include/linux/etherdevice.h:20,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/etherdevice.h:3,
- from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:20:
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c: In function 'pcie_tx_init_ndp':
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:338:38: error: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Werror=format=]
- 338 | wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap'
- 110 | _p_func(dev, fmt, ##__VA_ARGS__); \
- | ^~~
-./include/linux/dev_printk.h:144:56: note: in expansion of macro 'dev_fmt'
- 144 | dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
- | ^~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211/net/cfg80211.h:8828:9: note: in expansion of macro 'dev_err'
- 8828 | dev_err(&(wiphy)->dev, format, ##args)
- | ^~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:338:17: note: in expansion of macro 'wiphy_err'
- 338 | wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
- | ^~~~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:338:67: note: format string is defined here
- 338 | wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
- | ~^
- | |
- | int
- | %ld
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:338:38: error: format '%d' expects argument of type 'int', but argument 4 has type 'long unsigned int' [-Werror=format=]
- 338 | wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
- | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-./include/linux/dev_printk.h:110:30: note: in definition of macro 'dev_printk_index_wrap'
- 110 | _p_func(dev, fmt, ##__VA_ARGS__); \
- | ^~~
-./include/linux/dev_printk.h:144:56: note: in expansion of macro 'dev_fmt'
- 144 | dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
- | ^~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211/net/cfg80211.h:8828:9: note: in expansion of macro 'dev_err'
- 8828 | dev_err(&(wiphy)->dev, format, ##args)
- | ^~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:338:17: note: in expansion of macro 'wiphy_err'
- 338 | wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
- | ^~~~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.c:338:71: note: format string is defined here
- 338 | wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
- | ~^
- | |
- | int
- | %ld
- CC [M] /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/debugfs.o
-In file included from ./include/linux/device.h:15,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/device.h:3,
- from ./include/linux/dma-mapping.h:7,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/dma-mapping.h:3,
- from ./include/linux/skbuff.h:31,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/skbuff.h:3,
- from ./include/linux/if_ether.h:19,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/if_ether.h:3,
- from ./include/linux/etherdevice.h:20,
- from /home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211-backport/linux/etherdevice.h:3,
- from /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/pcie.c:19:
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/pcie.c: In function 'pcie_bf_mimo_ctrl_decode':
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/pcie.c:1325:37: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
- 1325 | filename, (unsigned int)fp_data);
- | ^
-./include/linux/dev_printk.h:110:37: note: in definition of macro 'dev_printk_index_wrap'
- 110 | _p_func(dev, fmt, ##__VA_ARGS__); \
- | ^~~~~~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/staging_dir/target-aarch64_cortex-a53_musl/usr/include/mac80211/net/cfg80211.h:8828:9: note: in expansion of macro 'dev_err'
- 8828 | dev_err(&(wiphy)->dev, format, ##args)
- | ^~~~~~~
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/pcie.c:1324:17: note: in expansion of macro 'wiphy_err'
- 1324 | wiphy_err(priv->hw->wiphy, "Error opening %s! %x\n",
- | ^~~~~~~~~
-cc1: all warnings being treated as errors
-make[4]: *** [scripts/Makefile.build:289: /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/tx_ndp.o] Error 1
-make[4]: *** Waiting for unfinished jobs....
-cc1: all warnings being treated as errors
-make[4]: *** [scripts/Makefile.build:289: /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/pcie.o] Error 1
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/debugfs.c: In function 'mwl_debugfs_regrdwr_read':
-/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/debugfs.c:1335:43: error: format '%d' expects argument of type 'int', but argument 4 has type 'ssize_t' {aka 'long int'} [-Werror=format=]
- 1335 | "error: %d(%u 0x%08x 0x%08x)\n",
- | ~^
- | |
- | int
- | %ld
- 1336 | ret, priv->reg_type, priv->reg_offset,
- | ~~~
- | |
- | ssize_t {aka long int}
-cc1: all warnings being treated as errors
-
-Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
----
- 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
-+++ b/debugfs.c
-@@ -1342,7 +1342,7 @@ done:
- priv->reg_value);
- else
- len += scnprintf(p + len, size - len,
-- "error: %d(%u 0x%08x 0x%08x)\n",
-+ "error: %zd(%u 0x%08x 0x%08x)\n",
- ret, priv->reg_type, priv->reg_offset,
- priv->reg_value);
-
---- a/hif/fwcmd.c
-+++ b/hif/fwcmd.c
-@@ -3623,7 +3623,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
- core_dump->size_kb = pcmd->cmd_data.coredump.size_kb;
- core_dump->flags = pcmd->cmd_data.coredump.flags;
- memcpy(buff,
-- (const void *)((u32)pcmd +
-+ (const void *)((uintptr_t)pcmd +
- sizeof(struct hostcmd_cmd_get_fw_core_dump) -
- sizeof(struct hostcmd_cmd_get_fw_core_dump_)),
- MAX_CORE_DUMP_BUFFER);
---- a/hif/pcie/8964/tx_ndp.c
-+++ b/hif/pcie/8964/tx_ndp.c
-@@ -336,7 +336,7 @@ int pcie_tx_init_ndp(struct ieee80211_hw
-
- if (sizeof(struct pcie_tx_ctrl_ndp) >
- sizeof(tx_info->driver_data)) {
-- wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
-+ wiphy_err(hw->wiphy, "driver data is not enough: %zu (%zu)\n",
- sizeof(struct pcie_tx_ctrl_ndp),
- sizeof(tx_info->driver_data));
- return -ENOMEM;
---- a/hif/pcie/pcie.c
-+++ b/hif/pcie/pcie.c
-@@ -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 {
-- wiphy_err(priv->hw->wiphy, "Error opening %s! %x\n",
-- filename, (unsigned int)fp_data);
-+ wiphy_err(priv->hw->wiphy, "Error opening %s! %ld\n",
-+ filename, PTR_ERR(fp_data));
- }
-
- #if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
diff --git a/package/kernel/mwlwifi/patches/001-Simplify-coredump-memcpy-in-mwl_fwcmd_get_fw_core_dump.patch b/package/kernel/mwlwifi/patches/001-Simplify-coredump-memcpy-in-mwl_fwcmd_get_fw_core_dump.patch
new file mode 100644
index 0000000000..4b0feeb17e
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/001-Simplify-coredump-memcpy-in-mwl_fwcmd_get_fw_core_dump.patch
@@ -0,0 +1,35 @@
+From 8daab38dfc1fe4d3df9fb5fc18610b942d5cc3b2 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth at gmail.com>
+Date: Sun, 12 May 2024 14:28:19 +0200
+Subject: [PATCH] Simplify coredump memcpy in mwl_fwcmd_get_fw_core_dump
+
+Simplify coredump memcpy in mwl_fwcmd_get_fw_core_dump. Instead of doing
+fragile address additions, just access the buffer member in pcmd and
+reference the pointer.
+
+This fix a compilation warning in 64Bit system:
+
+/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/fwcmd.c: In function 'mwl_fwcmd_get_fw_core_dump': /home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/fwcmd.c:3608:31: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+3608 | (const void *)((u32)pcmd +
+| ^
+
+Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
+---
+ hif/fwcmd.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+--- a/hif/fwcmd.c
++++ b/hif/fwcmd.c
+@@ -3622,11 +3622,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ie
+ core_dump->context = pcmd->cmd_data.coredump.context;
+ core_dump->size_kb = pcmd->cmd_data.coredump.size_kb;
+ core_dump->flags = pcmd->cmd_data.coredump.flags;
+- memcpy(buff,
+- (const void *)((u32)pcmd +
+- sizeof(struct hostcmd_cmd_get_fw_core_dump) -
+- sizeof(struct hostcmd_cmd_get_fw_core_dump_)),
+- MAX_CORE_DUMP_BUFFER);
++ memcpy(buff, pcmd->buffer, MAX_CORE_DUMP_BUFFER);
+
+ mutex_unlock(&priv->fwcmd_mutex);
+
diff --git a/package/kernel/mwlwifi/patches/002-Correctly-use-PTR_ERR-in-pcie_bf_mimo_ctrl_decode.patch b/package/kernel/mwlwifi/patches/002-Correctly-use-PTR_ERR-in-pcie_bf_mimo_ctrl_decode.patch
new file mode 100644
index 0000000000..f204e9fe73
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/002-Correctly-use-PTR_ERR-in-pcie_bf_mimo_ctrl_decode.patch
@@ -0,0 +1,32 @@
+From 37c7a798719f1d04326d36c35711c4249bc7492e Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth at gmail.com>
+Date: Sun, 12 May 2024 14:32:20 +0200
+Subject: [PATCH] Correctly use PTR_ERR in pcie_bf_mimo_ctrl_decode
+
+Correctly use PTR_ERR instead of cast to unsigned int in
+pcie_bf_mimo_ctrl_decode if fp_data pointer contains errors.
+
+This fix a compilation warning on 64Bit:
+
+/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-aarch64_cortex-a53_musl/linux-ipq807x_generic/mwlwifi-2023-04-29-6a436714/hif/pcie/pcie.c:1325:37: error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
+1325 | filename, (unsigned int)fp_data);
+| ^
+
+Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
+---
+ hif/pcie/pcie.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/hif/pcie/pcie.c
++++ b/hif/pcie/pcie.c
+@@ -1466,8 +1466,8 @@ static void pcie_bf_mimo_ctrl_decode(str
+ &fp_data->f_pos);
+ filp_close(fp_data, current->files);
+ } else {
+- wiphy_err(priv->hw->wiphy, "Error opening %s! %x\n",
+- filename, (unsigned int)fp_data);
++ wiphy_err(priv->hw->wiphy, "Error opening %s! %ld\n",
++ filename, PTR_ERR(fp_data));
+ }
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,10,0)
diff --git a/package/kernel/mwlwifi/patches/003-Use-zu-and-zd-for-ssize_t-and-size_t.patch b/package/kernel/mwlwifi/patches/003-Use-zu-and-zd-for-ssize_t-and-size_t.patch
new file mode 100644
index 0000000000..d615e13380
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/003-Use-zu-and-zd-for-ssize_t-and-size_t.patch
@@ -0,0 +1,36 @@
+From 5fe83bd36c035099a6d721a8e42cf3d04a1ce2b6 Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth at gmail.com>
+Date: Sun, 12 May 2024 14:36:32 +0200
+Subject: [PATCH] Use %zu and %zd for ssize_t and size_t
+
+Use %zu and %zu for ssize_t and size_t to fix compilation warning on
+64Bit.
+
+Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
+---
+ debugfs.c | 2 +-
+ hif/pcie/8964/tx_ndp.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debugfs.c
++++ b/debugfs.c
+@@ -1342,7 +1342,7 @@ done:
+ priv->reg_value);
+ else
+ len += scnprintf(p + len, size - len,
+- "error: %d(%u 0x%08x 0x%08x)\n",
++ "error: %zd(%u 0x%08x 0x%08x)\n",
+ ret, priv->reg_type, priv->reg_offset,
+ priv->reg_value);
+
+--- a/hif/pcie/8964/tx_ndp.c
++++ b/hif/pcie/8964/tx_ndp.c
+@@ -336,7 +336,7 @@ int pcie_tx_init_ndp(struct ieee80211_hw
+
+ if (sizeof(struct pcie_tx_ctrl_ndp) >
+ sizeof(tx_info->driver_data)) {
+- wiphy_err(hw->wiphy, "driver data is not enough: %d (%d)\n",
++ wiphy_err(hw->wiphy, "driver data is not enough: %zu (%zu)\n",
+ sizeof(struct pcie_tx_ctrl_ndp),
+ sizeof(tx_info->driver_data));
+ return -ENOMEM;
diff --git a/package/kernel/mwlwifi/patches/004-Fix-debugfs-compilation-warning-in-mwl_debugfs_info_read.patch b/package/kernel/mwlwifi/patches/004-Fix-debugfs-compilation-warning-in-mwl_debugfs_info_read.patch
new file mode 100644
index 0000000000..0c1eae7e6b
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/004-Fix-debugfs-compilation-warning-in-mwl_debugfs_info_read.patch
@@ -0,0 +1,28 @@
+From 44419b1feae3eedda21cdc71da9acb611ca1a6fd Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth at gmail.com>
+Date: Sun, 12 May 2024 14:42:01 +0200
+Subject: [PATCH] Fix debugfs compilation warning in mwl_debugfs_info_read
+
+Fix debugfs compilation warning on 64Bit mwl_debugfs_info_read by
+casing for uintptr_t and use %zx.
+
+Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
+---
+ debugfs.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debugfs.c
++++ b/debugfs.c
+@@ -364,10 +364,10 @@ static ssize_t mwl_debugfs_info_read(str
+ "-----------------------=> address| address|qlen|fw_desc_cnt\n");
+ spin_lock_irqsave(&pcie_priv->tx_desc_lock, flags);
+ len += scnprintf(p + len, size - len,
+- "wcb_base0 : %x => %8x|%8p|%4d|%d\n", get_hw_spec->wcb_base0, *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base0)),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base0)),skb_queue_len(&pcie_priv->txq[0]),pcie_priv->fw_desc_cnt[0]);
++ "wcb_base0 : %x => %8px|%8p|%4d|%d\n", get_hw_spec->wcb_base0, (void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base0),(void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base0),skb_queue_len(&pcie_priv->txq[0]),pcie_priv->fw_desc_cnt[0]);
+ for(i = 0; i < SYSADPT_TOTAL_TX_QUEUES - 1; i++)
+ len += scnprintf(p + len, size - len,
+- "wcb_base[%2d]: %x => %8x|%8p|%4d|%d\n", i, get_hw_spec->wcb_base[i], *((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),skb_queue_len(&pcie_priv->txq[i + 1]),pcie_priv->fw_desc_cnt[i + 1]);
++ "wcb_base[%2d]: %x => %8px|%8p|%4d|%d\n", i, get_hw_spec->wcb_base[i], (void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base[i]),(void *)(uintptr_t)le32_to_cpu(get_hw_spec->wcb_base[i]),skb_queue_len(&pcie_priv->txq[i + 1]),pcie_priv->fw_desc_cnt[i + 1]);
+ spin_unlock_irqrestore(&pcie_priv->tx_desc_lock, flags);
+ }
+
diff --git a/package/kernel/mwlwifi/patches/005-Use-BUILD_BUG_ON.patch b/package/kernel/mwlwifi/patches/005-Use-BUILD_BUG_ON.patch
new file mode 100644
index 0000000000..d8c527b99b
--- /dev/null
+++ b/package/kernel/mwlwifi/patches/005-Use-BUILD_BUG_ON.patch
@@ -0,0 +1,32 @@
+From dba74289f74095944b39fc96b069c512b5321b7a Mon Sep 17 00:00:00 2001
+From: Christian Marangi <ansuelsmth at gmail.com>
+Date: Sun, 12 May 2024 14:53:45 +0200
+Subject: [PATCH] Use BUILD_BUG_ON instead of checking size at runtime for
+ pcie_tx_init_ndp
+
+Use BUILD_BUG_ON instead of checking size at runtime for
+pcie_tx_init_ndp.
+
+Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
+---
+ hif/pcie/8964/tx_ndp.c | 9 ++-------
+ 1 file changed, 2 insertions(+), 7 deletions(-)
+
+--- a/hif/pcie/8964/tx_ndp.c
++++ b/hif/pcie/8964/tx_ndp.c
+@@ -334,13 +334,8 @@ int pcie_tx_init_ndp(struct ieee80211_hw
+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(&skb);
+ int rc;
+
+- if (sizeof(struct pcie_tx_ctrl_ndp) >
+- sizeof(tx_info->driver_data)) {
+- wiphy_err(hw->wiphy, "driver data is not enough: %zu (%zu)\n",
+- sizeof(struct pcie_tx_ctrl_ndp),
+- sizeof(tx_info->driver_data));
+- return -ENOMEM;
+- }
++ BUILD_BUG_ON(sizeof(struct pcie_tx_ctrl_ndp) >
++ sizeof(tx_info->driver_data));
+
+ rc = pcie_tx_ring_alloc_ndp(priv);
+ if (rc) {
diff --git a/package/kernel/mwlwifi/patches/004-mwlwifi-fix-PCIe-DT-node-null-pointer-dereference.patch b/package/kernel/mwlwifi/patches/010-mwlwifi-fix-PCIe-DT-node-null-pointer-dereference.patch
similarity index 100%
rename from package/kernel/mwlwifi/patches/004-mwlwifi-fix-PCIe-DT-node-null-pointer-dereference.patch
rename to package/kernel/mwlwifi/patches/010-mwlwifi-fix-PCIe-DT-node-null-pointer-dereference.patch
diff --git a/package/kernel/mwlwifi/patches/005-mac80211_update.patch b/package/kernel/mwlwifi/patches/020-mac80211_update.patch
similarity index 99%
rename from package/kernel/mwlwifi/patches/005-mac80211_update.patch
rename to package/kernel/mwlwifi/patches/020-mac80211_update.patch
index 2ceee4732d..1c5d581939 100644
--- a/package/kernel/mwlwifi/patches/005-mac80211_update.patch
+++ b/package/kernel/mwlwifi/patches/020-mac80211_update.patch
@@ -304,7 +304,7 @@
}
if (++tx_send_head_new >= MAX_NUM_TX_DESC)
-@@ -488,7 +488,7 @@ void pcie_tx_done_ndp(struct ieee80211_h
+@@ -483,7 +483,7 @@ void pcie_tx_done_ndp(struct ieee80211_h
}
pcie_tx_prepare_info(priv, 0, tx_info);
@@ -313,7 +313,7 @@
bypass_ack:
if (++tx_done_tail >= MAX_TX_RING_DONE_SIZE)
-@@ -601,13 +601,13 @@ void pcie_tx_xmit_ndp(struct ieee80211_h
+@@ -596,13 +596,13 @@ void pcie_tx_xmit_ndp(struct ieee80211_h
ack_skb = skb_copy(skb, GFP_ATOMIC);
ack_info = IEEE80211_SKB_CB(ack_skb);
pcie_tx_prepare_info(priv, 0, ack_info);
More information about the lede-commits
mailing list