Fix compilation warning with 64 bit system #413
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LGA1150
suggested changes
May 11, 2023
hif/fwcmd.c
Outdated
| @@ -3604,7 +3604,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ieee80211_hw *hw, | |||
| 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 + | |||
There was a problem hiding this comment.
pcmd is already a pointer. The cast to u32 in the original code effectively truncates the higher 32-bit..
You can remove the cast.
There was a problem hiding this comment.
@LGA1150 i may be totally wrong but without casting think we would add at offset of struct hostcmd_cmd_get_fw_core_dump and not single address of 32 or 64 bit.
There was a problem hiding this comment.
My bad, I didn't notice the sizeof addition. But the offset calculation looks ugly anyway.
struct hostcmd_cmd_get_fw_core_dump {
struct hostcmd_header cmd_hdr;
union {
struct coredump_cmd coredump;
struct debug_mem_cmd debug_mem;
} cmd_data;
/*Buffer where F/W Copies the Core Dump*/
char buffer[MAX_CORE_DUMP_BUFFER];
} __packed;
struct hostcmd_cmd_get_fw_core_dump_ {
struct hostcmd_header cmd_hdr;
union {
struct coredump_cmd coredump;
struct debug_mem_cmd debug_mem;
} cmd_data;
} __packed;So, sizeof(struct hostcmd_cmd_get_fw_core_dump) - sizeof(struct hostcmd_cmd_get_fw_core_dump_) is the offset of buffer in struct hostcmd_cmd_get_fw_core_dump. One can use offsetof to get the offset. And in this case, pcmd is already struct hostcmd_cmd_get_fw_core_dump*, so pcmd->buffer is enough.
There was a problem hiding this comment.
yep was aware of the offsetof macro but I didn't want to modify this too much. Will check if we can directly use buffer
Ansuel
force-pushed
the
fix-64bit
branch
2 times, most recently
from
afffd2b to
ed4422e
Compare
|
This branch has conflicts that must be resolved |
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 <[email protected]>
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 <[email protected]>
Use %zu and %zu for ssize_t and size_t to fix compilation warning on 64Bit. Signed-off-by: Christian Marangi <[email protected]>
Fix debugfs compilation warning on 64Bit mwl_debugfs_info_read by casing for uintptr_t and use %zx. Signed-off-by: Christian Marangi <[email protected]>
…_ndp Use BUILD_BUG_ON instead of checking size at runtime for pcie_tx_init_ndp. Signed-off-by: Christian Marangi <[email protected]>
neheb
approved these changes
May 12, 2024
neheb
reviewed
May 12, 2024
| sizeof(tx_info->driver_data)); | ||
| return -ENOMEM; | ||
| } | ||
| BUILD_BUG_ON(sizeof(struct pcie_tx_ctrl_ndp) > |
There was a problem hiding this comment.
Would it make sense to use BUILD_BUG_ON_MSG instead?
There was a problem hiding this comment.
Yes, thank you for maintaining this message, it's an initialization function, it doesn't cost anything in terms of performance.
neheb
reviewed
May 15, 2024
| @@ -364,10 +364,10 @@ static ssize_t mwl_debugfs_info_read(struct file *file, char __user *ubuf, | |||
| "-----------------------=> 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]); | |||
neheb
reviewed
May 15, 2024
| 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]); |
There was a problem hiding this comment.
You can delete this part :
*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),(void *)*((unsigned int *)le32_to_cpu(get_hw_spec->wcb_base[i])),
wcb_base must be an internal memory on the 88X8xxx chip, searching RAM is useless.
jbsky
suggested changes
May 18, 2024
| @@ -3622,11 +3622,7 @@ int mwl_fwcmd_get_fw_core_dump(struct ieee80211_hw *hw, | |||
| core_dump->context = pcmd->cmd_data.coredump.context; | |||
There was a problem hiding this comment.
You'd have to test this function, I'm not sure:
pcmd->cmd_data.coredump.buffer = cpu_to_le32(priv->pphys_cmd_buf +
sizeof(struct hostcmd_cmd_get_fw_core_dump) -
sizeof(struct hostcmd_cmd_get_fw_core_dump_));
in
2 struct have exactly the same size.
struct coredump_cmd {
__le32 context;
__le32 buffer;
__le32 buffer_len;
__le16 size_kb;
__le16 flags;
} __packed;
struct debug_mem_cmd {
__le32 set;
__le32 type;
__le32 addr;
__le32 val;
} __packed;
but
char buffer[MAX_CORE_DUMP_BUFFER];
Roughly speaking, for a union, if I calculate, it would be worth :
cpu_to_le32(priv->pphys_cmd_buf
+ sizeof(char buffer[MAX_CORE_DUMP_BUFFER]))
sounds strange
Thank you in advance,
hauke
pushed a commit
to neheb/openwrt
that referenced
this pull request
Oct 19, 2024
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: kaloz/mwlwifi#413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#15452 Signed-off-by: Hauke Mehrtens <[email protected]>
liudf0716
pushed a commit
to liudf0716/openwrt
that referenced
this pull request
Oct 22, 2024
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: kaloz/mwlwifi#413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#15452 Signed-off-by: Hauke Mehrtens <[email protected]>
vincejv
pushed a commit
to vincejv/openwrt
that referenced
this pull request
Oct 27, 2024
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: kaloz/mwlwifi#413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#15452 Signed-off-by: Hauke Mehrtens <[email protected]>
vincejv
pushed a commit
to vincejv/openwrt
that referenced
this pull request
Oct 27, 2024
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: kaloz/mwlwifi#413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#15452 Signed-off-by: Hauke Mehrtens <[email protected]>
kimocoder
pushed a commit
to thisiskimocoder/openwrt
that referenced
this pull request
Oct 28, 2024
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: kaloz/mwlwifi#413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#15452 Signed-off-by: Hauke Mehrtens <[email protected]>
Vladdrako
pushed a commit
to Vladdrako/openwrt
that referenced
this pull request
Dec 11, 2024
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: kaloz/mwlwifi#413 Renamed other patches so as to not overlap. Signed-off-by: Rosen Penev <[email protected]> Link: openwrt#15452 Signed-off-by: Hauke Mehrtens <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
@kaloz simple pr. We are enforcing WERROR on OpenWRT and these came up with building on mvebu cortexa72