linux-kernel - Re: [PATCH net-next 1/7] net: korina: Fix MDIO functions

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]

Date:   Wed, 14 Apr 2021 22:36:56 +0200
From:   Thomas Bogendoerfer <tsbogend@...ha.franken.de>
To:     Andrew Lunn <andrew@...n.ch>
Cc:     "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>, netdev@...r.kernel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next 1/7] net: korina: Fix MDIO functions

On Wed, Apr 14, 2021 at 09:36:04PM +0200, Andrew Lunn wrote:
> > +static int korina_mdio_wait(struct korina_private *lp)
> > +{
> > +	int timeout = 1000;
> > +
> > +	while ((readl(&lp->eth_regs->miimind) & 1) && timeout-- > 0)
> > +		udelay(1);
> > +
> > +	if (timeout <= 0)
> > +		return -1;
> > +
> > +	return 0;
> 
> Using readl_poll_timeout_atomic() would be better.

I'll have a look

> 
> 
> > +}
> > +
> > +static int korina_mdio_read(struct net_device *dev, int phy, int reg)
> >  {
> >  	struct korina_private *lp = netdev_priv(dev);
> >  	int ret;
> >  
> > -	mii_id = ((lp->rx_irq == 0x2c ? 1 : 0) << 8);
> > +	if (korina_mdio_wait(lp))
> > +		return -1;
> 
> This should really be -ETIMEDOUT

ok.

> >  	dev->watchdog_timeo = TX_TIMEOUT;
> >  	netif_napi_add(dev, &lp->napi, korina_poll, NAPI_POLL_WEIGHT);
> >  
> > -	lp->phy_addr = (((lp->rx_irq == 0x2c? 1:0) << 8) | 0x05);
> >  	lp->mii_if.dev = dev;
> > -	lp->mii_if.mdio_read = mdio_read;
> > -	lp->mii_if.mdio_write = mdio_write;
> > -	lp->mii_if.phy_id = lp->phy_addr;
> > +	lp->mii_if.mdio_read = korina_mdio_read;
> > +	lp->mii_if.mdio_write = korina_mdio_write;
> > +	lp->mii_if.phy_id = 1;
> >  	lp->mii_if.phy_id_mask = 0x1f;
> >  	lp->mii_if.reg_num_mask = 0x1f;
> 
> You could also replace all the mii code with phylib.

that's on my todo.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]