mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-02-20 09:31:21 -05:00
ice: rework of dump serdes equalizer values feature
Refactor function ice_get_tx_rx_equa() to iterate over new table of params instead of multiple calls to ice_aq_get_phy_equalization(). Subsequent commit will extend that function by add more serdes equalizer values to dump. Shorten the fields of struct ice_serdes_equalization_to_ethtool for readability purposes. Reviewed-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Signed-off-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com> Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@intel.com> (A Contingent worker at Intel) Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
committed by
Tony Nguyen
parent
ccb35037c4
commit
8ea085937d
@@ -693,75 +693,36 @@ static int ice_get_port_topology(struct ice_hw *hw, u8 lport,
|
||||
static int ice_get_tx_rx_equa(struct ice_hw *hw, u8 serdes_num,
|
||||
struct ice_serdes_equalization_to_ethtool *ptr)
|
||||
{
|
||||
static const int tx = ICE_AQC_OP_CODE_TX_EQU;
|
||||
static const int rx = ICE_AQC_OP_CODE_RX_EQU;
|
||||
struct {
|
||||
int data_in;
|
||||
int opcode;
|
||||
int *out;
|
||||
} aq_params[] = {
|
||||
{ ICE_AQC_TX_EQU_PRE1, tx, &ptr->tx_equ_pre1 },
|
||||
{ ICE_AQC_TX_EQU_PRE3, tx, &ptr->tx_equ_pre3 },
|
||||
{ ICE_AQC_TX_EQU_ATTEN, tx, &ptr->tx_equ_atten },
|
||||
{ ICE_AQC_TX_EQU_POST1, tx, &ptr->tx_equ_post1 },
|
||||
{ ICE_AQC_TX_EQU_PRE2, tx, &ptr->tx_equ_pre2 },
|
||||
{ ICE_AQC_RX_EQU_PRE2, rx, &ptr->rx_equ_pre2 },
|
||||
{ ICE_AQC_RX_EQU_PRE1, rx, &ptr->rx_equ_pre1 },
|
||||
{ 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 },
|
||||
};
|
||||
int err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_TX_EQU_PRE1,
|
||||
ICE_AQC_OP_CODE_TX_EQU, serdes_num,
|
||||
&ptr->tx_equalization_pre1);
|
||||
if (err)
|
||||
return err;
|
||||
for (int i = 0; i < ARRAY_SIZE(aq_params); i++) {
|
||||
err = ice_aq_get_phy_equalization(hw, aq_params[i].data_in,
|
||||
aq_params[i].opcode,
|
||||
serdes_num, aq_params[i].out);
|
||||
if (err)
|
||||
break;
|
||||
}
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_TX_EQU_PRE3,
|
||||
ICE_AQC_OP_CODE_TX_EQU, serdes_num,
|
||||
&ptr->tx_equalization_pre3);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_TX_EQU_ATTEN,
|
||||
ICE_AQC_OP_CODE_TX_EQU, serdes_num,
|
||||
&ptr->tx_equalization_atten);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_TX_EQU_POST1,
|
||||
ICE_AQC_OP_CODE_TX_EQU, serdes_num,
|
||||
&ptr->tx_equalization_post1);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_TX_EQU_PRE2,
|
||||
ICE_AQC_OP_CODE_TX_EQU, serdes_num,
|
||||
&ptr->tx_equalization_pre2);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_RX_EQU_PRE2,
|
||||
ICE_AQC_OP_CODE_RX_EQU, serdes_num,
|
||||
&ptr->rx_equalization_pre2);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_RX_EQU_PRE1,
|
||||
ICE_AQC_OP_CODE_RX_EQU, serdes_num,
|
||||
&ptr->rx_equalization_pre1);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_RX_EQU_POST1,
|
||||
ICE_AQC_OP_CODE_RX_EQU, serdes_num,
|
||||
&ptr->rx_equalization_post1);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_RX_EQU_BFLF,
|
||||
ICE_AQC_OP_CODE_RX_EQU, serdes_num,
|
||||
&ptr->rx_equalization_bflf);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_RX_EQU_BFHF,
|
||||
ICE_AQC_OP_CODE_RX_EQU, serdes_num,
|
||||
&ptr->rx_equalization_bfhf);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
err = ice_aq_get_phy_equalization(hw, ICE_AQC_RX_EQU_DRATE,
|
||||
ICE_AQC_OP_CODE_RX_EQU, serdes_num,
|
||||
&ptr->rx_equalization_drate);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
return 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -10,17 +10,17 @@ struct ice_phy_type_to_ethtool {
|
||||
};
|
||||
|
||||
struct ice_serdes_equalization_to_ethtool {
|
||||
int rx_equalization_pre2;
|
||||
int rx_equalization_pre1;
|
||||
int rx_equalization_post1;
|
||||
int rx_equalization_bflf;
|
||||
int rx_equalization_bfhf;
|
||||
int rx_equalization_drate;
|
||||
int tx_equalization_pre1;
|
||||
int tx_equalization_pre3;
|
||||
int tx_equalization_atten;
|
||||
int tx_equalization_post1;
|
||||
int tx_equalization_pre2;
|
||||
int rx_equ_pre2;
|
||||
int rx_equ_pre1;
|
||||
int rx_equ_post1;
|
||||
int rx_equ_bflf;
|
||||
int rx_equ_bfhf;
|
||||
int rx_equ_drate;
|
||||
int tx_equ_pre1;
|
||||
int tx_equ_pre3;
|
||||
int tx_equ_atten;
|
||||
int tx_equ_post1;
|
||||
int tx_equ_pre2;
|
||||
};
|
||||
|
||||
struct ice_regdump_to_ethtool {
|
||||
|
||||
Reference in New Issue
Block a user