[PATCH net-next 0/2] net: lan743x: PCI11010 / PCI11414 devices Enhancements

netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed

* [PATCH net-next 0/2] net: lan743x: PCI11010 / PCI11414 devices Enhancements
@ 2022-09-16  8:23 Raju Lakkaraju
  2022-09-16  8:23 ` [PATCH net-next 1/2] net: lan743x: Remove PTP_PF_EXTTS support for non-PCI11x1x devices Raju Lakkaraju
  2022-09-16  8:23 ` [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips Raju Lakkaraju
  0 siblings, 2 replies; 5+ messages in thread
From: Raju Lakkaraju @ 2022-09-16  8:23 UTC (permalink / raw)
  To: netdev
  Cc: davem, kuba, linux-kernel, bryan.whitehead, lxu, richardcochran,
	UNGLinuxDriver, Ian.Saturley

This patch series address the Remove PTP_PF_EXTTS support for     
 non-PCI11x1x devices and Add support to SGMII register dump

Raju Lakkaraju (2):
  net: lan743x: Remove PTP_PF_EXTTS support for non-PCI11x1x devices
  net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414
    chips

 .../net/ethernet/microchip/lan743x_ethtool.c  | 136 +++++++++++++++++-
 .../net/ethernet/microchip/lan743x_ethtool.h  |  70 +++++++++
 drivers/net/ethernet/microchip/lan743x_main.c |  16 +++
 drivers/net/ethernet/microchip/lan743x_main.h |   9 +-
 drivers/net/ethernet/microchip/lan743x_ptp.c  |   7 +
 5 files changed, 235 insertions(+), 3 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH net-next 1/2] net: lan743x: Remove PTP_PF_EXTTS support for non-PCI11x1x devices
  2022-09-16  8:23 [PATCH net-next 0/2] net: lan743x: PCI11010 / PCI11414 devices Enhancements Raju Lakkaraju
@ 2022-09-16  8:23 ` Raju Lakkaraju
  2022-09-16  8:23 ` [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips Raju Lakkaraju
  1 sibling, 0 replies; 5+ messages in thread
From: Raju Lakkaraju @ 2022-09-16  8:23 UTC (permalink / raw)
  To: netdev
  Cc: davem, kuba, linux-kernel, bryan.whitehead, lxu, richardcochran,
	UNGLinuxDriver, Ian.Saturley

Remove PTP_PF_EXTTS support for non-PCI11x1x devices since they do not
support the PTP-IO Input event triggered timestamping mechanisms
added by commit 60942c397af6094c04406b77982314dfe69ef3c4

Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
 drivers/net/ethernet/microchip/lan743x_ptp.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/ethernet/microchip/lan743x_ptp.c b/drivers/net/ethernet/microchip/lan743x_ptp.c
index 6a11e2ceb013..da3ea905adbb 100644
--- a/drivers/net/ethernet/microchip/lan743x_ptp.c
+++ b/drivers/net/ethernet/microchip/lan743x_ptp.c
@@ -1049,6 +1049,10 @@ static int lan743x_ptpci_verify_pin_config(struct ptp_clock_info *ptp,
 					   enum ptp_pin_function func,
 					   unsigned int chan)
 {
+	struct lan743x_ptp *lan_ptp =
+		container_of(ptp, struct lan743x_ptp, ptp_clock_info);
+	struct lan743x_adapter *adapter =
+		container_of(lan_ptp, struct lan743x_adapter, ptp);
 	int result = 0;
 
 	/* Confirm the requested function is supported. Parameter
@@ -1057,7 +1061,10 @@ static int lan743x_ptpci_verify_pin_config(struct ptp_clock_info *ptp,
 	switch (func) {
 	case PTP_PF_NONE:
 	case PTP_PF_PEROUT:
+		break;
 	case PTP_PF_EXTTS:
+		if (!adapter->is_pci11x1x)
+			result = -1;
 		break;
 	case PTP_PF_PHYSYNC:
 	default:
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
  2022-09-16  8:23 [PATCH net-next 0/2] net: lan743x: PCI11010 / PCI11414 devices Enhancements Raju Lakkaraju
  2022-09-16  8:23 ` [PATCH net-next 1/2] net: lan743x: Remove PTP_PF_EXTTS support for non-PCI11x1x devices Raju Lakkaraju
@ 2022-09-16  8:23 ` Raju Lakkaraju
  2022-09-16 12:18   ` Andrew Lunn
  1 sibling, 1 reply; 5+ messages in thread
From: Raju Lakkaraju @ 2022-09-16  8:23 UTC (permalink / raw)
  To: netdev
  Cc: davem, kuba, linux-kernel, bryan.whitehead, lxu, richardcochran,
	UNGLinuxDriver, Ian.Saturley

Add support to SGMII register dump

Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@microchip.com>
---
 .../net/ethernet/microchip/lan743x_ethtool.c  | 136 +++++++++++++++++-
 .../net/ethernet/microchip/lan743x_ethtool.h  |  70 +++++++++
 drivers/net/ethernet/microchip/lan743x_main.c |  16 +++
 drivers/net/ethernet/microchip/lan743x_main.h |   9 +-
 4 files changed, 228 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.c b/drivers/net/ethernet/microchip/lan743x_ethtool.c
index c739d60ee17d..81e61b9dac5c 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.c
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.c
@@ -24,6 +24,9 @@
 #define LOCK_TIMEOUT_MAX_CNT		    (100) // 1 sec (10 msce * 100)
 
 #define LAN743X_CSR_READ_OP(offset)	     lan743x_csr_read(adapter, offset)
+#define VSPEC1			MDIO_MMD_VEND1
+#define VSPEC2			MDIO_MMD_VEND2
+#define SGMII_RD(adp, dev, adr) lan743x_sgmii_dump_read(adp, dev, adr)
 
 static int lan743x_otp_power_up(struct lan743x_adapter *adapter)
 {
@@ -582,6 +585,7 @@ static void lan743x_ethtool_get_drvinfo(struct net_device *netdev,
 	strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
 	strscpy(info->bus_info,
 		pci_name(adapter->pdev), sizeof(info->bus_info));
+	info->n_priv_flags = adapter->flags;
 }
 
 static u32 lan743x_ethtool_get_msglevel(struct net_device *netdev)
@@ -796,6 +800,7 @@ static const u32 lan743x_set2_hw_cnt_addr[] = {
 
 static const char lan743x_priv_flags_strings[][ETH_GSTRING_LEN] = {
 	"OTP_ACCESS",
+	"SGMII_REG_DUMP",
 };
 
 static void lan743x_ethtool_get_strings(struct net_device *netdev,
@@ -1190,6 +1195,76 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev,
 }
 #endif /* CONFIG_PM */
 
+static void lan743x_sgmii_regs(struct net_device *dev,
+			       struct ethtool_regs *regs, void *p)
+{
+	struct lan743x_adapter *adp = netdev_priv(dev);
+	u32 *rb = p;
+
+	rb[ETH_SR_VSMMD_DEV_ID1]                = SGMII_RD(adp, VSPEC1, 0x0002);
+	rb[ETH_SR_VSMMD_DEV_ID2]                = SGMII_RD(adp, VSPEC1, 0x0003);
+	rb[ETH_SR_VSMMD_PCS_ID1]                = SGMII_RD(adp, VSPEC1, 0x0004);
+	rb[ETH_SR_VSMMD_PCS_ID2]                = SGMII_RD(adp, VSPEC1, 0x0005);
+	rb[ETH_SR_VSMMD_STS]                    = SGMII_RD(adp, VSPEC1, 0x0008);
+	rb[ETH_SR_VSMMD_CTRL]                   = SGMII_RD(adp, VSPEC1, 0x0009);
+	rb[ETH_SR_MII_CTRL]                     = SGMII_RD(adp, VSPEC2, 0x0000);
+	rb[ETH_SR_MII_STS]                      = SGMII_RD(adp, VSPEC2, 0x0001);
+	rb[ETH_SR_MII_DEV_ID1]                  = SGMII_RD(adp, VSPEC2, 0x0002);
+	rb[ETH_SR_MII_DEV_ID2]                  = SGMII_RD(adp, VSPEC2, 0x0003);
+	rb[ETH_SR_MII_AN_ADV]                   = SGMII_RD(adp, VSPEC2, 0x0004);
+	rb[ETH_SR_MII_LP_BABL]                  = SGMII_RD(adp, VSPEC2, 0x0005);
+	rb[ETH_SR_MII_EXPN]                     = SGMII_RD(adp, VSPEC2, 0x0006);
+	rb[ETH_SR_MII_EXT_STS]                  = SGMII_RD(adp, VSPEC2, 0x000F);
+	rb[ETH_SR_MII_TIME_SYNC_ABL]            = SGMII_RD(adp, VSPEC2, 0x0708);
+	rb[ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_LWR] = SGMII_RD(adp, VSPEC2, 0x0709);
+	rb[ETH_SR_MII_TIME_SYNC_TX_MAX_DLY_UPR] = SGMII_RD(adp, VSPEC2, 0x070A);
+	rb[ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_LWR] = SGMII_RD(adp, VSPEC2, 0x070B);
+	rb[ETH_SR_MII_TIME_SYNC_TX_MIN_DLY_UPR] = SGMII_RD(adp, VSPEC2, 0x070C);
+	rb[ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_LWR] = SGMII_RD(adp, VSPEC2, 0x070D);
+	rb[ETH_SR_MII_TIME_SYNC_RX_MAX_DLY_UPR] = SGMII_RD(adp, VSPEC2, 0x070E);
+	rb[ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_LWR] = SGMII_RD(adp, VSPEC2, 0x070F);
+	rb[ETH_SR_MII_TIME_SYNC_RX_MIN_DLY_UPR] = SGMII_RD(adp, VSPEC2, 0x0710);
+	rb[ETH_VR_MII_DIG_CTRL1]                = SGMII_RD(adp, VSPEC2, 0x8000);
+	rb[ETH_VR_MII_AN_CTRL]                  = SGMII_RD(adp, VSPEC2, 0x8001);
+	rb[ETH_VR_MII_AN_INTR_STS]              = SGMII_RD(adp, VSPEC2, 0x8002);
+	rb[ETH_VR_MII_TC]                       = SGMII_RD(adp, VSPEC2, 0x8003);
+	rb[ETH_VR_MII_DBG_CTRL]                 = SGMII_RD(adp, VSPEC2, 0x8005);
+	rb[ETH_VR_MII_EEE_MCTRL0]               = SGMII_RD(adp, VSPEC2, 0x8006);
+	rb[ETH_VR_MII_EEE_TXTIMER]              = SGMII_RD(adp, VSPEC2, 0x8008);
+	rb[ETH_VR_MII_EEE_RXTIMER]              = SGMII_RD(adp, VSPEC2, 0x8009);
+	rb[ETH_VR_MII_LINK_TIMER_CTRL]          = SGMII_RD(adp, VSPEC2, 0x800A);
+	rb[ETH_VR_MII_EEE_MCTRL1]               = SGMII_RD(adp, VSPEC2, 0x800B);
+	rb[ETH_VR_MII_DIG_STS]                  = SGMII_RD(adp, VSPEC2, 0x8010);
+	rb[ETH_VR_MII_ICG_ERRCNT1]              = SGMII_RD(adp, VSPEC2, 0x8011);
+	rb[ETH_VR_MII_GPIO]                     = SGMII_RD(adp, VSPEC2, 0x8015);
+	rb[ETH_VR_MII_EEE_LPI_STATUS]           = SGMII_RD(adp, VSPEC2, 0x8016);
+	rb[ETH_VR_MII_EEE_WKERR]                = SGMII_RD(adp, VSPEC2, 0x8017);
+	rb[ETH_VR_MII_MISC_STS]                 = SGMII_RD(adp, VSPEC2, 0x8018);
+	rb[ETH_VR_MII_RX_LSTS]                  = SGMII_RD(adp, VSPEC2, 0x8020);
+	rb[ETH_VR_MII_Gen2_Gen4_TX_BSTCTRL0]    = SGMII_RD(adp, VSPEC2, 0x8038);
+	rb[ETH_VR_MII_Gen2_Gen4_TX_LVLCTRL0]    = SGMII_RD(adp, VSPEC2, 0x803A);
+	rb[ETH_VR_MII_Gen2_Gen4_TXGENCTRL0]     = SGMII_RD(adp, VSPEC2, 0x803C);
+	rb[ETH_VR_MII_Gen2_Gen4_TXGENCTRL1]     = SGMII_RD(adp, VSPEC2, 0x803D);
+	rb[ETH_VR_MII_Gen4_TXGENCTRL2]          = SGMII_RD(adp, VSPEC2, 0x803E);
+	rb[ETH_VR_MII_Gen2_Gen4_TX_STS]         = SGMII_RD(adp, VSPEC2, 0x8048);
+	rb[ETH_VR_MII_Gen2_Gen4_RXGENCTRL0]     = SGMII_RD(adp, VSPEC2, 0x8058);
+	rb[ETH_VR_MII_Gen2_Gen4_RXGENCTRL1]     = SGMII_RD(adp, VSPEC2, 0x8059);
+	rb[ETH_VR_MII_Gen4_RXEQ_CTRL]           = SGMII_RD(adp, VSPEC2, 0x805B);
+	rb[ETH_VR_MII_Gen4_RXLOS_CTRL0]         = SGMII_RD(adp, VSPEC2, 0x805D);
+	rb[ETH_VR_MII_Gen2_Gen4_MPLL_CTRL0]     = SGMII_RD(adp, VSPEC2, 0x8078);
+	rb[ETH_VR_MII_Gen2_Gen4_MPLL_CTRL1]     = SGMII_RD(adp, VSPEC2, 0x8079);
+	rb[ETH_VR_MII_Gen2_Gen4_MPLL_STS]       = SGMII_RD(adp, VSPEC2, 0x8088);
+	rb[ETH_VR_MII_Gen2_Gen4_LVL_CTRL]       = SGMII_RD(adp, VSPEC2, 0x8090);
+	rb[ETH_VR_MII_Gen4_MISC_CTRL2]          = SGMII_RD(adp, VSPEC2, 0x8093);
+	rb[ETH_VR_MII_Gen2_Gen4_MISC_CTRL0]     = SGMII_RD(adp, VSPEC2, 0x8099);
+	rb[ETH_VR_MII_Gen2_Gen4_MISC_CTRL1]     = SGMII_RD(adp, VSPEC2, 0x809A);
+	rb[ETH_VR_MII_SNPS_CR_CTRL]             = SGMII_RD(adp, VSPEC2, 0x80A0);
+	rb[ETH_VR_MII_SNPS_CR_ADDR]             = SGMII_RD(adp, VSPEC2, 0x80A1);
+	rb[ETH_VR_MII_SNPS_CR_DATA]             = SGMII_RD(adp, VSPEC2, 0x80A2);
+	rb[ETH_VR_MII_DIG_CTRL2]                = SGMII_RD(adp, VSPEC2, 0x80E1);
+	rb[ETH_VR_MII_DIG_ERRCNT]               = SGMII_RD(adp, VSPEC2, 0x80E2);
+}
+
 static void lan743x_common_regs(struct net_device *dev,
 				struct ethtool_regs *regs, void *p)
 
@@ -1222,15 +1297,70 @@ static void lan743x_common_regs(struct net_device *dev,
 
 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 priv_flags = adapter->flags;
+	int regs;
+
+	if (priv_flags & LAN743X_SGMII_REG_DUMP)
+		regs = MAX_LAN743X_ETH_SGMII_REGS;
+	else
+		regs = MAX_LAN743X_ETH_REGS;
+
+	return 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;
+	u32 *rb = p;
+
 	regs->version = LAN743X_ETH_REG_VERSION;
 
-	lan743x_common_regs(dev, regs, p);
+	regs_len = lan743x_get_regs_len(dev);
+	memset(p, 0, regs_len);
+
+	if (adapter->flags & LAN743X_SGMII_REG_DUMP) {
+		rb[ETH_SGMII_PRIV_FLAGS]  = adapter->flags;
+		lan743x_sgmii_regs(dev, regs, p);
+	} else {
+		lan743x_common_regs(dev, regs, p);
+	}
+}
+
+static void lan743x_get_pauseparam(struct net_device *dev,
+				   struct ethtool_pauseparam *pause)
+{
+	struct lan743x_adapter *adapter = netdev_priv(dev);
+
+//	pause->autoneg = adapter->pause_autoneg;
+	pause->tx_pause = adapter->pause_tx;
+	pause->rx_pause = adapter->pause_rx;
+}
+
+static int lan743x_set_pauseparam(struct net_device *dev,
+				  struct ethtool_pauseparam *pause)
+{
+	struct lan743x_adapter *adapter = netdev_priv(dev);
+	struct phy_device *phydev = dev->phydev;
+
+	if (pause->autoneg)
+		return -EINVAL;
+
+	if (!phydev)
+		return -EINVAL;
+
+	if (!phy_validate_pause(phydev, pause))
+		return -EINVAL;
+
+	//adapter->pause_auto = pause->autoneg;
+	adapter->pause_rx   = pause->rx_pause;
+	adapter->pause_tx   = pause->tx_pause;
+
+	phy_set_asym_pause(phydev, pause->rx_pause, pause->tx_pause);
+
+	return 0;
 }
 
 const struct ethtool_ops lan743x_ethtool_ops = {
@@ -1259,6 +1389,8 @@ const struct ethtool_ops lan743x_ethtool_ops = {
 	.set_link_ksettings = phy_ethtool_set_link_ksettings,
 	.get_regs_len = lan743x_get_regs_len,
 	.get_regs = lan743x_get_regs,
+	.get_pauseparam = lan743x_get_pauseparam,
+	.set_pauseparam = lan743x_set_pauseparam,
 #ifdef CONFIG_PM
 	.get_wol = lan743x_ethtool_get_wol,
 	.set_wol = lan743x_ethtool_set_wol,
diff --git a/drivers/net/ethernet/microchip/lan743x_ethtool.h b/drivers/net/ethernet/microchip/lan743x_ethtool.h
index 7f5996a52488..2a68f1c21770 100644
--- a/drivers/net/ethernet/microchip/lan743x_ethtool.h
+++ b/drivers/net/ethernet/microchip/lan743x_ethtool.h
@@ -32,6 +32,76 @@ enum {
 	MAX_LAN743X_ETH_REGS
 };
 
+enum {
+	ETH_SGMII_PRIV_FLAGS,
+	/* 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;
 
 #endif /* _LAN743X_ETHTOOL_H */
diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 2599dfffd1da..b79609fd33e4 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -25,6 +25,22 @@
 #define PCS_POWER_STATE_DOWN	0x6
 #define PCS_POWER_STATE_UP	0x4
 
+static int lan743x_sgmii_read(struct lan743x_adapter *adapter,
+			      u8 mmd, u16 addr);
+int lan743x_sgmii_dump_read(struct lan743x_adapter *adapter,
+			    u8 dev, u16 adr)
+{
+	int ret;
+
+	ret = lan743x_sgmii_read(adapter, dev, adr);
+	if (ret < 0) {
+		pr_warn("SGMII read fail\n");
+		return ret;
+	}
+
+	return ret;
+}
+
 static void pci11x1x_strap_get_status(struct lan743x_adapter *adapter)
 {
 	u32 chip_rev;
diff --git a/drivers/net/ethernet/microchip/lan743x_main.h b/drivers/net/ethernet/microchip/lan743x_main.h
index 67877d3b6dd9..170adc46dd08 100644
--- a/drivers/net/ethernet/microchip/lan743x_main.h
+++ b/drivers/net/ethernet/microchip/lan743x_main.h
@@ -1039,11 +1039,16 @@ struct lan743x_adapter {
 	u8			used_tx_channels;
 	u8			max_vector_count;
 
-#define LAN743X_ADAPTER_FLAG_OTP		BIT(0)
 	u32			flags;
 	u32			hw_cfg;
+	u32			pause_tx;
+	u32			pause_rx;
+	u32			pause_auto;
 };
 
+#define LAN743X_ADAPTER_FLAG_OTP		BIT(0)
+#define LAN743X_SGMII_REG_DUMP			BIT(1)
+
 #define LAN743X_COMPONENT_FLAG_RX(channel)  BIT(20 + (channel))
 
 #define INTR_FLAG_IRQ_REQUESTED(vector_index)	BIT(0 + vector_index)
@@ -1159,5 +1164,7 @@ u32 lan743x_csr_read(struct lan743x_adapter *adapter, int offset);
 void lan743x_csr_write(struct lan743x_adapter *adapter, int offset, u32 data);
 int lan743x_hs_syslock_acquire(struct lan743x_adapter *adapter, u16 timeout);
 void lan743x_hs_syslock_release(struct lan743x_adapter *adapter);
+int lan743x_sgmii_dump_read(struct lan743x_adapter *adapter,
+			    u8 dev, u16 adr);
 
 #endif /* _LAN743X_H */
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
  2022-09-16  8:23 ` [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips Raju Lakkaraju
@ 2022-09-16 12:18   ` Andrew Lunn
  2022-09-16 13:09     ` Raju.Lakkaraju
  0 siblings, 1 reply; 5+ messages in thread
From: Andrew Lunn @ 2022-09-16 12:18 UTC (permalink / raw)
  To: Raju Lakkaraju
  Cc: netdev, davem, kuba, linux-kernel, bryan.whitehead, lxu,
	richardcochran, UNGLinuxDriver, Ian.Saturley

On Fri, Sep 16, 2022 at 01:53:27PM +0530, Raju Lakkaraju wrote:
> Add support to SGMII register dump

> +static void lan743x_get_pauseparam(struct net_device *dev,
> +				   struct ethtool_pauseparam *pause)
> +{
> +	struct lan743x_adapter *adapter = netdev_priv(dev);
> +
> +//	pause->autoneg = adapter->pause_autoneg;
> +	pause->tx_pause = adapter->pause_tx;
> +	pause->rx_pause = adapter->pause_rx;
> +}
> +
> +static int lan743x_set_pauseparam(struct net_device *dev,
> +				  struct ethtool_pauseparam *pause)
> +{
> +	struct lan743x_adapter *adapter = netdev_priv(dev);
> +	struct phy_device *phydev = dev->phydev;
> +
> +	if (pause->autoneg)
> +		return -EINVAL;
> +
> +	if (!phydev)
> +		return -EINVAL;
> +
> +	if (!phy_validate_pause(phydev, pause))
> +		return -EINVAL;
> +
> +	//adapter->pause_auto = pause->autoneg;
> +	adapter->pause_rx   = pause->rx_pause;
> +	adapter->pause_tx   = pause->tx_pause;
> +
> +	phy_set_asym_pause(phydev, pause->rx_pause, pause->tx_pause);
> +
> +	return 0;
>  }

This is not part of register dumping...

> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -25,6 +25,22 @@
>  #define PCS_POWER_STATE_DOWN	0x6
>  #define PCS_POWER_STATE_UP	0x4
>  
> +static int lan743x_sgmii_read(struct lan743x_adapter *adapter,
> +			      u8 mmd, u16 addr);
> +int lan743x_sgmii_dump_read(struct lan743x_adapter *adapter,
> +			    u8 dev, u16 adr)
> +{
> +	int ret;
> +
> +	ret = lan743x_sgmii_read(adapter, dev, adr);
> +	if (ret < 0) {
> +		pr_warn("SGMII read fail\n");

Better to use netdev_warn(), so we know which devices has read
problems.

	Andrew

^ permalink raw reply	[flat|nested] 5+ messages in thread

* RE: [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips
  2022-09-16 12:18   ` Andrew Lunn
@ 2022-09-16 13:09     ` Raju.Lakkaraju
  0 siblings, 0 replies; 5+ messages in thread
From: Raju.Lakkaraju @ 2022-09-16 13:09 UTC (permalink / raw)
  To: andrew
  Cc: netdev, davem, kuba, linux-kernel, Bryan.Whitehead, lxu,
	richardcochran, UNGLinuxDriver, Ian.Saturley

Hi Andrew,

Thank you for quick review comments.
By mistake I sent the wrong file.

Already V1 patch posted with fix.
i.e
[PATCH net-next V1 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips

Thanks,
Raju

-----Original Message-----
From: Andrew Lunn <andrew@lunn.ch> 
Sent: 16 September 2022 05:48 PM
To: Raju Lakkaraju - I30499 <Raju.Lakkaraju@microchip.com>
Cc: netdev@vger.kernel.org; davem@davemloft.net; kuba@kernel.org; linux-kernel@vger.kernel.org; Bryan Whitehead - C21958 <Bryan.Whitehead@microchip.com>; lxu@maxlinear.com; richardcochran@gmail.com; UNGLinuxDriver <UNGLinuxDriver@microchip.com>; Ian Saturley - M21209 <Ian.Saturley@microchip.com>
Subject: Re: [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

On Fri, Sep 16, 2022 at 01:53:27PM +0530, Raju Lakkaraju wrote:
> Add support to SGMII register dump

> +static void lan743x_get_pauseparam(struct net_device *dev,
> +                                struct ethtool_pauseparam *pause) {
> +     struct lan743x_adapter *adapter = netdev_priv(dev);
> +
> +//   pause->autoneg = adapter->pause_autoneg;
> +     pause->tx_pause = adapter->pause_tx;
> +     pause->rx_pause = adapter->pause_rx; }
> +
> +static int lan743x_set_pauseparam(struct net_device *dev,
> +                               struct ethtool_pauseparam *pause) {
> +     struct lan743x_adapter *adapter = netdev_priv(dev);
> +     struct phy_device *phydev = dev->phydev;
> +
> +     if (pause->autoneg)
> +             return -EINVAL;
> +
> +     if (!phydev)
> +             return -EINVAL;
> +
> +     if (!phy_validate_pause(phydev, pause))
> +             return -EINVAL;
> +
> +     //adapter->pause_auto = pause->autoneg;
> +     adapter->pause_rx   = pause->rx_pause;
> +     adapter->pause_tx   = pause->tx_pause;
> +
> +     phy_set_asym_pause(phydev, pause->rx_pause, pause->tx_pause);
> +
> +     return 0;
>  }

This is not part of register dumping...

> --- a/drivers/net/ethernet/microchip/lan743x_main.c
> +++ b/drivers/net/ethernet/microchip/lan743x_main.c
> @@ -25,6 +25,22 @@
>  #define PCS_POWER_STATE_DOWN 0x6
>  #define PCS_POWER_STATE_UP   0x4
>
> +static int lan743x_sgmii_read(struct lan743x_adapter *adapter,
> +                           u8 mmd, u16 addr); int 
> +lan743x_sgmii_dump_read(struct lan743x_adapter *adapter,
> +                         u8 dev, u16 adr) {
> +     int ret;
> +
> +     ret = lan743x_sgmii_read(adapter, dev, adr);
> +     if (ret < 0) {
> +             pr_warn("SGMII read fail\n");

Better to use netdev_warn(), so we know which devices has read problems.

        Andrew

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-09-16 13:10 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-16  8:23 [PATCH net-next 0/2] net: lan743x: PCI11010 / PCI11414 devices Enhancements Raju Lakkaraju
2022-09-16  8:23 ` [PATCH net-next 1/2] net: lan743x: Remove PTP_PF_EXTTS support for non-PCI11x1x devices Raju Lakkaraju
2022-09-16  8:23 ` [PATCH net-next 2/2] net: lan743x: Add support to SGMII register dump for PCI11010/PCI11414 chips Raju Lakkaraju
2022-09-16 12:18   ` Andrew Lunn
2022-09-16 13:09     ` Raju.Lakkaraju

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).