net: lan743x: PCI11010 / PCI11414 devices Enhancements
Subsystems (5)
cover net: lan743x: PCI11010 / PCI11414 devices Enhancements
This patch series continues with the addition of supported features for the Ethernet function of the PCI11010 / PCI11414 devices to the LAN743x driver.
Raju Lakkaraju (5):
net: lan743x: Add support to LAN743x register dump
net: lan743x: Add support to Secure-ON WOL
net: lan743x: Add support to SGMII block access functions
net: lan743x: Add support to SGMII 1G and 2.5G
net: phy: add support to get Master-Slave configuration
.../net/ethernet/microchip/lan743x_ethtool.c | 65 ++- .../net/ethernet/microchip/lan743x_ethtool.h | 26 ++ drivers/net/ethernet/microchip/lan743x_main.c | 378 +++++++++++++++++- drivers/net/ethernet/microchip/lan743x_main.h | 144 +++++++ drivers/net/phy/mxl-gpy.c | 55 +++ 5 files changed, 659 insertions(+), 9 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 net: lan743x: Add support to LAN743x register dump
Add support to LAN743x common register dump
--- .../net/ethernet/microchip/lan743x_ethtool.c | 45 +++++++++++++++++++ .../net/ethernet/microchip/lan743x_ethtool.h | 26 +++++++++++ 2 files changed, 71 insertions(+)
drivers/net/ethernet/microchip/lan743x_ethtool.c +45 -0
@@ -1178,6 +1178,49 @@ 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) + +{ +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 ); + rb[ETH_STRAP_READ ] =lan743x_csr_read (adapter,STRAP_READ ); + rb[ETH_INT_STS ] =lan743x_csr_read (adapter,INT_STS ); + rb[ETH_HW_CFG ] =lan743x_csr_read (adapter,HW_CFG ); + rb[ETH_PMT_CTL ] =lan743x_csr_read (adapter,PMT_CTL ); + rb[ETH_E2P_CMD ] =lan743x_csr_read (adapter,E2P_CMD ); + rb[ETH_E2P_DATA ] =lan743x_csr_read (adapter,E2P_DATA ); + rb[ETH_MAC_CR ] =lan743x_csr_read (adapter,MAC_CR ); + rb[ETH_MAC_RX ] =lan743x_csr_read (adapter,MAC_RX ); + rb[ETH_MAC_TX ] =lan743x_csr_read (adapter,MAC_TX ); + rb[ETH_FLOW ] =lan743x_csr_read (adapter,MAC_FLOW ); + rb[ETH_MII_ACC ] =lan743x_csr_read (adapter,MAC_MII_ACC ); + rb[ETH_MII_DATA ] =lan743x_csr_read (adapter,MAC_MII_DATA ); + rb[ETH_EEE_TX_LPI_REQ_DLY ] =lan743x_csr_read (adapter, +MAC_EEE_TX_LPI_REQ_DLY_CNT ); + rb[ETH_WUCSR ] =lan743x_csr_read (adapter,MAC_WUCSR ); + rb[ETH_WK_SRC ] =lan743x_csr_read (adapter,MAC_WK_SRC ); +} + +static int lan743x_get_regs_len (struct net_device *dev) +{ +return MAX_LAN743X_ETH_REGS *sizeof (u32); +} + +static void lan743x_get_regs (struct net_device *dev, +struct ethtool_regs *regs,void *p) +{ + regs->version =LAN743X_ETH_REG_VERSION ; + +lan743x_common_regs (dev, regs, p); +} +const struct ethtool_ops lan743x_ethtool_ops = { .get_drvinfo = lan743x_ethtool_get_drvinfo, .get_msglevel = lan743x_ethtool_get_msglevel,
@@ -1202,6 +1245,8 @@ const struct ethtool_ops lan743x_ethtool_ops = { .set_eee = lan743x_ethtool_set_eee, .get_link_ksettings = phy_ethtool_get_link_ksettings, .set_link_ksettings = phy_ethtool_set_link_ksettings, + .get_regs_len = lan743x_get_regs_len, + .get_regs = lan743x_get_regs, #ifdef CONFIG_PM .get_wol = lan743x_ethtool_get_wol, .set_wol = lan743x_ethtool_set_wol,
drivers/net/ethernet/microchip/lan743x_ethtool.h +26 -0
@@ -6,6 +6,32 @@#include "linux/ethtool.h" +#define LAN743X_ETH_REG_VERSION 1 + +enum { +ETH_PRIV_FLAGS , +ETH_ID_REV , +ETH_FPGA_REV , +ETH_STRAP_READ , +ETH_INT_STS , +ETH_HW_CFG , +ETH_PMT_CTL , +ETH_E2P_CMD , +ETH_E2P_DATA , +ETH_MAC_CR , +ETH_MAC_RX , +ETH_MAC_TX , +ETH_FLOW , +ETH_MII_ACC , +ETH_MII_DATA , +ETH_EEE_TX_LPI_REQ_DLY , +ETH_WUCSR , +ETH_WK_SRC , + +/* Add new registers above */ +MAX_LAN743X_ETH_REGS +}; +extern const struct ethtool_ops lan743x_ethtool_ops;#endif /* _LAN743X_ETHTOOL_H */
Signature · 1 line
2.25.1
PATCH 2/5 net: lan743x: Add support to Secure-ON WOL
In reply to Raju LakkarajuAdd support to Magic Packet Detection with Secure-ON for PCI11010/PCI11414 chips
--- .../net/ethernet/microchip/lan743x_ethtool.c | 14 +++++++++ drivers/net/ethernet/microchip/lan743x_main.c | 29 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.h | 10 +++++++ 3 files changed, 53 insertions(+)
drivers/net/ethernet/microchip/lan743x_ethtool.c +14 -0
@@ -1149,7 +1149,13 @@ static void lan743x_ethtool_get_wol(struct net_device *netdev, wol->supported |=WAKE_BCAST |WAKE_UCAST |WAKE_MCAST |WAKE_MAGIC |WAKE_PHY |WAKE_ARP ; +if (adapter->is_pci11x1x) + wol->supported |=WAKE_MAGICSECURE ; + wol->wolopts |= adapter->wolopts; +if (adapter->wolopts &WAKE_MAGICSECURE ) +memcpy (wol->sopass, adapter->sopass, +SOPASS_MAX *sizeof (wol->sopass[0 ])); } static int lan743x_ethtool_set_wol(struct net_device *netdev,
@@ -1170,6 +1176,14 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev, adapter->wolopts |=WAKE_PHY ;if (wol->wolopts &WAKE_ARP ) adapter->wolopts |=WAKE_ARP ; +if (wol->wolopts &WAKE_MAGICSECURE && + wol->wolopts &WAKE_MAGIC ) { +memcpy (adapter->sopass, wol->sopass, +SOPASS_MAX *sizeof (wol->sopass[0 ])); + adapter->wolopts |=WAKE_MAGICSECURE ; + }else { +memset (adapter->sopass,0 ,sizeof (u8) *SOPASS_MAX ); + }device_set_wakeup_enable (&adapter->pdev->dev, (bool )wol->wolopts);
drivers/net/ethernet/microchip/lan743x_main.c +29 -0
@@ -3124,6 +3124,7 @@ static void lan743x_pm_set_wol(struct lan743x_adapter *adapter)const u8 ipv6_multicast[3 ] = {0x33 ,0x33 };const u8 arp_type[2 ] = {0x08 ,0x06 };int mask_index; +u32 sopass;u32 pmtctl;u32 wucsr;u32 macrx;
@@ -3218,6 +3219,14 @@ static void lan743x_pm_set_wol(struct lan743x_adapter *adapter) pmtctl |=PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ ; } +if (adapter->wolopts &WAKE_MAGICSECURE ) { + sopass = *(u32 *)adapter->sopass; +lan743x_csr_write (adapter,MAC_MP_SO_LO , sopass); + sopass = *(u16 *)&adapter->sopass[4 ]; +lan743x_csr_write (adapter,MAC_MP_SO_HI , sopass); + wucsr |=MAC_MP_SO_EN_ ; + } +lan743x_csr_write (adapter,MAC_WUCSR , wucsr);lan743x_csr_write (adapter,PMT_CTL , pmtctl);lan743x_csr_write (adapter,MAC_RX , macrx);
@@ -3228,6 +3237,7 @@ static int lan743x_pm_suspend(struct device *dev)struct pci_dev *pdev =to_pci_dev (dev);struct net_device *netdev =pci_get_drvdata (pdev);struct lan743x_adapter *adapter =netdev_priv (netdev); +u32 data;lan743x_pcidev_shutdown (pdev);
@@ -3239,6 +3249,18 @@ static int lan743x_pm_suspend(struct device *dev)if (adapter->wolopts)lan743x_pm_set_wol (adapter); +if (adapter->is_pci11x1x) { +/* Save HW_CFG to config again in PM resume */ + data =lan743x_csr_read (adapter,HW_CFG ); + adapter->hw_cfg = data; + data |= (HW_CFG_RST_PROTECT_PCIE_ | +HW_CFG_D3_RESET_DIS_ | +HW_CFG_D3_VAUX_OVR_ | +HW_CFG_HOT_RESET_DIS_ | +HW_CFG_RST_PROTECT_ ); +lan743x_csr_write (adapter,HW_CFG , data); + } +/* Host sets PME_En, put D3hot */ return pci_prepare_to_sleep (pdev); }
@@ -3254,6 +3276,10 @@ static int lan743x_pm_resume(struct device *dev)pci_restore_state (pdev);pci_save_state (pdev); +/* Restore HW_CFG that was saved during pm suspend */ +if (adapter->is_pci11x1x) +lan743x_csr_write (adapter,HW_CFG , adapter->hw_cfg); + ret =lan743x_hardware_init (adapter, pdev);if (ret) { netif_err(adapter, probe, adapter->netdev,
@@ -3270,6 +3296,9 @@ static int lan743x_pm_resume(struct device *dev)lan743x_netdev_open (netdev);netif_device_attach (netdev); + ret =lan743x_csr_read (adapter,MAC_WK_SRC ); +netif_info (adapter, drv, adapter->netdev, +"Wakeup source : 0x%08X\n" , ret);return 0 ; }
drivers/net/ethernet/microchip/lan743x_main.h +10 -0
@@ -43,6 +43,11 @@#define STRAP_READ_ADV_PM_DISABLE_ BIT(0)#define HW_CFG (0x010) +#define HW_CFG_RST_PROTECT_PCIE_ BIT(19) +#define HW_CFG_HOT_RESET_DIS_ BIT(15) +#define HW_CFG_D3_VAUX_OVR_ BIT(14) +#define HW_CFG_D3_RESET_DIS_ BIT(13) +#define HW_CFG_RST_PROTECT_ BIT(12)#define HW_CFG_RELOAD_TYPE_ALL_ (0x00000FC0)#define HW_CFG_EE_OTP_RELOAD_ BIT(4)#define HW_CFG_LRST_ BIT(1)
@@ -214,6 +219,7 @@#define MAC_EEE_TX_LPI_REQ_DLY_CNT (0x130)#define MAC_WUCSR (0x140) +#define MAC_MP_SO_EN_ BIT(21)#define MAC_WUCSR_RFE_WAKE_EN_ BIT(14)#define MAC_WUCSR_PFDA_EN_ BIT(3)#define MAC_WUCSR_WAKE_EN_ BIT(2)
@@ -221,6 +227,8 @@#define MAC_WUCSR_BCST_EN_ BIT(0)#define MAC_WK_SRC (0x144) +#define MAC_MP_SO_HI (0x148) +#define MAC_MP_SO_LO (0x14C)#define MAC_WUF_CFG0 (0x150)#define MAC_NUM_OF_WUF_CFG (32)
@@ -912,6 +920,7 @@ struct lan743x_adapter {int msg_enable;#ifdef CONFIG_PM u32 wolopts; +u8 sopass[SOPASS_MAX ];#endif struct pci_dev *pdev;struct lan743x_csr csr;
@@ -937,6 +946,7 @@ struct lan743x_adapter {#define LAN743X_ADAPTER_FLAG_OTP BIT(0)u32 flags; +u32 hw_cfg; };#define LAN743X_COMPONENT_FLAG_RX (channel) BIT(20 + (channel))
Signature · 1 line
2.25.1
Andrew Lunn
maintainerRe: [PATCH net-next 2/5] net: lan743x: Add support to Secure-ON WOL
Quoted 14 lines · Raju Lakkaraju
Add support to Magic Packet Detection with Secure-ON for PCI11010/PCI11414 chips
Signed-off-by Raju Lakkaraju <[email protected]>--- .../net/ethernet/microchip/lan743x_ethtool.c | 14 +++++++++ drivers/net/ethernet/microchip/lan743x_main.c | 29 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.h | 10 +++++++ 3 files changed, 53 insertions(+)drivers/net/ethernet/microchip/lan743x_ethtool.c +0
-0
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_ethtool_get_wol(struct net_device *netdev, · line 1158
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +6
-0@@ -1149,7 +1149,13 @@ static void lan743x_ethtool_get_wol(struct net_device *netdev, wol->supported |=WAKE_BCAST |WAKE_UCAST |WAKE_MCAST |WAKE_MAGIC |WAKE_PHY |WAKE_ARP ; +if (adapter->is_pci11x1x) + wol->supported |=WAKE_MAGICSECURE ; + wol->wolopts |= adapter->wolopts; +if (adapter->wolopts &WAKE_MAGICSECURE ) +memcpy (wol->sopass, adapter->sopass, +SOPASS_MAX *sizeof (wol->sopass[0 ]));
sizeof(wol->sopass) is simpler. That is what other drivers use.
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_ethtool_set_wol(struct net_device *netdev, · line 1186
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+if (wol->wolopts &WAKE_MAGICSECURE && + wol->wolopts &WAKE_MAGIC ) { +memcpy (adapter->sopass, wol->sopass, +SOPASS_MAX *sizeof (wol->sopass[0 ])); + adapter->wolopts |=WAKE_MAGICSECURE ; + }else { +memset (adapter->sopass,0 ,sizeof (u8) *SOPASS_MAX ); + }
Same here.
Andrew
Re: [PATCH net-next 2/5] net: lan743x: Add support to Secure-ON WOL
Hi Andrew,
Thank you for review comments.
Quoted 20 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 17 lines · Raju Lakkaraju
Add support to Magic Packet Detection with Secure-ON for PCI11010/PCI11414 chips
Signed-off-by Raju Lakkaraju <[email protected]>--- .../net/ethernet/microchip/lan743x_ethtool.c | 14 +++++++++ drivers/net/ethernet/microchip/lan743x_main.c | 29 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.h | 10 +++++++ 3 files changed, 53 insertions(+)drivers/net/ethernet/microchip/lan743x_ethtool.c +0
-0@@ -1149,7 +1149,13 @@ static void lan743x_ethtool_get_wol(struct net_device *netdev, wol->supported |=WAKE_BCAST |WAKE_UCAST |WAKE_MCAST |WAKE_MAGIC |WAKE_PHY |WAKE_ARP ;
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static void lan743x_ethtool_get_wol(struct net_device *netdev, · line 1158
Quoted 7 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +6
-0+if (adapter->is_pci11x1x) + wol->supported |=WAKE_MAGICSECURE ; + wol->wolopts |= adapter->wolopts; +if (adapter->wolopts &WAKE_MAGICSECURE ) +memcpy (wol->sopass, adapter->sopass, +SOPASS_MAX *sizeof (wol->sopass[0 ]));
sizeof(wol->sopass)is simpler. That is what other drivers use.
Accepted. I'll change.
Quoted 11 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c static int lan743x_ethtool_set_wol(struct net_device *netdev, · line 1186
Quoted 8 lines
drivers/net/ethernet/microchip/lan743x_ethtool.c +8
-0+if (wol->wolopts &WAKE_MAGICSECURE && + wol->wolopts &WAKE_MAGIC ) { +memcpy (adapter->sopass, wol->sopass, +SOPASS_MAX *sizeof (wol->sopass[0 ])); + adapter->wolopts |=WAKE_MAGICSECURE ; + }else { +memset (adapter->sopass,0 ,sizeof (u8) *SOPASS_MAX ); + }Same here.
Accepted. I'll change.
Quoted 1 line
Andrew
Signature · 2 lines
Thanks, Raju
PATCH 3/5 net: lan743x: Add support to SGMII block access functions
In reply to Raju LakkarajuAdd SGMII access read and write functions
--- drivers/net/ethernet/microchip/lan743x_main.c | 69 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.h | 12 ++++ 2 files changed, 81 insertions(+)
drivers/net/ethernet/microchip/lan743x_main.c +69 -0
@@ -909,6 +909,74 @@ static int lan743x_mdiobus_c45_write(struct mii_bus *bus,return ret; } +static int lan743x_sgmii_wait_till_not_busy (struct lan743x_adapter *adapter) +{ +u32 data; +int ret; + + ret =readx_poll_timeout (LAN743X_CSR_READ_OP ,SGMII_ACC , data, + !(data &SGMII_ACC_SGMII_BZY_ ),100 ,1000000 ); +if (unlikely (ret <0 )) +netif_err (adapter, drv, adapter->netdev, +"%s: error %d sgmii wait timeout\n" , __func__, ret); + +return ret; +} + +static int lan743x_sgmii_read (struct lan743x_adapter *adapter,u8 mmd,u16 addr) +{ +u32 mmd_access; +int ret; +u32 val; + +if (mmd >31 ) { +netif_err (adapter, probe, adapter->netdev, +"%s mmd should <= 31\n" , __func__); +return -EINVAL ; + } + +mutex_lock (&adapter->sgmii_rw_lock); +/* Load Register Address */ + mmd_access = mmd <<SGMII_ACC_SGMII_MMD_SHIFT_ ; + mmd_access |= (addr |SGMII_ACC_SGMII_BZY_ ); +lan743x_csr_write (adapter,SGMII_ACC , mmd_access); + ret =lan743x_sgmii_wait_till_not_busy (adapter); +if (ret <0 ) + goto sgmii_unlock; + + val =lan743x_csr_read (adapter,SGMII_DATA ); + ret = (int )(val &SGMII_DATA_MASK_ ); + +sgmii_unlock: +mutex_unlock (&adapter->sgmii_rw_lock); + +return ret; +} + +static int lan743x_sgmii_write (struct lan743x_adapter *adapter, +u8 mmd,u16 addr,u16 val) +{ +u32 mmd_access; +int ret; + +if (mmd >31 ) { +netif_err (adapter, probe, adapter->netdev, +"%s mmd should <= 31\n" , __func__); +return -EINVAL ; + } +mutex_lock (&adapter->sgmii_rw_lock); +/* Load Register Data */ +lan743x_csr_write (adapter,SGMII_DATA , (u32)(val &SGMII_DATA_MASK_ )); +/* Load Register Address */ + mmd_access = mmd <<SGMII_ACC_SGMII_MMD_SHIFT_ ; + mmd_access |= (addr |SGMII_ACC_SGMII_BZY_ |SGMII_ACC_SGMII_WR_ ); +lan743x_csr_write (adapter,SGMII_ACC , mmd_access); + ret =lan743x_sgmii_wait_till_not_busy (adapter); +mutex_unlock (&adapter->sgmii_rw_lock); + +return ret; +} +static void lan743x_mac_set_address (struct lan743x_adapter *adapter,u8 *addr) {
@@ -2875,6 +2943,7 @@ static int lan743x_hardware_init(struct lan743x_adapter *adapter, adapter->max_vector_count =PCI11X1X_MAX_VECTOR_COUNT ;pci11x1x_strap_get_status (adapter);spin_lock_init (&adapter->eth_syslock_spinlock); +mutex_init (&adapter->sgmii_rw_lock); }else { adapter->max_tx_channels =LAN743X_MAX_TX_CHANNELS ; adapter->used_tx_channels =LAN743X_USED_TX_CHANNELS ;
drivers/net/ethernet/microchip/lan743x_main.h +12 -0
@@ -288,6 +288,17 @@#define MAC_WUCSR2 (0x600) +#define SGMII_ACC (0x720) +#define SGMII_ACC_SGMII_BZY_ BIT(31) +#define SGMII_ACC_SGMII_WR_ BIT(30) +#define SGMII_ACC_SGMII_MMD_SHIFT_ (16) +#define SGMII_ACC_SGMII_MMD_MASK_ GENMASK(20, 16) +#define SGMII_ACC_SGMII_MMD_VSR_ BIT(15) +#define SGMII_ACC_SGMII_ADDR_SHIFT_ (0) +#define SGMII_ACC_SGMII_ADDR_MASK_ GENMASK(15, 0) +#define SGMII_DATA (0x724) +#define SGMII_DATA_SHIFT_ (0) +#define SGMII_DATA_MASK_ GENMASK(15, 0)#define SGMII_CTL (0x728)#define SGMII_CTL_SGMII_ENABLE_ BIT(31)#define SGMII_CTL_LINK_STATUS_SOURCE_ BIT(8)
@@ -940,6 +951,7 @@ struct lan743x_adapter {spinlock_t eth_syslock_spinlock;bool eth_syslock_en;u32 eth_syslock_acquire_cnt; +struct mutex sgmii_rw_lock;u8 max_tx_channels;u8 used_tx_channels;u8 max_vector_count;
Signature · 1 line
2.25.1
Andrew Lunn
maintainerRe: [PATCH net-next 3/5] net: lan743x: Add support to SGMII block access functions
Quoted 14 lines · Raju Lakkaraju
Add SGMII access read and write functions
Signed-off-by Raju Lakkaraju <[email protected]>--- drivers/net/ethernet/microchip/lan743x_main.c | 69 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.h | 12 ++++ 2 files changed, 81 insertions(+)drivers/net/ethernet/microchip/lan743x_main.c +0
-0@@ -909,6 +909,74 @@ static int lan743x_mdiobus_c45_write(struct mii_bus *bus,return ret;
drivers/net/ethernet/microchip/lan743x_main.c static int lan743x_mdiobus_c45_write(struct mii_bus *bus, · line 919
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.c +8
-0} +static int lan743x_sgmii_wait_till_not_busy (struct lan743x_adapter *adapter) +{ +u32 data; +int ret; + + ret =readx_poll_timeout (LAN743X_CSR_READ_OP ,SGMII_ACC , data, + !(data &SGMII_ACC_SGMII_BZY_ ),100 ,1000000 ); +if (unlikely (ret <0 ))
unlikely() seems pointless here. You have just done a blocking poll, so you don't care about high performance, this is not the fast path.
Andrew
Re: [PATCH net-next 3/5] net: lan743x: Add support to SGMII block access functions
Hi Andrew,
Thank you for review comments.
Quoted 31 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 14 lines · Raju Lakkaraju
Add SGMII access read and write functions
Signed-off-by Raju Lakkaraju <[email protected]>--- drivers/net/ethernet/microchip/lan743x_main.c | 69 +++++++++++++++++++ drivers/net/ethernet/microchip/lan743x_main.h | 12 ++++ 2 files changed, 81 insertions(+)drivers/net/ethernet/microchip/lan743x_main.c +0
-0@@ -909,6 +909,74 @@ static int lan743x_mdiobus_c45_write(struct mii_bus *bus,return ret;drivers/net/ethernet/microchip/lan743x_main.c static int lan743x_mdiobus_c45_write(struct mii_bus *bus, · line 919
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.c +8
-0} +static int lan743x_sgmii_wait_till_not_busy (struct lan743x_adapter *adapter) +{ +u32 data; +int ret; + + ret =readx_poll_timeout (LAN743X_CSR_READ_OP ,SGMII_ACC , data, + !(data &SGMII_ACC_SGMII_BZY_ ),100 ,1000000 ); +if (unlikely (ret <0 ))
unlikely()seems pointless here. You have just done a blocking poll, so you don't care about high performance, this is not the fast path.
Quoted 1 line
Andrew
Accepted.
I will remove the unlinkely().
Signature · 2 lines
Thanks, Raju
PATCH 4/5 net: lan743x: Add support to SGMII 1G and 2.5G
In reply to Raju LakkarajuAdd support to SGMII 1G and 2.5G for PCI11010/PCI11414 chips
--- .../net/ethernet/microchip/lan743x_ethtool.c | 6 +- drivers/net/ethernet/microchip/lan743x_main.c | 280 +++++++++++++++++- drivers/net/ethernet/microchip/lan743x_main.h | 122 ++++++++ 3 files changed, 399 insertions(+), 9 deletions(-)
drivers/net/ethernet/microchip/lan743x_ethtool.c +3 -3
@@ -155,8 +155,8 @@ static int lan743x_otp_write(struct lan743x_adapter *adapter, u32 offset,return 0 ; } -static int lan743x_hs_syslock_acquire (struct lan743x_adapter *adapter, -u16 timeout) +int lan743x_hs_syslock_acquire (struct lan743x_adapter *adapter, +u16 timeout) {u16 timeout_cnt =0 ;u32 val;
@@ -192,7 +192,7 @@ static int lan743x_hs_syslock_acquire(struct lan743x_adapter *adapter,return 0 ; } -static void lan743x_hs_syslock_release (struct lan743x_adapter *adapter) +void lan743x_hs_syslock_release (struct lan743x_adapter *adapter) {u32 val;
drivers/net/ethernet/microchip/lan743x_main.c +274 -6
324 lines not on this page · raw message
drivers/net/ethernet/microchip/lan743x_main.h +122 -0
151 lines not on this page · raw message
Signature · 1 line
2.25.1
Andrew Lunn
maintainerRe: [PATCH net-next 4/5] net: lan743x: Add support to SGMII 1G and 2.5G
drivers/net/ethernet/microchip/lan743x_main.h line 318
Quoted 7 lines
drivers/net/ethernet/microchip/lan743x_main.h +7
-0+/* MMD Device IDs */ +#define STD_DEVID (0x0) +#define MMD_PMAPMD (0x1) +#define MMD_PCS (0x3) +#define MMD_ANEG (0x7) +#define MMD_VSPEC1 (0x1E) +#define MMD_VSPEC2 (0x1F)
Please use the values from include/uapi/mdio.h
drivers/net/ethernet/microchip/lan743x_main.h line 322
Quoted 4 lines
drivers/net/ethernet/microchip/lan743x_main.h +4
-0+ +/* Vendor Specific SGMII MMD details */ +#define SR_MII_DEV_ID1 0x0002 +#define SR_MII_DEV_ID2 0x0003
MDIO_DEVID1 & MDIO_DEVID2
Quoted 4 lines
drivers/net/ethernet/microchip/lan743x_main.h +4
-0+#define SR_VSMMD_PCS_ID1 0x0004 +#define SR_VSMMD_PCS_ID2 0x0005 +#define SR_VSMMD_STS 0x0008 +#define SR_VSMMD_CTRL 0x0009
drivers/net/ethernet/microchip/lan743x_main.h line 336
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.h +10
-0+ +#define SR_MII_CTRL 0x0000 +#define SR_MII_CTRL_RST_ BIT(15) +#define SR_MII_CTRL_LBE_ BIT(14) +#define SR_MII_CTRL_SS13_ BIT(13) +#define SR_MII_CTRL_AN_ENABLE_ BIT(12) +#define SR_MII_CTRL_LPM_ BIT(11) +#define SR_MII_CTRL_RESTART_AN_ BIT(9) +#define SR_MII_CTRL_DUPLEX_MODE_ BIT(8) +#define SR_MII_CTRL_SS6_ BIT(6)
These look like standard BMCR registers. Please use the values from mii.h
Quoted 6 lines
drivers/net/ethernet/microchip/lan743x_main.h +6
-0+#define SR_MII_STS 0x0001 +#define SR_MII_STS_ABL100T4_ BIT(15) +#define SR_MII_STS_FD100ABL_ BIT(14) +#define SR_MII_STS_HD100ABL_ BIT(13) +#define SR_MII_STS_FD10ABL_ BIT(12) +#define SR_MII_STS_HD10ABL_ BIT(11)
drivers/net/ethernet/microchip/lan743x_main.h line 352
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.h +10
-0+#define SR_MII_STS_FD100T_ BIT(10) +#define SR_MII_STS_HD100T_ BIT(9) +#define SR_MII_STS_EXT_STS_ABL_ BIT(8) +#define SR_MII_STS_UN_DIR_ABL_ BIT(7) +#define SR_MII_STS_MF_PRE_SUP_ BIT(6) +#define SR_MII_STS_AN_CMPL_ BIT(5) +#define SR_MII_STS_RF_ BIT(4) +#define SR_MII_STS_AN_ABL_ BIT(3) +#define SR_MII_STS_LINK_STS_ BIT(2) +#define SR_MII_STS_EXT_REG_CAP_ BIT(0)
These look like BMSR.
It could even be, you can just use generic code for these.
Andrew
Re: [PATCH net-next 4/5] net: lan743x: Add support to SGMII 1G and 2.5G
Hi Andrew,
Thank you for review comments.
Quoted 12 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
drivers/net/ethernet/microchip/lan743x_main.h line 318
Quoted 7 lines
drivers/net/ethernet/microchip/lan743x_main.h +7
-0+/* MMD Device IDs */ +#define STD_DEVID (0x0) +#define MMD_PMAPMD (0x1) +#define MMD_PCS (0x3) +#define MMD_ANEG (0x7) +#define MMD_VSPEC1 (0x1E) +#define MMD_VSPEC2 (0x1F)Please use the values from
include/uapi/mdio.h
Accepted. Will fix this.
Quoted 6 lines
drivers/net/ethernet/microchip/lan743x_main.h line 322
Quoted 4 lines
drivers/net/ethernet/microchip/lan743x_main.h +4
-0+ +/* Vendor Specific SGMII MMD details */ +#define SR_MII_DEV_ID1 0x0002 +#define SR_MII_DEV_ID2 0x0003
MDIO_DEVID1&MDIO_DEVID2
Not used these definitions. I will remote.
Quoted 10 lines
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.h +9
-0+#define SR_VSMMD_PCS_ID1 0x0004 +#define SR_VSMMD_PCS_ID2 0x0005 +#define SR_VSMMD_STS 0x0008 +#define SR_VSMMD_CTRL 0x0009 + +#define SR_MII_CTRL 0x0000 +#define SR_MII_CTRL_RST_ BIT(15) +#define SR_MII_CTRL_LBE_ BIT(14) +#define SR_MII_CTRL_SS13_ BIT(13)
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_main.h line 336
Quoted 5 lines
drivers/net/ethernet/microchip/lan743x_main.h +5
-0+#define SR_MII_CTRL_AN_ENABLE_ BIT(12) +#define SR_MII_CTRL_LPM_ BIT(11) +#define SR_MII_CTRL_RESTART_AN_ BIT(9) +#define SR_MII_CTRL_DUPLEX_MODE_ BIT(8) +#define SR_MII_CTRL_SS6_ BIT(6)These look like standard BMCR registers. Please use the values from
mii.h
Accepted. Will fix this.
Quoted 10 lines
Quoted 10 lines
drivers/net/ethernet/microchip/lan743x_main.h +10
-0+#define SR_MII_STS 0x0001 +#define SR_MII_STS_ABL100T4_ BIT(15) +#define SR_MII_STS_FD100ABL_ BIT(14) +#define SR_MII_STS_HD100ABL_ BIT(13) +#define SR_MII_STS_FD10ABL_ BIT(12) +#define SR_MII_STS_HD10ABL_ BIT(11) +#define SR_MII_STS_FD100T_ BIT(10) +#define SR_MII_STS_HD100T_ BIT(9) +#define SR_MII_STS_EXT_STS_ABL_ BIT(8) +#define SR_MII_STS_UN_DIR_ABL_ BIT(7)
Quoted 9 lines
drivers/net/ethernet/microchip/lan743x_main.h line 352
Quoted 6 lines
drivers/net/ethernet/microchip/lan743x_main.h +6
-0+#define SR_MII_STS_MF_PRE_SUP_ BIT(6) +#define SR_MII_STS_AN_CMPL_ BIT(5) +#define SR_MII_STS_RF_ BIT(4) +#define SR_MII_STS_AN_ABL_ BIT(3) +#define SR_MII_STS_LINK_STS_ BIT(2) +#define SR_MII_STS_EXT_REG_CAP_ BIT(0)These look like BMSR.
Accepted. Will fix this.
Quoted 3 lines
It could even be, you can just use generic code for these.
Andrew
Signature · 2 lines
Thanks, Raju
PATCH 5/5 net: phy: add support to get Master-Slave configuration
In reply to Raju LakkarajuImplement reporting the Master-Slave configuration and state
--- drivers/net/phy/mxl-gpy.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)
drivers/net/phy/mxl-gpy.c +55 -0
@@ -27,11 +27,19 @@#define PHY_ID_GPY241BM 0x67C9DE80#define PHY_ID_GPY245B 0x67C9DEC0 +#define PHY_STD_GCTRL 0x09/* Gbit ctrl */ +#define PHY_STD_GSTAT 0x0A/* Gbit status */ #define PHY_MIISTAT 0x18/* MII state */ #define PHY_IMASK 0x19/* interrupt mask */ #define PHY_ISTAT 0x1A/* interrupt status */ #define PHY_FWV 0x1E/* firmware version */ +#define PHY_STD_GCTRL_MS BIT(11) +#define PHY_STD_GCTRL_MSEN BIT(12) + +#define PHY_STD_GSTAT_MSRES BIT(14) +#define PHY_STD_GSTAT_MSFAULT BIT(15) +#define PHY_MIISTAT_SPD_MASK GENMASK(2, 0)#define PHY_MIISTAT_DPX BIT(3)#define PHY_MIISTAT_LS BIT(10)
@@ -160,6 +168,48 @@ static bool gpy_2500basex_chk(struct phy_device *phydev)return true; } +static int gpy_master_slave_cfg_get (struct phy_device *phydev) +{ +int state; +int cfg; +int ret; + + ret =phy_read (phydev,PHY_STD_GCTRL ); +if (ret <0 ) { +phydev_err (phydev,"Error: MDIO register access failed: %d\n" , + ret); +return ret; + } + +if (ret &PHY_STD_GCTRL_MSEN ) +if (ret &PHY_STD_GCTRL_MS ) + cfg =MASTER_SLAVE_CFG_MASTER_FORCE ; +else + cfg =MASTER_SLAVE_CFG_SLAVE_FORCE ; +else + cfg =MASTER_SLAVE_CFG_MASTER_PREFERRED ; + + ret =phy_read (phydev,PHY_STD_GSTAT ); +if (ret <0 ) { +phydev_err (phydev,"Error: MDIO register access failed: %d\n" , + ret); +return ret; + } + +if (ret &PHY_STD_GSTAT_MSFAULT ) + state =MASTER_SLAVE_STATE_ERR ; +else +if (ret &PHY_STD_GSTAT_MSRES ) + state =MASTER_SLAVE_STATE_MASTER ; +else + state =MASTER_SLAVE_STATE_SLAVE ; + + phydev->master_slave_get = cfg; + phydev->master_slave_state = state; + +return 0 ; +} +static bool gpy_sgmii_aneg_en (struct phy_device *phydev) {int ret;
@@ -295,6 +345,9 @@ static void gpy_update_interface(struct phy_device *phydev) ret);break ; } + +if (phydev->speed ==SPEED_2500 || phydev->speed ==SPEED_1000 ) +gpy_master_slave_cfg_get (phydev); }static int gpy_read_status (struct phy_device *phydev)
@@ -309,6 +362,8 @@ static int gpy_read_status(struct phy_device *phydev) phydev->duplex =DUPLEX_UNKNOWN ; phydev->pause =0 ; phydev->asym_pause =0 ; + phydev->master_slave_get =MASTER_SLAVE_CFG_UNKNOWN ; + phydev->master_slave_state =MASTER_SLAVE_STATE_UNKNOWN ;if (phydev->autoneg ==AUTONEG_ENABLE && phydev->autoneg_complete) { ret =genphy_c45_read_lpa (phydev);
Signature · 1 line
2.25.1
Andrew Lunn
maintainerRe: [PATCH net-next 5/5] net: phy: add support to get Master-Slave configuration
Quoted 12 lines · Raju Lakkaraju
Implement reporting the Master-Slave configuration and state
Signed-off-by Raju Lakkaraju <[email protected]>--- drivers/net/phy/mxl-gpy.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)drivers/net/phy/mxl-gpy.c +0
-0
drivers/net/phy/mxl-gpy.c line 31
Quoted 5 lines
drivers/net/phy/mxl-gpy.c +2
-0@@ -27,11 +27,19 @@#define PHY_ID_GPY241BM 0x67C9DE80#define PHY_ID_GPY245B 0x67C9DEC0 +#define PHY_STD_GCTRL 0x09/* Gbit ctrl */ +#define PHY_STD_GSTAT 0x0A/* Gbit status */
#define MII_CTRL1000 0x09 /* 1000BASE-T control */
#define MII_STAT1000 0x0a /* 1000BASE-T status */
from mii.h
drivers/net/phy/mxl-gpy.c line 41
Quoted 10 lines
drivers/net/phy/mxl-gpy.c +5
-0#define PHY_MIISTAT 0x18/* MII state */ #define PHY_IMASK 0x19/* interrupt mask */ #define PHY_ISTAT 0x1A/* interrupt status */ #define PHY_FWV 0x1E/* firmware version */ +#define PHY_STD_GCTRL_MS BIT(11) +#define PHY_STD_GCTRL_MSEN BIT(12) + +#define PHY_STD_GSTAT_MSRES BIT(14) +#define PHY_STD_GSTAT_MSFAULT BIT(15)
If the device is just following the standard, there should not be any need to add defines, they should already exist. And if it does follow the standard there are probably helpers you can use.
Quoted 37 lines
drivers/net/phy/mxl-gpy.c +30
-0#define PHY_MIISTAT_SPD_MASK GENMASK(2, 0)#define PHY_MIISTAT_DPX BIT(3)#define PHY_MIISTAT_LS BIT(10)@@ -160,6 +168,48 @@ static bool gpy_2500basex_chk(struct phy_device *phydev)return true; } +static int gpy_master_slave_cfg_get (struct phy_device *phydev) +{ +int state; +int cfg; +int ret; + + ret =phy_read (phydev,PHY_STD_GCTRL ); +if (ret <0 ) { +phydev_err (phydev,"Error: MDIO register access failed: %d\n" , + ret); +return ret; + } + +if (ret &PHY_STD_GCTRL_MSEN ) +if (ret &PHY_STD_GCTRL_MS ) + cfg =MASTER_SLAVE_CFG_MASTER_FORCE ; +else + cfg =MASTER_SLAVE_CFG_SLAVE_FORCE ; +else + cfg =MASTER_SLAVE_CFG_MASTER_PREFERRED ; + + ret =phy_read (phydev,PHY_STD_GSTAT ); +if (ret <0 ) { +phydev_err (phydev,"Error: MDIO register access failed: %d\n" , + ret); +return ret; + } + +if (ret &PHY_STD_GSTAT_MSFAULT ) + state =MASTER_SLAVE_STATE_ERR ;
drivers/net/phy/mxl-gpy.c static bool gpy_2500basex_chk(struct phy_device *phydev) · line 210
Quoted 10 lines
drivers/net/phy/mxl-gpy.c +10
-0+else +if (ret &PHY_STD_GSTAT_MSRES ) + state =MASTER_SLAVE_STATE_MASTER ; +else + state =MASTER_SLAVE_STATE_SLAVE ; + + phydev->master_slave_get = cfg; + phydev->master_slave_state = state; + +return 0 ;
Would genphy_read_master_slave() work?
Andrew
Re: [PATCH net-next 5/5] net: phy: add support to get Master-Slave configuration
Hi Andrew,
Thank you for review comments.
Quoted 18 lines · Andrew Lunn
EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
Quoted 15 lines · Raju Lakkaraju
Implement reporting the Master-Slave configuration and state
Signed-off-by Raju Lakkaraju <[email protected]>--- drivers/net/phy/mxl-gpy.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)drivers/net/phy/mxl-gpy.c +0
-0@@ -27,11 +27,19 @@#define PHY_ID_GPY241BM 0x67C9DE80#define PHY_ID_GPY245B 0x67C9DEC0
Quoted 8 lines
drivers/net/phy/mxl-gpy.c line 31
Quoted 2 lines
drivers/net/phy/mxl-gpy.c +2
-0+#define PHY_STD_GCTRL 0x09/* Gbit ctrl */ +#define PHY_STD_GSTAT 0x0A/* Gbit status */ #define MII_CTRL1000 0x09 /* 1000BASE-T control */ #define MII_STAT1000 0x0a /* 1000BASE-T status */from
mii.h
I can use generic master-slave function.
I will remove these changes
Quoted 5 lines
Quoted 5 lines
drivers/net/phy/mxl-gpy.c +0
-0#define PHY_MIISTAT 0x18/* MII state */ #define PHY_IMASK 0x19/* interrupt mask */ #define PHY_ISTAT 0x1A/* interrupt status */ #define PHY_FWV 0x1E/* firmware version */
Quoted 10 lines
drivers/net/phy/mxl-gpy.c line 41
Quoted 5 lines
drivers/net/phy/mxl-gpy.c +5
-0+#define PHY_STD_GCTRL_MS BIT(11) +#define PHY_STD_GCTRL_MSEN BIT(12) + +#define PHY_STD_GSTAT_MSRES BIT(14) +#define PHY_STD_GSTAT_MSFAULT BIT(15)If the device is just following the standard, there should not be any need to add defines, they should already exist. And if it does follow the standard there are probably helpers you can use.
Accepted.
Device following the standard. I will use generic master-slave function
Quoted 41 lines
Quoted 41 lines
drivers/net/phy/mxl-gpy.c +34
-0#define PHY_MIISTAT_SPD_MASK GENMASK(2, 0)#define PHY_MIISTAT_DPX BIT(3)#define PHY_MIISTAT_LS BIT(10)@@ -160,6 +168,48 @@ static bool gpy_2500basex_chk(struct phy_device *phydev)return true; } +static int gpy_master_slave_cfg_get (struct phy_device *phydev) +{ +int state; +int cfg; +int ret; + + ret =phy_read (phydev,PHY_STD_GCTRL ); +if (ret <0 ) { +phydev_err (phydev,"Error: MDIO register access failed: %d\n" , + ret); +return ret; + } + +if (ret &PHY_STD_GCTRL_MSEN ) +if (ret &PHY_STD_GCTRL_MS ) + cfg =MASTER_SLAVE_CFG_MASTER_FORCE ; +else + cfg =MASTER_SLAVE_CFG_SLAVE_FORCE ; +else + cfg =MASTER_SLAVE_CFG_MASTER_PREFERRED ; + + ret =phy_read (phydev,PHY_STD_GSTAT ); +if (ret <0 ) { +phydev_err (phydev,"Error: MDIO register access failed: %d\n" , + ret); +return ret; + } + +if (ret &PHY_STD_GSTAT_MSFAULT ) + state =MASTER_SLAVE_STATE_ERR ; +else +if (ret &PHY_STD_GSTAT_MSRES ) + state =MASTER_SLAVE_STATE_MASTER ; +else
Quoted 8 lines
drivers/net/phy/mxl-gpy.c static bool gpy_2500basex_chk(struct phy_device *phydev) · line 210
Quoted 6 lines
drivers/net/phy/mxl-gpy.c +6
-0+ state =MASTER_SLAVE_STATE_SLAVE ; + + phydev->master_slave_get = cfg; + phydev->master_slave_state = state; + +return 0 ;Would
genphy_read_master_slave()work?
Yes.
I can use genphy_read_master_slave() function.
Quoted 2 lines
Andrew
Signature · 2 lines
Thanks, Raju