Skip to content

Commit af2d620

Browse files
halfboy93gregkh
authored andcommitted
ice: remove invalid parameter of equalizer
[ Upstream commit c5cc2a2 ] It occurred that in the commit 7083893 ("ice: Implement driver functionality to dump serdes equalizer values") the invalid DRATE parameter for reading has been added. The output of the command: $ ethtool -d <ethX> returns the garbage value in the place where DRATE value should be stored. Remove mentioned parameter to prevent return of corrupted data to userspace. Fixes: 7083893 ("ice: Implement driver functionality to dump serdes equalizer values") Signed-off-by: Mateusz Polchlopek <[email protected]> Reviewed-by: Michal Swiatkowski <[email protected]> Tested-by: Rinitha S <[email protected]> (A Contingent worker at Intel) Signed-off-by: Tony Nguyen <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent f9d23ea commit af2d620

File tree

3 files changed

+0
-3
lines changed

3 files changed

+0
-3
lines changed

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,6 @@ struct ice_aqc_dnl_equa_param {
14911491
#define ICE_AQC_RX_EQU_POST1 (0x12 << ICE_AQC_RX_EQU_SHIFT)
14921492
#define ICE_AQC_RX_EQU_BFLF (0x13 << ICE_AQC_RX_EQU_SHIFT)
14931493
#define ICE_AQC_RX_EQU_BFHF (0x14 << ICE_AQC_RX_EQU_SHIFT)
1494-
#define ICE_AQC_RX_EQU_DRATE (0x15 << ICE_AQC_RX_EQU_SHIFT)
14951494
#define ICE_AQC_RX_EQU_CTLE_GAINHF (0x20 << ICE_AQC_RX_EQU_SHIFT)
14961495
#define ICE_AQC_RX_EQU_CTLE_GAINLF (0x21 << ICE_AQC_RX_EQU_SHIFT)
14971496
#define ICE_AQC_RX_EQU_CTLE_GAINDC (0x22 << ICE_AQC_RX_EQU_SHIFT)

drivers/net/ethernet/intel/ice/ice_ethtool.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ static int ice_get_tx_rx_equa(struct ice_hw *hw, u8 serdes_num,
710710
{ ICE_AQC_RX_EQU_POST1, rx, &ptr->rx_equ_post1 },
711711
{ ICE_AQC_RX_EQU_BFLF, rx, &ptr->rx_equ_bflf },
712712
{ ICE_AQC_RX_EQU_BFHF, rx, &ptr->rx_equ_bfhf },
713-
{ ICE_AQC_RX_EQU_DRATE, rx, &ptr->rx_equ_drate },
714713
{ ICE_AQC_RX_EQU_CTLE_GAINHF, rx, &ptr->rx_equ_ctle_gainhf },
715714
{ ICE_AQC_RX_EQU_CTLE_GAINLF, rx, &ptr->rx_equ_ctle_gainlf },
716715
{ ICE_AQC_RX_EQU_CTLE_GAINDC, rx, &ptr->rx_equ_ctle_gaindc },

drivers/net/ethernet/intel/ice/ice_ethtool.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ struct ice_serdes_equalization_to_ethtool {
1515
int rx_equ_post1;
1616
int rx_equ_bflf;
1717
int rx_equ_bfhf;
18-
int rx_equ_drate;
1918
int rx_equ_ctle_gainhf;
2019
int rx_equ_ctle_gainlf;
2120
int rx_equ_ctle_gaindc;

0 commit comments

Comments
 (0)