net: lan743x: Fixes for multiple WOL related issues
Subsystems (5)
v5 cover net: lan743x: Fixes for multiple WOL related issues
This patch series implement the following fixes:
1. Disable WOL upon resume in order to restore full data path operation
2. Support WOL at both the PHY and MAC appropriately
3. Remove interrupt mask clearing from config_init
Patch-3 was sent seperately earlier. Review comments in link:
https://lore.kernel.org/lkml/[email protected]/T/
Raju Lakkaraju (3):
net: lan743x: disable WOL upon resume to restore full data path
operation
net: lan743x: Support WOL at both the PHY and MAC appropriately
net: phy: mxl-gpy: Remove interrupt mask clearing from config_init
.../net/ethernet/microchip/lan743x_ethtool.c | 44 ++++++++++++-- drivers/net/ethernet/microchip/lan743x_main.c | 48 ++++++++++++--- drivers/net/ethernet/microchip/lan743x_main.h | 28 +++++++++ drivers/net/phy/mxl-gpy.c | 58 ++++++++++++------- 4 files changed, 146 insertions(+), 32 deletions(-)
Signature · 1 line
2.34.1
PATCH v5 1/3 net: lan743x: disable WOL upon resume to restore full data path operation
When Wake-on-LAN (WoL) is active and the system is in suspend mode, triggering a system event can wake the system from sleep, which may block the data path. To restore normal data path functionality after waking, disable all wake-up events. Furthermore, clear all Write 1 to Clear (W1C) status bits by writing 1's to them.
---
Change List:
------------
V4 -> V5:
- Change Wakeup source message from info to debug
V3 -> V4:
- No change
V2 -> V3:
- No change
V1 -> V2:
- Repost - No change
V0 -> V1:
- Variable "data" change from "int" to "unsigned int"
drivers/net/ethernet/microchip/lan743x_main.c | 30 ++++++++++++++++--- drivers/net/ethernet/microchip/lan743x_main.h | 24 +++++++++++++++ 2 files changed, 50 insertions(+), 4 deletions(-)
drivers/net/ethernet/microchip/lan743x_main.c +26 -4
@@ -3575,7 +3575,7 @@ static void lan743x_pm_set_wol(struct lan743x_adapter *adapter)/* clear wake settings */ pmtctl =lan743x_csr_read (adapter,PMT_CTL ); - pmtctl |=PMT_CTL_WUPS_MASK_ ; + pmtctl |=PMT_CTL_WUPS_MASK_ |PMT_CTL_RES_CLR_WKP_MASK_ ; pmtctl &= ~(PMT_CTL_GPIO_WAKEUP_EN_ |PMT_CTL_EEE_WAKEUP_EN_ |PMT_CTL_WOL_EN_ |PMT_CTL_MAC_D3_RX_CLK_OVR_ |PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ |PMT_CTL_ETH_PHY_WAKE_EN_ );
@@ -3710,6 +3710,7 @@ static int lan743x_pm_resume(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;int ret;pci_set_power_state (pdev,PCI_D0 );
@@ -3728,6 +3729,30 @@ static int lan743x_pm_resume(struct device *dev)return ret; } + ret =lan743x_csr_read (adapter,MAC_WK_SRC ); +netif_dbg (adapter, drv, adapter->netdev, +"Wakeup source : 0x%08X\n" , ret); + +/* Clear the wol configuration and status bits. Note that +* the status bits are "Write One to Clear (W1C)" +*/ + data =MAC_WUCSR_EEE_TX_WAKE_ |MAC_WUCSR_EEE_RX_WAKE_ | +MAC_WUCSR_RFE_WAKE_FR_ |MAC_WUCSR_PFDA_FR_ |MAC_WUCSR_WUFR_ | +MAC_WUCSR_MPR_ |MAC_WUCSR_BCAST_FR_ ; +lan743x_csr_write (adapter,MAC_WUCSR , data); + + data =MAC_WUCSR2_NS_RCD_ |MAC_WUCSR2_ARP_RCD_ | +MAC_WUCSR2_IPV6_TCPSYN_RCD_ |MAC_WUCSR2_IPV4_TCPSYN_RCD_ ; +lan743x_csr_write (adapter,MAC_WUCSR2 , data); + + data =MAC_WK_SRC_ETH_PHY_WK_ |MAC_WK_SRC_IPV6_TCPSYN_RCD_WK_ | +MAC_WK_SRC_IPV4_TCPSYN_RCD_WK_ |MAC_WK_SRC_EEE_TX_WK_ | +MAC_WK_SRC_EEE_RX_WK_ |MAC_WK_SRC_RFE_FR_WK_ | +MAC_WK_SRC_PFDA_FR_WK_ |MAC_WK_SRC_MP_FR_WK_ | +MAC_WK_SRC_BCAST_FR_WK_ |MAC_WK_SRC_WU_FR_WK_ | +MAC_WK_SRC_WK_FR_SAVED_ ; +lan743x_csr_write (adapter,MAC_WK_SRC , data); +/* open netdev when netdev is at running state while resume. * For instance, it is true when system wakesup after pm-suspend * However, it is false when system wakes up after suspend GUI menu
@@ -3736,9 +3761,6 @@ 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 +24 -0
@@ -61,6 +61,7 @@#define PMT_CTL_RX_FCT_RFE_D3_CLK_OVR_ BIT(18)#define PMT_CTL_GPIO_WAKEUP_EN_ BIT(15)#define PMT_CTL_EEE_WAKEUP_EN_ BIT(13) +#define PMT_CTL_RES_CLR_WKP_MASK_ GENMASK(9, 8)#define PMT_CTL_READY_ BIT(7)#define PMT_CTL_ETH_PHY_RST_ BIT(4)#define PMT_CTL_WOL_EN_ BIT(3)
@@ -227,12 +228,31 @@#define MAC_WUCSR (0x140)#define MAC_MP_SO_EN_ BIT(21)#define MAC_WUCSR_RFE_WAKE_EN_ BIT(14) +#define MAC_WUCSR_EEE_TX_WAKE_ BIT(13) +#define MAC_WUCSR_EEE_RX_WAKE_ BIT(11) +#define MAC_WUCSR_RFE_WAKE_FR_ BIT(9) +#define MAC_WUCSR_PFDA_FR_ BIT(7) +#define MAC_WUCSR_WUFR_ BIT(6) +#define MAC_WUCSR_MPR_ BIT(5) +#define MAC_WUCSR_BCAST_FR_ BIT(4)#define MAC_WUCSR_PFDA_EN_ BIT(3)#define MAC_WUCSR_WAKE_EN_ BIT(2)#define MAC_WUCSR_MPEN_ BIT(1)#define MAC_WUCSR_BCST_EN_ BIT(0)#define MAC_WK_SRC (0x144) +#define MAC_WK_SRC_ETH_PHY_WK_ BIT(17) +#define MAC_WK_SRC_IPV6_TCPSYN_RCD_WK_ BIT(16) +#define MAC_WK_SRC_IPV4_TCPSYN_RCD_WK_ BIT(15) +#define MAC_WK_SRC_EEE_TX_WK_ BIT(14) +#define MAC_WK_SRC_EEE_RX_WK_ BIT(13) +#define MAC_WK_SRC_RFE_FR_WK_ BIT(12) +#define MAC_WK_SRC_PFDA_FR_WK_ BIT(11) +#define MAC_WK_SRC_MP_FR_WK_ BIT(10) +#define MAC_WK_SRC_BCAST_FR_WK_ BIT(9) +#define MAC_WK_SRC_WU_FR_WK_ BIT(8) +#define MAC_WK_SRC_WK_FR_SAVED_ BIT(7) +#define MAC_MP_SO_HI (0x148)#define MAC_MP_SO_LO (0x14C)
@@ -295,6 +315,10 @@#define RFE_INDX (index) (0x580 + (index << 2))#define MAC_WUCSR2 (0x600) +#define MAC_WUCSR2_NS_RCD_ BIT(7) +#define MAC_WUCSR2_ARP_RCD_ BIT(6) +#define MAC_WUCSR2_IPV6_TCPSYN_RCD_ BIT(5) +#define MAC_WUCSR2_IPV4_TCPSYN_RCD_ BIT(4)#define SGMII_ACC (0x720)#define SGMII_ACC_SGMII_BZY_ BIT(31)
Signature · 1 line
2.34.1
PATCH v5 2/3 net: lan743x: Support WOL at both the PHY and MAC appropriately
In reply to Raju LakkarajuPrevent options not supported by the PHY from being requested to it by the MAC Whenever a WOL option is supported by both, the PHY is given priority since that usually leads to better power savings.
---
Change List:
------------
V4 -> V5:
- Change Fixes's SHA from 13 chars to 12 chars
- Remove the "Reported-by" and "Closes" tags
V3 -> V4:
- Fix the support for "CONFIG_PM=N"
V2 -> V3:
- Remove the "phy does not support WOL" debug message which is not required
- Remove WAKE_PHY support option from Ethernet MAC (LAN743x/PCI11x1x) driver
- Add "phy_wol_supported" and "phy_wolopts" variables to hold PHY's WOL config
V1 -> V2:
- Repost - No change
V0 -> V1:
- Change the "phy does not support WOL" print from netif_info() to
netif_dbg()
.../net/ethernet/microchip/lan743x_ethtool.c | 44 +++++++++++++++++-- drivers/net/ethernet/microchip/lan743x_main.c | 18 ++++++-- drivers/net/ethernet/microchip/lan743x_main.h | 4 ++ 3 files changed, 58 insertions(+), 8 deletions(-)
drivers/net/ethernet/microchip/lan743x_ethtool.c +40 -4
@@ -1127,8 +1127,12 @@ static void lan743x_ethtool_get_wol(struct net_device *netdev,if (netdev->phydev)phy_ethtool_get_wol (netdev->phydev, wol); - wol->supported |=WAKE_BCAST |WAKE_UCAST |WAKE_MCAST | -WAKE_MAGIC |WAKE_PHY |WAKE_ARP ; +if (wol->supported != adapter->phy_wol_supported) +netif_warn (adapter, drv, adapter->netdev, +"PHY changed its supported WOL! old=%x, new=%x\n" , + adapter->phy_wol_supported, wol->supported); + + wol->supported |=MAC_SUPPORTED_WAKES ;if (adapter->is_pci11x1x) wol->supported |=WAKE_MAGICSECURE ;
@@ -1143,7 +1147,39 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev, {struct lan743x_adapter *adapter =netdev_priv (netdev); +/* WAKE_MAGICSEGURE is a modifier of and only valid together with +* WAKE_MAGIC +*/ +if ((wol->wolopts &WAKE_MAGICSECURE ) && !(wol->wolopts &WAKE_MAGIC )) +return -EINVAL ; + +if (netdev->phydev) { +struct ethtool_wolinfo phy_wol; +int ret; + + phy_wol.wolopts = wol->wolopts & adapter->phy_wol_supported; + +/* If WAKE_MAGICSECURE was requested, filter out WAKE_MAGIC +* for PHYs that do not support WAKE_MAGICSECURE +*/ +if (wol->wolopts &WAKE_MAGICSECURE && + !(adapter->phy_wol_supported &WAKE_MAGICSECURE )) + phy_wol.wolopts &= ~WAKE_MAGIC ; + + ret =phy_ethtool_set_wol (netdev->phydev, &phy_wol); +if (ret && (ret != -EOPNOTSUPP )) +return ret; + +if (ret == -EOPNOTSUPP ) + adapter->phy_wolopts =0 ; +else + adapter->phy_wolopts = phy_wol.wolopts; + }else { + adapter->phy_wolopts =0 ; + } + adapter->wolopts =0 ; + wol->wolopts &= ~adapter->phy_wolopts;if (wol->wolopts &WAKE_UCAST ) adapter->wolopts |=WAKE_UCAST ;if (wol->wolopts &WAKE_MCAST )
@@ -1164,10 +1200,10 @@ static int lan743x_ethtool_set_wol(struct net_device *netdev, memset(adapter->sopass, 0, sizeof(u8) * SOPASS_MAX); } + wol->wolopts = adapter->wolopts | adapter->phy_wolopts;device_set_wakeup_enable (&adapter->pdev->dev, (bool )wol->wolopts); -return netdev->phydev ?phy_ethtool_set_wol (netdev->phydev, wol) - : -ENETDOWN ; +return 0 ; }#endif /* CONFIG_PM */
drivers/net/ethernet/microchip/lan743x_main.c +14 -4
@@ -3118,6 +3118,17 @@ static int lan743x_netdev_open(struct net_device *netdev)if (ret) goto close_tx; } + +#ifdef CONFIG_PM +if (adapter->netdev->phydev) { +struct ethtool_wolinfo wol = { .cmd =ETHTOOL_GWOL }; + +phy_ethtool_get_wol (netdev->phydev, &wol); + adapter->phy_wol_supported = wol.supported; + adapter->phy_wolopts = wol.wolopts; + } +#endif +return 0 ; close_tx:
@@ -3587,10 +3598,9 @@ static void lan743x_pm_set_wol(struct lan743x_adapter *adapter) pmtctl |=PMT_CTL_ETH_PHY_D3_COLD_OVR_ |PMT_CTL_ETH_PHY_D3_OVR_ ; -if (adapter->wolopts &WAKE_PHY ) { - pmtctl |=PMT_CTL_ETH_PHY_EDPD_PLL_CTL_ ; +if (adapter->phy_wolopts) pmtctl |=PMT_CTL_ETH_PHY_WAKE_EN_ ; - } +if (adapter->wolopts &WAKE_MAGIC ) { wucsr |=MAC_WUCSR_MPEN_ ; macrx |=MAC_RX_RXEN_ ;
@@ -3686,7 +3696,7 @@ static int lan743x_pm_suspend(struct device *dev)lan743x_csr_write (adapter,MAC_WUCSR2 ,0 );lan743x_csr_write (adapter,MAC_WK_SRC ,0xFFFFFFFF ); -if (adapter->wolopts) +if (adapter->wolopts || adapter->phy_wolopts)lan743x_pm_set_wol (adapter);if (adapter->is_pci11x1x) {
drivers/net/ethernet/microchip/lan743x_main.h +4 -0
@@ -1042,6 +1042,8 @@ enum lan743x_sgmii_lsd {LINK_2500_SLAVE }; +#define MAC_SUPPORTED_WAKES (WAKE_BCAST | WAKE_UCAST | WAKE_MCAST | \ + WAKE_MAGIC | WAKE_ARP)struct lan743x_adapter {struct net_device *netdev;struct mii_bus *mdiobus;
@@ -1049,6 +1051,8 @@ struct lan743x_adapter {#ifdef CONFIG_PM u32 wolopts;u8 sopass[SOPASS_MAX ]; +u32 phy_wolopts; +u32 phy_wol_supported;#endif struct pci_dev *pdev;struct lan743x_csr csr;
Signature · 1 line
2.34.1
PATCH v5 3/3 net: phy: mxl-gpy: Remove interrupt mask clearing from config_init
In reply to Raju LakkarajuWhen the system resumes from sleep, the phy_init_hw() function invokes config_init(), which clears all interrupt masks and causes wake events to be lost in subsequent wake sequences. Remove interrupt mask clearing from config_init() and preserve relevant masks in config_intr().
---
Change List:
------------
V4 -> V5:
- No change
V3 -> V4:
- No change
V0 -> V3:
- Address the https://lore.kernel.org/lkml/[email protected]/T/
review comments
drivers/net/phy/mxl-gpy.c | 58 +++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 20 deletions(-)
drivers/net/phy/mxl-gpy.c +38 -20
@@ -107,6 +107,7 @@ struct gpy_priv {u8 fw_major;u8 fw_minor; +u32 wolopts;/* It takes 3 seconds to fully switch out of loopback mode before * it can safely re-enter loopback mode. Record the time when
@@ -221,6 +222,15 @@ static int gpy_hwmon_register(struct phy_device *phydev) }#endif +static int gpy_ack_interrupt (struct phy_device *phydev) +{ +int ret; + +/* Clear all pending interrupts */ + ret =phy_read (phydev,PHY_ISTAT ); +return ret <0 ? ret :0 ; +} +static int gpy_mbox_read (struct phy_device *phydev,u32 addr) {struct gpy_priv *priv = phydev->priv;
@@ -262,16 +272,8 @@ static int gpy_mbox_read(struct phy_device *phydev, u32 addr)static int gpy_config_init (struct phy_device *phydev) { -int ret; - -/* Mask all interrupts */ - ret =phy_write (phydev,PHY_IMASK ,0 ); -if (ret) -return ret; - -/* Clear all pending interrupts */ - ret =phy_read (phydev,PHY_ISTAT ); -return ret <0 ? ret :0 ; +/* Nothing to configure. Configuration Requirement Placeholder */ +return 0 ; }static int gpy21x_config_init (struct phy_device *phydev)
@@ -627,11 +629,23 @@ static int gpy_read_status(struct phy_device *phydev)static int gpy_config_intr (struct phy_device *phydev) { +struct gpy_priv *priv = phydev->priv;u16 mask =0 ; +int ret; + + ret =gpy_ack_interrupt (phydev); +if (ret) +return ret;if (phydev->interrupts ==PHY_INTERRUPT_ENABLED ) mask =PHY_IMASK_MASK ; +if (priv->wolopts &WAKE_MAGIC ) + mask |=PHY_IMASK_WOL ; + +if (priv->wolopts &WAKE_PHY ) + mask |=PHY_IMASK_LSTC ; +return phy_write (phydev,PHY_IMASK , mask); }
@@ -678,6 +692,7 @@ static int gpy_set_wol(struct phy_device *phydev, struct ethtool_wolinfo *wol) {struct net_device *attach_dev = phydev->attached_dev; +struct gpy_priv *priv = phydev->priv;int ret;if (wol->wolopts &WAKE_MAGIC ) {
@@ -725,6 +740,8 @@ static int gpy_set_wol(struct phy_device *phydev, ret =phy_read (phydev,PHY_ISTAT );if (ret <0 )return ret; + + priv->wolopts |=WAKE_MAGIC ; }else {/* Disable magic packet matching */ ret = phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2,
@@ -732,6 +749,13 @@ static int gpy_set_wol(struct phy_device *phydev, WOL_EN);if (ret <0 )return ret; + +/* Disable the WOL interrupt */ + ret =phy_clear_bits (phydev,PHY_IMASK ,PHY_IMASK_WOL ); +if (ret <0 ) +return ret; + + priv->wolopts &= ~WAKE_MAGIC ; }if (wol->wolopts &WAKE_PHY ) {
@@ -748,9 +772,11 @@ static int gpy_set_wol(struct phy_device *phydev,if (ret & (PHY_IMASK_MASK & ~PHY_IMASK_LSTC ))phy_trigger_machine (phydev); + priv->wolopts |=WAKE_PHY ;return 0 ; } + priv->wolopts &= ~WAKE_PHY ;/* Disable the link state change interrupt */ return phy_clear_bits (phydev,PHY_IMASK ,PHY_IMASK_LSTC ); }
@@ -758,18 +784,10 @@ static int gpy_set_wol(struct phy_device *phydev,static void gpy_get_wol (struct phy_device *phydev,struct ethtool_wolinfo *wol) { -int ret; +struct gpy_priv *priv = phydev->priv; wol->supported =WAKE_MAGIC |WAKE_PHY ; - wol->wolopts =0 ; - - ret =phy_read_mmd (phydev,MDIO_MMD_VEND2 ,VPSPEC2_WOL_CTL ); -if (ret &WOL_EN ) - wol->wolopts |=WAKE_MAGIC ; - - ret =phy_read (phydev,PHY_IMASK ); -if (ret &PHY_IMASK_LSTC ) - wol->wolopts |=WAKE_PHY ; + wol->wolopts = priv->wolopts; }static int gpy_loopback (struct phy_device *phydev,bool enable)
Signature · 1 line
2.34.1
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:
Quoted 9 lines · On Fri, 14 Jun 2024 22:41:54 +0530 you wrote:
This patch series implement the following fixes:
1. Disable WOL upon resume in order to restore full data path operation
2. Support WOL at both the PHY and MAC appropriately
3. Remove interrupt mask clearing fromconfig_initPatch-3 was sent seperately earlier. Review comments in link:
https://lore.kernel.org/lkml/[email protected]/T/[...]
Here is the summary with links:
- [net,V5,1/3] net: lan743x: disable WOL upon resume to restore full data path operation
https://git.kernel.org/netdev/net/c/7725363936a8 - [net,V5,2/3] net: lan743x: Support WOL at both the PHY and MAC appropriately https://git.kernel.org/netdev/net/c/8c248cd83601 - [net,V5,3/3] net: phy: mxl-gpy: Remove interrupt mask clearing from config_init https://git.kernel.org/netdev/net/c/c44d3ffd85db
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html