@@ -93,6 +93,9 @@
#define I40E_OEM_SNAP_SHIFT 16
#define I40E_OEM_RELEASE_MASK 0x0000ffff
+/* default value when register dump is fail */
+#define I40E_READ_REG_INVALID 0xaabbccdd
+
#define I40E_RX_DESC(R, i) \
(&(((union i40e_rx_desc *)((R)->desc))[i]))
#define I40E_TX_DESC(R, i) \
@@ -426,6 +426,19 @@ static const char i40e_gstrings_test[][ETH_GSTRING_LEN] = {
#define I40E_TEST_LEN (sizeof(i40e_gstrings_test) / ETH_GSTRING_LEN)
+static const struct i40e_diag_reg_test_info i40e_phy_regs_list[] = {
+ /* offset mask elements stride */
+ {I40E_PRTMAC_PCS_LINK_CTRL, 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_LINK_STATUS1(0), 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_LINK_STATUS2, 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_XGMII_FIFO_STATUS, 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_AN_LP_STATUS, 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_KR_STATUS, 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_FEC_KR_STATUS1, 0xFFFFFFFF, 1, 4},
+ {I40E_PRTMAC_PCS_FEC_KR_STATUS2, 0xFFFFFFFF, 1, 4},
+ { 0 }
+};
+
struct i40e_priv_flags {
char flag_string[ETH_GSTRING_LEN];
u64 flag;
@@ -1814,38 +1827,61 @@ static int i40e_get_regs_len(struct net_device *netdev)
for (i = 0; i40e_reg_list[i].offset != 0; i++)
reg_count += i40e_reg_list[i].elements;
+ for (i = 0; i40e_phy_regs_list[i].offset != 0; i++)
+ reg_count += i40e_phy_regs_list[i].elements;
+
return reg_count * sizeof(u32);
}
-static void i40e_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
- void *p)
+static void i40e_read_regs(struct net_device *netdev,
+ const struct i40e_diag_reg_test_info *i40e_regs_list,
+ void *p, u32 *ri)
{
struct i40e_netdev_priv *np = netdev_priv(netdev);
struct i40e_pf *pf = np->vsi->back;
struct i40e_hw *hw = &pf->hw;
u32 *reg_buf = p;
- unsigned int i, j, ri;
+ unsigned int i, j;
u32 reg;
+ u32 val;
+
+ /* loop through the regs table for what to print */
+ for (i = 0; i40e_regs_list[i].offset != 0; i++) {
+ for (j = 0; j < i40e_regs_list[i].elements; j++) {
+ reg = i40e_regs_list[i].offset
+ + (j * i40e_regs_list[i].stride);
+
+ /* check the range on registers */
+ if (reg <= (pf->ioremap_len - sizeof(u32)))
+ val = rd32(hw, reg);
+ else
+ val = I40E_READ_REG_INVALID;
+
+ netdev_dbg(netdev, "reg[%02u] 0x%08X %08X\n",
+ *ri, reg, val);
+ reg_buf[(*ri)++] = val;
+ }
+ }
+}
+
+static void i40e_get_regs(struct net_device *netdev, struct ethtool_regs *regs,
+ void *p)
+{
+ struct i40e_netdev_priv *np = netdev_priv(netdev);
+ struct i40e_hw *hw = &np->vsi->back->hw;
+ u32 ri = 0;
/* Tell ethtool which driver-version-specific regs output we have.
*
- * At some point, if we have ethtool doing special formatting of
- * this data, it will rely on this version number to know how to
- * interpret things. Hence, this needs to be updated if/when the
- * diags register table is changed.
+ * At some point, if we will have ethtool able to parse binary stream
+ * output, it will rely on this version number, basing on encoded
+ * MAC type, Revision ID and Device ID of tested PHY.
*/
- regs->version = 1;
-
- /* loop through the diags reg table for what to print */
- ri = 0;
- for (i = 0; i40e_reg_list[i].offset != 0; i++) {
- for (j = 0; j < i40e_reg_list[i].elements; j++) {
- reg = i40e_reg_list[i].offset
- + (j * i40e_reg_list[i].stride);
- reg_buf[ri++] = rd32(hw, reg);
- }
- }
+ regs->version = hw->mac.type << 24 | hw->revision_id << 16 |
+ hw->device_id;
+ i40e_read_regs(netdev, i40e_reg_list, p, &ri);
+ i40e_read_regs(netdev, i40e_phy_regs_list, p, &ri);
}
static int i40e_get_eeprom(struct net_device *netdev,
@@ -522,6 +522,14 @@
#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_SHIFT 0
#define I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_MASK I40E_MASK(0xFFFF, \
I40E_PRTMAC_HSEC_CTL_TX_PAUSE_REFRESH_TIMER_SHIFT)
+#define I40E_PRTMAC_PCS_LINK_STATUS1(_i) (0x0008C200 + ((_i) * 4))
+#define I40E_PRTMAC_PCS_LINK_STATUS2 0x0008C220
+#define I40E_PRTMAC_PCS_LINK_CTRL 0x0008C260
+#define I40E_PRTMAC_PCS_XGMII_FIFO_STATUS 0x0008C320
+#define I40E_PRTMAC_PCS_AN_LP_STATUS 0x0008C680
+#define I40E_PRTMAC_PCS_KR_STATUS 0x0008CA00
+#define I40E_PRTMAC_PCS_FEC_KR_STATUS1 0x0008CC20
+#define I40E_PRTMAC_PCS_FEC_KR_STATUS2 0x0008CC40
#define I40E_GLNVM_FLA 0x000B6108 /* Reset: POR */
#define I40E_GLNVM_FLA_LOCKED_SHIFT 6
#define I40E_GLNVM_FLA_LOCKED_MASK I40E_MASK(0x1, I40E_GLNVM_FLA_LOCKED_SHIFT)
Implement ethtool register dump for some PHY registers in order to assist field debugging of link issues. Signed-off-by: Radoslaw Tyl <radoslawx.tyl@intel.com> --- v1 to v2: - fix sparse warning --- drivers/net/ethernet/intel/i40e/i40e.h | 3 + .../net/ethernet/intel/i40e/i40e_ethtool.c | 72 ++++++++++++++----- .../net/ethernet/intel/i40e/i40e_register.h | 8 +++ 3 files changed, 65 insertions(+), 18 deletions(-)