| Message ID | 20201211143456.GA83809@ns.kevlo.org |
|---|---|
| State | New |
| Headers | show |
| Series | igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr | expand |
On Fri, 11 Dec 2020 22:34:56 +0800 Kevin Lo wrote: > This patch sets the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr. > Without this change it wouldn't lead to a shadow RAM write EEWR timeout. > > Signed-off-by: Kevin Lo <kevlo@kevlo.org> This is a fix, please add a Fixes tag. Please CC the maintainers: M: Jesse Brandeburg <jesse.brandeburg@intel.com> M: Tony Nguyen <anthony.l.nguyen@intel.com>
On Sat, Dec 12, 2020 at 02:00:10PM -0800, Jakub Kicinski wrote: > > On Fri, 11 Dec 2020 22:34:56 +0800 Kevin Lo wrote: > > This patch sets the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr. > > Without this change it wouldn't lead to a shadow RAM write EEWR timeout. > > > > Signed-off-by: Kevin Lo <kevlo@kevlo.org> > > This is a fix, please add a Fixes tag. > > Please CC the maintainers: > > M: Jesse Brandeburg <jesse.brandeburg@intel.com> > M: Tony Nguyen <anthony.l.nguyen@intel.com> I will update the Fixes tag and send V2, thanks.
diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c index 8b67d9b49a83..b0a5cd31683e 100644 --- a/drivers/net/ethernet/intel/igc/igc_i225.c +++ b/drivers/net/ethernet/intel/igc/igc_i225.c @@ -221,7 +221,7 @@ static s32 igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, struct igc_nvm_info *nvm = &hw->nvm; u32 attempts = 100000; u32 i, k, eewr = 0; - s32 ret_val = 0; + s32 ret_val = -IGC_ERR_NVM; /* A check for invalid values: offset too large, too many words, * too many words for the offset, and not enough words. @@ -229,7 +229,6 @@ static s32 igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, if (offset >= nvm->word_size || (words > (nvm->word_size - offset)) || words == 0) { hw_dbg("nvm parameter(s) out of bounds\n"); - ret_val = -IGC_ERR_NVM; goto out; }
This patch sets the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr. Without this change it wouldn't lead to a shadow RAM write EEWR timeout. Signed-off-by: Kevin Lo <kevlo@kevlo.org> ---