| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 2 Nov 2022 09:31:54 +0100
From: Horatiu Vultur <horatiu.vultur@...rochip.com>
To: Raju Lakkaraju <Raju.Lakkaraju@...rochip.com>
CC: <netdev@...r.kernel.org>, <davem@...emloft.net>, <kuba@...nel.org>,
<linux-kernel@...r.kernel.org>, <bryan.whitehead@...rochip.com>,
<pabeni@...hat.com>, <edumazet@...gle.com>, <olteanv@...il.com>,
<linux@...linux.org.uk>, <UNGLinuxDriver@...rochip.com>,
<andrew@...n.ch>, <Ian.Saturley@...rochip.com>
Subject: Re: [PATCH net-next V5] net: lan743x: Add support to SGMII register
dump for PCI11010/PCI11414 chips
The 11/02/2022 10:58, Raju Lakkaraju wrote:
Hi Raju,
> Add support to SGMII register dump
>
> Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@...rochip.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
Powered by blists - more mailing lists