linux-kernel - Re: [PATCH] net: phy: marvell: clear wol event before setting it

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20180430131730.GE10066@lunn.ch>
Date:   Mon, 30 Apr 2018 15:17:30 +0200
From:   Andrew Lunn <andrew@...n.ch>
To:     Jisheng Zhang <Jisheng.Zhang@...aptics.com>
Cc:     Bhadram Varka <vbhadram@...dia.com>,
        Florian Fainelli <f.fainelli@...il.com>,
        "David S. Miller" <davem@...emloft.net>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org, Jingju Hou <Jingju.Hou@...aptics.com>
Subject: Re: [PATCH] net: phy: marvell: clear wol event before setting it

> > diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
> > index ed8a67d..5d3d138 100644
> > --- a/drivers/net/phy/marvell.c
> > +++ b/drivers/net/phy/marvell.c
> > @@ -55,6 +55,7 @@
> > 
> >   #define MII_M1011_IEVENT               0x13
> >   #define MII_M1011_IEVENT_CLEAR         0x0000
> > +#define MII_M1011_IEVENT_WOL_EVENT     BIT(7)
> > 
> >   #define MII_M1011_IMASK                        0x12
> > - #define MII_M1011_IMASK_INIT           0x6400
> > + #define MII_M1011_IMASK_INIT           0x6480
> > 
> > @@ -195,13 +196,40 @@ struct marvell_priv {
> >          bool copper;
> >   };
> > 
> > +static int marvell_clear_wol_status(struct phy_device *phydev)
> > +{
> > +       int err, temp, oldpage;
> > +
> > +       oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);
> > +       if (oldpage < 0)
> > +               return oldpage;
> > +
> > +       err = phy_write(phydev, MII_MARVELL_PHY_PAGE,
> > +                        MII_88E1318S_PHY_WOL_PAGE);
> > +       if (err < 0)
> > +               return err;
> > +
> > +       /*
> > +        * Clear WOL status so that for next WOL event
> > +        * interrupt will be generated by HW
> > +        */
> > +       temp = phy_read(phydev, MII_88E1318S_PHY_WOL_CTRL);
> > +       temp |= MII_88E1318S_PHY_WOL_CTRL_CLEAR_WOL_STATUS;
> > +       err = phy_write(phydev, MII_88E1318S_PHY_WOL_CTRL, temp);
> 
> is it better to reuse __phy_write()?

phy_modify_paged() would be the best function to use.

	Andrew