Commit 070f9c65 authored by Keerthy's avatar Keerthy Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: Push the request_irq function to the end of probe 



Push the request_irq function to the end of probe so as
to ensure all the required fields are populated in the event
of an ISR getting executed right after requesting the irq.

Currently while loading the crash kernel a crash was seen as
soon as devm_request_threaded_irq was called. This was due to
n->poll being NULL which is called as part of net_rx_action
function.

Suggested-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8799a221

drivers/net/ethernet/ti/cpsw.c

+25 −24
Original line number Diff line number Diff line
@@ -3089,6 +3089,31 @@ static int cpsw_probe(struct platform_device *pdev) 
			cpsw->quirk_irq = true;

	}



	ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;



	ndev->netdev_ops = &cpsw_netdev_ops;

	ndev->ethtool_ops = &cpsw_ethtool_ops;

	netif_napi_add(ndev, &cpsw->napi_rx, cpsw_rx_poll, CPSW_POLL_WEIGHT);

	netif_tx_napi_add(ndev, &cpsw->napi_tx, cpsw_tx_poll, CPSW_POLL_WEIGHT);

	cpsw_split_res(ndev);



	/* register the network device */

	SET_NETDEV_DEV(ndev, &pdev->dev);

	ret = register_netdev(ndev);

	if (ret) {

		dev_err(priv->dev, "error registering net device\n");

		ret = -ENODEV;

		goto clean_ale_ret;

	}



	if (cpsw->data.dual_emac) {

		ret = cpsw_probe_dual_emac(priv);

		if (ret) {

			cpsw_err(priv, probe, "error probe slave 2 emac interface\n");

			goto clean_unregister_netdev_ret;

		}

	}



	/* Grab RX and TX IRQs. Note that we also have RX_THRESHOLD and

	 * MISC IRQs which are always kept disabled with this driver so

	 * we will not request them.
@@ -3127,33 +3152,9 @@ static int cpsw_probe(struct platform_device *pdev) 
		goto clean_ale_ret;

	}



	ndev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;



	ndev->netdev_ops = &cpsw_netdev_ops;

	ndev->ethtool_ops = &cpsw_ethtool_ops;

	netif_napi_add(ndev, &cpsw->napi_rx, cpsw_rx_poll, CPSW_POLL_WEIGHT);

	netif_tx_napi_add(ndev, &cpsw->napi_tx, cpsw_tx_poll, CPSW_POLL_WEIGHT);

	cpsw_split_res(ndev);



	/* register the network device */

	SET_NETDEV_DEV(ndev, &pdev->dev);

	ret = register_netdev(ndev);

	if (ret) {

		dev_err(priv->dev, "error registering net device\n");

		ret = -ENODEV;

		goto clean_ale_ret;

	}



	cpsw_notice(priv, probe,

		    "initialized device (regs %pa, irq %d, pool size %d)\n",

		    &ss_res->start, ndev->irq, dma_params.descs_pool_size);

	if (cpsw->data.dual_emac) {

		ret = cpsw_probe_dual_emac(priv);

		if (ret) {

			cpsw_err(priv, probe, "error probe slave 2 emac interface\n");

			goto clean_unregister_netdev_ret;

		}

	}



	pm_runtime_put(&pdev->dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE