netdev - Re: [PATCH 2/3] phylib: add missing _{check_gmii_support,link_ok,nway

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:	Mon, 15 Sep 2008 18:03:24 -0500
From:	Andy Fleming <afleming@...escale.com>
To:	Lennert Buytenhek <buytenh@...tstofly.org>
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH 2/3] phylib: add missing _{check_gmii_support,link_ok,nway_restart}


On Sep 3, 2008, at 08:20, Lennert Buytenhek wrote:

> drivers/net/mii.c provides a couple of routines which currently have
> no phylib equivalents.  This patch provides those phylib equivalents.
>
> Signed-off-by: Lennert Buytenhek <buytenh@...vell.com>

I think all of this functionality is provided by other parts of the  
phylib.  See below.


> /**
> + * phy_check_gmii_support - check if the PHY supports (R)GMII
> + * @phydev: the phy_device struct
> + */
> +int phy_check_gmii_support(struct phy_device *phydev)
> +{
> +	int retval;
> +
> +	retval = phy_read(phydev, MII_BMSR);
> +	if (retval < 0 || (retval & BMSR_ESTATEN) == 0)
> +		return 0;
> +
> +	retval = phy_read(phydev, MII_ESTATUS);
> +	if (retval < 0)
> +		return 0;
> +
> +	return !!(retval & (ESTATUS_1000_TFULL | ESTATUS_1000_THALF));
> +}
> +EXPORT_SYMBOL(phy_check_gmii_support);


If you look in genphy_config_init() in drivers/net/phy/phy_device.c,  
you'll see that it fills in phydev->supported based on ESTATUS.  So  
this function could be reduced to:

return !!(phydev->supported & (SUPPORTED_1000baseT_Full |  
SUPPORTED_1000baseT_Half));


> +
> +/**
> + * phy_link_ok - is link status up/ok
> + * @phydev: the phy_device struct
> + *
> + * Returns 1 if the PHY reports link status up/ok, 0 otherwise.
> + */
> +int phy_link_ok(struct phy_device *phydev)
> +{
> +	int retval;
> +
> +	/* first, a dummy read, needed to latch some MII phys */
> +	phy_read(phydev, MII_BMSR);
> +
> +	retval = phy_read(phydev, MII_BMSR);
> +	if (retval < 0 || (retval & BMSR_LSTATUS) == 0)
> +		return 0;
> +
> +	return 1;
> +}
> +EXPORT_SYMBOL(phy_link_ok);


genphy_update_link() does everything here except return 0/1.  But it  
fills in phydev->link, which is meant to reflect the current link  
status.


> +
> +/**
> + * phy_nway_restart - restart NWay (autonegotiation) for this  
> interface
> + * @phydev: the phy_device struct
> + *
> + * Returns 0 on success, negative on error.
> + */
> +int phy_nway_restart(struct phy_device *phydev)
> +{
> +	int bmcr;
> +
> +	/* if autoneg is off, it's an error */
> +	bmcr = phy_read(phydev, MII_BMCR);
> +	if (bmcr < 0 || (bmcr & BMCR_ANENABLE) == 0)
> +		return -EINVAL;
> +
> +	if (phy_write(phydev, MII_BMCR, bmcr | BMCR_ANRESTART) < 0)
> +		return -EINVAL;
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL(phy_nway_restart);


genphy_restart_aneg() does this, though that's the low-level API for it.

Andy
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html