* [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
@ 2022-11-02 5:28 Raju Lakkaraju
2022-11-02 8:31 ` Horatiu Vultur
0 siblings, 1 reply; 5+ messages in thread
From: Raju Lakkaraju @ 2022-11-02 5:28 UTC (permalink / raw)
To: netdev
Cc: davem, kuba, linux-kernel, bryan.whitehead, pabeni, edumazet,
olteanv, linux, UNGLinuxDriver, andrew, Ian.Saturley
Add support to SGMII register dump
Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
Change List:
============
V4 -> V5:
- Remove the debug read function macro
- Add auto variable structure to handle register definitions
V3 -> V4:
- No changes. Patch on tags 6.1-rc1
V2 -> V3:
- Remove the private flag option.
As per review comment, use -w/-W to configure dump flag.
But, change to -w/-W option, EEPROM/OTP data might be corrupt
in case of wrong flag input.
Need to fix this properly in future development.
V1 -> V2:
- Add set_dump and get_dump_flag functions
V0 -> V1:
- Removed unwanted code
.../net/ethernet/microchip/lan743x_ethtool.c | 113 ++++++++++++++++--
.../net/ethernet/microchip/lan743x_ethtool.h | 71 ++++++++++-
drivers/net/ethernet/microchip/lan743x_main.c | 2 +-
drivers/net/ethernet/microchip/lan743x_main.h | 1 +
4 files changed, 178 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
index 88f9484cc2a7..0624ce24b44e 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
@@ -1190,15 +1190,11 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
}
#endif /* CONFIG_PM */
-static void lan743x_common_regs(struct net_device *dev,
- struct ethtool_regs *regs, void *p)
-
+static void lan743x_common_regs(struct net_device *dev, void *p)
{
struct lan743x_adapter *adapter = netdev_priv(dev);
u32 *rb = p;
- memset(p, 0, (MAX_LAN743X_ETH_REGS * sizeof(u32)));
-
rb[ETH_PRIV_FLAGS] = adapter->flags;
rb[ETH_ID_REV] = lan743x_csr_read(adapter, ID_REV);
rb[ETH_FPGA_REV] = lan743x_csr_read(adapter, FPGA_REV);
@@ -1220,17 +1216,120 @@ static void lan743x_common_regs(struct net_device *dev,
rb[ETH_WK_SRC] = lan743x_csr_read(adapter, MAC_WK_SRC);
}
+static void lan743x_sgmii_regs(struct net_device *dev, void *p)
+{
+ struct lan743x_adapter *adp = netdev_priv(dev);
+ u32 *rb = p;
+ u16 idx;
+ int val;
+ struct {
+ u8 id;
+ u8 dev;
+ u16 addr;
+ } regs[] = {
+ { ETH_SR_VSMMD_DEV_ID1, MDIO_MMD_VEND1, 0x0002},
+ { ETH_SR_VSMMD_DEV_ID2, MDIO_MMD_VEND1, 0x0003},
+ { ETH_SR_VSMMD_PCS_ID1, MDIO_MMD_VEND1, 0x0004},
+ { ETH_SR_VSMMD_PCS_ID2, MDIO_MMD_VEND1, 0x0005},
+ { ETH_SR_VSMMD_STS, MDIO_MMD_VEND1, 0x0008},
+ { ETH_SR_VSMMD_CTRL, MDIO_MMD_VEND1, 0x0009},
+ { ETH_SR_MII_CTRL, MDIO_MMD_VEND2, 0x0000},
+ { ETH_SR_MII_STS, MDIO_MMD_VEND2, 0x0001},
+ { ETH_SR_MII_DEV_ID1, MDIO_MMD_VEND2, 0x0002},
+ { ETH_SR_MII_DEV_ID2, MDIO_MMD_VEND2, 0x0003},
+ { ETH_SR_MII_AN_ADV, MDIO_MMD_VEND2, 0x0004},
+ { ETH_SR_MII_LP_BABL, MDIO_MMD_VEND2, 0x0005},
+ { ETH_SR_MII_EXPN, MDIO_MMD_VEND2, 0x0006},
+ { ETH_SR_MII_EXT_STS, MDIO_MMD_VEND2, 0x000F},
+ { ETH_SR_MII_TIME_SYNC_ABL, MDIO_MMD_VEND2, 0x0708},
+ { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x0709},
+ { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070A},
+ { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070B},
+ { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x070C},
+ { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x070D},
+ { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070E},
+ { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070F},
+ { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x0710},
+ { ETH_VR_MII_DIG_CTRL1, MDIO_MMD_VEND2, 0x8000},
+ { ETH_VR_MII_AN_CTRL, MDIO_MMD_VEND2, 0x8001},
+ { ETH_VR_MII_AN_INTR_STS, MDIO_MMD_VEND2, 0x8002},
+ { ETH_VR_MII_TC, MDIO_MMD_VEND2, 0x8003},
+ { ETH_VR_MII_DBG_CTRL, MDIO_MMD_VEND2, 0x8005},
+ { ETH_VR_MII_EEE_MCTRL0, MDIO_MMD_VEND2, 0x8006},
+ { ETH_VR_MII_EEE_TXTIMER, MDIO_MMD_VEND2, 0x8008},
+ { ETH_VR_MII_EEE_RXTIMER, MDIO_MMD_VEND2, 0x8009},
+ { ETH_VR_MII_LINK_TIMER_CTRL, MDIO_MMD_VEND2, 0x800A},
+ { ETH_VR_MII_EEE_MCTRL1, MDIO_MMD_VEND2, 0x800B},
+ { ETH_VR_MII_DIG_STS, MDIO_MMD_VEND2, 0x8010},
+ { ETH_VR_MII_ICG_ERRCNT1, MDIO_MMD_VEND2, 0x8011},
+ { ETH_VR_MII_GPIO, MDIO_MMD_VEND2, 0x8015},
+ { ETH_VR_MII_EEE_LPI_STATUS, MDIO_MMD_VEND2, 0x8016},
+ { ETH_VR_MII_EEE_WKERR, MDIO_MMD_VEND2, 0x8017},
+ { ETH_VR_MII_MISC_STS, MDIO_MMD_VEND2, 0x8018},
+ { ETH_VR_MII_RX_LSTS, MDIO_MMD_VEND2, 0x8020},
+ { ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0, MDIO_MMD_VEND2, 0x8038},
+ { ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0, MDIO_MMD_VEND2, 0x803A},
+ { ETH_VR_MII_GEN2_GEN4_TXGENCTRL0, MDIO_MMD_VEND2, 0x803C},
+ { ETH_VR_MII_GEN2_GEN4_TXGENCTRL1, MDIO_MMD_VEND2, 0x803D},
+ { ETH_VR_MII_GEN4_TXGENCTRL2, MDIO_MMD_VEND2, 0x803E},
+ { ETH_VR_MII_GEN2_GEN4_TX_STS, MDIO_MMD_VEND2, 0x8048},
+ { ETH_VR_MII_GEN2_GEN4_RXGENCTRL0, MDIO_MMD_VEND2, 0x8058},
+ { ETH_VR_MII_GEN2_GEN4_RXGENCTRL1, MDIO_MMD_VEND2, 0x8059},
+ { ETH_VR_MII_GEN4_RXEQ_CTRL, MDIO_MMD_VEND2, 0x805B},
+ { ETH_VR_MII_GEN4_RXLOS_CTRL0, MDIO_MMD_VEND2, 0x805D},
+ { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0, MDIO_MMD_VEND2, 0x8078},
+ { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1, MDIO_MMD_VEND2, 0x8079},
+ { ETH_VR_MII_GEN2_GEN4_MPLL_STS, MDIO_MMD_VEND2, 0x8088},
+ { ETH_VR_MII_GEN2_GEN4_LVL_CTRL, MDIO_MMD_VEND2, 0x8090},
+ { ETH_VR_MII_GEN4_MISC_CTRL2, MDIO_MMD_VEND2, 0x8093},
+ { ETH_VR_MII_GEN2_GEN4_MISC_CTRL0, MDIO_MMD_VEND2, 0x8099},
+ { ETH_VR_MII_GEN2_GEN4_MISC_CTRL1, MDIO_MMD_VEND2, 0x809A},
+ { ETH_VR_MII_SNPS_CR_CTRL, MDIO_MMD_VEND2, 0x80A0},
+ { ETH_VR_MII_SNPS_CR_ADDR, MDIO_MMD_VEND2, 0x80A1},
+ { ETH_VR_MII_SNPS_CR_DATA, MDIO_MMD_VEND2, 0x80A2},
+ { ETH_VR_MII_DIG_CTRL2, MDIO_MMD_VEND2, 0x80E1},
+ { ETH_VR_MII_DIG_ERRCNT, MDIO_MMD_VEND2, 0x80E2},
+ };
+
+ for (idx = 0; idx < ARRAY_SIZE(regs) / sizeof(regs[0]); idx++) {
+ val = lan743x_sgmii_read(adp, regs[idx].dev, regs[idx].addr);
+ if (val < 0)
+ rb[regs[idx].id] = 0xFFFF;
+ else
+ rb[regs[idx].id] = val;
+ }
+}
+
static int lan743x_get_regs_len(struct net_device *dev)
{
- return MAX_LAN743X_ETH_REGS * sizeof(u32);
+ struct lan743x_adapter *adapter = netdev_priv(dev);
+ u32 num_regs = MAX_LAN743X_ETH_COMMON_REGS;
+
+ if (adapter->is_sgmii_en)
+ num_regs += MAX_LAN743X_ETH_SGMII_REGS;
+
+ return num_regs * sizeof(u32);
}
static void lan743x_get_regs(struct net_device *dev,
struct ethtool_regs *regs, void *p)
{
+ struct lan743x_adapter *adapter = netdev_priv(dev);
+ int regs_len;
+
+ regs_len = lan743x_get_regs_len(dev);
+ memset(p, 0, regs_len);
+
regs->version = LAN743X_ETH_REG_VERSION;
+ regs->len = regs_len;
- lan743x_common_regs(dev, regs, p);
+ lan743x_common_regs(dev, p);
+ p = (u32 *)p + MAX_LAN743X_ETH_COMMON_REGS;
+
+ if (adapter->is_sgmii_en) {
+ lan743x_sgmii_regs(dev, p);
+ p = (u32 *)p + MAX_LAN743X_ETH_SGMII_REGS;
+ }
}
static void lan743x_get_pauseparam(struct net_device *dev,
diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.h b/drivers/net/ethernet/microchip/lan743x_ethtool.h
index 7f5996a52488..267d5035b8ad 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.h
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.h
@@ -29,7 +29,76 @@ enum {
ETH_WK_SRC,
/* Add new registers above */
- MAX_LAN743X_ETH_REGS
+ MAX_LAN743X_ETH_COMMON_REGS
+};
+
+enum {
+ /* SGMII Register */
+ ETH_SR_VSMMD_DEV_ID1,
+ ETH_SR_VSMMD_DEV_ID2,
+ ETH_SR_VSMMD_PCS_ID1,
+ ETH_SR_VSMMD_PCS_ID2,
+ ETH_SR_VSMMD_STS,
+ ETH_SR_VSMMD_CTRL,
+ ETH_SR_MII_CTRL,
+ ETH_SR_MII_STS,
+ ETH_SR_MII_DEV_ID1,
+ ETH_SR_MII_DEV_ID2,
+ ETH_SR_MII_AN_ADV,
+ ETH_SR_MII_LP_BABL,
+ ETH_SR_MII_EXPN,
+ ETH_SR_MII_EXT_STS,
+ ETH_SR_MII_TIME_SYNC_ABL,
+ ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR,
+ ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR,
+ ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR,
+ ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR,
+ ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR,
+ ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR,
+ ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR,
+ ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR,
+ ETH_VR_MII_DIG_CTRL1,
+ ETH_VR_MII_AN_CTRL,
+ ETH_VR_MII_AN_INTR_STS,
+ ETH_VR_MII_TC,
+ ETH_VR_MII_DBG_CTRL,
+ ETH_VR_MII_EEE_MCTRL0,
+ ETH_VR_MII_EEE_TXTIMER,
+ ETH_VR_MII_EEE_RXTIMER,
+ ETH_VR_MII_LINK_TIMER_CTRL,
+ ETH_VR_MII_EEE_MCTRL1,
+ ETH_VR_MII_DIG_STS,
+ ETH_VR_MII_ICG_ERRCNT1,
+ ETH_VR_MII_GPIO,
+ ETH_VR_MII_EEE_LPI_STATUS,
+ ETH_VR_MII_EEE_WKERR,
+ ETH_VR_MII_MISC_STS,
+ ETH_VR_MII_RX_LSTS,
+ ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0,
+ ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0,
+ ETH_VR_MII_GEN2_GEN4_TXGENCTRL0,
+ ETH_VR_MII_GEN2_GEN4_TXGENCTRL1,
+ ETH_VR_MII_GEN4_TXGENCTRL2,
+ ETH_VR_MII_GEN2_GEN4_TX_STS,
+ ETH_VR_MII_GEN2_GEN4_RXGENCTRL0,
+ ETH_VR_MII_GEN2_GEN4_RXGENCTRL1,
+ ETH_VR_MII_GEN4_RXEQ_CTRL,
+ ETH_VR_MII_GEN4_RXLOS_CTRL0,
+ ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0,
+ ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1,
+ ETH_VR_MII_GEN2_GEN4_MPLL_STS,
+ ETH_VR_MII_GEN2_GEN4_LVL_CTRL,
+ ETH_VR_MII_GEN4_MISC_CTRL2,
+ ETH_VR_MII_GEN2_GEN4_MISC_CTRL0,
+ ETH_VR_MII_GEN2_GEN4_MISC_CTRL1,
+ ETH_VR_MII_SNPS_CR_CTRL,
+ ETH_VR_MII_SNPS_CR_ADDR,
+ ETH_VR_MII_SNPS_CR_DATA,
+ ETH_VR_MII_DIG_CTRL2,
+ ETH_VR_MII_DIG_ERRCNT,
+
+ /* Add new registers above */
+ MAX_LAN743X_ETH_SGMII_REGS
};
extern const struct ethtool_ops lan743x_ethtool_ops;
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index c0f8ba601c01..534840f9a7ca 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -939,7 +939,7 @@ static int lan743x_sgmii_wait_till_not_busy(struct lan743x_adapter *adapter)
return ret;
}
-static int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr)
+int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr)
{
u32 mmd_access;
int ret;
diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
index bc5eea4c7b40..8438c3dbcf36 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.h
+++ b/drivers/net/ethernet/microchip/lan743x_main.h
@@ -1161,5 +1161,6 @@ int lan743x_hs_syslock_acquire(struct lan743x_adapter *adapter, u16 timeout);
void lan743x_hs_syslock_release(struct lan743x_adapter *adapter);
void lan743x_mac_flow_ctrl_set_enables(struct lan743x_adapter *adapter,
bool tx_enable, bool rx_enable);
+int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr);
#endif /* _LAN743X_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
2022-11-02 5:28 [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips Raju Lakkaraju
@ 2022-11-02 8:31 ` Horatiu Vultur
2022-11-02 8:46 ` Raju Lakkaraju
0 siblings, 1 reply; 5+ messages in thread
From: Horatiu Vultur @ 2022-11-02 8:31 UTC (permalink / raw)
To: Raju Lakkaraju
Cc: netdev, davem, kuba, linux-kernel, bryan.whitehead, pabeni,
edumazet, olteanv, linux, UNGLinuxDriver, andrew, Ian.Saturley
The 11/02/2022 10:58, Raju Lakkaraju wrote:
Hi Raju,
> Add support to SGMII register dump
>
> Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
> ---
> Change List:
> ============
> V4 -> V5:
> - Remove the debug read function macro
> - Add auto variable structure to handle register definitions
>
> V3 -> V4:
> - No changes. Patch on tags 6.1-rc1
>
> V2 -> V3:
> - Remove the private flag option.
> As per review comment, use -w/-W to configure dump flag.
> But, change to -w/-W option, EEPROM/OTP data might be corrupt
> in case of wrong flag input.
> Need to fix this properly in future development.
>
> V1 -> V2:
> - Add set_dump and get_dump_flag functions
>
> V0 -> V1:
> - Removed unwanted code
>
> .../net/ethernet/microchip/lan743x_ethtool.c | 113 ++++++++++++++++--
> .../net/ethernet/microchip/lan743x_ethtool.h | 71 ++++++++++-
> drivers/net/ethernet/microchip/lan743x_main.c | 2 +-
> drivers/net/ethernet/microchip/lan743x_main.h | 1 +
> 4 files changed, 178 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
> index 88f9484cc2a7..0624ce24b44e 100644
> --- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
> +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
> @@ -1190,15 +1190,11 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
> }
> #endif /* CONFIG_PM */
>
> -static void lan743x_common_regs(struct net_device *dev,
> - struct ethtool_regs *regs, void *p)
> -
> +static void lan743x_common_regs(struct net_device *dev, void *p)
> {
This change shouldn't be part of a different patch? Because this change
doesn't have anything to do with the SGMII register dump, you just
remove unused parameter.
> struct lan743x_adapter *adapter = netdev_priv(dev);
> u32 *rb = p;
>
> - memset(p, 0, (MAX_LAN743X_ETH_REGS * sizeof(u32)));
> -
> rb[ETH_PRIV_FLAGS] = adapter->flags;
> rb[ETH_ID_REV] = lan743x_csr_read(adapter, ID_REV);
> rb[ETH_FPGA_REV] = lan743x_csr_read(adapter, FPGA_REV);
> @@ -1220,17 +1216,120 @@ static void lan743x_common_regs(struct net_device *dev,
> rb[ETH_WK_SRC] = lan743x_csr_read(adapter, MAC_WK_SRC);
> }
>
> +static void lan743x_sgmii_regs(struct net_device *dev, void *p)
> +{
> + struct lan743x_adapter *adp = netdev_priv(dev);
> + u32 *rb = p;
> + u16 idx;
> + int val;
> + struct {
> + u8 id;
> + u8 dev;
> + u16 addr;
> + } regs[] = {
> + { ETH_SR_VSMMD_DEV_ID1, MDIO_MMD_VEND1, 0x0002},
> + { ETH_SR_VSMMD_DEV_ID2, MDIO_MMD_VEND1, 0x0003},
> + { ETH_SR_VSMMD_PCS_ID1, MDIO_MMD_VEND1, 0x0004},
> + { ETH_SR_VSMMD_PCS_ID2, MDIO_MMD_VEND1, 0x0005},
> + { ETH_SR_VSMMD_STS, MDIO_MMD_VEND1, 0x0008},
> + { ETH_SR_VSMMD_CTRL, MDIO_MMD_VEND1, 0x0009},
> + { ETH_SR_MII_CTRL, MDIO_MMD_VEND2, 0x0000},
> + { ETH_SR_MII_STS, MDIO_MMD_VEND2, 0x0001},
> + { ETH_SR_MII_DEV_ID1, MDIO_MMD_VEND2, 0x0002},
> + { ETH_SR_MII_DEV_ID2, MDIO_MMD_VEND2, 0x0003},
> + { ETH_SR_MII_AN_ADV, MDIO_MMD_VEND2, 0x0004},
> + { ETH_SR_MII_LP_BABL, MDIO_MMD_VEND2, 0x0005},
> + { ETH_SR_MII_EXPN, MDIO_MMD_VEND2, 0x0006},
> + { ETH_SR_MII_EXT_STS, MDIO_MMD_VEND2, 0x000F},
> + { ETH_SR_MII_TIME_SYNC_ABL, MDIO_MMD_VEND2, 0x0708},
> + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x0709},
> + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070A},
> + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070B},
> + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x070C},
> + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x070D},
> + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070E},
> + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070F},
> + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x0710},
> + { ETH_VR_MII_DIG_CTRL1, MDIO_MMD_VEND2, 0x8000},
> + { ETH_VR_MII_AN_CTRL, MDIO_MMD_VEND2, 0x8001},
> + { ETH_VR_MII_AN_INTR_STS, MDIO_MMD_VEND2, 0x8002},
> + { ETH_VR_MII_TC, MDIO_MMD_VEND2, 0x8003},
> + { ETH_VR_MII_DBG_CTRL, MDIO_MMD_VEND2, 0x8005},
> + { ETH_VR_MII_EEE_MCTRL0, MDIO_MMD_VEND2, 0x8006},
> + { ETH_VR_MII_EEE_TXTIMER, MDIO_MMD_VEND2, 0x8008},
> + { ETH_VR_MII_EEE_RXTIMER, MDIO_MMD_VEND2, 0x8009},
> + { ETH_VR_MII_LINK_TIMER_CTRL, MDIO_MMD_VEND2, 0x800A},
> + { ETH_VR_MII_EEE_MCTRL1, MDIO_MMD_VEND2, 0x800B},
> + { ETH_VR_MII_DIG_STS, MDIO_MMD_VEND2, 0x8010},
> + { ETH_VR_MII_ICG_ERRCNT1, MDIO_MMD_VEND2, 0x8011},
> + { ETH_VR_MII_GPIO, MDIO_MMD_VEND2, 0x8015},
> + { ETH_VR_MII_EEE_LPI_STATUS, MDIO_MMD_VEND2, 0x8016},
> + { ETH_VR_MII_EEE_WKERR, MDIO_MMD_VEND2, 0x8017},
> + { ETH_VR_MII_MISC_STS, MDIO_MMD_VEND2, 0x8018},
> + { ETH_VR_MII_RX_LSTS, MDIO_MMD_VEND2, 0x8020},
> + { ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0, MDIO_MMD_VEND2, 0x8038},
> + { ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0, MDIO_MMD_VEND2, 0x803A},
> + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL0, MDIO_MMD_VEND2, 0x803C},
> + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL1, MDIO_MMD_VEND2, 0x803D},
> + { ETH_VR_MII_GEN4_TXGENCTRL2, MDIO_MMD_VEND2, 0x803E},
> + { ETH_VR_MII_GEN2_GEN4_TX_STS, MDIO_MMD_VEND2, 0x8048},
> + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL0, MDIO_MMD_VEND2, 0x8058},
> + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL1, MDIO_MMD_VEND2, 0x8059},
> + { ETH_VR_MII_GEN4_RXEQ_CTRL, MDIO_MMD_VEND2, 0x805B},
> + { ETH_VR_MII_GEN4_RXLOS_CTRL0, MDIO_MMD_VEND2, 0x805D},
> + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0, MDIO_MMD_VEND2, 0x8078},
> + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1, MDIO_MMD_VEND2, 0x8079},
> + { ETH_VR_MII_GEN2_GEN4_MPLL_STS, MDIO_MMD_VEND2, 0x8088},
> + { ETH_VR_MII_GEN2_GEN4_LVL_CTRL, MDIO_MMD_VEND2, 0x8090},
> + { ETH_VR_MII_GEN4_MISC_CTRL2, MDIO_MMD_VEND2, 0x8093},
> + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL0, MDIO_MMD_VEND2, 0x8099},
> + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL1, MDIO_MMD_VEND2, 0x809A},
> + { ETH_VR_MII_SNPS_CR_CTRL, MDIO_MMD_VEND2, 0x80A0},
> + { ETH_VR_MII_SNPS_CR_ADDR, MDIO_MMD_VEND2, 0x80A1},
> + { ETH_VR_MII_SNPS_CR_DATA, MDIO_MMD_VEND2, 0x80A2},
> + { ETH_VR_MII_DIG_CTRL2, MDIO_MMD_VEND2, 0x80E1},
> + { ETH_VR_MII_DIG_ERRCNT, MDIO_MMD_VEND2, 0x80E2},
> + };
> +
> + for (idx = 0; idx < ARRAY_SIZE(regs) / sizeof(regs[0]); idx++) {
Is this correct?
You have 62 entries but you go only over the first 15. Or am I
misunderstood something?
> + val = lan743x_sgmii_read(adp, regs[idx].dev, regs[idx].addr);
> + if (val < 0)
> + rb[regs[idx].id] = 0xFFFF;
> + else
> + rb[regs[idx].id] = val;
> + }
> +}
> +
> static int lan743x_get_regs_len(struct net_device *dev)
> {
> - return MAX_LAN743X_ETH_REGS * sizeof(u32);
> + struct lan743x_adapter *adapter = netdev_priv(dev);
> + u32 num_regs = MAX_LAN743X_ETH_COMMON_REGS;
> +
> + if (adapter->is_sgmii_en)
> + num_regs += MAX_LAN743X_ETH_SGMII_REGS;
> +
> + return num_regs * sizeof(u32);
> }
>
> static void lan743x_get_regs(struct net_device *dev,
> struct ethtool_regs *regs, void *p)
> {
> + struct lan743x_adapter *adapter = netdev_priv(dev);
> + int regs_len;
> +
> + regs_len = lan743x_get_regs_len(dev);
> + memset(p, 0, regs_len);
> +
> regs->version = LAN743X_ETH_REG_VERSION;
> + regs->len = regs_len;
>
> - lan743x_common_regs(dev, regs, p);
> + lan743x_common_regs(dev, p);
> + p = (u32 *)p + MAX_LAN743X_ETH_COMMON_REGS;
> +
> + if (adapter->is_sgmii_en) {
> + lan743x_sgmii_regs(dev, p);
> + p = (u32 *)p + MAX_LAN743X_ETH_SGMII_REGS;
> + }
> }
>
> static void lan743x_get_pauseparam(struct net_device *dev,
> diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.h b/drivers/net/ethernet/microchip/lan743x_ethtool.h
> index 7f5996a52488..267d5035b8ad 100644
> --- a/drivers/net/ethernet/microchip/lan743x_ethtool.h
> +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.h
> @@ -29,7 +29,76 @@ enum {
> ETH_WK_SRC,
>
> /* Add new registers above */
> - MAX_LAN743X_ETH_REGS
> + MAX_LAN743X_ETH_COMMON_REGS
> +};
> +
> +enum {
> + /* SGMII Register */
> + ETH_SR_VSMMD_DEV_ID1,
> + ETH_SR_VSMMD_DEV_ID2,
> + ETH_SR_VSMMD_PCS_ID1,
> + ETH_SR_VSMMD_PCS_ID2,
> + ETH_SR_VSMMD_STS,
> + ETH_SR_VSMMD_CTRL,
> + ETH_SR_MII_CTRL,
> + ETH_SR_MII_STS,
> + ETH_SR_MII_DEV_ID1,
> + ETH_SR_MII_DEV_ID2,
> + ETH_SR_MII_AN_ADV,
> + ETH_SR_MII_LP_BABL,
> + ETH_SR_MII_EXPN,
> + ETH_SR_MII_EXT_STS,
> + ETH_SR_MII_TIME_SYNC_ABL,
> + ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR,
> + ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR,
> + ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR,
> + ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR,
> + ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR,
> + ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR,
> + ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR,
> + ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR,
> + ETH_VR_MII_DIG_CTRL1,
> + ETH_VR_MII_AN_CTRL,
> + ETH_VR_MII_AN_INTR_STS,
> + ETH_VR_MII_TC,
> + ETH_VR_MII_DBG_CTRL,
> + ETH_VR_MII_EEE_MCTRL0,
> + ETH_VR_MII_EEE_TXTIMER,
> + ETH_VR_MII_EEE_RXTIMER,
> + ETH_VR_MII_LINK_TIMER_CTRL,
> + ETH_VR_MII_EEE_MCTRL1,
> + ETH_VR_MII_DIG_STS,
> + ETH_VR_MII_ICG_ERRCNT1,
> + ETH_VR_MII_GPIO,
> + ETH_VR_MII_EEE_LPI_STATUS,
> + ETH_VR_MII_EEE_WKERR,
> + ETH_VR_MII_MISC_STS,
> + ETH_VR_MII_RX_LSTS,
> + ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0,
> + ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0,
> + ETH_VR_MII_GEN2_GEN4_TXGENCTRL0,
> + ETH_VR_MII_GEN2_GEN4_TXGENCTRL1,
> + ETH_VR_MII_GEN4_TXGENCTRL2,
> + ETH_VR_MII_GEN2_GEN4_TX_STS,
> + ETH_VR_MII_GEN2_GEN4_RXGENCTRL0,
> + ETH_VR_MII_GEN2_GEN4_RXGENCTRL1,
> + ETH_VR_MII_GEN4_RXEQ_CTRL,
> + ETH_VR_MII_GEN4_RXLOS_CTRL0,
> + ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0,
> + ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1,
> + ETH_VR_MII_GEN2_GEN4_MPLL_STS,
> + ETH_VR_MII_GEN2_GEN4_LVL_CTRL,
> + ETH_VR_MII_GEN4_MISC_CTRL2,
> + ETH_VR_MII_GEN2_GEN4_MISC_CTRL0,
> + ETH_VR_MII_GEN2_GEN4_MISC_CTRL1,
> + ETH_VR_MII_SNPS_CR_CTRL,
> + ETH_VR_MII_SNPS_CR_ADDR,
> + ETH_VR_MII_SNPS_CR_DATA,
> + ETH_VR_MII_DIG_CTRL2,
> + ETH_VR_MII_DIG_ERRCNT,
> +
> + /* Add new registers above */
> + MAX_LAN743X_ETH_SGMII_REGS
> };
>
> extern const struct ethtool_ops lan743x_ethtool_ops;
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
> index c0f8ba601c01..534840f9a7ca 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -939,7 +939,7 @@ static int lan743x_sgmii_wait_till_not_busy(struct lan743x_adapter *adapter)
> return ret;
> }
>
> -static int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr)
> +int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr)
> {
> u32 mmd_access;
> int ret;
> diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
> index bc5eea4c7b40..8438c3dbcf36 100644
> --- a/drivers/net/ethernet/microchip/lan743x_main.h
> +++ b/drivers/net/ethernet/microchip/lan743x_main.h
> @@ -1161,5 +1161,6 @@ int lan743x_hs_syslock_acquire(struct lan743x_adapter *adapter, u16 timeout);
> void lan743x_hs_syslock_release(struct lan743x_adapter *adapter);
> void lan743x_mac_flow_ctrl_set_enables(struct lan743x_adapter *adapter,
> bool tx_enable, bool rx_enable);
> +int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr);
>
> #endif /* _LAN743X_H */
> --
> 2.25.1
>
--
/Horatiu
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
2022-11-02 8:31 ` Horatiu Vultur
@ 2022-11-02 8:46 ` Raju Lakkaraju
2022-11-02 9:09 ` Horatiu Vultur
0 siblings, 1 reply; 5+ messages in thread
From: Raju Lakkaraju @ 2022-11-02 8:46 UTC (permalink / raw)
To: Horatiu Vultur
Cc: netdev, davem, kuba, linux-kernel, bryan.whitehead, pabeni,
edumazet, olteanv, linux, UNGLinuxDriver, andrew, Ian.Saturley
[-- Attachment #1: Type: text/plain, Size: 12945 bytes --]
Hi Horatiu,
Thank you for review comments.
The 11/02/2022 09:31, Horatiu Vultur wrote:
> The 11/02/2022 10:58, Raju Lakkaraju wrote:
>
> Hi Raju,
>
> > Add support to SGMII register dump
> >
> > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
> > ---
> > Change List:
> > ============
> > V4 -> V5:
> > - Remove the debug read function macro
> > - Add auto variable structure to handle register definitions
> >
> > V3 -> V4:
> > - No changes. Patch on tags 6.1-rc1
> >
> > V2 -> V3:
> > - Remove the private flag option.
> > As per review comment, use -w/-W to configure dump flag.
> > But, change to -w/-W option, EEPROM/OTP data might be corrupt
> > in case of wrong flag input.
> > Need to fix this properly in future development.
> >
> > V1 -> V2:
> > - Add set_dump and get_dump_flag functions
> >
> > V0 -> V1:
> > - Removed unwanted code
> >
> > .../net/ethernet/microchip/lan743x_ethtool.c | 113 ++++++++++++++++--
> > .../net/ethernet/microchip/lan743x_ethtool.h | 71 ++++++++++-
> > drivers/net/ethernet/microchip/lan743x_main.c | 2 +-
> > drivers/net/ethernet/microchip/lan743x_main.h | 1 +
> > 4 files changed, 178 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
> > index 88f9484cc2a7..0624ce24b44e 100644
> > --- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
> > +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
> > @@ -1190,15 +1190,11 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
> > }
> > #endif /* CONFIG_PM */
> >
> > -static void lan743x_common_regs(struct net_device *dev,
> > - struct ethtool_regs *regs, void *p)
> > -
> > +static void lan743x_common_regs(struct net_device *dev, void *p)
> > {
>
> This change shouldn't be part of a different patch? Because this change
> doesn't have anything to do with the SGMII register dump, you just
> remove unused parameter.
>
Yes.
I thought, it's minor change.
O.K. I will split into 2 patches and send again.
> > struct lan743x_adapter *adapter = netdev_priv(dev);
> > u32 *rb = p;
> >
> > - memset(p, 0, (MAX_LAN743X_ETH_REGS * sizeof(u32)));
> > -
> > rb[ETH_PRIV_FLAGS] = adapter->flags;
> > rb[ETH_ID_REV] = lan743x_csr_read(adapter, ID_REV);
> > rb[ETH_FPGA_REV] = lan743x_csr_read(adapter, FPGA_REV);
> > @@ -1220,17 +1216,120 @@ static void lan743x_common_regs(struct net_device *dev,
> > rb[ETH_WK_SRC] = lan743x_csr_read(adapter, MAC_WK_SRC);
> > }
> >
> > +static void lan743x_sgmii_regs(struct net_device *dev, void *p)
> > +{
> > + struct lan743x_adapter *adp = netdev_priv(dev);
> > + u32 *rb = p;
> > + u16 idx;
> > + int val;
> > + struct {
> > + u8 id;
> > + u8 dev;
> > + u16 addr;
> > + } regs[] = {
> > + { ETH_SR_VSMMD_DEV_ID1, MDIO_MMD_VEND1, 0x0002},
> > + { ETH_SR_VSMMD_DEV_ID2, MDIO_MMD_VEND1, 0x0003},
> > + { ETH_SR_VSMMD_PCS_ID1, MDIO_MMD_VEND1, 0x0004},
> > + { ETH_SR_VSMMD_PCS_ID2, MDIO_MMD_VEND1, 0x0005},
> > + { ETH_SR_VSMMD_STS, MDIO_MMD_VEND1, 0x0008},
> > + { ETH_SR_VSMMD_CTRL, MDIO_MMD_VEND1, 0x0009},
> > + { ETH_SR_MII_CTRL, MDIO_MMD_VEND2, 0x0000},
> > + { ETH_SR_MII_STS, MDIO_MMD_VEND2, 0x0001},
> > + { ETH_SR_MII_DEV_ID1, MDIO_MMD_VEND2, 0x0002},
> > + { ETH_SR_MII_DEV_ID2, MDIO_MMD_VEND2, 0x0003},
> > + { ETH_SR_MII_AN_ADV, MDIO_MMD_VEND2, 0x0004},
> > + { ETH_SR_MII_LP_BABL, MDIO_MMD_VEND2, 0x0005},
> > + { ETH_SR_MII_EXPN, MDIO_MMD_VEND2, 0x0006},
> > + { ETH_SR_MII_EXT_STS, MDIO_MMD_VEND2, 0x000F},
> > + { ETH_SR_MII_TIME_SYNC_ABL, MDIO_MMD_VEND2, 0x0708},
> > + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x0709},
> > + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070A},
> > + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070B},
> > + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x070C},
> > + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x070D},
> > + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070E},
> > + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070F},
> > + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x0710},
> > + { ETH_VR_MII_DIG_CTRL1, MDIO_MMD_VEND2, 0x8000},
> > + { ETH_VR_MII_AN_CTRL, MDIO_MMD_VEND2, 0x8001},
> > + { ETH_VR_MII_AN_INTR_STS, MDIO_MMD_VEND2, 0x8002},
> > + { ETH_VR_MII_TC, MDIO_MMD_VEND2, 0x8003},
> > + { ETH_VR_MII_DBG_CTRL, MDIO_MMD_VEND2, 0x8005},
> > + { ETH_VR_MII_EEE_MCTRL0, MDIO_MMD_VEND2, 0x8006},
> > + { ETH_VR_MII_EEE_TXTIMER, MDIO_MMD_VEND2, 0x8008},
> > + { ETH_VR_MII_EEE_RXTIMER, MDIO_MMD_VEND2, 0x8009},
> > + { ETH_VR_MII_LINK_TIMER_CTRL, MDIO_MMD_VEND2, 0x800A},
> > + { ETH_VR_MII_EEE_MCTRL1, MDIO_MMD_VEND2, 0x800B},
> > + { ETH_VR_MII_DIG_STS, MDIO_MMD_VEND2, 0x8010},
> > + { ETH_VR_MII_ICG_ERRCNT1, MDIO_MMD_VEND2, 0x8011},
> > + { ETH_VR_MII_GPIO, MDIO_MMD_VEND2, 0x8015},
> > + { ETH_VR_MII_EEE_LPI_STATUS, MDIO_MMD_VEND2, 0x8016},
> > + { ETH_VR_MII_EEE_WKERR, MDIO_MMD_VEND2, 0x8017},
> > + { ETH_VR_MII_MISC_STS, MDIO_MMD_VEND2, 0x8018},
> > + { ETH_VR_MII_RX_LSTS, MDIO_MMD_VEND2, 0x8020},
> > + { ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0, MDIO_MMD_VEND2, 0x8038},
> > + { ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0, MDIO_MMD_VEND2, 0x803A},
> > + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL0, MDIO_MMD_VEND2, 0x803C},
> > + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL1, MDIO_MMD_VEND2, 0x803D},
> > + { ETH_VR_MII_GEN4_TXGENCTRL2, MDIO_MMD_VEND2, 0x803E},
> > + { ETH_VR_MII_GEN2_GEN4_TX_STS, MDIO_MMD_VEND2, 0x8048},
> > + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL0, MDIO_MMD_VEND2, 0x8058},
> > + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL1, MDIO_MMD_VEND2, 0x8059},
> > + { ETH_VR_MII_GEN4_RXEQ_CTRL, MDIO_MMD_VEND2, 0x805B},
> > + { ETH_VR_MII_GEN4_RXLOS_CTRL0, MDIO_MMD_VEND2, 0x805D},
> > + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0, MDIO_MMD_VEND2, 0x8078},
> > + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1, MDIO_MMD_VEND2, 0x8079},
> > + { ETH_VR_MII_GEN2_GEN4_MPLL_STS, MDIO_MMD_VEND2, 0x8088},
> > + { ETH_VR_MII_GEN2_GEN4_LVL_CTRL, MDIO_MMD_VEND2, 0x8090},
> > + { ETH_VR_MII_GEN4_MISC_CTRL2, MDIO_MMD_VEND2, 0x8093},
> > + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL0, MDIO_MMD_VEND2, 0x8099},
> > + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL1, MDIO_MMD_VEND2, 0x809A},
> > + { ETH_VR_MII_SNPS_CR_CTRL, MDIO_MMD_VEND2, 0x80A0},
> > + { ETH_VR_MII_SNPS_CR_ADDR, MDIO_MMD_VEND2, 0x80A1},
> > + { ETH_VR_MII_SNPS_CR_DATA, MDIO_MMD_VEND2, 0x80A2},
> > + { ETH_VR_MII_DIG_CTRL2, MDIO_MMD_VEND2, 0x80E1},
> > + { ETH_VR_MII_DIG_ERRCNT, MDIO_MMD_VEND2, 0x80E2},
> > + };
> > +
> > + for (idx = 0; idx < ARRAY_SIZE(regs) / sizeof(regs[0]); idx++) {
>
> Is this correct?
Yes.
> You have 62 entries but you go only over the first 15. Or am I
> misunderstood something?
Your ethtool application don't have SGMII register dump register
definitions.
Once This patch accept by Linux community, I will submit ethtool application
changes to "Ethtool development community".
For your reference, Please find the attached file
(sgmii_sgmii_regdump_cmd.txt).
>
> > + val = lan743x_sgmii_read(adp, regs[idx].dev, regs[idx].addr);
> > + if (val < 0)
> > + rb[regs[idx].id] = 0xFFFF;
> > + else
> > + rb[regs[idx].id] = val;
> > + }
> > +}
> > +
> > static int lan743x_get_regs_len(struct net_device *dev)
> > {
> > - return MAX_LAN743X_ETH_REGS * sizeof(u32);
> > + struct lan743x_adapter *adapter = netdev_priv(dev);
> > + u32 num_regs = MAX_LAN743X_ETH_COMMON_REGS;
> > +
> > + if (adapter->is_sgmii_en)
> > + num_regs += MAX_LAN743X_ETH_SGMII_REGS;
> > +
> > + return num_regs * sizeof(u32);
> > }
> >
> > static void lan743x_get_regs(struct net_device *dev,
> > struct ethtool_regs *regs, void *p)
> > {
> > + struct lan743x_adapter *adapter = netdev_priv(dev);
> > + int regs_len;
> > +
> > + regs_len = lan743x_get_regs_len(dev);
> > + memset(p, 0, regs_len);
> > +
> > regs->version = LAN743X_ETH_REG_VERSION;
> > + regs->len = regs_len;
> >
> > - lan743x_common_regs(dev, regs, p);
> > + lan743x_common_regs(dev, p);
> > + p = (u32 *)p + MAX_LAN743X_ETH_COMMON_REGS;
> > +
> > + if (adapter->is_sgmii_en) {
> > + lan743x_sgmii_regs(dev, p);
> > + p = (u32 *)p + MAX_LAN743X_ETH_SGMII_REGS;
> > + }
> > }
> >
> > static void lan743x_get_pauseparam(struct net_device *dev,
> > diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.h b/drivers/net/ethernet/microchip/lan743x_ethtool.h
> > index 7f5996a52488..267d5035b8ad 100644
> > --- a/drivers/net/ethernet/microchip/lan743x_ethtool.h
> > +++ b/drivers/net/ethernet/microchip/lan743x_ethtool.h
> > @@ -29,7 +29,76 @@ enum {
> > ETH_WK_SRC,
> >
> > /* Add new registers above */
> > - MAX_LAN743X_ETH_REGS
> > + MAX_LAN743X_ETH_COMMON_REGS
> > +};
> > +
> > +enum {
> > + /* SGMII Register */
> > + ETH_SR_VSMMD_DEV_ID1,
> > + ETH_SR_VSMMD_DEV_ID2,
> > + ETH_SR_VSMMD_PCS_ID1,
> > + ETH_SR_VSMMD_PCS_ID2,
> > + ETH_SR_VSMMD_STS,
> > + ETH_SR_VSMMD_CTRL,
> > + ETH_SR_MII_CTRL,
> > + ETH_SR_MII_STS,
> > + ETH_SR_MII_DEV_ID1,
> > + ETH_SR_MII_DEV_ID2,
> > + ETH_SR_MII_AN_ADV,
> > + ETH_SR_MII_LP_BABL,
> > + ETH_SR_MII_EXPN,
> > + ETH_SR_MII_EXT_STS,
> > + ETH_SR_MII_TIME_SYNC_ABL,
> > + ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR,
> > + ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR,
> > + ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR,
> > + ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR,
> > + ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR,
> > + ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR,
> > + ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR,
> > + ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR,
> > + ETH_VR_MII_DIG_CTRL1,
> > + ETH_VR_MII_AN_CTRL,
> > + ETH_VR_MII_AN_INTR_STS,
> > + ETH_VR_MII_TC,
> > + ETH_VR_MII_DBG_CTRL,
> > + ETH_VR_MII_EEE_MCTRL0,
> > + ETH_VR_MII_EEE_TXTIMER,
> > + ETH_VR_MII_EEE_RXTIMER,
> > + ETH_VR_MII_LINK_TIMER_CTRL,
> > + ETH_VR_MII_EEE_MCTRL1,
> > + ETH_VR_MII_DIG_STS,
> > + ETH_VR_MII_ICG_ERRCNT1,
> > + ETH_VR_MII_GPIO,
> > + ETH_VR_MII_EEE_LPI_STATUS,
> > + ETH_VR_MII_EEE_WKERR,
> > + ETH_VR_MII_MISC_STS,
> > + ETH_VR_MII_RX_LSTS,
> > + ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0,
> > + ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0,
> > + ETH_VR_MII_GEN2_GEN4_TXGENCTRL0,
> > + ETH_VR_MII_GEN2_GEN4_TXGENCTRL1,
> > + ETH_VR_MII_GEN4_TXGENCTRL2,
> > + ETH_VR_MII_GEN2_GEN4_TX_STS,
> > + ETH_VR_MII_GEN2_GEN4_RXGENCTRL0,
> > + ETH_VR_MII_GEN2_GEN4_RXGENCTRL1,
> > + ETH_VR_MII_GEN4_RXEQ_CTRL,
> > + ETH_VR_MII_GEN4_RXLOS_CTRL0,
> > + ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0,
> > + ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1,
> > + ETH_VR_MII_GEN2_GEN4_MPLL_STS,
> > + ETH_VR_MII_GEN2_GEN4_LVL_CTRL,
> > + ETH_VR_MII_GEN4_MISC_CTRL2,
> > + ETH_VR_MII_GEN2_GEN4_MISC_CTRL0,
> > + ETH_VR_MII_GEN2_GEN4_MISC_CTRL1,
> > + ETH_VR_MII_SNPS_CR_CTRL,
> > + ETH_VR_MII_SNPS_CR_ADDR,
> > + ETH_VR_MII_SNPS_CR_DATA,
> > + ETH_VR_MII_DIG_CTRL2,
> > + ETH_VR_MII_DIG_ERRCNT,
> > +
> > + /* Add new registers above */
> > + MAX_LAN743X_ETH_SGMII_REGS
> > };
> >
> > extern const struct ethtool_ops lan743x_ethtool_ops;
> > diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
> > index c0f8ba601c01..534840f9a7ca 100644
> > --- a/drivers/net/ethernet/microchip/lan743x_main.c
> > +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> > @@ -939,7 +939,7 @@ static int lan743x_sgmii_wait_till_not_busy(struct lan743x_adapter *adapter)
> > return ret;
> > }
> >
> > -static int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr)
> > +int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr)
> > {
> > u32 mmd_access;
> > int ret;
> > diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
> > index bc5eea4c7b40..8438c3dbcf36 100644
> > --- a/drivers/net/ethernet/microchip/lan743x_main.h
> > +++ b/drivers/net/ethernet/microchip/lan743x_main.h
> > @@ -1161,5 +1161,6 @@ int lan743x_hs_syslock_acquire(struct lan743x_adapter *adapter, u16 timeout);
> > void lan743x_hs_syslock_release(struct lan743x_adapter *adapter);
> > void lan743x_mac_flow_ctrl_set_enables(struct lan743x_adapter *adapter,
> > bool tx_enable, bool rx_enable);
> > +int lan743x_sgmii_read(struct lan743x_adapter *adapter, u8 mmd, u16 addr);
> >
> > #endif /* _LAN743X_H */
> > --
> > 2.25.1
> >
>
> --
> /Horatiu
--------
Thanks,
Raju
[-- Attachment #2: sgmii_sgmii_regdump_cmd.txt --]
[-- Type: text/plain, Size: 3991 bytes --]
$ ethtool -d enp6s0
LAN743x Registers:
------------------
CHIP_ID_REV = 0xA04100A0
FPGA_REV = 0x00000000
STRAP_READ = 0x00000040
INT_STS = 0x00000230
HW_CFG = 0x00000000
PMT_CTRL = 0x000001A0
E2P_CMD = 0x00000000
E2P_DATA = 0x00000000
MAC Registers:
--------------
MAC_CR = 0x0008600E
MAC_RX = 0x05EE0069
MAC_TX = 0x00000041
FLOW = 0x6000FFFF
MII_ACC = 0x00000B80
MII_DATA = 0x00000003
WUCSR = 0x00000000
WK_SRC = 0x00000000
EEE_TX_LPI_REQ_DLY = 0x00000000
SGMII Register Dump:
-------------------
SR_VSMMD_DEV_ID1 [1E:0002] = 0x00000000
SR_VSMMD_DEV_ID2 [1E:0003] = 0x00000000
SR_VSMMD_PCS_ID1 [1E:0004] = 0x00007996
SR_VSMMD_PCS_ID2 [1E:0005] = 0x0000CED0
SR_VSMMD_STS [1E:0008] = 0x00008000
SR_VSMMD_CTRL [1E:0009] = 0x00000004
SR_MII_CTRL [1F:0000] = 0x00000140
SR_MII_STS [1F:0001] = 0x0000018D
SR_MII_DEV_ID1 [1F:0002] = 0x00007996
SR_MII_DEV_ID2 [1F:0003] = 0x0000CED0
SR_MII_AN_ADV [1F:0004] = 0x00000020
SR_MII_LP_BABL [1F:0005] = 0x00000000
SR_MII_EXPN [1F:0006] = 0x00000000
SR_MII_EXT_STS [1F:000F] = 0x0000C000
SR_MII_TIME_SYNC_ABL [1F:0708] = 0x00000003
SR_MII_TIME_SYNC_TX_MAX_DLY_LWR [1F:0709] = 0x00000000
SR_MII_TIME_SYNC_TX_MAX_DLY_UPR [1F:070A] = 0x00000000
SR_MII_TIME_SYNC_TX_MIN_DLY_LWR [1F:070B] = 0x00000000
SR_MII_TIME_SYNC_TX_MIN_DLY_UPR [1F:070C] = 0x00000000
SR_MII_TIME_SYNC_RX_MAX_DLY_LWR [1F:070D] = 0x00000000
SR_MII_TIME_SYNC_RX_MAX_DLY_UPR [1F:070E] = 0x00000000
SR_MII_TIME_SYNC_RX_MIN_DLY_LWR [1F:070F] = 0x00000000
SR_MII_TIME_SYNC_RX_MIN_DLY_UPR [1F:0710] = 0x00000000
VR_MII_DIG_CTRL1 [1F:8000] = 0x00000000
VR_MII_AN_CTRL [1F:8001] = 0x00000000
VR_MII_AN_INTR_STS [1F:8002] = 0x00000000
VR_MII_TC [1F:8003] = 0x00000000
VR_MII_DBG_CTRL [1F:8005] = 0x00000000
VR_MII_EEE_MCTRL0 [1F:8006] = 0x00000000
VR_MII_EEE_TXTIMER [1F:8008] = 0x00000000
VR_MII_EEE_RXTIMER [1F:8009] = 0x00000000
VR_MII_LINK_TIMER_CTRL [1F:800A] = 0x00000000
VR_MII_EEE_MCTRL1 [1F:800B] = 0x00000000
VR_MII_DIG_STS [1F:8010] = 0x00000000
VR_MII_ICG_ERRCNT1 [1F:8011] = 0x00000000
VR_MII_GPIO [1F:8015] = 0x00000000
VR_MII_EEE_LPI_STATUS [1F:8016] = 0x00000000
VR_MII_EEE_WKERR [1F:8017] = 0x00000000
VR_MII_MISC_STS [1F:8018] = 0x00000000
VR_MII_RX_LSTS [1F:8020] = 0x00000000
VR_MII_Gen2_Gen4_TX_BSTCTRL0 [1F:8038] = 0x00000000
VR_MII_Gen2_Gen4_TX_LVLCTRL0 [1F:803A] = 0x00000000
VR_MII_Gen2_Gen4_TXGENCTRL0 [1F:803C] = 0x00000000
VR_MII_Gen2_Gen4_TXGENCTRL1 [1F:803D] = 0x00000000
VR_MII_Gen4_TXGENCTRL2 [1F:803E] = 0x00000000
VR_MII_Gen2_Gen4_TX_STS [1F:8048] = 0x00000000
VR_MII_Gen2_Gen4_RXGENCTRL0 [1F:8058] = 0x00000000
VR_MII_Gen2_Gen4_RXGENCTRL1 [1F:8059] = 0x00000000
VR_MII_Gen4_RXEQ_CTRL [1F:805B] = 0x00000000
VR_MII_Gen4_RXLOS_CTRL0 [1F:805D] = 0x00000000
VR_MII_Gen2_Gen4_MPLL_CTRL0 [1F:8078] = 0x00000000
VR_MII_Gen2_Gen4_MPLL_CTRL1 [1F:8079] = 0x00000000
VR_MII_Gen2_Gen4_MPLL_STS [1F:8088] = 0x00000000
VR_MII_Gen2_Gen4_LVL_CTRL [1F:8090] = 0x00000000
VR_MII_Gen4_MISC_CTRL2 [1F:8093] = 0x00000000
VR_MII_Gen2_Gen4_MISC_CTRL0 [1F:8099] = 0x00000000
VR_MII_Gen2_Gen4_MISC_CTRL1 [1F:809A] = 0x00000000
VR_MII_SNPS_CR_CTRL [1F:80A0] = 0x00000000
VR_MII_SNPS_CR_ADDR [1F:80A1] = 0x00000000
VR_MII_SNPS_CR_DATA [1F:80A2] = 0x00000000
VR_MII_DIG_CTRL2 [1F:80E1] = 0x00000000
VR_MII_DIG_ERRCNT [1F:80E2] = 0x00000000
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
2022-11-02 8:46 ` Raju Lakkaraju
@ 2022-11-02 9:09 ` Horatiu Vultur
2022-11-02 11:56 ` Raju Lakkaraju
0 siblings, 1 reply; 5+ messages in thread
From: Horatiu Vultur @ 2022-11-02 9:09 UTC (permalink / raw)
To: Raju Lakkaraju
Cc: netdev, davem, kuba, linux-kernel, bryan.whitehead, pabeni,
edumazet, olteanv, linux, UNGLinuxDriver, andrew, Ian.Saturley
The 11/02/2022 14:16, Raju Lakkaraju wrote:
> > > +static void lan743x_sgmii_regs(struct net_device *dev, void *p)
> > > +{
> > > + struct lan743x_adapter *adp = netdev_priv(dev);
> > > + u32 *rb = p;
> > > + u16 idx;
> > > + int val;
> > > + struct {
> > > + u8 id;
> > > + u8 dev;
> > > + u16 addr;
> > > + } regs[] = {
> > > + { ETH_SR_VSMMD_DEV_ID1, MDIO_MMD_VEND1, 0x0002},
> > > + { ETH_SR_VSMMD_DEV_ID2, MDIO_MMD_VEND1, 0x0003},
> > > + { ETH_SR_VSMMD_PCS_ID1, MDIO_MMD_VEND1, 0x0004},
> > > + { ETH_SR_VSMMD_PCS_ID2, MDIO_MMD_VEND1, 0x0005},
> > > + { ETH_SR_VSMMD_STS, MDIO_MMD_VEND1, 0x0008},
> > > + { ETH_SR_VSMMD_CTRL, MDIO_MMD_VEND1, 0x0009},
> > > + { ETH_SR_MII_CTRL, MDIO_MMD_VEND2, 0x0000},
> > > + { ETH_SR_MII_STS, MDIO_MMD_VEND2, 0x0001},
> > > + { ETH_SR_MII_DEV_ID1, MDIO_MMD_VEND2, 0x0002},
> > > + { ETH_SR_MII_DEV_ID2, MDIO_MMD_VEND2, 0x0003},
> > > + { ETH_SR_MII_AN_ADV, MDIO_MMD_VEND2, 0x0004},
> > > + { ETH_SR_MII_LP_BABL, MDIO_MMD_VEND2, 0x0005},
> > > + { ETH_SR_MII_EXPN, MDIO_MMD_VEND2, 0x0006},
> > > + { ETH_SR_MII_EXT_STS, MDIO_MMD_VEND2, 0x000F},
> > > + { ETH_SR_MII_TIME_SYNC_ABL, MDIO_MMD_VEND2, 0x0708},
> > > + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x0709},
> > > + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070A},
> > > + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070B},
> > > + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x070C},
> > > + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x070D},
> > > + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070E},
> > > + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070F},
> > > + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x0710},
> > > + { ETH_VR_MII_DIG_CTRL1, MDIO_MMD_VEND2, 0x8000},
> > > + { ETH_VR_MII_AN_CTRL, MDIO_MMD_VEND2, 0x8001},
> > > + { ETH_VR_MII_AN_INTR_STS, MDIO_MMD_VEND2, 0x8002},
> > > + { ETH_VR_MII_TC, MDIO_MMD_VEND2, 0x8003},
> > > + { ETH_VR_MII_DBG_CTRL, MDIO_MMD_VEND2, 0x8005},
> > > + { ETH_VR_MII_EEE_MCTRL0, MDIO_MMD_VEND2, 0x8006},
> > > + { ETH_VR_MII_EEE_TXTIMER, MDIO_MMD_VEND2, 0x8008},
> > > + { ETH_VR_MII_EEE_RXTIMER, MDIO_MMD_VEND2, 0x8009},
> > > + { ETH_VR_MII_LINK_TIMER_CTRL, MDIO_MMD_VEND2, 0x800A},
> > > + { ETH_VR_MII_EEE_MCTRL1, MDIO_MMD_VEND2, 0x800B},
> > > + { ETH_VR_MII_DIG_STS, MDIO_MMD_VEND2, 0x8010},
> > > + { ETH_VR_MII_ICG_ERRCNT1, MDIO_MMD_VEND2, 0x8011},
> > > + { ETH_VR_MII_GPIO, MDIO_MMD_VEND2, 0x8015},
> > > + { ETH_VR_MII_EEE_LPI_STATUS, MDIO_MMD_VEND2, 0x8016},
> > > + { ETH_VR_MII_EEE_WKERR, MDIO_MMD_VEND2, 0x8017},
> > > + { ETH_VR_MII_MISC_STS, MDIO_MMD_VEND2, 0x8018},
> > > + { ETH_VR_MII_RX_LSTS, MDIO_MMD_VEND2, 0x8020},
> > > + { ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0, MDIO_MMD_VEND2, 0x8038},
> > > + { ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0, MDIO_MMD_VEND2, 0x803A},
> > > + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL0, MDIO_MMD_VEND2, 0x803C},
> > > + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL1, MDIO_MMD_VEND2, 0x803D},
> > > + { ETH_VR_MII_GEN4_TXGENCTRL2, MDIO_MMD_VEND2, 0x803E},
> > > + { ETH_VR_MII_GEN2_GEN4_TX_STS, MDIO_MMD_VEND2, 0x8048},
> > > + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL0, MDIO_MMD_VEND2, 0x8058},
> > > + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL1, MDIO_MMD_VEND2, 0x8059},
> > > + { ETH_VR_MII_GEN4_RXEQ_CTRL, MDIO_MMD_VEND2, 0x805B},
> > > + { ETH_VR_MII_GEN4_RXLOS_CTRL0, MDIO_MMD_VEND2, 0x805D},
> > > + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0, MDIO_MMD_VEND2, 0x8078},
> > > + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1, MDIO_MMD_VEND2, 0x8079},
> > > + { ETH_VR_MII_GEN2_GEN4_MPLL_STS, MDIO_MMD_VEND2, 0x8088},
> > > + { ETH_VR_MII_GEN2_GEN4_LVL_CTRL, MDIO_MMD_VEND2, 0x8090},
> > > + { ETH_VR_MII_GEN4_MISC_CTRL2, MDIO_MMD_VEND2, 0x8093},
> > > + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL0, MDIO_MMD_VEND2, 0x8099},
> > > + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL1, MDIO_MMD_VEND2, 0x809A},
> > > + { ETH_VR_MII_SNPS_CR_CTRL, MDIO_MMD_VEND2, 0x80A0},
> > > + { ETH_VR_MII_SNPS_CR_ADDR, MDIO_MMD_VEND2, 0x80A1},
> > > + { ETH_VR_MII_SNPS_CR_DATA, MDIO_MMD_VEND2, 0x80A2},
> > > + { ETH_VR_MII_DIG_CTRL2, MDIO_MMD_VEND2, 0x80E1},
> > > + { ETH_VR_MII_DIG_ERRCNT, MDIO_MMD_VEND2, 0x80E2},
> > > + };
> > > +
> > > + for (idx = 0; idx < ARRAY_SIZE(regs) / sizeof(regs[0]); idx++) {
> >
> > Is this correct?
>
> Yes.
>
> > You have 62 entries but you go only over the first 15. Or am I
> > misunderstood something?
>
> Your ethtool application don't have SGMII register dump register
> definitions.
> Once This patch accept by Linux community, I will submit ethtool application
> changes to "Ethtool development community".
>
> For your reference, Please find the attached file
> (sgmii_sgmii_regdump_cmd.txt).
I don't think this has anything to do with ethtool.
Your array has 64 entries and the for loop goes from 0 to 15. So it
doesn't read all the registers. Of course ethtool will dump all the
registers but only first 15 might have a value different than 0. After
that all of them will be 0 regardless if in the HW is a different value.
> >
> > > + val = lan743x_sgmii_read(adp, regs[idx].dev, regs[idx].addr);
> > > + if (val < 0)
> > > + rb[regs[idx].id] = 0xFFFF;
> > > + else
> > > + rb[regs[idx].id] = val;
> > > + }
> > > +}
> > > +
--
/Horatiu
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
2022-11-02 9:09 ` Horatiu Vultur
@ 2022-11-02 11:56 ` Raju Lakkaraju
0 siblings, 0 replies; 5+ messages in thread
From: Raju Lakkaraju @ 2022-11-02 11:56 UTC (permalink / raw)
To: Horatiu Vultur
Cc: netdev, davem, kuba, linux-kernel, bryan.whitehead, pabeni,
edumazet, olteanv, linux, UNGLinuxDriver, andrew, Ian.Saturley
Hi Horatiu,
The 11/02/2022 10:09, Horatiu Vultur wrote:
> The 11/02/2022 14:16, Raju Lakkaraju wrote:
> > > > +static void lan743x_sgmii_regs(struct net_device *dev, void *p)
> > > > +{
> > > > + struct lan743x_adapter *adp = netdev_priv(dev);
> > > > + u32 *rb = p;
> > > > + u16 idx;
> > > > + int val;
> > > > + struct {
> > > > + u8 id;
> > > > + u8 dev;
> > > > + u16 addr;
> > > > + } regs[] = {
> > > > + { ETH_SR_VSMMD_DEV_ID1, MDIO_MMD_VEND1, 0x0002},
> > > > + { ETH_SR_VSMMD_DEV_ID2, MDIO_MMD_VEND1, 0x0003},
> > > > + { ETH_SR_VSMMD_PCS_ID1, MDIO_MMD_VEND1, 0x0004},
> > > > + { ETH_SR_VSMMD_PCS_ID2, MDIO_MMD_VEND1, 0x0005},
> > > > + { ETH_SR_VSMMD_STS, MDIO_MMD_VEND1, 0x0008},
> > > > + { ETH_SR_VSMMD_CTRL, MDIO_MMD_VEND1, 0x0009},
> > > > + { ETH_SR_MII_CTRL, MDIO_MMD_VEND2, 0x0000},
> > > > + { ETH_SR_MII_STS, MDIO_MMD_VEND2, 0x0001},
> > > > + { ETH_SR_MII_DEV_ID1, MDIO_MMD_VEND2, 0x0002},
> > > > + { ETH_SR_MII_DEV_ID2, MDIO_MMD_VEND2, 0x0003},
> > > > + { ETH_SR_MII_AN_ADV, MDIO_MMD_VEND2, 0x0004},
> > > > + { ETH_SR_MII_LP_BABL, MDIO_MMD_VEND2, 0x0005},
> > > > + { ETH_SR_MII_EXPN, MDIO_MMD_VEND2, 0x0006},
> > > > + { ETH_SR_MII_EXT_STS, MDIO_MMD_VEND2, 0x000F},
> > > > + { ETH_SR_MII_TIME_SYNC_ABL, MDIO_MMD_VEND2, 0x0708},
> > > > + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x0709},
> > > > + { ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070A},
> > > > + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070B},
> > > > + { ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x070C},
> > > > + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR, MDIO_MMD_VEND2, 0x070D},
> > > > + { ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR, MDIO_MMD_VEND2, 0x070E},
> > > > + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR, MDIO_MMD_VEND2, 0x070F},
> > > > + { ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR, MDIO_MMD_VEND2, 0x0710},
> > > > + { ETH_VR_MII_DIG_CTRL1, MDIO_MMD_VEND2, 0x8000},
> > > > + { ETH_VR_MII_AN_CTRL, MDIO_MMD_VEND2, 0x8001},
> > > > + { ETH_VR_MII_AN_INTR_STS, MDIO_MMD_VEND2, 0x8002},
> > > > + { ETH_VR_MII_TC, MDIO_MMD_VEND2, 0x8003},
> > > > + { ETH_VR_MII_DBG_CTRL, MDIO_MMD_VEND2, 0x8005},
> > > > + { ETH_VR_MII_EEE_MCTRL0, MDIO_MMD_VEND2, 0x8006},
> > > > + { ETH_VR_MII_EEE_TXTIMER, MDIO_MMD_VEND2, 0x8008},
> > > > + { ETH_VR_MII_EEE_RXTIMER, MDIO_MMD_VEND2, 0x8009},
> > > > + { ETH_VR_MII_LINK_TIMER_CTRL, MDIO_MMD_VEND2, 0x800A},
> > > > + { ETH_VR_MII_EEE_MCTRL1, MDIO_MMD_VEND2, 0x800B},
> > > > + { ETH_VR_MII_DIG_STS, MDIO_MMD_VEND2, 0x8010},
> > > > + { ETH_VR_MII_ICG_ERRCNT1, MDIO_MMD_VEND2, 0x8011},
> > > > + { ETH_VR_MII_GPIO, MDIO_MMD_VEND2, 0x8015},
> > > > + { ETH_VR_MII_EEE_LPI_STATUS, MDIO_MMD_VEND2, 0x8016},
> > > > + { ETH_VR_MII_EEE_WKERR, MDIO_MMD_VEND2, 0x8017},
> > > > + { ETH_VR_MII_MISC_STS, MDIO_MMD_VEND2, 0x8018},
> > > > + { ETH_VR_MII_RX_LSTS, MDIO_MMD_VEND2, 0x8020},
> > > > + { ETH_VR_MII_GEN2_GEN4_TX_BSTCTRL0, MDIO_MMD_VEND2, 0x8038},
> > > > + { ETH_VR_MII_GEN2_GEN4_TX_LVLCTRL0, MDIO_MMD_VEND2, 0x803A},
> > > > + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL0, MDIO_MMD_VEND2, 0x803C},
> > > > + { ETH_VR_MII_GEN2_GEN4_TXGENCTRL1, MDIO_MMD_VEND2, 0x803D},
> > > > + { ETH_VR_MII_GEN4_TXGENCTRL2, MDIO_MMD_VEND2, 0x803E},
> > > > + { ETH_VR_MII_GEN2_GEN4_TX_STS, MDIO_MMD_VEND2, 0x8048},
> > > > + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL0, MDIO_MMD_VEND2, 0x8058},
> > > > + { ETH_VR_MII_GEN2_GEN4_RXGENCTRL1, MDIO_MMD_VEND2, 0x8059},
> > > > + { ETH_VR_MII_GEN4_RXEQ_CTRL, MDIO_MMD_VEND2, 0x805B},
> > > > + { ETH_VR_MII_GEN4_RXLOS_CTRL0, MDIO_MMD_VEND2, 0x805D},
> > > > + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL0, MDIO_MMD_VEND2, 0x8078},
> > > > + { ETH_VR_MII_GEN2_GEN4_MPLL_CTRL1, MDIO_MMD_VEND2, 0x8079},
> > > > + { ETH_VR_MII_GEN2_GEN4_MPLL_STS, MDIO_MMD_VEND2, 0x8088},
> > > > + { ETH_VR_MII_GEN2_GEN4_LVL_CTRL, MDIO_MMD_VEND2, 0x8090},
> > > > + { ETH_VR_MII_GEN4_MISC_CTRL2, MDIO_MMD_VEND2, 0x8093},
> > > > + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL0, MDIO_MMD_VEND2, 0x8099},
> > > > + { ETH_VR_MII_GEN2_GEN4_MISC_CTRL1, MDIO_MMD_VEND2, 0x809A},
> > > > + { ETH_VR_MII_SNPS_CR_CTRL, MDIO_MMD_VEND2, 0x80A0},
> > > > + { ETH_VR_MII_SNPS_CR_ADDR, MDIO_MMD_VEND2, 0x80A1},
> > > > + { ETH_VR_MII_SNPS_CR_DATA, MDIO_MMD_VEND2, 0x80A2},
> > > > + { ETH_VR_MII_DIG_CTRL2, MDIO_MMD_VEND2, 0x80E1},
> > > > + { ETH_VR_MII_DIG_ERRCNT, MDIO_MMD_VEND2, 0x80E2},
> > > > + };
> > > > +
> > > > + for (idx = 0; idx < ARRAY_SIZE(regs) / sizeof(regs[0]); idx++) {
> > >
> > > Is this correct?
> >
> > Yes.
> >
> > > You have 62 entries but you go only over the first 15. Or am I
> > > misunderstood something?
> >
> > Your ethtool application don't have SGMII register dump register
> > definitions.
> > Once This patch accept by Linux community, I will submit ethtool application
> > changes to "Ethtool development community".
> >
> > For your reference, Please find the attached file
> > (sgmii_sgmii_regdump_cmd.txt).
>
> I don't think this has anything to do with ethtool.
> Your array has 64 entries and the for loop goes from 0 to 15. So it
> doesn't read all the registers. Of course ethtool will dump all the
> registers but only first 15 might have a value different than 0. After
> that all of them will be 0 regardless if in the HW is a different value.
>
You are correct.
It's my mistake.
Initially i was using sizeof (regs) / sizeof(regs[0]
But, checkpatch give a warning that i have to use ARRAY_SIZE macro.
i.e.
I forgot to remove "/ sizeof(regs[0]" there.
i.e.
ARRAY_SIZE(regs) / sizeof(regs[0])
I will fix this and resend the patch.
>
> > >
> > > > + val = lan743x_sgmii_read(adp, regs[idx].dev, regs[idx].addr);
> > > > + if (val < 0)
> > > > + rb[regs[idx].id] = 0xFFFF;
> > > > + else
> > > > + rb[regs[idx].id] = val;
> > > > + }
> > > > +}
> > > > +
>
> --
> /Horatiu
--------
Thanks,
Raju
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-11-02 11:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-02 5:28 [PATCH net-next V5] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips Raju Lakkaraju
2022-11-02 8:31 ` Horatiu Vultur
2022-11-02 8:46 ` Raju Lakkaraju
2022-11-02 9:09 ` Horatiu Vultur
2022-11-02 11:56 ` Raju Lakkaraju
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.