| Message ID | 20240228172603.29177-1-ivecera@redhat.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] i40e: Fix firmware version comparison function | expand |
Dear Ivan, Thank you for your patch. Am 28.02.24 um 18:26 schrieb Ivan Vecera: > Helper i40e_is_fw_ver_eq() compares incorrectly given firmware version > as it returns true when the major version of running firmware is > greater than the given major version that is wrong and results in … version. That … > failure during getting of DCB configuration where this helper is used. > Fix the check and return true only if the running FW version is exactly > equals to the given version. is … equal > Reproducer: > 1. Load i40e driver > 2. Check dmesg output > > [root@host ~]# modprobe i40e > [root@host ~]# dmesg | grep 'i40e.*DCB' > [ 74.750642] i40e 0000:02:00.0: Query for DCB configuration failed, err -EIO aq_err I40E_AQ_RC_EINVAL > [ 74.759770] i40e 0000:02:00.0: DCB init failed -5, disabled > [ 74.966550] i40e 0000:02:00.1: Query for DCB configuration failed, err -EIO aq_err I40E_AQ_RC_EINVAL > [ 74.975683] i40e 0000:02:00.1: DCB init failed -5, disabled > > Fixes: cf488e13221f ("i40e: Add other helpers to check version of running firmware and AQ API") > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > --- > drivers/net/ethernet/intel/i40e/i40e_prototype.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h > index af4269330581..ce1f11b8ad65 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h > +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h > @@ -567,8 +567,7 @@ static inline bool i40e_is_fw_ver_lt(struct i40e_hw *hw, u16 maj, u16 min) > **/ > static inline bool i40e_is_fw_ver_eq(struct i40e_hw *hw, u16 maj, u16 min) > { > - return (hw->aq.fw_maj_ver > maj || > - (hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min)); > + return (hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min); > } > > #endif /* _I40E_PROTOTYPE_H_ */ With the nits in the commit message addressed, this is Reviewed-by: Paul Menzel <pmenzel@molgen.mpg.de> Kind regards, Paul
> -----Original Message----- > From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Ivan Vecera > Sent: Wednesday, February 28, 2024 10:56 PM > To: netdev@vger.kernel.org > Cc: moderated list:INTEL ETHERNET DRIVERS <intel-wired-lan@lists.osuosl.org>; Brandeburg, Jesse <jesse.brandeburg@intel.com>; open list <linux-kernel@vger.kernel.org>; Eric Dumazet <edumazet@google.com>; Nguyen, Anthony L <anthony.l.nguyen@intel.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; David S. Miller <davem@davemloft.net> > Subject: [Intel-wired-lan] [PATCH net] i40e: Fix firmware version comparison function > > Helper i40e_is_fw_ver_eq() compares incorrectly given firmware version > as it returns true when the major version of running firmware is > greater than the given major version that is wrong and results in > failure during getting of DCB configuration where this helper is used. > Fix the check and return true only if the running FW version is exactly > equals to the given version. > > Reproducer: > 1. Load i40e driver > 2. Check dmesg output > > [root@host ~]# modprobe i40e > [root@host ~]# dmesg | grep 'i40e.*DCB' > [ 74.750642] i40e 0000:02:00.0: Query for DCB configuration failed, err -EIO aq_err I40E_AQ_RC_EINVAL > [ 74.759770] i40e 0000:02:00.0: DCB init failed -5, disabled > [ 74.966550] i40e 0000:02:00.1: Query for DCB configuration failed, err -EIO aq_err I40E_AQ_RC_EINVAL > [ 74.975683] i40e 0000:02:00.1: DCB init failed -5, disabled > > Fixes: cf488e13221f ("i40e: Add other helpers to check version of running firmware and AQ API") > Signed-off-by: Ivan Vecera <ivecera@redhat.com> > --- > drivers/net/ethernet/intel/i40e/i40e_prototype.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_prototype.h b/drivers/net/ethernet/intel/i40e/i40e_prototype.h index af4269330581..ce1f11b8ad65 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_prototype.h +++ b/drivers/net/ethernet/intel/i40e/i40e_prototype.h @@ -567,8 +567,7 @@ static inline bool i40e_is_fw_ver_lt(struct i40e_hw *hw, u16 maj, u16 min) **/ static inline bool i40e_is_fw_ver_eq(struct i40e_hw *hw, u16 maj, u16 min) { - return (hw->aq.fw_maj_ver > maj || - (hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min)); + return (hw->aq.fw_maj_ver == maj && hw->aq.fw_min_ver == min); } #endif /* _I40E_PROTOTYPE_H_ */
Helper i40e_is_fw_ver_eq() compares incorrectly given firmware version as it returns true when the major version of running firmware is greater than the given major version that is wrong and results in failure during getting of DCB configuration where this helper is used. Fix the check and return true only if the running FW version is exactly equals to the given version. Reproducer: 1. Load i40e driver 2. Check dmesg output [root@host ~]# modprobe i40e [root@host ~]# dmesg | grep 'i40e.*DCB' [ 74.750642] i40e 0000:02:00.0: Query for DCB configuration failed, err -EIO aq_err I40E_AQ_RC_EINVAL [ 74.759770] i40e 0000:02:00.0: DCB init failed -5, disabled [ 74.966550] i40e 0000:02:00.1: Query for DCB configuration failed, err -EIO aq_err I40E_AQ_RC_EINVAL [ 74.975683] i40e 0000:02:00.1: DCB init failed -5, disabled Fixes: cf488e13221f ("i40e: Add other helpers to check version of running firmware and AQ API") Signed-off-by: Ivan Vecera <ivecera@redhat.com> --- drivers/net/ethernet/intel/i40e/i40e_prototype.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)