Commit e084310b authored by Andrii Staikov's avatar Andrii Staikov Committed by sanglipeng
Browse files

i40e: fix misleading debug logs 

stable inclusion
from stable-v5.10.192
commit 0a9040dedec21fbf362437d35f5e6f57735c06d2
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I933RF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=0a9040dedec21fbf362437d35f5e6f57735c06d2



--------------------------------

[ Upstream commit 2f2beb88 ]

Change "write" into the actual "read" word.
Change parameters description.

Fixes: 7073f46e ("i40e: Add AQ commands for NVM Update for X722")
Signed-off-by: default avatarAleksandr Loktionov <aleksandr.loktionov@intel.com>
Signed-off-by: default avatarAndrii Staikov <andrii.staikov@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent b4d60083

drivers/net/ethernet/intel/i40e/i40e_nvm.c

+8 −8
Original line number Diff line number Diff line
@@ -210,11 +210,11 @@ static i40e_status i40e_read_nvm_word_srctl(struct i40e_hw *hw, u16 offset, 
 * @hw: pointer to the HW structure.

 * @module_pointer: module pointer location in words from the NVM beginning

 * @offset: offset in words from module start

 * @words: number of words to write

 * @data: buffer with words to write to the Shadow RAM

 * @words: number of words to read

 * @data: buffer with words to read to the Shadow RAM

 * @last_command: tells the AdminQ that this is the last command

 *

 * Writes a 16 bit words buffer to the Shadow RAM using the admin command.

 * Reads a 16 bit words buffer to the Shadow RAM using the admin command.

 **/

static i40e_status i40e_read_nvm_aq(struct i40e_hw *hw,

				    u8 module_pointer, u32 offset,
@@ -234,18 +234,18 @@ static i40e_status i40e_read_nvm_aq(struct i40e_hw *hw, 
	 */

	if ((offset + words) > hw->nvm.sr_size)

		i40e_debug(hw, I40E_DEBUG_NVM,

			   "NVM write error: offset %d beyond Shadow RAM limit %d\n",

			   "NVM read error: offset %d beyond Shadow RAM limit %d\n",

			   (offset + words), hw->nvm.sr_size);

	else if (words > I40E_SR_SECTOR_SIZE_IN_WORDS)

		/* We can write only up to 4KB (one sector), in one AQ write */

		/* We can read only up to 4KB (one sector), in one AQ write */

		i40e_debug(hw, I40E_DEBUG_NVM,

			   "NVM write fail error: tried to write %d words, limit is %d.\n",

			   "NVM read fail error: tried to read %d words, limit is %d.\n",

			   words, I40E_SR_SECTOR_SIZE_IN_WORDS);

	else if (((offset + (words - 1)) / I40E_SR_SECTOR_SIZE_IN_WORDS)

		 != (offset / I40E_SR_SECTOR_SIZE_IN_WORDS))

		/* A single write cannot spread over two sectors */

		/* A single read cannot spread over two sectors */

		i40e_debug(hw, I40E_DEBUG_NVM,

			   "NVM write error: cannot spread over two sectors in a single write offset=%d words=%d\n",

			   "NVM read error: cannot spread over two sectors in a single read offset=%d words=%d\n",

			   offset, words);

	else

		ret_code = i40e_aq_read_nvm(hw, module_pointer,