Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58279cea authored by Radoslaw Tyl's avatar Radoslaw Tyl Committed by Greg Kroah-Hartman
Browse files

i40e: fix registers dump after run ethtool adapter self test 



[ Upstream commit c5cff16f461a4a434a9915a7be7ac9ced861a8a4 ]

Fix invalid registers dump from ethtool -d ethX after adapter self test
by ethtool -t ethY. It causes invalid data display.

The problem was caused by overwriting i40e_reg_list[].elements
which is common for ethtool self test and dump.

Fixes: 22dd9ae8 ("i40e: Rework register diagnostic")
Signed-off-by: default avatarRadoslaw Tyl <radoslawx.tyl@intel.com>
Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Arpana Arland <arpanax.arland@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Link: https://lore.kernel.org/r/20230328172659.3906413-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5195de1d

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

+6 −5
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ static i40e_status i40e_diag_reg_pattern_test(struct i40e_hw *hw, 
	return 0;

}



struct i40e_diag_reg_test_info i40e_reg_list[] = {

const struct i40e_diag_reg_test_info i40e_reg_list[] = {

	/* offset               mask         elements   stride */

	{I40E_QTX_CTL(0),       0x0000FFBF, 1,

		I40E_QTX_CTL(1) - I40E_QTX_CTL(0)},
@@ -78,27 +78,28 @@ i40e_status i40e_diag_reg_test(struct i40e_hw *hw) 
{

	i40e_status ret_code = 0;

	u32 reg, mask;

	u32 elements;

	u32 i, j;



	for (i = 0; i40e_reg_list[i].offset != 0 &&

					     !ret_code; i++) {



		elements = i40e_reg_list[i].elements;

		/* set actual reg range for dynamically allocated resources */

		if (i40e_reg_list[i].offset == I40E_QTX_CTL(0) &&

		    hw->func_caps.num_tx_qp != 0)

			i40e_reg_list[i].elements = hw->func_caps.num_tx_qp;

			elements = hw->func_caps.num_tx_qp;

		if ((i40e_reg_list[i].offset == I40E_PFINT_ITRN(0, 0) ||

		     i40e_reg_list[i].offset == I40E_PFINT_ITRN(1, 0) ||

		     i40e_reg_list[i].offset == I40E_PFINT_ITRN(2, 0) ||

		     i40e_reg_list[i].offset == I40E_QINT_TQCTL(0) ||

		     i40e_reg_list[i].offset == I40E_QINT_RQCTL(0)) &&

		    hw->func_caps.num_msix_vectors != 0)

			i40e_reg_list[i].elements =

				hw->func_caps.num_msix_vectors - 1;

			elements = hw->func_caps.num_msix_vectors - 1;



		/* test register access */

		mask = i40e_reg_list[i].mask;

		for (j = 0; j < i40e_reg_list[i].elements && !ret_code; j++) {

		for (j = 0; j < elements && !ret_code; j++) {

			reg = i40e_reg_list[i].offset +

			      (j * i40e_reg_list[i].stride);

			ret_code = i40e_diag_reg_pattern_test(hw, reg, mask);

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

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ struct i40e_diag_reg_test_info { 
	u32 stride;	/* bytes between each element */

};



extern struct i40e_diag_reg_test_info i40e_reg_list[];

extern const struct i40e_diag_reg_test_info i40e_reg_list[];



i40e_status i40e_diag_reg_test(struct i40e_hw *hw);

i40e_status i40e_diag_eeprom_test(struct i40e_hw *hw);