TI: AM654/j721e: Ringacc and UDMA updates
Vignesh Raghavendra
maintainercover TI: AM654/j721e: Ringacc and UDMA updates
Align Ringacc and UDMA driver with kernel updates.
Depends on [1]
[1] https://patchwork.ozlabs.org/project/uboot/list/?series=186589
Vignesh Raghavendra (6):
soc: ti: k3-ringacc: Move state tracking variables under a struct
soc: ti: k3-ringacc: Add an API to request pair of rings
soc: ti: k3-ringacc: Separate soc specific initialization
dma: ti: k3-udma: Introduce udma_chan_config struct
dma: ti: k3-udma: Move RX descriptor ring entries to rflow struct
dma: ti: k3-udma: Switch to k3_ringacc_request_rings_pair
drivers/dma/ti/k3-udma.c | 281 ++++++++++++------------ drivers/soc/ti/k3-navss-ringacc.c | 161 +++++++++----- include/linux/soc/ti/k3-navss-ringacc.h | 4 + 3 files changed, 254 insertions(+), 192 deletions(-)
Signature · 1 line
2.27.0
Vignesh Raghavendra
maintainerPATCH 1/6 soc: ti: k3-ringacc: Move state tracking variables under a struct
Move the free, occ, windex and rinfex under a struct.
We can use memset to zero them and it will allow a cleaner way to extend the variables for duplex rings.
--- drivers/soc/ti/k3-navss-ringacc.c | 89 ++++++++++++++++--------------- 1 file changed, 46 insertions(+), 43 deletions(-)
drivers/soc/ti/k3-navss-ringacc.c +46 -43
@@ -126,6 +126,22 @@ struct k3_nav_ring_ops {int (*pop_head)(struct k3_nav_ring *ring,void *elm); }; +/** +* struct k3_nav_ring_state - Internal state tracking structure +* +* @free: Number of free entries +* @occ: Occupancy +* @windex: Write index +* @rindex: Read index +*/ +struct k3_nav_ring_state { +u32 free; +u32 occ; +u32 windex; +u32 rindex; +u32 tdown_complete:1 ; +}; +/** * struct k3_nav_ring - RA Ring descriptor *
@@ -139,10 +155,6 @@ struct k3_nav_ring_ops {* @elm_size - Size of the ring element * @mode - Ring mode * @flags - flags -* @free - Number of free elements -* @occ - Ring occupancy -* @windex - Write index (only for @K3_NAV_RINGACC_RING_MODE_RING) -* @rindex - Read index (only for @K3_NAV_RINGACC_RING_MODE_RING) * @ring_id - Ring Id * @parent - Pointer on struct @k3_nav_ringacc * @use_count - Use count for shared rings
@@ -161,10 +173,7 @@ struct k3_nav_ring {u32 flags;#define KNAV_RING_FLAG_BUSY BIT(1)#define K3_NAV_RING_FLAG_SHARED BIT(2) -u32 free; -u32 occ; -u32 windex; -u32 rindex; +struct k3_nav_ring_state state;u32 ring_id;struct k3_nav_ringacc *parent;u32 use_count;
@@ -338,10 +347,7 @@ void k3_nav_ringacc_ring_reset(struct k3_nav_ring *ring)if (!ring || !(ring->flags &KNAV_RING_FLAG_BUSY ))return ; - ring->occ =0 ; - ring->free =0 ; - ring->rindex =0 ; - ring->windex =0 ; +memset (&ring->state,0 ,sizeof (ring->state));k3_ringacc_ring_reset_sci (ring); }
@@ -546,10 +552,7 @@ int k3_nav_ringacc_ring_cfg(struct k3_nav_ring *ring, ring->size = cfg->size; ring->elm_size = cfg->elm_size; ring->mode = cfg->mode; - ring->occ =0 ; - ring->free =0 ; - ring->rindex =0 ; - ring->windex =0 ; +memset (&ring->state,0 ,sizeof (ring->state));if (ring->proxy_id !=K3_RINGACC_PROXY_NOT_USED ) ring->proxy = ringacc->proxy_target_base +
@@ -625,10 +628,10 @@ u32 k3_nav_ringacc_ring_get_free(struct k3_nav_ring *ring)if (!ring || !(ring->flags &KNAV_RING_FLAG_BUSY ))return -EINVAL ; -if (!ring->free) - ring->free = ring->size -ringacc_readl (&ring->rt->occ); +if (!ring->state.free) + ring->state.free = ring->size -ringacc_readl (&ring->rt->occ); -return ring->free; +return ring->state.free; }u32 k3_nav_ringacc_ring_get_occ (struct k3_nav_ring *ring)
@@ -694,21 +697,21 @@ static int k3_nav_ringacc_ring_access_proxy(pr_debug ("proxy:memcpy_fromio(x): --> ptr(%p), mode:%d\n" , ptr, access_mode);memcpy_fromio (elem, ptr, (4 << ring->elm_size)); - ring->occ--; + ring->state.occ--;break ;case K3_RINGACC_ACCESS_MODE_PUSH_TAIL :case K3_RINGACC_ACCESS_MODE_PUSH_HEAD :pr_debug ("proxy:memcpy_toio(x): --> ptr(%p), mode:%d\n" , ptr, access_mode);memcpy_toio (ptr, elem, (4 << ring->elm_size)); - ring->free--; + ring->state.free--;break ;default :return -EINVAL ; }pr_debug ("proxy: free%d occ%d\n" , - ring->free, ring->occ); + ring->state.free, ring->state.occ);return 0 ; }
@@ -763,21 +766,21 @@ static int k3_nav_ringacc_ring_access_io(pr_debug ("memcpy_fromio(x): --> ptr(%p), mode:%d\n" , ptr, access_mode);memcpy_fromio (elem, ptr, (4 << ring->elm_size)); - ring->occ--; + ring->state.occ--;break ;case K3_RINGACC_ACCESS_MODE_PUSH_TAIL :case K3_RINGACC_ACCESS_MODE_PUSH_HEAD :pr_debug ("memcpy_toio(x): --> ptr(%p), mode:%d\n" , ptr, access_mode);memcpy_toio (ptr, elem, (4 << ring->elm_size)); - ring->free--; + ring->state.free--;break ;default :return -EINVAL ; }pr_debug ("free%d index%d occ%d index%d\n" , - ring->free, ring->windex, ring->occ, ring->rindex); + ring->state.free, ring->state.windex, ring->state.occ, ring->state.rindex);return 0 ; }
@@ -810,7 +813,7 @@ static int k3_nav_ringacc_ring_push_mem(struct k3_nav_ring *ring, void *elem) {void *elem_ptr; - elem_ptr =k3_nav_ringacc_get_elm_addr (ring, ring->windex); + elem_ptr =k3_nav_ringacc_get_elm_addr (ring, ring->state.windex);memcpy (elem_ptr, elem, (4 << ring->elm_size));
@@ -819,12 +822,12 @@ static int k3_nav_ringacc_ring_push_mem(struct k3_nav_ring *ring, void *elem) ring->size * (4 << ring->elm_size), ARCH_DMA_MINALIGN)); - ring->windex = (ring->windex +1 ) % ring->size; - ring->free--; + ring->state.windex = (ring->state.windex +1 ) % ring->size; + ring->state.free--;ringacc_writel (1 , &ring->rt->db);pr_debug ("ring_push_mem: free%d index%d\n" , - ring->free, ring->windex); + ring->state.free, ring->state.windex);return 0 ; }
@@ -833,7 +836,7 @@ static int k3_nav_ringacc_ring_pop_mem(struct k3_nav_ring *ring, void *elem) {void *elem_ptr; - elem_ptr =k3_nav_ringacc_get_elm_addr (ring, ring->rindex); + elem_ptr =k3_nav_ringacc_get_elm_addr (ring, ring->state.rindex); invalidate_dcache_range((unsigned long)ring->ring_mem_virt, ALIGN((unsigned long)ring->ring_mem_virt +
@@ -842,12 +845,12 @@ static int k3_nav_ringacc_ring_pop_mem(struct k3_nav_ring *ring, void *elem)memcpy (elem, elem_ptr, (4 << ring->elm_size)); - ring->rindex = (ring->rindex +1 ) % ring->size; - ring->occ--; + ring->state.rindex = (ring->state.rindex +1 ) % ring->size; + ring->state.occ--;ringacc_writel (-1 , &ring->rt->db);pr_debug ("ring_pop_mem: occ%d index%d pos_ptr%p\n" , - ring->occ, ring->rindex, elem_ptr); + ring->state.occ, ring->state.rindex, elem_ptr);return 0 ; }
@@ -859,7 +862,7 @@ int k3_nav_ringacc_ring_push(struct k3_nav_ring *ring, void *elem)return -EINVAL ;pr_debug ("ring_push%d: free%d index%d\n" , - ring->ring_id, ring->free, ring->windex); + ring->ring_id, ring->state.free, ring->state.windex);if (k3_nav_ringacc_ring_is_full (ring))return -ENOMEM ;
@@ -878,7 +881,7 @@ int k3_nav_ringacc_ring_push_head(struct k3_nav_ring *ring, void *elem)return -EINVAL ;pr_debug ("ring_push_head: free%d index%d\n" , - ring->free, ring->windex); + ring->state.free, ring->state.windex);if (k3_nav_ringacc_ring_is_full (ring))return -ENOMEM ;
@@ -896,13 +899,13 @@ int k3_nav_ringacc_ring_pop(struct k3_nav_ring *ring, void *elem)if (!ring || !(ring->flags &KNAV_RING_FLAG_BUSY ))return -EINVAL ; -if (!ring->occ) - ring->occ =k3_nav_ringacc_ring_get_occ (ring); +if (!ring->state.occ) + ring->state.occ =k3_nav_ringacc_ring_get_occ (ring);pr_debug ("ring_pop%d: occ%d index%d\n" , - ring->ring_id, ring->occ, ring->rindex); + ring->ring_id, ring->state.occ, ring->state.rindex); -if (!ring->occ) +if (!ring->state.occ && !ring->state.tdown_complete)return -ENODATA ;if (ring->ops && ring->ops->pop_head)
@@ -918,13 +921,13 @@ int k3_nav_ringacc_ring_pop_tail(struct k3_nav_ring *ring, void *elem)if (!ring || !(ring->flags &KNAV_RING_FLAG_BUSY ))return -EINVAL ; -if (!ring->occ) - ring->occ =k3_nav_ringacc_ring_get_occ (ring); +if (!ring->state.occ) + ring->state.occ =k3_nav_ringacc_ring_get_occ (ring);pr_debug ("ring_pop_tail: occ%d index%d\n" , - ring->occ, ring->rindex); + ring->state.occ, ring->state.rindex); -if (!ring->occ) +if (!ring->state.occ)return -ENODATA ;if (ring->ops && ring->ops->pop_tail)
Signature · 1 line
2.27.0
Vignesh Raghavendra
maintainerPATCH 2/6 soc: ti: k3-ringacc: Add an API to request pair of rings
In reply to Vignesh RaghavendraAdd new API k3_ringacc_request_rings_pair() to request pair of rings at once, as in the most case Rings are used with DMA channels which required to request pair of rings - one to feed DMA with descriptors (TX/RX FDQ) and one to receive completions (RX/TX CQ). This will allow to simplify Ringacc API users.
--- drivers/soc/ti/k3-navss-ringacc.c | 23 +++++++++++++++++++++++ include/linux/soc/ti/k3-navss-ringacc.h | 4 ++++ 2 files changed, 27 insertions(+)
drivers/soc/ti/k3-navss-ringacc.c +23 -0
@@ -321,6 +321,29 @@ error:return NULL ; } +int k3_nav_ringacc_request_rings_pair (struct k3_nav_ringacc *ringacc, +int fwd_id,int compl_id, +struct k3_nav_ring **fwd_ring, +struct k3_nav_ring **compl_ring) +{ +int ret =0 ; + +if (!fwd_ring || !compl_ring) +return -EINVAL ; + + *fwd_ring =k3_nav_ringacc_request_ring (ringacc, fwd_id,0 ); +if (!(*fwd_ring)) +return -ENODEV ; + + *compl_ring =k3_nav_ringacc_request_ring (ringacc, compl_id,0 ); +if (!(*compl_ring)) { +k3_nav_ringacc_ring_free (*fwd_ring); + ret = -ENODEV ; + } + +return ret; +} +static void k3_ringacc_ring_reset_sci (struct k3_nav_ring *ring) {struct k3_nav_ringacc *ringacc = ring->parent;
include/linux/soc/ti/k3-navss-ringacc.h +4 -0
@@ -100,6 +100,10 @@ struct k3_nav_ring_cfg {struct k3_nav_ring *k3_nav_ringacc_request_ring (struct k3_nav_ringacc *ringacc,int id,u32 flags); +int k3_nav_ringacc_request_rings_pair (struct k3_nav_ringacc *ringacc, +int fwd_id,int compl_id, +struct k3_nav_ring **fwd_ring, +struct k3_nav_ring **compl_ring);/** * k3_nav_ringacc_get_dev - get pointer on RA device * @ringacc: pointer on RA
Signature · 1 line
2.27.0
Vignesh Raghavendra
maintainerPATCH 3/6 soc: ti: k3-ringacc: Separate soc specific initialization
In reply to Vignesh RaghavendraIn preparation of adding more K3 SoCs, separate soc specific initialization add a SoC specific initialization hook.
--- drivers/soc/ti/k3-navss-ringacc.c | 49 +++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 9 deletions(-)
drivers/soc/ti/k3-navss-ringacc.c +40 -9
@@ -180,6 +180,10 @@ struct k3_nav_ring {int proxy_id; }; +struct k3_nav_ringacc_ops { +int (*init)(struct udevice *dev,struct k3_nav_ringacc *ringacc); +}; +/** * struct k3_nav_ringacc - Rings accelerator descriptor *
@@ -195,6 +199,7 @@ struct k3_nav_ring {* @tisci - pointer ti-sci handle * @tisci_ring_ops - ti-sci rings ops * @tisci_dev_id - ti-sci device id +* @ops: SoC specific ringacc operation */ struct k3_nav_ringacc {struct udevice *dev;
@@ -213,6 +218,8 @@ struct k3_nav_ringacc {const struct ti_sci_handle *tisci;const struct ti_sci_rm_ringacc_ops *tisci_ring_ops;u32 tisci_dev_id; + +const struct k3_nav_ringacc_ops *ops; };static long k3_nav_ringacc_ring_get_fifo_pos (struct k3_nav_ring *ring)
@@ -1008,18 +1015,11 @@ static int k3_nav_ringacc_probe_dt(struct k3_nav_ringacc *ringacc)return 0 ; } -static int k3_nav_ringacc_probe (struct udevice *dev) +static int k3_nav_ringacc_init (struct udevice *dev,struct k3_nav_ringacc *ringacc) { -struct k3_nav_ringacc *ringacc;void __iomem *base_fifo, *base_rt;int ret, i; - ringacc =dev_get_priv (dev); -if (!ringacc) -return -ENOMEM ; - - ringacc->dev = dev; - ret =k3_nav_ringacc_probe_dt (ringacc);if (ret)return ret;
@@ -1089,11 +1089,42 @@ static int k3_nav_ringacc_probe(struct udevice *dev)return 0 ; } +struct ringacc_match_data { +struct k3_nav_ringacc_ops ops; +}; + +static struct ringacc_match_data k3_nav_ringacc_data = { + .ops = { + .init = k3_nav_ringacc_init, + }, +}; +static const struct udevice_id knav_ringacc_ids[] = { - { .compatible ="ti,am654-navss-ringacc" }, + { .compatible ="ti,am654-navss-ringacc" , .data = (ulong)&k3_nav_ringacc_data, }, {}, }; +static int k3_nav_ringacc_probe (struct udevice *dev) +{ +struct k3_nav_ringacc *ringacc; +int ret; +const struct ringacc_match_data *match_data; + + match_data = (struct ringacc_match_data *)dev_get_driver_data (dev); + + ringacc =dev_get_priv (dev); +if (!ringacc) +return -ENOMEM ; + + ringacc->dev = dev; + ringacc->ops = &match_data->ops; + ret = ringacc->ops->init (dev, ringacc); +if (ret) +return ret; + +return 0 ; +} +U_BOOT_DRIVER (k3_navss_ringacc) = { .name ="k3-navss-ringacc" , .id =UCLASS_MISC ,
Signature · 1 line
2.27.0
Vignesh Raghavendra
maintainerPATCH 4/6 dma: ti: k3-udma: Introduce udma_chan_config struct
In reply to Vignesh RaghavendraEncapsulate channel configuration in a separate struct so as to ease resetting of these fields with memset() and also to increase readability of the code.
--- drivers/dma/ti/k3-udma.c | 197 +++++++++++++++++++++------------------ 1 file changed, 108 insertions(+), 89 deletions(-)
drivers/dma/ti/k3-udma.c +108 -89
@@ -137,6 +137,26 @@ struct udma_dev {u32 ch_count; }; +struct udma_chan_config { +u32 psd_size;/* size of Protocol Specific Data */ +u32 metadata_size;/* (needs_epib ? 16:0) + psd_size */ +u32 hdesc_size;/* Size of a packet descriptor in packet mode */ +int remote_thread_id; +u32 atype; +u32 src_thread; +u32 dst_thread; +enum psil_endpoint_type ep_type; +enum udma_tp_level channel_tpl;/* Channel Throughput Level */ + +enum dma_direction dir; + +unsigned int pkt_mode:1 ;/* TR or packet */ +unsigned int needs_epib:1 ;/* EPIB is needed for the communication or not */ +unsigned int enable_acc32:1 ; +unsigned int enable_burst:1 ; +unsigned int notdpkt:1 ;/* Suppress sending TDC packet */ +}; +struct udma_chan {struct udma_dev *ud;char name[20 ];
@@ -149,20 +169,11 @@ struct udma_chan {u32 bcnt;/* number of bytes completed since the start of the channel */ -bool pkt_mode;/* TR or packet */ -bool needs_epib;/* EPIB is needed for the communication or not */ -u32 psd_size;/* size of Protocol Specific Data */ -u32 metadata_size;/* (needs_epib ? 16:0) + psd_size */ -int slave_thread_id; -u32 src_thread; -u32 dst_thread; -u32 static_tr_type; +struct udma_chan_config config;u32 id; -enum dma_direction dir;struct cppi5_host_desc_t *desc_tx; -u32 hdesc_size;bool in_use;void *desc_rx;u32 num_rx_bufs;
@@ -288,7 +299,7 @@ static inline bool udma_is_chan_running(struct udma_chan *uc)u32 trt_ctl =0 ;u32 rrt_ctl =0 ; -switch (uc->dir) { +switch (uc->config.dir) {case DMA_DEV_TO_MEM : rrt_ctl =udma_rchanrt_read (uc->rchan,UDMA_RCHAN_RT_CTL_REG ); pr_debug("%s: rrt_ctl: 0x%08x (peer: 0x%08x)\n",
@@ -322,7 +333,7 @@ static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr)struct k3_nav_ring *ring =NULL ;int ret = -ENOENT ; -switch (uc->dir) { +switch (uc->config.dir) {case DMA_DEV_TO_MEM : ring = uc->rchan->r_ring;break ;
@@ -347,7 +358,7 @@ static void udma_reset_rings(struct udma_chan *uc)struct k3_nav_ring *ring1 =NULL ;struct k3_nav_ring *ring2 =NULL ; -switch (uc->dir) { +switch (uc->config.dir) {case DMA_DEV_TO_MEM : ring1 = uc->rchan->fd_ring; ring2 = uc->rchan->r_ring;
@@ -409,7 +420,7 @@ static inline int udma_stop_hard(struct udma_chan *uc) {pr_debug ("%s: ENTER (chan%d)\n" , __func__, uc->id); -switch (uc->dir) { +switch (uc->config.dir) {case DMA_DEV_TO_MEM :udma_rchanrt_write (uc->rchan,UDMA_RCHAN_RT_PEER_RT_EN_REG ,0 );udma_rchanrt_write (uc->rchan,UDMA_RCHAN_RT_CTL_REG ,0 );
@@ -435,9 +446,8 @@ static int udma_start(struct udma_chan *uc)if (udma_is_chan_running (uc)) goto out; -pr_debug ("%s: chan:%d dir:%s (static_tr_type: %d)\n" , - __func__, uc->id,udma_get_dir_text (uc->dir), - uc->static_tr_type); +pr_debug ("%s: chan:%d dir:%s\n" , + __func__, uc->id,udma_get_dir_text (uc->config.dir));/* Make sure that we clear the teardown bit, if it is set */ udma_stop_hard (uc);
@@ -445,7 +455,7 @@ static int udma_start(struct udma_chan *uc)/* Reset all counters */ udma_reset_counters (uc); -switch (uc->dir) { +switch (uc->config.dir) {case DMA_DEV_TO_MEM :udma_rchanrt_write (uc->rchan,UDMA_RCHAN_RT_CTL_REG ,UDMA_CHAN_RT_CTL_EN );
@@ -547,10 +557,10 @@ static inline void udma_stop_dev2mem(struct udma_chan *uc, bool sync)static inline int udma_stop (struct udma_chan *uc) {pr_debug ("%s: chan:%d dir:%s\n" , - __func__, uc->id,udma_get_dir_text (uc->dir)); + __func__, uc->id,udma_get_dir_text (uc->config.dir));udma_reset_counters (uc); -switch (uc->dir) { +switch (uc->config.dir) {case DMA_DEV_TO_MEM :udma_stop_dev2mem (uc, true);break ;
@@ -851,7 +861,7 @@ static int udma_alloc_rx_resources(struct udma_chan *uc)return ret;/* For MEM_TO_MEM we don't need rflow or rings */ -if (uc->dir ==DMA_MEM_TO_MEM ) +if (uc->config.dir ==DMA_MEM_TO_MEM )return 0 ; ret =udma_get_rflow (uc, uc->rchan->id);
@@ -913,7 +923,7 @@ static int udma_alloc_tchan_sci_req(struct udma_chan *uc)u32 mode;int ret; -if (uc->pkt_mode) +if (uc->config.pkt_mode) mode =TI_SCI_RM_UDMAP_CHAN_TYPE_PKT_PBRR ;else mode =TI_SCI_RM_UDMAP_CHAN_TYPE_3RDP_BCOPY_PBRR ;
@@ -924,11 +934,11 @@ static int udma_alloc_tchan_sci_req(struct udma_chan *uc) req.nav_id = tisci_rm->tisci_dev_id; req.index = uc->tchan->id; req.tx_chan_type = mode; -if (uc->dir ==DMA_MEM_TO_MEM ) +if (uc->config.dir ==DMA_MEM_TO_MEM ) req.tx_fetch_size =sizeof (struct cppi5_desc_hdr_t ) >>2 ;else - req.tx_fetch_size =cppi5_hdesc_calc_size (uc->needs_epib, - uc->psd_size, + req.tx_fetch_size =cppi5_hdesc_calc_size (uc->config.needs_epib, + uc->config.psd_size,0 ) >>2 ; req.txcq_qnum = tc_ring;
@@ -951,7 +961,7 @@ static int udma_alloc_rchan_sci_req(struct udma_chan *uc)u32 mode;int ret; -if (uc->pkt_mode) +if (uc->config.pkt_mode) mode =TI_SCI_RM_UDMAP_CHAN_TYPE_PKT_PBRR ;else mode =TI_SCI_RM_UDMAP_CHAN_TYPE_3RDP_BCOPY_PBRR ;
@@ -964,16 +974,16 @@ static int udma_alloc_rchan_sci_req(struct udma_chan *uc) req.nav_id = tisci_rm->tisci_dev_id; req.index = uc->rchan->id; req.rx_chan_type = mode; -if (uc->dir ==DMA_MEM_TO_MEM ) { +if (uc->config.dir ==DMA_MEM_TO_MEM ) { req.rx_fetch_size =sizeof (struct cppi5_desc_hdr_t ) >>2 ; req.rxcq_qnum = tc_ring; }else { - req.rx_fetch_size =cppi5_hdesc_calc_size (uc->needs_epib, - uc->psd_size, + req.rx_fetch_size =cppi5_hdesc_calc_size (uc->config.needs_epib, + uc->config.psd_size,0 ) >>2 ; req.rxcq_qnum = rx_ring; } -if (uc->rflow->id != uc->rchan->id && uc->dir !=DMA_MEM_TO_MEM ) { +if (uc->rflow->id != uc->rchan->id && uc->config.dir !=DMA_MEM_TO_MEM ) { req.flowid_start = uc->rflow->id; req.flowid_cnt =1 ; }
@@ -984,7 +994,7 @@ static int udma_alloc_rchan_sci_req(struct udma_chan *uc) uc->rchan->id, ret);return ret; } -if (uc->dir ==DMA_MEM_TO_MEM ) +if (uc->config.dir ==DMA_MEM_TO_MEM )return ret; flow_req.valid_params =
@@ -1006,12 +1016,12 @@ static int udma_alloc_rchan_sci_req(struct udma_chan *uc) flow_req.nav_id = tisci_rm->tisci_dev_id; flow_req.flow_index = uc->rflow->id; -if (uc->needs_epib) +if (uc->config.needs_epib) flow_req.rx_einfo_present =1 ;else flow_req.rx_einfo_present =0 ; -if (uc->psd_size) +if (uc->config.psd_size) flow_req.rx_psinfo_present =1 ;else flow_req.rx_psinfo_present =0 ;
@@ -1044,11 +1054,12 @@ static int udma_alloc_chan_resources(struct udma_chan *uc)int ret;pr_debug ("%s: chan:%d as %s\n" , - __func__, uc->id,udma_get_dir_text (uc->dir)); + __func__, uc->id,udma_get_dir_text (uc->config.dir)); -switch (uc->dir) { +switch (uc->config.dir) {case DMA_MEM_TO_MEM :/* Non synchronized - mem to mem type of transfer */ + uc->config.pkt_mode = false; ret =udma_get_chan_pair (uc);if (ret)return ret;
@@ -1061,8 +1072,8 @@ static int udma_alloc_chan_resources(struct udma_chan *uc)if (ret) goto err_free_res; - uc->src_thread = ud->psil_base + uc->tchan->id; - uc->dst_thread = (ud->psil_base + uc->rchan->id) |0x8000 ; + uc->config.src_thread = ud->psil_base + uc->tchan->id; + uc->config.dst_thread = (ud->psil_base + uc->rchan->id) |0x8000 ;break ;case DMA_MEM_TO_DEV :/* Slave transfer synchronized - mem to dev (TX) trasnfer */
@@ -1070,10 +1081,9 @@ static int udma_alloc_chan_resources(struct udma_chan *uc)if (ret) goto err_free_res; - uc->src_thread = ud->psil_base + uc->tchan->id; - uc->dst_thread = uc->slave_thread_id; -if (!(uc->dst_thread &0x8000 )) - uc->dst_thread |=0x8000 ; + uc->config.src_thread = ud->psil_base + uc->tchan->id; + uc->config.dst_thread = uc->config.remote_thread_id; + uc->config.dst_thread |=0x8000 ;break ;case DMA_DEV_TO_MEM :
@@ -1082,19 +1092,19 @@ static int udma_alloc_chan_resources(struct udma_chan *uc)if (ret) goto err_free_res; - uc->src_thread = uc->slave_thread_id; - uc->dst_thread = (ud->psil_base + uc->rchan->id) |0x8000 ; + uc->config.src_thread = uc->config.remote_thread_id; + uc->config.dst_thread = (ud->psil_base + uc->rchan->id) |0x8000 ;break ;default :/* Can not happen */ pr_debug ("%s: chan:%d invalid direction (%u)\n" , - __func__, uc->id, uc->dir); + __func__, uc->id, uc->config.dir);return -EINVAL ; }/* We have channel indexes and rings */ -if (uc->dir ==DMA_MEM_TO_MEM ) { +if (uc->config.dir ==DMA_MEM_TO_MEM ) { ret =udma_alloc_tchan_sci_req (uc);if (ret) goto err_free_res;
@@ -1104,7 +1114,7 @@ static int udma_alloc_chan_resources(struct udma_chan *uc) goto err_free_res; }else {/* Slave transfer */ -if (uc->dir ==DMA_MEM_TO_DEV ) { +if (uc->config.dir ==DMA_MEM_TO_DEV ) { ret =udma_alloc_tchan_sci_req (uc);if (ret) goto err_free_res;
@@ -1125,7 +1135,7 @@ static int udma_alloc_chan_resources(struct udma_chan *uc) }/* PSI-L pairing */ - ret =udma_navss_psil_pair (ud, uc->src_thread, uc->dst_thread); + ret =udma_navss_psil_pair (ud, uc->config.src_thread, uc->config.dst_thread);if (ret) {dev_err (ud->dev,"k3_nav_psil_request_link fail\n" ); goto err_free_res;
@@ -1136,7 +1146,7 @@ static int udma_alloc_chan_resources(struct udma_chan *uc) err_free_res:udma_free_tx_resources (uc);udma_free_rx_resources (uc); - uc->slave_thread_id =-1 ; + uc->config.remote_thread_id =-1 ;return ret; }
@@ -1145,15 +1155,15 @@ static void udma_free_chan_resources(struct udma_chan *uc)/* Some configuration to UDMA-P channel: disable, reset, whatever */ /* Release PSI-L pairing */ -udma_navss_psil_unpair (uc->ud, uc->src_thread, uc->dst_thread); +udma_navss_psil_unpair (uc->ud, uc->config.src_thread, uc->config.dst_thread);/* Reset the rings for a new start */ udma_reset_rings (uc);udma_free_tx_resources (uc);udma_free_rx_resources (uc); - uc->slave_thread_id =-1 ; - uc->dir =DMA_MEM_TO_MEM ; + uc->config.remote_thread_id =-1 ; + uc->config.dir =DMA_MEM_TO_MEM ; }static int udma_get_mmrs (struct udevice *dev)
@@ -1377,10 +1387,10 @@ static int udma_probe(struct udevice *dev) uc->ud = ud; uc->id = i; - uc->slave_thread_id =-1 ; + uc->config.remote_thread_id =-1 ; uc->tchan =NULL ; uc->rchan =NULL ; - uc->dir =DMA_MEM_TO_MEM ; + uc->config.dir =DMA_MEM_TO_MEM ;sprintf (uc->name,"UDMA chan%d\n" , i);if (!i) uc->in_use = true;
@@ -1527,6 +1537,7 @@ static int udma_transfer(struct udevice *dev, int direction,static int udma_request (struct dma *dma) {struct udma_dev *ud =dev_get_priv (dma->dev); +struct udma_chan_config *ucc;struct udma_chan *uc;unsigned long dummy;int ret;
@@ -1537,30 +1548,27 @@ static int udma_request(struct dma *dma) } uc = &ud->channels[dma->id]; + ucc = &uc->config; ret =udma_alloc_chan_resources (uc);if (ret) {dev_err (dma->dev,"alloc dma res failed %d\n" , ret);return -EINVAL ; } - uc->hdesc_size =cppi5_hdesc_calc_size (uc->needs_epib, - uc->psd_size,0 ); - uc->hdesc_size =ALIGN (uc->hdesc_size,ARCH_DMA_MINALIGN ); - -if (uc->dir ==DMA_MEM_TO_DEV ) { - uc->desc_tx =dma_alloc_coherent (uc->hdesc_size, &dummy); -memset (uc->desc_tx,0 , uc->hdesc_size); +if (uc->config.dir ==DMA_MEM_TO_DEV ) { + uc->desc_tx =dma_alloc_coherent (ucc->hdesc_size, &dummy); +memset (uc->desc_tx,0 , ucc->hdesc_size); }else { uc->desc_rx =dma_alloc_coherent ( - uc->hdesc_size *UDMA_RX_DESC_NUM , &dummy); -memset (uc->desc_rx,0 , uc->hdesc_size *UDMA_RX_DESC_NUM ); + ucc->hdesc_size *UDMA_RX_DESC_NUM , &dummy); +memset (uc->desc_rx,0 , ucc->hdesc_size *UDMA_RX_DESC_NUM ); } uc->in_use = true; uc->desc_rx_cur =0 ; uc->num_rx_bufs =0 ; -if (uc->dir ==DMA_DEV_TO_MEM ) { +if (uc->config.dir ==DMA_DEV_TO_MEM ) { uc->cfg_data.flow_id_base = uc->rflow->id; uc->cfg_data.flow_id_cnt =1 ; }
@@ -1645,7 +1653,7 @@ static int udma_send(struct dma *dma, void *src, size_t len, void *metadata) } uc = &ud->channels[dma->id]; -if (uc->dir !=DMA_MEM_TO_DEV ) +if (uc->config.dir !=DMA_MEM_TO_DEV )return -EINVAL ; tc_ring_id =k3_nav_ringacc_get_ring_id (uc->tchan->tc_ring);
@@ -1655,8 +1663,8 @@ static int udma_send(struct dma *dma, void *src, size_t len, void *metadata)cppi5_hdesc_reset_hbdesc (desc_tx);cppi5_hdesc_init (desc_tx, - uc->needs_epib ?CPPI5_INFO0_HDESC_EPIB_PRESENT :0 , - uc->psd_size); + uc->config.needs_epib ?CPPI5_INFO0_HDESC_EPIB_PRESENT :0 , + uc->config.psd_size);cppi5_hdesc_set_pktlen (desc_tx, len);cppi5_hdesc_attach_buf (desc_tx, dma_src, len, dma_src, len);cppi5_desc_set_pktids (&desc_tx->hdr, uc->id,0x3fff );
@@ -1669,7 +1677,7 @@ static int udma_send(struct dma *dma, void *src, size_t len, void *metadata)ALIGN ((unsigned long )dma_src + len, ARCH_DMA_MINALIGN));flush_dcache_range ((unsigned long )desc_tx, -ALIGN ((unsigned long )desc_tx + uc->hdesc_size, +ALIGN ((unsigned long )desc_tx + uc->config.hdesc_size,ARCH_DMA_MINALIGN )); ret =udma_push_to_ring (uc->tchan->t_ring, uc->desc_tx);
@@ -1687,6 +1695,7 @@ static int udma_send(struct dma *dma, void *src, size_t len, void *metadata)static int udma_receive (struct dma *dma,void **dst,void *metadata) {struct udma_dev *ud =dev_get_priv (dma->dev); +struct udma_chan_config *ucc;struct cppi5_host_desc_t *desc_rx;dma_addr_t buf_dma;struct udma_chan *uc;
@@ -1699,8 +1708,9 @@ static int udma_receive(struct dma *dma, void **dst, void *metadata)return -EINVAL ; } uc = &ud->channels[dma->id]; + ucc = &uc->config; -if (uc->dir !=DMA_DEV_TO_MEM ) +if (uc->config.dir !=DMA_DEV_TO_MEM )return -EINVAL ;if (!uc->num_rx_bufs)return -EINVAL ;
@@ -1715,7 +1725,7 @@ static int udma_receive(struct dma *dma, void **dst, void *metadata)/* invalidate cache data */ invalidate_dcache_range ((ulong )desc_rx, - (ulong)(desc_rx + uc->hdesc_size)); + (ulong)(desc_rx + ucc->hdesc_size));cppi5_hdesc_get_obuf (desc_rx, &buf_dma, &buf_dma_len); pkt_len =cppi5_hdesc_get_pktlen (desc_rx);
@@ -1734,6 +1744,7 @@ static int udma_receive(struct dma *dma, void **dst, void *metadata)static int udma_of_xlate (struct dma *dma,struct ofnode_phandle_args *args) { +struct udma_chan_config *ucc;struct udma_dev *ud =dev_get_priv (dma->dev);struct udma_chan *uc = &ud->channels[0 ];struct psil_endpoint_config *ep_config;
@@ -1748,32 +1759,40 @@ static int udma_of_xlate(struct dma *dma, struct ofnode_phandle_args *args)if (val == ud->ch_count)return -EBUSY ; - uc->slave_thread_id = args->args[0 ]; -if (uc->slave_thread_id &K3_PSIL_DST_THREAD_ID_OFFSET ) - uc->dir =DMA_MEM_TO_DEV ; + ucc = &uc->config; + ucc->remote_thread_id = args->args[0 ]; +if (ucc->remote_thread_id &K3_PSIL_DST_THREAD_ID_OFFSET ) + ucc->dir =DMA_MEM_TO_DEV ;else - uc->dir =DMA_DEV_TO_MEM ; + ucc->dir =DMA_DEV_TO_MEM ; - ep_config =psil_get_ep_config (uc->slave_thread_id); + ep_config =psil_get_ep_config (ucc->remote_thread_id);if (IS_ERR (ep_config)) {dev_err (ud->dev,"No configuration for psi-l thread 0x%04x\n" , - uc->slave_thread_id); - uc->dir =DMA_MEM_TO_MEM ; - uc->slave_thread_id =-1 ; + uc->config.remote_thread_id); + ucc->dir =DMA_MEM_TO_MEM ; + ucc->remote_thread_id =-1 ;return false; } - uc->pkt_mode = ep_config->pkt_mode; + ucc->pkt_mode = ep_config->pkt_mode; + ucc->channel_tpl = ep_config->channel_tpl; + ucc->notdpkt = ep_config->notdpkt; + ucc->ep_type = ep_config->ep_type; + + ucc->needs_epib = ep_config->needs_epib; + ucc->psd_size = ep_config->psd_size; + ucc->metadata_size = (ucc->needs_epib ?CPPI5_INFO0_HDESC_EPIB_SIZE :0 ) + ucc->psd_size; - uc->needs_epib = ep_config->needs_epib; - uc->psd_size = ep_config->psd_size; - uc->metadata_size = (uc->needs_epib ?CPPI5_INFO0_HDESC_EPIB_SIZE :0 ) + uc->psd_size; + ucc->hdesc_size =cppi5_hdesc_calc_size (ucc->needs_epib, + ucc->psd_size,0 ); + ucc->hdesc_size =ALIGN (ucc->hdesc_size,ARCH_DMA_MINALIGN ); dma->id = uc->id;pr_debug ("Allocated dma chn:%lu epib:%d psdata:%u meta:%u thread_id:%x\n" , - dma->id, uc->needs_epib, - uc->psd_size, uc->metadata_size, - uc->slave_thread_id); + dma->id, ucc->needs_epib, + ucc->psd_size, ucc->metadata_size, + ucc->remote_thread_id);return 0 ; }
@@ -1792,26 +1811,26 @@ int udma_prepare_rcv_buf(struct dma *dma, void *dst, size_t size) } uc = &ud->channels[dma->id]; -if (uc->dir !=DMA_DEV_TO_MEM ) +if (uc->config.dir !=DMA_DEV_TO_MEM )return -EINVAL ;if (uc->num_rx_bufs >=UDMA_RX_DESC_NUM )return -EINVAL ; desc_num = uc->desc_rx_cur %UDMA_RX_DESC_NUM ; - desc_rx = uc->desc_rx + (desc_num * uc->hdesc_size); + desc_rx = uc->desc_rx + (desc_num * uc->config.hdesc_size); dma_dst = (dma_addr_t )dst;cppi5_hdesc_reset_hbdesc (desc_rx);cppi5_hdesc_init (desc_rx, - uc->needs_epib ?CPPI5_INFO0_HDESC_EPIB_PRESENT :0 , - uc->psd_size); + uc->config.needs_epib ?CPPI5_INFO0_HDESC_EPIB_PRESENT :0 , + uc->config.psd_size);cppi5_hdesc_set_pktlen (desc_rx, size);cppi5_hdesc_attach_buf (desc_rx, dma_dst, size, dma_dst, size);flush_dcache_range ((unsigned long )desc_rx, -ALIGN ((unsigned long )desc_rx + uc->hdesc_size, +ALIGN ((unsigned long )desc_rx + uc->config.hdesc_size,ARCH_DMA_MINALIGN ));udma_push_to_ring (uc->rchan->fd_ring, desc_rx);
Signature · 1 line
2.27.0
Vignesh Raghavendra
maintainerPATCH 5/6 dma: ti: k3-udma: Move RX descriptor ring entries to rflow struct
In reply to Vignesh RaghavendraIn K3 UDMA architecture, RX rings are associated with RX flows rather than RX channels, therefore move the ring pointers to udma_rflow struct
--- drivers/dma/ti/k3-udma.c | 52 +++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 24 deletions(-)
drivers/dma/ti/k3-udma.c +28 -24
@@ -65,8 +65,6 @@ struct udma_rchan {void __iomem *reg_rt;int id; -struct k3_nav_ring *fd_ring;/* Free Descriptor ring */ -struct k3_nav_ring *r_ring;/* Receive ring*/ };#define UDMA_FLAG_PDMA_ACC32 BIT(0)
@@ -86,6 +84,9 @@ struct udma_match_data {struct udma_rflow {int id; + +struct k3_nav_ring *fd_ring;/* Free Descriptor ring */ +struct k3_nav_ring *r_ring;/* Receive ring*/ };enum udma_rm_range {
@@ -335,7 +336,7 @@ static int udma_pop_from_ring(struct udma_chan *uc, dma_addr_t *addr)switch (uc->config.dir) {case DMA_DEV_TO_MEM : - ring = uc->rchan->r_ring; + ring = uc->rflow->r_ring;break ;case DMA_MEM_TO_DEV : ring = uc->tchan->tc_ring;
@@ -360,8 +361,8 @@ static void udma_reset_rings(struct udma_chan *uc)switch (uc->config.dir) {case DMA_DEV_TO_MEM : - ring1 = uc->rchan->fd_ring; - ring2 = uc->rchan->r_ring; + ring1 = uc->rflow->fd_ring; + ring2 = uc->rflow->r_ring;break ;case DMA_MEM_TO_DEV : ring1 = uc->tchan->t_ring;
@@ -840,12 +841,15 @@ static void udma_free_rx_resources(struct udma_chan *uc)if (!uc->rchan)return ; -k3_nav_ringacc_ring_free (uc->rchan->fd_ring); -k3_nav_ringacc_ring_free (uc->rchan->r_ring); - uc->rchan->fd_ring =NULL ; - uc->rchan->r_ring =NULL ; +if (uc->rflow) { +k3_nav_ringacc_ring_free (uc->rflow->fd_ring); +k3_nav_ringacc_ring_free (uc->rflow->r_ring); + uc->rflow->fd_ring =NULL ; + uc->rflow->r_ring =NULL ; + +udma_put_rflow (uc); + } -udma_put_rflow (uc);udma_put_rchan (uc); }
@@ -872,17 +876,17 @@ static int udma_alloc_rx_resources(struct udma_chan *uc) fd_ring_id = ud->tchan_cnt + ud->echan_cnt + uc->rchan->id; - uc->rchan->fd_ring =k3_nav_ringacc_request_ring ( + uc->rflow->fd_ring =k3_nav_ringacc_request_ring ( ud->ringacc, fd_ring_id,RINGACC_RING_USE_PROXY ); -if (!uc->rchan->fd_ring) { +if (!uc->rflow->fd_ring) { ret = -EBUSY ; goto err_rx_ring; } - uc->rchan->r_ring =k3_nav_ringacc_request_ring ( + uc->rflow->r_ring =k3_nav_ringacc_request_ring ( ud->ringacc,-1 ,RINGACC_RING_USE_PROXY ); -if (!uc->rchan->r_ring) { +if (!uc->rflow->r_ring) { ret = -EBUSY ; goto err_rxc_ring; }
@@ -892,8 +896,8 @@ static int udma_alloc_rx_resources(struct udma_chan *uc) ring_cfg.elm_size =K3_NAV_RINGACC_RING_ELSIZE_8 ; ring_cfg.mode =K3_NAV_RINGACC_RING_MODE_RING ; - ret =k3_nav_ringacc_ring_cfg (uc->rchan->fd_ring, &ring_cfg); - ret |=k3_nav_ringacc_ring_cfg (uc->rchan->r_ring, &ring_cfg); + ret =k3_nav_ringacc_ring_cfg (uc->rflow->fd_ring, &ring_cfg); + ret |=k3_nav_ringacc_ring_cfg (uc->rflow->r_ring, &ring_cfg);if (ret) goto err_ringcfg;
@@ -901,11 +905,11 @@ static int udma_alloc_rx_resources(struct udma_chan *uc)return 0 ; err_ringcfg: -k3_nav_ringacc_ring_free (uc->rchan->r_ring); - uc->rchan->r_ring =NULL ; +k3_nav_ringacc_ring_free (uc->rflow->r_ring); + uc->rflow->r_ring =NULL ; err_rxc_ring: -k3_nav_ringacc_ring_free (uc->rchan->fd_ring); - uc->rchan->fd_ring =NULL ; +k3_nav_ringacc_ring_free (uc->rflow->fd_ring); + uc->rflow->fd_ring =NULL ; err_rx_ring:udma_put_rflow (uc); err_rflow:
@@ -952,8 +956,8 @@ static int udma_alloc_tchan_sci_req(struct udma_chan *uc)static int udma_alloc_rchan_sci_req (struct udma_chan *uc) {struct udma_dev *ud = uc->ud; -int fd_ring =k3_nav_ringacc_get_ring_id (uc->rchan->fd_ring); -int rx_ring =k3_nav_ringacc_get_ring_id (uc->rchan->r_ring); +int fd_ring =k3_nav_ringacc_get_ring_id (uc->rflow->fd_ring); +int rx_ring =k3_nav_ringacc_get_ring_id (uc->rflow->r_ring);int tc_ring =k3_nav_ringacc_get_ring_id (uc->tchan->tc_ring);struct ti_sci_msg_rm_udmap_rx_ch_cfg req = {0 };struct ti_sci_msg_rm_udmap_flow_cfg flow_req = {0 };
@@ -1715,7 +1719,7 @@ static int udma_receive(struct dma *dma, void **dst, void *metadata)if (!uc->num_rx_bufs)return -EINVAL ; - ret =k3_nav_ringacc_ring_pop (uc->rchan->r_ring, &desc_rx); + ret =k3_nav_ringacc_ring_pop (uc->rflow->r_ring, &desc_rx);if (ret && ret != -ENODATA ) {dev_err (dma->dev,"rx dma fail ch_id:%lu %d\n" , dma->id, ret);return ret;
@@ -1833,7 +1837,7 @@ int udma_prepare_rcv_buf(struct dma *dma, void *dst, size_t size)ALIGN ((unsigned long )desc_rx + uc->config.hdesc_size, ARCH_DMA_MINALIGN)); -udma_push_to_ring (uc->rchan->fd_ring, desc_rx); +udma_push_to_ring (uc->rflow->fd_ring, desc_rx); uc->num_rx_bufs++; uc->desc_rx_cur++;
Signature · 1 line
2.27.0
Vignesh Raghavendra
maintainerPATCH 6/6 dma: ti: k3-udma: Switch to k3_ringacc_request_rings_pair
In reply to Vignesh RaghavendraWe only request ring pairs via K3 DMA driver, switch to use the new k3_ringacc_request_rings_pair() to simplify the code.
As a good side effect, all boot stages now use exposed RING mode which avoid maintaining proxy mode for 32 bit R5 core.
--- drivers/dma/ti/k3-udma.c | 52 ++++++++++++---------------------------- 1 file changed, 15 insertions(+), 37 deletions(-)
drivers/dma/ti/k3-udma.c +15 -37
@@ -32,12 +32,6 @@#include "k3-udma-hwdef.h" #include "k3-psil-priv.h" -#if BITS_PER_LONG ==64 -#define RINGACC_RING_USE_PROXY (0) -#else -#define RINGACC_RING_USE_PROXY (1) -#endif -#define K3_UDMA_MAX_RFLOWS 1024struct udma_chan ;
@@ -796,21 +790,14 @@ static int udma_alloc_tx_resources(struct udma_chan *uc)if (ret)return ret; - uc->tchan->t_ring =k3_nav_ringacc_request_ring ( - ud->ringacc, uc->tchan->id, -RINGACC_RING_USE_PROXY ); -if (!uc->tchan->t_ring) { + ret =k3_nav_ringacc_request_rings_pair (ud->ringacc, uc->tchan->id,-1 , + &uc->tchan->t_ring, + &uc->tchan->tc_ring); +if (ret) { ret = -EBUSY ; goto err_tx_ring; } - uc->tchan->tc_ring =k3_nav_ringacc_request_ring ( - ud->ringacc,-1 ,RINGACC_RING_USE_PROXY ); -if (!uc->tchan->tc_ring) { - ret = -EBUSY ; - goto err_txc_ring; - } -memset (&ring_cfg,0 ,sizeof (ring_cfg)); ring_cfg.size =16 ; ring_cfg.elm_size =K3_NAV_RINGACC_RING_ELSIZE_8 ;
@@ -827,7 +814,6 @@ static int udma_alloc_tx_resources(struct udma_chan *uc) err_ringcfg:k3_nav_ringacc_ring_free (uc->tchan->tc_ring); uc->tchan->tc_ring =NULL ; -err_txc_ring:k3_nav_ringacc_ring_free (uc->tchan->t_ring); uc->tchan->t_ring =NULL ; err_tx_ring:
@@ -857,6 +843,7 @@ static int udma_alloc_rx_resources(struct udma_chan *uc) {struct k3_nav_ring_cfg ring_cfg;struct udma_dev *ud = uc->ud; +struct udma_rflow *rflow;int fd_ring_id;int ret;
@@ -876,40 +863,31 @@ static int udma_alloc_rx_resources(struct udma_chan *uc) fd_ring_id = ud->tchan_cnt + ud->echan_cnt + uc->rchan->id; - uc->rflow->fd_ring =k3_nav_ringacc_request_ring ( - ud->ringacc, fd_ring_id, -RINGACC_RING_USE_PROXY ); -if (!uc->rflow->fd_ring) { + rflow = uc->rflow; + ret =k3_nav_ringacc_request_rings_pair (ud->ringacc, fd_ring_id,-1 , + &rflow->fd_ring, &rflow->r_ring); +if (ret) { ret = -EBUSY ; goto err_rx_ring; } - uc->rflow->r_ring =k3_nav_ringacc_request_ring ( - ud->ringacc,-1 ,RINGACC_RING_USE_PROXY ); -if (!uc->rflow->r_ring) { - ret = -EBUSY ; - goto err_rxc_ring; - } -memset (&ring_cfg,0 ,sizeof (ring_cfg)); ring_cfg.size =16 ; ring_cfg.elm_size =K3_NAV_RINGACC_RING_ELSIZE_8 ; ring_cfg.mode =K3_NAV_RINGACC_RING_MODE_RING ; - ret =k3_nav_ringacc_ring_cfg (uc->rflow->fd_ring, &ring_cfg); - ret |=k3_nav_ringacc_ring_cfg (uc->rflow->r_ring, &ring_cfg); - + ret =k3_nav_ringacc_ring_cfg (rflow->fd_ring, &ring_cfg); + ret |=k3_nav_ringacc_ring_cfg (rflow->r_ring, &ring_cfg);if (ret) goto err_ringcfg;return 0 ; err_ringcfg: -k3_nav_ringacc_ring_free (uc->rflow->r_ring); - uc->rflow->r_ring =NULL ; -err_rxc_ring: -k3_nav_ringacc_ring_free (uc->rflow->fd_ring); - uc->rflow->fd_ring =NULL ; +k3_nav_ringacc_ring_free (rflow->r_ring); + rflow->r_ring =NULL ; +k3_nav_ringacc_ring_free (rflow->fd_ring); + rflow->fd_ring =NULL ; err_rx_ring:udma_put_rflow (uc); err_rflow:
Signature · 1 line
2.27.0
cover TI: AM654/j721e: Ringacc and UDMA updates
In reply to Vignesh RaghavendraQuoted 14 lines · Vignesh Raghavendra
Align Ringacc and UDMA driver with kernel updates.
Depends on [1]
[1] https://patchwork.ozlabs.org/project/uboot/list/?series=186589
Vignesh Raghavendra (6):
soc: ti: k3-ringacc: Move state tracking variables under a struct
soc: ti: k3-ringacc: Add an API to request pair of rings
soc: ti: k3-ringacc: Separate soc specific initialization
dma: ti: k3-udma: Introduceudma_chan_configstruct
dma: ti: k3-udma: Move RX descriptor ring entries to rflow struct
dma: ti: k3-udma: Switch tok3_ringacc_request_rings_pair
Quoted 5 lines
drivers/dma/ti/k3-udma.c | 281 ++++++++++++------------ drivers/soc/ti/k3-navss-ringacc.c | 161 +++++++++----- include/linux/soc/ti/k3-navss-ringacc.h | 4 + 3 files changed, 254 insertions(+), 192 deletions(-)
Thank you.
Signature · 2 lines
Best regards, grygorii
cover TI: AM654/j721e: Ringacc and UDMA updates
In reply to Vignesh RaghavendraQuoted 5 lines · Vignesh Raghavendra
Align Ringacc and UDMA driver with kernel updates.
Depends on [1]
[1] https://patchwork.ozlabs.org/project/uboot/list/?series=186589
Applied to u-boot-ti.
Thanks and regards,
Lokesh
Quoted 14 lines
Vignesh Raghavendra (6):
soc: ti: k3-ringacc: Move state tracking variables under a struct
soc: ti: k3-ringacc: Add an API to request pair of rings
soc: ti: k3-ringacc: Separate soc specific initialization
dma: ti: k3-udma: Introduceudma_chan_configstruct
dma: ti: k3-udma: Move RX descriptor ring entries to rflow struct
dma: ti: k3-udma: Switch tok3_ringacc_request_rings_pairdrivers/dma/ti/k3-udma.c | 281 ++++++++++++------------ drivers/soc/ti/k3-navss-ringacc.c | 161 +++++++++----- include/linux/soc/ti/k3-navss-ringacc.h | 4 + 3 files changed, 254 insertions(+), 192 deletions(-)