Commit 75428f53 authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jakub Kicinski
Browse files

net: intel: fix old compiler regressions 



The kernel build regressions/improvements email contained a couple of
issues with old compilers (in fact all the reports were on different
architectures, but all gcc 5.5) and the FIELD_PREP() and FIELD_GET()
conversions. They're all because an integer #define that should have
been declared as unsigned, was shifted to the point that it could set
the sign bit.

The fix just involves making sure the defines use the "U" identifier on
the constants to make sure they're unsigned. Should make the checkers
happier.

Confirmed with objdump before/after that there is no change to the
binaries.

Issues were reported as follows:
./drivers/net/ethernet/intel/ice/ice_base.c:238:7: note: in expansion of macro 'FIELD_GET'
      (FIELD_GET(GLINT_CTL_ITR_GRAN_25_M, regval) == ICE_ITR_GRAN_US))
       ^
./include/linux/compiler_types.h:435:38: error: call to '__compiletime_assert_1093' declared with attribute error: FIELD_GET: mask is not constant
drivers/net/ethernet/intel/ice/ice_nvm.c:709:16: note: in expansion of macro ‘FIELD_GET’
  orom->major = FIELD_GET(ICE_OROM_VER_MASK, combo_ver);
                ^
./include/linux/compiler_types.h:435:38: error: call to ‘__compiletime_assert_796’ declared with attribute error: FIELD_GET: mask is not constant
drivers/net/ethernet/intel/ice/ice_common.c:945:18: note: in expansion of macro ‘FIELD_GET’
  u8 max_agg_bw = FIELD_GET(GL_PWR_MODE_CTL_CAR_MAX_BW_M,
                  ^
./include/linux/compiler_types.h:435:38: error: call to ‘__compiletime_assert_420’ declared with attribute error: FIELD_GET: mask is not constant
drivers/net/ethernet/intel/i40e/i40e_dcb.c:458:8: note: in expansion of macro ‘FIELD_GET’
  oui = FIELD_GET(I40E_LLDP_TLV_OUI_MASK, ouisubtype);
        ^

Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Closes: https://lore.kernel.org/lkml/d03e90ca-8485-4d1b-5ec1-c3398e0e8da@linux-m68k.org/

 #i40e #ice
Fixes: 62589808 ("i40e: field get conversion")
Fixes: 5a259f8e ("ice: field get conversion")
Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Link: https://lore.kernel.org/r/20240206022906.2194214-1-jesse.brandeburg@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5001bfe9

drivers/net/ethernet/intel/i40e/i40e_dcb.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#define I40E_LLDP_TLV_SUBTYPE_SHIFT	0

#define I40E_LLDP_TLV_SUBTYPE_MASK	(0xFF << I40E_LLDP_TLV_SUBTYPE_SHIFT)

#define I40E_LLDP_TLV_OUI_SHIFT		8

#define I40E_LLDP_TLV_OUI_MASK		(0xFFFFFF << I40E_LLDP_TLV_OUI_SHIFT)

#define I40E_LLDP_TLV_OUI_MASK		(0xFFFFFFU << I40E_LLDP_TLV_OUI_SHIFT)



/* Defines for IEEE ETS TLV */

#define I40E_IEEE_ETS_MAXTC_SHIFT	0

drivers/net/ethernet/intel/ice/ice_osdep.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define rd64(a, reg)		readq((a)->hw_addr + (reg))



#define ice_flush(a)		rd32((a), GLGEN_STAT)

#define ICE_M(m, s)		((m) << (s))

#define ICE_M(m, s)		((m ## U) << (s))



struct ice_dma_mem {

	void *va;

drivers/net/ethernet/intel/ice/ice_type.h

+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ struct ice_aq_get_set_rss_lut_params { 
#define ICE_OROM_VER_BUILD_SHIFT	8

#define ICE_OROM_VER_BUILD_MASK		(0xffff << ICE_OROM_VER_BUILD_SHIFT)

#define ICE_OROM_VER_SHIFT		24

#define ICE_OROM_VER_MASK		(0xff << ICE_OROM_VER_SHIFT)

#define ICE_OROM_VER_MASK		(0xffU << ICE_OROM_VER_SHIFT)

#define ICE_SR_PFA_PTR			0x40

#define ICE_SR_1ST_NVM_BANK_PTR		0x42

#define ICE_SR_NVM_BANK_SIZE		0x43