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

Commit 297357d1 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: systemport: Utilize bcm_sysport_set_features() during resume/open 



During driver resume and open, the HW may have lost its context/state,
utilize bcm_sysport_set_features() to make sure we do restore the
correct set of features that were previously configured.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10b476c5

drivers/net/ethernet/broadcom/bcmsysport.c

+7 −7
Original line number Diff line number Diff line
@@ -1972,6 +1972,11 @@ static int bcm_sysport_open(struct net_device *dev) 
	else

		gib_set_pad_extension(priv);



	/* Apply features again in case we changed them while interface was

	 * down

	 */

	bcm_sysport_set_features(dev, dev->features);



	/* Set MAC address */

	umac_set_hw_addr(priv, dev->dev_addr);
@@ -2708,7 +2713,6 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) 
	struct net_device *dev = dev_get_drvdata(d);

	struct bcm_sysport_priv *priv = netdev_priv(dev);

	unsigned int i;

	u32 reg;

	int ret;



	if (!netif_running(dev))
@@ -2752,12 +2756,8 @@ static int __maybe_unused bcm_sysport_resume(struct device *d) 
		goto out_free_rx_ring;

	}



	/* Enable rxhck */

	if (priv->rx_chk_en) {

		reg = rxchk_readl(priv, RXCHK_CONTROL);

		reg |= RXCHK_EN;

		rxchk_writel(priv, reg, RXCHK_CONTROL);

	}

	/* Restore enabled features */

	bcm_sysport_set_features(dev, dev->features);



	rbuf_init(priv);