diff mbox series

net: sparx5: fix bitmask on 32-bit targets

Message ID 20210802152201.1158412-1-arnd@kernel.org
State New
Headers show
Series net: sparx5: fix bitmask on 32-bit targets | expand

Commit Message

Arnd Bergmann Aug. 2, 2021, 3:21 p.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>


I saw the build failure that was fixed in commit 6387f65e2acb ("net:
sparx5: fix compiletime_assert for GCC 4.9") and noticed another
issue that was introduced in the same patch: Using GENMASK() to
create a 64-bit mask does not work on 32-bit architectures.

This probably won't ever happen on this driver since it's specific
to a 64-bit SoC, but it's better to write it portably, so use
GENMASK_ULL() instead.

Fixes: f3cad2611a77 ("net: sparx5: add hostmode with phylink support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.29.2

Comments

patchwork-bot+netdevbpf@kernel.org Aug. 3, 2021, 11 a.m. UTC | #1 
Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Mon,  2 Aug 2021 17:21:53 +0200 you wrote:
> From: Arnd Bergmann <arnd@arndb.de>

> 

> I saw the build failure that was fixed in commit 6387f65e2acb ("net:

> sparx5: fix compiletime_assert for GCC 4.9") and noticed another

> issue that was introduced in the same patch: Using GENMASK() to

> create a 64-bit mask does not work on 32-bit architectures.

> 

> [...]


Here is the summary with links:
  - net: sparx5: fix bitmask on 32-bit targets
    https://git.kernel.org/netdev/net/c/f41e57af926a

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
diff mbox series

Patch

diff --git a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
index 1a240e6bddd0..cb68eaaac881 100644
--- a/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
+++ b/drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c
@@ -32,7 +32,7 @@  static void __ifh_encode_bitfield(void *ifh, u64 value, u32 pos, u32 width)
 	u32 byte = (35 - (pos / 8));
 	/* Calculate the Start bit position in the Start IFH byte */
 	u32 bit  = (pos % 8);
-	u64 encode = GENMASK(bit + width - 1, bit) & (value << bit);
+	u64 encode = GENMASK_ULL(bit + width - 1, bit) & (value << bit);
 
 	/* The b0-b7 goes into the start IFH byte */
 	if (encode & 0xFF)