| Message ID | 20250205104252.30464-2-przemyslaw.kitszel@intel.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [iwl-net] ice: health.c: fix compilation on gcc 7.5 | expand |
On Wed, Feb 05, 2025 at 11:42:12AM +0100, Przemek Kitszel wrote: > GCC 7 is not as good as GCC 8+ in telling what is a compile-time const, > and thus could be used for static storage. So we could not use variables > for that, no matter how much "const" keyword is sprinkled around. > > Excerpt from the report: > My GCC is: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0. > > CC [M] drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o > drivers/net/ethernet/intel/ice/devlink/health.c:35:3: error: initializer element is not constant > ice_common_port_solutions, {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/intel/ice/devlink/health.c:35:3: note: (near initialization for 'ice_health_status_lookup[0].solution') > drivers/net/ethernet/intel/ice/devlink/health.c:35:31: error: initializer element is not constant > ice_common_port_solutions, {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/intel/ice/devlink/health.c:35:31: note: (near initialization for 'ice_health_status_lookup[0].data_label[0]') > drivers/net/ethernet/intel/ice/devlink/health.c:37:46: error: initializer element is not constant > "Change or replace the module or cable.", {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/intel/ice/devlink/health.c:37:46: note: (near initialization for 'ice_health_status_lookup[1].data_label[0]') > drivers/net/ethernet/intel/ice/devlink/health.c:39:3: error: initializer element is not constant > ice_common_port_solutions, {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: 85d6164ec56d ("ice: add fw and port health reporters") > Reported-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > Closes: https://lore.kernel.org/netdev/CY8PR11MB7134BF7A46D71E50D25FA7A989F72@CY8PR11MB7134.namprd11.prod.outlook.com > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> > --- > I would really like to bump min gcc to 8.5 (RH 8 family), > instead of supporting old Ubuntu. However SLES 15 is also stuck with gcc 7.5 :( > > CC: Linus Torvalds <torvalds@linux-foundation.org> > CC: Kees Cook <kees@kernel.org> > CC: Nick Desaulniers <nick.desaulniers@gmail.com> > --- > drivers/net/ethernet/intel/ice/devlink/health.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ice/devlink/health.c b/drivers/net/ethernet/intel/ice/devlink/health.c > index ea40f7941259..4bc546bafad1 100644 > --- a/drivers/net/ethernet/intel/ice/devlink/health.c > +++ b/drivers/net/ethernet/intel/ice/devlink/health.c > @@ -23,12 +23,12 @@ struct ice_health_status { > * For instance, Health Code 0x1002 is triggered when the command fails. > * Such codes should be disregarded by the end-user. > * The below lookup requires to be sorted by code. > + * #defines instead of proper const strings are used due to gcc 7 limitation. > */ > > -static const char *const ice_common_port_solutions = > - "Check your cable connection. Change or replace the module or cable. Manually set speed and duplex."; > -static const char *const ice_port_number_label = "Port Number"; > -static const char *const ice_update_nvm_solution = "Update to the latest NVM image."; > +#define ice_common_port_solutions "Check your cable connection. Change or replace the module or cable. Manually set speed and duplex." > +#define ice_port_number_label "Port Number" > +#define ice_update_nvm_solution "Update to the latest NVM image." > > static const struct ice_health_status ice_health_status_lookup[] = { > {ICE_AQC_HEALTH_STATUS_ERR_UNKNOWN_MOD_STRICT, "An unsupported module was detected.", > > base-commit: 4241a702e0d0c2ca9364cfac08dbf134264962de Thanks for fixing Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com> > -- > 2.46.0
> From: Kitszel, Przemyslaw <przemyslaw.kitszel@intel.com> > [...] > Subject: [PATCH iwl-net] ice: health.c: fix compilation on gcc 7.5 > > GCC 7 is not as good as GCC 8+ in telling what is a compile-time const, and > thus could be used for static storage. So we could not use variables for that, > no matter how much "const" keyword is sprinkled around. > > Excerpt from the report: > My GCC is: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0. > > CC [M] drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o > drivers/net/ethernet/intel/ice/devlink/health.c:35:3: error: initializer element > is not constant > ice_common_port_solutions, {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/intel/ice/devlink/health.c:35:3: note: (near initialization > for 'ice_health_status_lookup[0].solution') > drivers/net/ethernet/intel/ice/devlink/health.c:35:31: error: initializer > element is not constant > ice_common_port_solutions, {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/intel/ice/devlink/health.c:35:31: note: (near initialization > for 'ice_health_status_lookup[0].data_label[0]') > drivers/net/ethernet/intel/ice/devlink/health.c:37:46: error: initializer > element is not constant > "Change or replace the module or cable.", {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~ > drivers/net/ethernet/intel/ice/devlink/health.c:37:46: note: (near initialization > for 'ice_health_status_lookup[1].data_label[0]') > drivers/net/ethernet/intel/ice/devlink/health.c:39:3: error: initializer element > is not constant > ice_common_port_solutions, {ice_port_number_label}}, > ^~~~~~~~~~~~~~~~~~~~~~~~~ > > Fixes: 85d6164ec56d ("ice: add fw and port health reporters") > Reported-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> > Closes: > https://lore.kernel.org/netdev/CY8PR11MB7134BF7A46D71E50D25FA7A989F > 72@CY8PR11MB7134.namprd11.prod.outlook.com > Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Tested-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> [...]
diff --git a/drivers/net/ethernet/intel/ice/devlink/health.c b/drivers/net/ethernet/intel/ice/devlink/health.c index ea40f7941259..4bc546bafad1 100644 --- a/drivers/net/ethernet/intel/ice/devlink/health.c +++ b/drivers/net/ethernet/intel/ice/devlink/health.c @@ -23,12 +23,12 @@ struct ice_health_status { * For instance, Health Code 0x1002 is triggered when the command fails. * Such codes should be disregarded by the end-user. * The below lookup requires to be sorted by code. + * #defines instead of proper const strings are used due to gcc 7 limitation. */ -static const char *const ice_common_port_solutions = - "Check your cable connection. Change or replace the module or cable. Manually set speed and duplex."; -static const char *const ice_port_number_label = "Port Number"; -static const char *const ice_update_nvm_solution = "Update to the latest NVM image."; +#define ice_common_port_solutions "Check your cable connection. Change or replace the module or cable. Manually set speed and duplex." +#define ice_port_number_label "Port Number" +#define ice_update_nvm_solution "Update to the latest NVM image." static const struct ice_health_status ice_health_status_lookup[] = { {ICE_AQC_HEALTH_STATUS_ERR_UNKNOWN_MOD_STRICT, "An unsupported module was detected.",
GCC 7 is not as good as GCC 8+ in telling what is a compile-time const, and thus could be used for static storage. So we could not use variables for that, no matter how much "const" keyword is sprinkled around. Excerpt from the report: My GCC is: gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0. CC [M] drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o drivers/net/ethernet/intel/ice/devlink/health.c:35:3: error: initializer element is not constant ice_common_port_solutions, {ice_port_number_label}}, ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/intel/ice/devlink/health.c:35:3: note: (near initialization for 'ice_health_status_lookup[0].solution') drivers/net/ethernet/intel/ice/devlink/health.c:35:31: error: initializer element is not constant ice_common_port_solutions, {ice_port_number_label}}, ^~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/intel/ice/devlink/health.c:35:31: note: (near initialization for 'ice_health_status_lookup[0].data_label[0]') drivers/net/ethernet/intel/ice/devlink/health.c:37:46: error: initializer element is not constant "Change or replace the module or cable.", {ice_port_number_label}}, ^~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/intel/ice/devlink/health.c:37:46: note: (near initialization for 'ice_health_status_lookup[1].data_label[0]') drivers/net/ethernet/intel/ice/devlink/health.c:39:3: error: initializer element is not constant ice_common_port_solutions, {ice_port_number_label}}, ^~~~~~~~~~~~~~~~~~~~~~~~~ Fixes: 85d6164ec56d ("ice: add fw and port health reporters") Reported-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Closes: https://lore.kernel.org/netdev/CY8PR11MB7134BF7A46D71E50D25FA7A989F72@CY8PR11MB7134.namprd11.prod.outlook.com Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> --- I would really like to bump min gcc to 8.5 (RH 8 family), instead of supporting old Ubuntu. However SLES 15 is also stuck with gcc 7.5 :( CC: Linus Torvalds <torvalds@linux-foundation.org> CC: Kees Cook <kees@kernel.org> CC: Nick Desaulniers <nick.desaulniers@gmail.com> --- drivers/net/ethernet/intel/ice/devlink/health.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 4241a702e0d0c2ca9364cfac08dbf134264962de