| Message ID | 20240417095425.2253876-1-s-vadapalli@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c24cd679b075b0e953ea167b0aa2b2d59e4eba7f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them | expand |
On 17/04/2024 12:54, Siddharth Vadapalli wrote: > The TX and RX DMA Channels used by the driver to exchange data with CPSW > are not guaranteed to be in a clean state during driver initialization. > The Bootloader could have used the same DMA Channels without cleaning them > up in the event of failure. Thus, reset and disable the DMA Channels to > ensure that they are in a clean state before using them. > > Fixes: 93a76530316a ("net: ethernet: ti: introduce am65x/j721e gigabit eth subsystem driver") > Reported-by: Schuyler Patton <spatton@ti.com> > Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> Reviewed-by: Roger Quadros <rogerq@kernel.org>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 17 Apr 2024 15:24:25 +0530 you wrote: > The TX and RX DMA Channels used by the driver to exchange data with CPSW > are not guaranteed to be in a clean state during driver initialization. > The Bootloader could have used the same DMA Channels without cleaning them > up in the event of failure. Thus, reset and disable the DMA Channels to > ensure that they are in a clean state before using them. > > Fixes: 93a76530316a ("net: ethernet: ti: introduce am65x/j721e gigabit eth subsystem driver") > Reported-by: Schuyler Patton <spatton@ti.com> > Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> > > [...] Here is the summary with links: - [net] net: ethernet: ti: am65-cpsw-nuss: cleanup DMA Channels before using them https://git.kernel.org/netdev/net/c/c24cd679b075 You are awesome, thank you!
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c index bfba883d4fc4..259d7cb13f6e 100644 --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c @@ -3260,6 +3260,8 @@ static void am65_cpsw_unregister_devlink(struct am65_cpsw_common *common) static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common) { + struct am65_cpsw_rx_chn *rx_chan = &common->rx_chns; + struct am65_cpsw_tx_chn *tx_chan = common->tx_chns; struct device *dev = common->dev; struct am65_cpsw_port *port; int ret = 0, i; @@ -3272,6 +3274,22 @@ static int am65_cpsw_nuss_register_ndevs(struct am65_cpsw_common *common) if (ret) return ret; + /* The DMA Channels are not guaranteed to be in a clean state. + * Reset and disable them to ensure that they are back to the + * clean state and ready to be used. + */ + for (i = 0; i < common->tx_ch_num; i++) { + k3_udma_glue_reset_tx_chn(tx_chan[i].tx_chn, &tx_chan[i], + am65_cpsw_nuss_tx_cleanup); + k3_udma_glue_disable_tx_chn(tx_chan[i].tx_chn); + } + + for (i = 0; i < AM65_CPSW_MAX_RX_FLOWS; i++) + k3_udma_glue_reset_rx_chn(rx_chan->rx_chn, i, rx_chan, + am65_cpsw_nuss_rx_cleanup, !!i); + + k3_udma_glue_disable_rx_chn(rx_chan->rx_chn); + ret = am65_cpsw_nuss_register_devlink(common); if (ret) return ret;
The TX and RX DMA Channels used by the driver to exchange data with CPSW are not guaranteed to be in a clean state during driver initialization. The Bootloader could have used the same DMA Channels without cleaning them up in the event of failure. Thus, reset and disable the DMA Channels to ensure that they are in a clean state before using them. Fixes: 93a76530316a ("net: ethernet: ti: introduce am65x/j721e gigabit eth subsystem driver") Reported-by: Schuyler Patton <spatton@ti.com> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com> --- Hello, This patch is based on commit: 96fca68c4fbf Merge tag 'nfsd-6.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux of mainline Linux. Regards, Siddharth. drivers/net/ethernet/ti/am65-cpsw-nuss.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)