| Message ID | 1500550192-6550-1-git-send-email-j-keerthy@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/20/2017 06:29 AM, Keerthy wrote: > 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. > In general patch looks good to me, but it's really unexpected to receive IRQs while CPSW is probing ;( So, case you have is: - loading the crash kernel with CPSW driver enabled - HW is in unpredictable state (CPDMA queues can be filled with descriptors which ca point on memory this kernel instance do not own). In my opinion, CPSW driver should not be the part of crash kernel by default and if networking functionality is required then it should be loaded as module. And to make things work right It might be required to add in probe call soft_reset("cpsw", &cpsw->regs->soft_reset); right after pm_runtime_get_sync(&pdev->dev) Could you confirm that it will fix issue without your patch, pls? > Suggested-by: Sekhar Nori <nsekhar@ti.com> > Signed-off-by: Keerthy <j-keerthy@ti.com> > --- > drivers/net/ethernet/ti/cpsw.c | 49 +++++++++++++++++++++--------------------- > 1 file changed, 25 insertions(+), 24 deletions(-) > > diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c > index 37fc165..94892d5 100644 > --- a/drivers/net/ethernet/ti/cpsw.c > +++ b/drivers/net/ethernet/ti/cpsw.c > @@ -3085,6 +3085,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. > @@ -3123,33 +3148,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); > >
From: Grygorii Strashko <grygorii.strashko@ti.com> Date: Thu, 20 Jul 2017 11:08:09 -0500 > In general patch looks good to me, but it's really unexpected to > receive IRQs while CPSW is probing ;( This is a poor expectation. Boot loaders and other entities can leave the device in any state whatsoever. Furthermore, enabling an IRQ whose handler cannot properly execute without crashing is wrong fundamentally. All data structures and state must be set up properly before the IRQ is requested. Therefore this patch is correct and I will apply it. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/20/2017 05:28 PM, David Miller wrote: > From: Grygorii Strashko <grygorii.strashko@ti.com> > Date: Thu, 20 Jul 2017 11:08:09 -0500 > >> In general patch looks good to me, but it's really unexpected to >> receive IRQs while CPSW is probing ;( > > This is a poor expectation. > > Boot loaders and other entities can leave the device in any state > whatsoever. > > Furthermore, enabling an IRQ whose handler cannot properly execute > without crashing is wrong fundamentally. All data structures and > state must be set up properly before the IRQ is requested. > > Therefore this patch is correct and I will apply it. > Thanks. Agree (it just has never triggered before, so I meant - unexpected from current driver code point of view ;(). And I'm just worry that it might not be enough :(, especially for am335x.
On Friday 21 July 2017 04:14 AM, Grygorii Strashko wrote: > > > On 07/20/2017 05:28 PM, David Miller wrote: >> From: Grygorii Strashko <grygorii.strashko@ti.com> >> Date: Thu, 20 Jul 2017 11:08:09 -0500 >> >>> In general patch looks good to me, but it's really unexpected to >>> receive IRQs while CPSW is probing ;( >> >> This is a poor expectation. >> >> Boot loaders and other entities can leave the device in any state >> whatsoever. >> >> Furthermore, enabling an IRQ whose handler cannot properly execute >> without crashing is wrong fundamentally. All data structures and >> state must be set up properly before the IRQ is requested. >> >> Therefore this patch is correct and I will apply it. >> > > Thanks. Agree (it just has never triggered before, so I meant - unexpected > from current driver code point of view ;(). > And I'm just worry that it might not be enough :(, especially for am335x. I tried nfs boot on am335x-evm with this patch and it boots fine for me. > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 07/20/2017 11:45 PM, Keerthy wrote: > > > On Friday 21 July 2017 04:14 AM, Grygorii Strashko wrote: >> >> >> On 07/20/2017 05:28 PM, David Miller wrote: >>> From: Grygorii Strashko <grygorii.strashko@ti.com> >>> Date: Thu, 20 Jul 2017 11:08:09 -0500 >>> >>>> In general patch looks good to me, but it's really unexpected to >>>> receive IRQs while CPSW is probing ;( >>> >>> This is a poor expectation. >>> >>> Boot loaders and other entities can leave the device in any state >>> whatsoever. >>> >>> Furthermore, enabling an IRQ whose handler cannot properly execute >>> without crashing is wrong fundamentally. All data structures and >>> state must be set up properly before the IRQ is requested. >>> >>> Therefore this patch is correct and I will apply it. >>> >> >> Thanks. Agree (it just has never triggered before, so I meant - unexpected >> from current driver code point of view ;(). >> And I'm just worry that it might not be enough :(, especially for am335x. > > I tried nfs boot on am335x-evm with this patch and it boots fine for me. > Thank you Keerthy, I've also simulated and tested it on am335x and dra7 and see networking working and no crashes.
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 37fc165..94892d5 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -3085,6 +3085,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. @@ -3123,33 +3148,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);
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: Sekhar Nori <nsekhar@ti.com> Signed-off-by: Keerthy <j-keerthy@ti.com> --- drivers/net/ethernet/ti/cpsw.c | 49 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-)