netdev - Re: [PATCH 1/5] net: phy: smsc: skip ENERGYON interrupt if disabled

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] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 1 Sep 2020 09:59:56 +0200
From:   Marco Felsch <m.felsch@...gutronix.de>
To:     Andrew Lunn <andrew@...n.ch>
Cc:     davem@...emloft.net, kuba@...nel.org, robh+dt@...nel.org,
        f.fainelli@...il.com, hkallweit1@...il.com, linux@...linux.org.uk,
        zhengdejin5@...il.com, richard.leitner@...data.com,
        netdev@...r.kernel.org, devicetree@...r.kernel.org,
        kernel@...gutronix.de
Subject: Re: [PATCH 1/5] net: phy: smsc: skip ENERGYON interrupt if disabled

Hi Andrew,

thanks for your fast response :)

On 20-08-31 16:02, Andrew Lunn wrote:
> On Mon, Aug 31, 2020 at 03:48:32PM +0200, Marco Felsch wrote:
> > Don't enable the interrupt if the platform disable the energy detection
> > by "smsc,disable-energy-detect".
> > 
> > Signed-off-by: Marco Felsch <m.felsch@...gutronix.de>
> > ---
> >  drivers/net/phy/smsc.c | 15 +++++++++++----
> >  1 file changed, 11 insertions(+), 4 deletions(-)
> > 
> > diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
> > index 74568ae16125..fa539a867de6 100644
> > --- a/drivers/net/phy/smsc.c
> > +++ b/drivers/net/phy/smsc.c
> > @@ -37,10 +37,17 @@ struct smsc_phy_priv {
> >  
> >  static int smsc_phy_config_intr(struct phy_device *phydev)
> >  {
> > -	int rc = phy_write (phydev, MII_LAN83C185_IM,
> > -			((PHY_INTERRUPT_ENABLED == phydev->interrupts)
> > -			? MII_LAN83C185_ISF_INT_PHYLIB_EVENTS
> > -			: 0));
> > +	struct smsc_phy_priv *priv = phydev->priv;
> > +	u16 intmask = 0;
> > +	int rc;
> > +
> > +	if (phydev->interrupts) {
> > +		intmask = MII_LAN83C185_ISF_INT4 | MII_LAN83C185_ISF_INT6;
> > +		if (priv->energy_enable)
> > +			intmask |= MII_LAN83C185_ISF_INT7;
> 
> Hi Marco
> 
> These names are not particularly helpful. The include file does
> actually document the bits.
> 
> #define MII_LAN83C185_ISF_INT1 (1<<1) /* Auto-Negotiation Page Received */
> #define MII_LAN83C185_ISF_INT2 (1<<2) /* Parallel Detection Fault */
> #define MII_LAN83C185_ISF_INT3 (1<<3) /* Auto-Negotiation LP Ack */
> #define MII_LAN83C185_ISF_INT4 (1<<4) /* Link Down */
> #define MII_LAN83C185_ISF_INT5 (1<<5) /* Remote Fault Detected */
> #define MII_LAN83C185_ISF_INT6 (1<<6) /* Auto-Negotiation complete */
> #define MII_LAN83C185_ISF_INT7 (1<<7) /* ENERGYON */
> 
> If you feel like it, maybe add another patch which renames these to
> something better. MII_LAN83C185_ISF_DOWN, MII_LAN83C185_ISF_ENERGY_ON,
> etc?

I know.. I will add a patch to change this after we get the clock
discussion done.

Regards,
  Marco

> For this patch:
> 
> Reviewed-by: Andrew Lunn <andrew@...n.ch>
> 
>     Andrew
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |