On Tue, Dec 31, 2024 at 10:50:44AM +0100, Mateusz Polchlopek wrote:
> It occurred that in the commit 70838938e89c ("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: 70838938e89c ("ice: Implement driver functionality to dump serdes
> equalizer values")
> Signed-off-by: Mateusz Polchlopek <[email protected]>
> ---
> drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 -
> drivers/net/ethernet/intel/ice/ice_ethtool.c | 1 -
> drivers/net/ethernet/intel/ice/ice_ethtool.h | 1 -
> 3 files changed, 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> index 3bf05b135b35..73756dbfc77f 100644
> --- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> +++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
> @@ -1498,7 +1498,6 @@ struct ice_aqc_dnl_equa_param {
> #define ICE_AQC_RX_EQU_POST1 (0x12 << ICE_AQC_RX_EQU_SHIFT)
> #define ICE_AQC_RX_EQU_BFLF (0x13 << ICE_AQC_RX_EQU_SHIFT)
> #define ICE_AQC_RX_EQU_BFHF (0x14 << ICE_AQC_RX_EQU_SHIFT)
> -#define ICE_AQC_RX_EQU_DRATE (0x15 << ICE_AQC_RX_EQU_SHIFT)
> #define ICE_AQC_RX_EQU_CTLE_GAINHF (0x20 << ICE_AQC_RX_EQU_SHIFT)
> #define ICE_AQC_RX_EQU_CTLE_GAINLF (0x21 << ICE_AQC_RX_EQU_SHIFT)
> #define ICE_AQC_RX_EQU_CTLE_GAINDC (0x22 << ICE_AQC_RX_EQU_SHIFT)
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> index 3072634bf049..f241493a6ac8 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
> @@ -710,7 +710,6 @@ static int ice_get_tx_rx_equa(struct ice_hw *hw, u8
> serdes_num,
> { ICE_AQC_RX_EQU_POST1, rx, &ptr->rx_equ_post1 },
> { ICE_AQC_RX_EQU_BFLF, rx, &ptr->rx_equ_bflf },
> { ICE_AQC_RX_EQU_BFHF, rx, &ptr->rx_equ_bfhf },
> - { ICE_AQC_RX_EQU_DRATE, rx, &ptr->rx_equ_drate },
> { ICE_AQC_RX_EQU_CTLE_GAINHF, rx, &ptr->rx_equ_ctle_gainhf },
> { ICE_AQC_RX_EQU_CTLE_GAINLF, rx, &ptr->rx_equ_ctle_gainlf },
> { ICE_AQC_RX_EQU_CTLE_GAINDC, rx, &ptr->rx_equ_ctle_gaindc },
> diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.h
> b/drivers/net/ethernet/intel/ice/ice_ethtool.h
> index 8f2ad1c172c0..23b2cfbc9684 100644
> --- a/drivers/net/ethernet/intel/ice/ice_ethtool.h
> +++ b/drivers/net/ethernet/intel/ice/ice_ethtool.h
> @@ -15,7 +15,6 @@ struct ice_serdes_equalization_to_ethtool {
> int rx_equ_post1;
> int rx_equ_bflf;
> int rx_equ_bfhf;
> - int rx_equ_drate;
> int rx_equ_ctle_gainhf;
> int rx_equ_ctle_gainlf;
> int rx_equ_ctle_gaindc;
> --
> 2.38.1
Thanks for fixing
Reviewed-by: Michal Swiatkowski <[email protected]>
