net: sparx5: fix compiletime_assert for GCC 4.9
Subsystems (3)
Jakub Kicinski
maintainerPATCH 1/1 net: sparx5: fix compiletime_assert for GCC 4.9
Stephen reports sparx5 broke GCC 4.9 build.
Move the compiletime_assert() out of the static function. Compile-tested only, no object code changes.
Reported-by Stephen Rothwell <[email protected]>
Fixes f3cad2611a77 ("net: sparx5: add hostmode with phylink support")
Signed-off-by Jakub Kicinski <[email protected]>
--- .../ethernet/microchip/sparx5/sparx5_netdev.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/ethernet/microchip/sparx5/sparx5_netdev.c +13 -6
@@ -13,7 +13,19 @@*/ #define VSTAX 73 -static void ifh_encode_bitfield (void *ifh,u64 value,u32 pos,u32 width) +#define ifh_encode_bitfield (ifh, value, pos, _width) \ + ({ \ + u32 width = (_width); \ + \ +/* Max width is 5 bytes - 40 bits. In worst case this will +* spread over 6 bytes - 48 bits +*/ \ +compiletime_assert (width <=40 , \ +"Unsupported width, must be <= 40" ); \ +__ifh_encode_bitfield ((ifh), (value), (pos), width); \ + }) + +static void __ifh_encode_bitfield (void *ifh,u64 value,u32 pos,u32 width) {u8 *ifh_hdr = ifh;/* Calculate the Start IFH byte position of this IFH bit position */
@@ -22,11 +34,6 @@ static void ifh_encode_bitfield(void *ifh, u64 value, u32 pos, u32 width)u32 bit = (pos %8 );u64 encode =GENMASK (bit + width -1 , bit) & (value << bit); -/* Max width is 5 bytes - 40 bits. In worst case this will -* spread over 6 bytes - 48 bits -*/ -compiletime_assert (width <=40 ,"Unsupported width, must be <= 40" ); -/* The b0-b7 goes into the start IFH byte */ if (encode &0xFF ) ifh_hdr[byte] |= (u8)((encode &0xFF ));
Signature · 1 line
2.31.1
This patch was applied to netdev/net.git (refs/heads/master):
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
Quoted 9 lines · On Sat, 31 Jul 2021 07:39:17 -0700 you wrote:
Stephen reports sparx5 broke GCC 4.9 build.
Move thecompiletime_assert()out of the static function. Compile-tested only, no object code changes.Reported-by Stephen Rothwell <[email protected]>Fixes f3cad2611a77 ("net: sparx5: add hostmode with phylink support")Signed-off-by Jakub Kicinski <[email protected]>[...]
Here is the summary with links:
- [net] net: sparx5: fix compiletime_assert for GCC 4.9
https://git.kernel.org/netdev/net/c/6387f65e2acb
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html