Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dmaengine: ti: k3-udma-glue: Drop skip_fdq argument from k3_udma_glue_reset_rx_chn

The user of k3_udma_glue_reset_rx_chn() e.g. ti_am65_cpsw_nuss can
run on multiple platforms having different DMA architectures.
On some platforms there can be one FDQ for all flows in the RX channel
while for others there is a separate FDQ for each flow in the RX channel.

So far we have been relying on the skip_fdq argument of
k3_udma_glue_reset_rx_chn().

Instead of relying on the user to provide this information, infer it
based on DMA architecture during k3_udma_glue_request_rx_chn() and save it
in an internal flag 'single_fdq'. Use that flag at
k3_udma_glue_reset_rx_chn() to deicide if the FDQ needs
to be cleared for every flow or just for flow 0.

Fixes the below issue on ti_am65_cpsw_nuss driver on AM62-SK.

> ip link set eth1 down
> ip link set eth0 down
> ethtool -L eth0 rx 8
> ip link set eth0 up
> modprobe -r ti_am65_cpsw_nuss

[ 103.045726] ------------[ cut here ]------------
[ 103.050505] k3_knav_desc_pool size 512000 != avail 64000
[ 103.050703] WARNING: CPU: 1 PID: 450 at drivers/net/ethernet/ti/k3-cppi-desc-pool.c:33 k3_cppi_desc_pool_destroy+0xa0/0xa8 [k3_cppi_desc_pool]
[ 103.068810] Modules linked in: ti_am65_cpsw_nuss(-) k3_cppi_desc_pool snd_soc_hdmi_codec crct10dif_ce snd_soc_simple_card snd_soc_simple_card_utils display_connector rtc_ti_k3 k3_j72xx_bandgap tidss drm_client_lib snd_soc_davinci_mcas
p drm_dma_helper tps6598x phylink snd_soc_ti_udma rti_wdt drm_display_helper snd_soc_tlv320aic3x_i2c typec at24 phy_gmii_sel snd_soc_ti_edma snd_soc_tlv320aic3x sii902x snd_soc_ti_sdma sa2ul omap_mailbox drm_kms_helper authenc cfg80211 r
fkill fuse drm drm_panel_orientation_quirks backlight ip_tables x_tables ipv6 [last unloaded: k3_cppi_desc_pool]
[ 103.119950] CPU: 1 UID: 0 PID: 450 Comm: modprobe Not tainted 6.13.0-rc7-00001-g9c5e3435fa66 #1011
[ 103.119968] Hardware name: Texas Instruments AM625 SK (DT)
[ 103.119974] pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[ 103.119983] pc : k3_cppi_desc_pool_destroy+0xa0/0xa8 [k3_cppi_desc_pool]
[ 103.148007] lr : k3_cppi_desc_pool_destroy+0xa0/0xa8 [k3_cppi_desc_pool]
[ 103.154709] sp : ffff8000826ebbc0
[ 103.158015] x29: ffff8000826ebbc0 x28: ffff0000090b6300 x27: 0000000000000000
[ 103.165145] x26: 0000000000000000 x25: 0000000000000000 x24: ffff0000019df6b0
[ 103.172271] x23: ffff0000019df6b8 x22: ffff0000019df410 x21: ffff8000826ebc88
[ 103.179397] x20: 000000000007d000 x19: ffff00000a3b3000 x18: 0000000000000000
[ 103.186522] x17: 0000000000000000 x16: 0000000000000000 x15: 000001e8c35e1cde
[ 103.193647] x14: 0000000000000396 x13: 000000000000035c x12: 0000000000000000
[ 103.200772] x11: 000000000000003a x10: 00000000000009c0 x9 : ffff8000826eba20
[ 103.207897] x8 : ffff0000090b6d20 x7 : ffff00007728c180 x6 : ffff00007728c100
[ 103.215022] x5 : 0000000000000001 x4 : ffff000000508a50 x3 : ffff7ffff6146000
[ 103.222147] x2 : 0000000000000000 x1 : e300b4173ee6b200 x0 : 0000000000000000
[ 103.229274] Call trace:
[ 103.231714] k3_cppi_desc_pool_destroy+0xa0/0xa8 [k3_cppi_desc_pool] (P)
[ 103.238408] am65_cpsw_nuss_free_rx_chns+0x28/0x4c [ti_am65_cpsw_nuss]
[ 103.244942] devm_action_release+0x14/0x20
[ 103.249040] release_nodes+0x3c/0x68
[ 103.252610] devres_release_all+0x8c/0xdc
[ 103.256614] device_unbind_cleanup+0x18/0x60
[ 103.260876] device_release_driver_internal+0xf8/0x178
[ 103.266004] driver_detach+0x50/0x9c
[ 103.269571] bus_remove_driver+0x6c/0xbc
[ 103.273485] driver_unregister+0x30/0x60
[ 103.277401] platform_driver_unregister+0x14/0x20
[ 103.282096] am65_cpsw_nuss_driver_exit+0x18/0xff4 [ti_am65_cpsw_nuss]
[ 103.288620] __arm64_sys_delete_module+0x17c/0x25c
[ 103.293404] invoke_syscall+0x44/0x100
[ 103.297149] el0_svc_common.constprop.0+0xc0/0xe0
[ 103.301845] do_el0_svc+0x1c/0x28
[ 103.305155] el0_svc+0x28/0x98
[ 103.308207] el0t_64_sync_handler+0xc8/0xcc
[ 103.312384] el0t_64_sync+0x198/0x19c
[ 103.316040] ---[ end trace 0000000000000000 ]---

Signed-off-by: Roger Quadros <rogerq@kernel.org>
Acked-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
Link: https://lore.kernel.org/r/20250224-k3-udma-glue-single-fdq-v2-1-cbe7621f2507@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Roger Quadros and committed by
Vinod Koul
0da30874 95032938

+15 -9
+11 -4
drivers/dma/ti/k3-udma-glue.c
··· 84 84 struct k3_udma_glue_rx_flow *flows; 85 85 u32 flow_num; 86 86 u32 flows_ready; 87 + bool single_fdq; /* one FDQ for all flows */ 87 88 }; 88 89 89 90 static void k3_udma_chan_dev_release(struct device *dev) ··· 971 970 972 971 ep_cfg = rx_chn->common.ep_config; 973 972 974 - if (xudma_is_pktdma(rx_chn->common.udmax)) 973 + if (xudma_is_pktdma(rx_chn->common.udmax)) { 975 974 rx_chn->udma_rchan_id = ep_cfg->mapped_channel_id; 976 - else 975 + rx_chn->single_fdq = false; 976 + } else { 977 977 rx_chn->udma_rchan_id = -1; 978 + rx_chn->single_fdq = true; 979 + } 978 980 979 981 /* request and cfg UDMAP RX channel */ 980 982 rx_chn->udma_rchanx = xudma_rchan_get(rx_chn->common.udmax, ··· 1107 1103 rx_chn->common.chan_dev.dma_coherent = true; 1108 1104 dma_coerce_mask_and_coherent(&rx_chn->common.chan_dev, 1109 1105 DMA_BIT_MASK(48)); 1106 + rx_chn->single_fdq = false; 1107 + } else { 1108 + rx_chn->single_fdq = true; 1110 1109 } 1111 1110 1112 1111 ret = k3_udma_glue_allocate_rx_flows(rx_chn, cfg); ··· 1460 1453 1461 1454 void k3_udma_glue_reset_rx_chn(struct k3_udma_glue_rx_channel *rx_chn, 1462 1455 u32 flow_num, void *data, 1463 - void (*cleanup)(void *data, dma_addr_t desc_dma), bool skip_fdq) 1456 + void (*cleanup)(void *data, dma_addr_t desc_dma)) 1464 1457 { 1465 1458 struct k3_udma_glue_rx_flow *flow = &rx_chn->flows[flow_num]; 1466 1459 struct device *dev = rx_chn->common.dev; ··· 1472 1465 dev_dbg(dev, "RX reset flow %u occ_rx %u\n", flow_num, occ_rx); 1473 1466 1474 1467 /* Skip RX FDQ in case one FDQ is used for the set of flows */ 1475 - if (skip_fdq) 1468 + if (rx_chn->single_fdq && flow_num) 1476 1469 goto do_reset; 1477 1470 1478 1471 /*
+2 -2
drivers/net/ethernet/ti/am65-cpsw-nuss.c
··· 515 515 napi_disable(&flow->napi_rx); 516 516 hrtimer_cancel(&flow->rx_hrtimer); 517 517 k3_udma_glue_reset_rx_chn(rx_chn->rx_chn, id, rx_chn, 518 - am65_cpsw_nuss_rx_cleanup, !!id); 518 + am65_cpsw_nuss_rx_cleanup); 519 519 520 520 for (port = 0; port < common->port_num; port++) { 521 521 if (!common->ports[port].ndev) ··· 3406 3406 for (i = 0; i < common->rx_ch_num_flows; i++) 3407 3407 k3_udma_glue_reset_rx_chn(rx_chan->rx_chn, i, 3408 3408 rx_chan, 3409 - am65_cpsw_nuss_rx_cleanup, !!i); 3409 + am65_cpsw_nuss_rx_cleanup); 3410 3410 3411 3411 k3_udma_glue_disable_rx_chn(rx_chan->rx_chn); 3412 3412
+1 -1
drivers/net/ethernet/ti/icssg/icssg_common.c
··· 955 955 956 956 for (i = 0; i < num_flows; i++) 957 957 k3_udma_glue_reset_rx_chn(chn->rx_chn, i, chn, 958 - prueth_rx_cleanup, !!i); 958 + prueth_rx_cleanup); 959 959 if (disable) 960 960 k3_udma_glue_disable_rx_chn(chn->rx_chn); 961 961 }
+1 -2
include/linux/dma/k3-udma-glue.h
··· 138 138 u32 flow_num); 139 139 void k3_udma_glue_reset_rx_chn(struct k3_udma_glue_rx_channel *rx_chn, 140 140 u32 flow_num, void *data, 141 - void (*cleanup)(void *data, dma_addr_t desc_dma), 142 - bool skip_fdq); 141 + void (*cleanup)(void *data, dma_addr_t desc_dma)); 143 142 int k3_udma_glue_rx_flow_enable(struct k3_udma_glue_rx_channel *rx_chn, 144 143 u32 flow_idx); 145 144 int k3_udma_glue_rx_flow_disable(struct k3_udma_glue_rx_channel *rx_chn,