[PATCH] net: ibm_newemac: Don't start autonegotiation when disabled in BMCR (genmii)

[Benjamin Herrenschmidt]

On Tue, 2011-07-19 at 12:50 +0200, Stefan Roese wrote:
> As noticed on a custom 440GX board using the Micrel KSZ8041 PHY in
> fiber mode, a strapped fixed PHY configuration will currently restart
> the autonegotiation. This patch checks the BMCR_ANENABLE bit and
> skips this autonegotiation if its disabled.

Won't that just break aneg on everything else ?

IE, most other PHYs rely on ANENABLE being set further down this same
function (especially if the FW doesn't do it but even then, we may reset
PHYs along the way etc...)

This is something that really a case where the device-tree should
indicate that aneg shall not be performed and from there don't call
setup_aneg at all.

Cheers,
Ben.

> Signed-off-by: Stefan Roese <sr at denx.de>
> Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
> ---
>  drivers/net/ibm_newemac/phy.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/ibm_newemac/phy.c b/drivers/net/ibm_newemac/phy.c
> index ac9d964..90afc58 100644
> --- a/drivers/net/ibm_newemac/phy.c
> +++ b/drivers/net/ibm_newemac/phy.c
> @@ -116,6 +116,11 @@ static int genmii_setup_aneg(struct mii_phy *phy, u32 advertise)
>  	ctl = phy_read(phy, MII_BMCR);
>  	if (ctl < 0)
>  		return ctl;
> +
> +	/* Don't start auto negotiation when its disabled in BMCR */
> +	if (!(ctl & BMCR_ANENABLE))
> +		return 0;
> +
>  	ctl &= ~(BMCR_FULLDPLX | BMCR_SPEED100 | BMCR_SPEED1000 | BMCR_ANENABLE);
>  
>  	/* First clear the PHY */