Re: [PATCH] net: ethernet: xilinx_emaclite: keep protocol selector bits by reading ANAR

[Michal Simek <monstr@monstr.eu>]

[-- Attachment #1: Type: text/plain, Size: 2216 bytes --]

On 05/28/2013 06:10 PM, Jens Renner (EFE) wrote:
> This patch reads the PHY's MII_ADVERTISE register (ANAR) before modifying it.
> Hence, the protocol selector bits (4:0) which indicate IEEE 803.3u support are
> prevented from being cleared. While the selector bits are fixed / read-only on
> some PHYs, not setting them correctly on others (like TI DP83630) makes the
> PHY fall back to 10/half mode which should be avoided.
> 
> Signed-off-by: Jens Renner <renner@efe-gmbh.de>
> ---
> drivers/net/ethernet/xilinx/xilinx_emaclite.c               |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
> index 919b983..4a67af1 100644
> --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
> +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
> @@ -922,7 +922,7 @@ void xemaclite_adjust_link(struct net_device *ndev)
>  static int xemaclite_open(struct net_device *dev)
>  {
>         struct net_local *lp = netdev_priv(dev);
> -       int retval;
> +       int retval, adv;
> 
>         /* Just to be safe, stop the device first */
>         xemaclite_disable_interrupts(lp);
> @@ -946,7 +946,10 @@ static int xemaclite_open(struct net_device *dev)
>                 phy_write(lp->phy_dev, MII_CTRL1000, 0);
> 
>                 /* Advertise only 10 and 100mbps full/half duplex speeds */
> -               phy_write(lp->phy_dev, MII_ADVERTISE, ADVERTISE_ALL);
> +               adv = phy_read(lp->phy_dev, MII_ADVERTISE);
> +               if (adv < 0)
> +                       return adv;
> +               phy_write(lp->phy_dev, MII_ADVERTISE, adv | ADVERTISE_ALL);
> 
>                 /* Restart auto negotiation */
>                 bmcr = phy_read(lp->phy_dev, MII_BMCR);

Acked-by: Michal Simek <monstr@monstr.eu>

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]