diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-08-02 17:21:53 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-08-03 11:52:37 +0100 |
| commit | f41e57af926ad840d114439d34cafc0533bf25f0 (patch) | |
| tree | 93d5caedf306613c1212fcbaef4915b72cfe1654 /drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c | |
| parent | sctp: move the active_key update after sh_keys is added (diff) | |
| download | linux-dev-f41e57af926ad840d114439d34cafc0533bf25f0.tar.xz linux-dev-f41e57af926ad840d114439d34cafc0533bf25f0.zip | |
net: sparx5: fix bitmask on 32-bit targets
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c')
| -rw-r--r-- | drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |