Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2436af8c authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller
Browse files

GRETH: avoid writing bad speed/duplex when setting transfer mode 



Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b669e7f0

drivers/net/greth.c

+8 −11
Original line number Diff line number Diff line
@@ -1232,29 +1232,26 @@ static void greth_link_change(struct net_device *dev) 
	struct greth_private *greth = netdev_priv(dev);

	struct phy_device *phydev = greth->phy;

	unsigned long flags;



	int status_change = 0;

	u32 ctrl;



	spin_lock_irqsave(&greth->devlock, flags);



	if (phydev->link) {



		if ((greth->speed != phydev->speed) || (greth->duplex != phydev->duplex)) {



			GRETH_REGANDIN(greth->regs->control,

				       ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB));

			ctrl = GRETH_REGLOAD(greth->regs->control) &

			       ~(GRETH_CTRL_FD | GRETH_CTRL_SP | GRETH_CTRL_GB);



			if (phydev->duplex)

				GRETH_REGORIN(greth->regs->control, GRETH_CTRL_FD);



			if (phydev->speed == SPEED_100) {



				GRETH_REGORIN(greth->regs->control, GRETH_CTRL_SP);

			}

				ctrl |= GRETH_CTRL_FD;



			if (phydev->speed == SPEED_100)

				ctrl |= GRETH_CTRL_SP;

			else if (phydev->speed == SPEED_1000)

				GRETH_REGORIN(greth->regs->control, GRETH_CTRL_GB);

				ctrl |= GRETH_CTRL_GB;



			GRETH_REGSAVE(greth->regs->control, ctrl);

			greth->speed = phydev->speed;

			greth->duplex = phydev->duplex;

			status_change = 1;