* [PATCH] rtw88: Made RA_MASK macros ULL
@ 2019-05-02 15:00 Nathan Chancellor
2019-05-02 15:02 ` [PATCH v2] rtw88: Make " Nathan Chancellor
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2019-05-02 15:00 UTC (permalink / raw)
To: Yan-Hsuan Chuang, Kalle Valo
Cc: linux-wireless, netdev, linux-kernel, clang-built-linux,
Nick Desaulniers, Nathan Chancellor
Clang warns about the definitions of these macros (full warnings trimmed
for brevity):
drivers/net/wireless/realtek/rtw88/main.c:524:15: warning: signed shift
result (0x3FF00000000) requires 43 bits to represent, but 'int' only has
32 bits [-Wshift-overflow]
ra_mask &= RA_MASK_VHT_RATES | RA_MASK_OFDM_IN_VHT;
^~~~~~~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/main.c:527:15: warning: signed shift
result (0xFF0000000) requires 37 bits to represent, but 'int' only has
32 bits [-Wshift-overflow]
ra_mask &= RA_MASK_HT_RATES | RA_MASK_OFDM_IN_HT_5G;
^~~~~~~~~~~~~~~~
Given that these are all used with ra_mask, which is of type u64, we can
just declare the macros to be ULL as well.
Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver")
Link: https://github.com/ClangBuiltLinux/linux/issues/467
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
drivers/net/wireless/realtek/rtw88/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 9893e5e297e3..a14a5f1b4b6d 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -462,15 +462,15 @@ static u8 get_rate_id(u8 wireless_set, enum rtw_bandwidth bw_mode, u8 tx_num)
#define RA_MASK_CCK_RATES 0x0000f
#define RA_MASK_OFDM_RATES 0x00ff0
-#define RA_MASK_HT_RATES_1SS (0xff000 << 0)
-#define RA_MASK_HT_RATES_2SS (0xff000 << 8)
-#define RA_MASK_HT_RATES_3SS (0xff000 << 16)
+#define RA_MASK_HT_RATES_1SS (0xff000ULL << 0)
+#define RA_MASK_HT_RATES_2SS (0xff000ULL << 8)
+#define RA_MASK_HT_RATES_3SS (0xff000ULL << 16)
#define RA_MASK_HT_RATES (RA_MASK_HT_RATES_1SS | \
RA_MASK_HT_RATES_2SS | \
RA_MASK_HT_RATES_3SS)
-#define RA_MASK_VHT_RATES_1SS (0x3ff000 << 0)
-#define RA_MASK_VHT_RATES_2SS (0x3ff000 << 10)
-#define RA_MASK_VHT_RATES_3SS (0x3ff000 << 20)
+#define RA_MASK_VHT_RATES_1SS (0x3ff000ULL << 0)
+#define RA_MASK_VHT_RATES_2SS (0x3ff000ULL << 10)
+#define RA_MASK_VHT_RATES_3SS (0x3ff000ULL << 20)
#define RA_MASK_VHT_RATES (RA_MASK_VHT_RATES_1SS | \
RA_MASK_VHT_RATES_2SS | \
RA_MASK_VHT_RATES_3SS)
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] rtw88: Make RA_MASK macros ULL
2019-05-02 15:00 [PATCH] rtw88: Made RA_MASK macros ULL Nathan Chancellor
@ 2019-05-02 15:02 ` Nathan Chancellor
2019-05-02 16:26 ` Kalle Valo
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2019-05-02 15:02 UTC (permalink / raw)
To: Yan-Hsuan Chuang, Kalle Valo
Cc: linux-wireless, netdev, linux-kernel, clang-built-linux,
Nick Desaulniers, Nathan Chancellor
Clang warns about the definitions of these macros (full warnings trimmed
for brevity):
drivers/net/wireless/realtek/rtw88/main.c:524:15: warning: signed shift
result (0x3FF00000000) requires 43 bits to represent, but 'int' only has
32 bits [-Wshift-overflow]
ra_mask &= RA_MASK_VHT_RATES | RA_MASK_OFDM_IN_VHT;
^~~~~~~~~~~~~~~~~
drivers/net/wireless/realtek/rtw88/main.c:527:15: warning: signed shift
result (0xFF0000000) requires 37 bits to represent, but 'int' only has
32 bits [-Wshift-overflow]
ra_mask &= RA_MASK_HT_RATES | RA_MASK_OFDM_IN_HT_5G;
^~~~~~~~~~~~~~~~
Given that these are all used with ra_mask, which is of type u64, we can
just declare the macros to be ULL as well.
Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver")
Link: https://github.com/ClangBuiltLinux/linux/issues/467
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
v1 -> v2:
* Fix commit message wording (made -> make)...
drivers/net/wireless/realtek/rtw88/main.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index 9893e5e297e3..a14a5f1b4b6d 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -462,15 +462,15 @@ static u8 get_rate_id(u8 wireless_set, enum rtw_bandwidth bw_mode, u8 tx_num)
#define RA_MASK_CCK_RATES 0x0000f
#define RA_MASK_OFDM_RATES 0x00ff0
-#define RA_MASK_HT_RATES_1SS (0xff000 << 0)
-#define RA_MASK_HT_RATES_2SS (0xff000 << 8)
-#define RA_MASK_HT_RATES_3SS (0xff000 << 16)
+#define RA_MASK_HT_RATES_1SS (0xff000ULL << 0)
+#define RA_MASK_HT_RATES_2SS (0xff000ULL << 8)
+#define RA_MASK_HT_RATES_3SS (0xff000ULL << 16)
#define RA_MASK_HT_RATES (RA_MASK_HT_RATES_1SS | \
RA_MASK_HT_RATES_2SS | \
RA_MASK_HT_RATES_3SS)
-#define RA_MASK_VHT_RATES_1SS (0x3ff000 << 0)
-#define RA_MASK_VHT_RATES_2SS (0x3ff000 << 10)
-#define RA_MASK_VHT_RATES_3SS (0x3ff000 << 20)
+#define RA_MASK_VHT_RATES_1SS (0x3ff000ULL << 0)
+#define RA_MASK_VHT_RATES_2SS (0x3ff000ULL << 10)
+#define RA_MASK_VHT_RATES_3SS (0x3ff000ULL << 20)
#define RA_MASK_VHT_RATES (RA_MASK_VHT_RATES_1SS | \
RA_MASK_VHT_RATES_2SS | \
RA_MASK_VHT_RATES_3SS)
--
2.21.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] rtw88: Make RA_MASK macros ULL
2019-05-02 15:02 ` [PATCH v2] rtw88: Make " Nathan Chancellor
@ 2019-05-02 16:26 ` Kalle Valo
0 siblings, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2019-05-02 16:26 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Yan-Hsuan Chuang, linux-wireless, netdev, linux-kernel,
clang-built-linux, Nick Desaulniers, Nathan Chancellor
Nathan Chancellor <natechancellor@gmail.com> wrote:
> Clang warns about the definitions of these macros (full warnings trimmed
> for brevity):
>
> drivers/net/wireless/realtek/rtw88/main.c:524:15: warning: signed shift
> result (0x3FF00000000) requires 43 bits to represent, but 'int' only has
> 32 bits [-Wshift-overflow]
> ra_mask &= RA_MASK_VHT_RATES | RA_MASK_OFDM_IN_VHT;
> ^~~~~~~~~~~~~~~~~
> drivers/net/wireless/realtek/rtw88/main.c:527:15: warning: signed shift
> result (0xFF0000000) requires 37 bits to represent, but 'int' only has
> 32 bits [-Wshift-overflow]
> ra_mask &= RA_MASK_HT_RATES | RA_MASK_OFDM_IN_HT_5G;
> ^~~~~~~~~~~~~~~~
>
> Given that these are all used with ra_mask, which is of type u64, we can
> just declare the macros to be ULL as well.
>
> Fixes: e3037485c68e ("rtw88: new Realtek 802.11ac driver")
> Link: https://github.com/ClangBuiltLinux/linux/issues/467
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Patch applied to wireless-drivers-next.git, thanks.
237b47efcdbc rtw88: Make RA_MASK macros ULL
--
https://patchwork.kernel.org/patch/10927105/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-02 16:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-02 15:00 [PATCH] rtw88: Made RA_MASK macros ULL Nathan Chancellor
2019-05-02 15:02 ` [PATCH v2] rtw88: Make " Nathan Chancellor
2019-05-02 16:26 ` Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).