Re: [PATCH net-next] net: phy: add wol config options in phy device

[Raju Lakkaraju]

Hi Russell King,

Sorry for late response

The 05/02/2024 16:59, Russell King (Oracle) wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> On Thu, May 02, 2024 at 04:51:42PM +0200, Andrew Lunn wrote:
> > On Tue, Apr 30, 2024 at 10:36:35AM +0530, Raju Lakkaraju wrote:
> > > Introduce a new member named 'wolopts' to the 'phy_device' structure to
> > > store the user-specified Wake-on-LAN (WOL) settings. Update this member
> > > within the phy driver's 'set_wol()' function whenever the WOL configuration
> > > is modified by the user.
> > >
> > > Currently, when the system resumes from sleep, the 'phy_init_hw()' function
> > > resets the PHY's configuration and interrupts, which leads to problems upon
> > > subsequent WOL attempts. By retaining the desired WOL settings in 'wolopts',
> > > we can ensure that the PHY's WOL configuration is correctly reapplied
> > > through 'phy_ethtool_set_wol()' before a system suspend, thereby resolving
> > > the issue
> >
> > Sorry it took a white to review this.
> >
> > >
> > > Signed-off-by: Raju Lakkaraju <Raju.Lakkaraju@xxxxxxxxxxxxx>
> > > ---
> > >  drivers/net/phy/mxl-gpy.c    | 5 +++++
> > >  drivers/net/phy/phy_device.c | 5 +++++
> > >  include/linux/phy.h          | 2 ++
> > >  3 files changed, 12 insertions(+)
> > >
> > > diff --git a/drivers/net/phy/mxl-gpy.c b/drivers/net/phy/mxl-gpy.c
> > > index b2d36a3a96f1..6edb29a1d77e 100644
> > > --- a/drivers/net/phy/mxl-gpy.c
> > > +++ b/drivers/net/phy/mxl-gpy.c
> > > @@ -680,6 +680,7 @@ static int gpy_set_wol(struct phy_device *phydev,
> > >     struct net_device *attach_dev = phydev->attached_dev;
> > >     int ret;
> > >
> > > +   phydev->wolopts = 0;
> >
> > Is this specific to mlx-gpy?
> >
> > You should be trying to solve the problem for all PHYs which support
> > WoL. So i expect the core to be doing most of the work. In fact, i
> > don't think there is any need for driver specific code.
> 
> It would be good to hear exactly why its necessary for phylib to track
> this state,

Andrew suggested that if PHY device support WOL, Ethernet MAC device should be in
sleep expect interrrupt handling functionality.

To achive this, if we have phy device's wolopts, based on user configuration,
we can configure phy WOL or Ethernet MAC WOL.

PCI11x1x chip MAC can support WOL (i.e. WAKE_MAGIC, WAKE_SECURE, WAKE_UCAST,
WAKE_MCAST, WAKE_BCAST, WAKE_PHY)

GPY211C PHY connect as External PHY to PCI11x1x ethernet device to achive
2.5G/1G/100M/10Mpbs with either SGMII or 2500Base-X mode. GPY211C PHY can
support WOL (i.e. WAKE_PHY or WAKE_MAGIC).

Similarly, KSZ91931 PHY connect as External PHY to PCI11x1x ethernet device to
achive 1G/100M/10Mbps with RGMII or GMII mode. But, KSZ9131 PHY driver does
not support WOL.

If we have phy's wolopts which holds the user configuration, Ethernet MAC
device can configure Power Manager's WOL registers whether handle only 
PHY interrupts or MAC's WOL functionality.

In existing code, we don't have any information about PHY's user configure to
configure the PM mode

> and why the PHY isn't retaining it.
> 

mxl-gpy driver does not have soft_reset( ) function.
In resume sequence, mxl-gpy driver is clearing the WOL configuration and interrupt
i.e.
gpy_config_init( ) and gpy_config_intr( )

> I suspect this may have something to do with resets - the PHY being
> hardware reset when coming out of resume (resulting in all state
> being lost.) What's resetting it would also be good to track down
> (as in hardware, firmware, or the kernel.)
> 
In case of resume, the following sequence executes:

pci_pm_resume( )
--> lan743x_pm_resume()
   --> lan743x_netdev_open( )
      --> phy_connect_direct( )
         --> phy_attach_direct( )
	     --> phy_init_hw( )
	        --> gpy_config_init( )
		--> gpy_config_intr( )

In existing gpy_config_init( ) and gpy_config_intr( ) function don't have any
indication about whether execute in initial operation or WOL's resume
operation.

If we avoid clearing Interrupts in WOL's resume case, we need not re-configure
the WOL on PHY. 

I add the following code and test.  It's working as expected.

In File: drivers/net/phy/mxl-gpy.c
In gpy_config_init( ) function:

+       if (!phydev->wolopts) {
               /* Mask all interrupts */
               ret = phy_write(phydev, PHY_IMASK, 0);
               if (ret)
                       return ret;
+       }

In gpy_config_intr( ) function:

+       if (phydev->wolopts)
+               mask |= (phy_read(phydev, PHY_IMASK) &
+                        (PHY_IMASK_WOL | PHY_IMASK_LSTC));
+

> --
> RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
> FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!

-- 
Thanks,                                                                         
Raju