Commit f41e57af authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

net: sparx5: fix bitmask on 32-bit targets 



I saw the build failure that was fixed in commit 6387f65e ("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: f3cad261 ("net: sparx5: add hostmode with phylink support")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ae954bbc

drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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)