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

Commit aa9773be authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dpaa_eth-fixes' 



Madalin Bucur says:

====================
dpaa_eth: a couple of fixes

Add cleanup on PHY initialization failure path, avoid using
uninitialized memory at CGR init.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c030af87 0fbb0f24

drivers/net/ethernet/freescale/dpaa/dpaa_eth.c

+5 −1
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ static int dpaa_eth_cgr_init(struct dpaa_priv *priv) 
	priv->cgr_data.cgr.cb = dpaa_eth_cgscn;



	/* Enable Congestion State Change Notifications and CS taildrop */

	memset(&initcgr, 0, sizeof(initcgr));

	initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CSCN_EN | QM_CGR_WE_CS_THRES);

	initcgr.cgr.cscn_en = QM_CGR_EN;
@@ -2291,7 +2292,8 @@ static int dpaa_open(struct net_device *net_dev) 
	net_dev->phydev = mac_dev->init_phy(net_dev, priv->mac_dev);

	if (!net_dev->phydev) {

		netif_err(priv, ifup, net_dev, "init_phy() failed\n");

		return -ENODEV;

		err = -ENODEV;

		goto phy_init_failed;

	}



	for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++) {
@@ -2314,6 +2316,7 @@ static int dpaa_open(struct net_device *net_dev) 
	for (i = 0; i < ARRAY_SIZE(mac_dev->port); i++)

		fman_port_disable(mac_dev->port[i]);



phy_init_failed:

	dpaa_eth_napi_disable(priv);



	return err;
@@ -2420,6 +2423,7 @@ static int dpaa_ingress_cgr_init(struct dpaa_priv *priv) 
	}



	/* Enable CS TD, but disable Congestion State Change Notifications. */

	memset(&initcgr, 0, sizeof(initcgr));

	initcgr.we_mask = cpu_to_be16(QM_CGR_WE_CS_THRES);

	initcgr.cgr.cscn_en = QM_CGR_EN;

	cs_th = DPAA_INGRESS_CS_THRESHOLD;