common/cnxk: use aggregate level rr prio from mbox
PATCH 1/4 common/cnxk: use aggregate level rr prio from mbox
Use aggregate level Round Robin Priority from mbox response instead of fixing it to single macro. This is useful when kernel AF driver changes the constant.
--- drivers/common/cnxk/roc_nix_priv.h | 5 +++-- drivers/common/cnxk/roc_nix_tm.c | 3 ++- drivers/common/cnxk/roc_nix_tm_utils.c | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-)
drivers/common/cnxk/roc_nix_priv.h +3 -2
@@ -181,6 +181,7 @@ struct nix {uint16_t tm_root_lvl;uint16_t tm_flags;uint16_t tm_link_cfg_lvl; +uint8_t tm_aggr_lvl_rr_prio;uint16_t contig_rsvd[NIX_TXSCH_LVL_CNT ];uint16_t discontig_rsvd[NIX_TXSCH_LVL_CNT ];uint64_t tm_markfmt_en;
@@ -284,7 +285,6 @@ void nix_unregister_irqs(struct nix *nix);/* Default TL1 priority and Quantum from AF */ #define NIX_TM_TL1_DFLT_RR_QTM ((1 << 24) - 1) -#define NIX_TM_TL1_DFLT_RR_PRIO 1struct nix_tm_shaper_data {uint64_t burst_exponent;
@@ -432,7 +432,8 @@ bool nix_tm_child_res_valid(struct nix_tm_node_list *list, struct nix_tm_node *parent);uint16_t nix_tm_resource_estimate (struct nix *nix,uint16_t *schq_contig,uint16_t *schq,enum roc_nix_tm_tree tree); -uint8_t nix_tm_tl1_default_prep (uint32_t schq,volatile uint64_t *reg, +uint8_t nix_tm_tl1_default_prep (struct nix *nix,uint32_t schq, +volatile uint64_t *reg,volatile uint64_t *regval); uint8_t nix_tm_topology_reg_prep(struct nix *nix, struct nix_tm_node *node, volatile uint64_t *reg,
drivers/common/cnxk/roc_nix_tm.c +2 -1
@@ -55,7 +55,7 @@ nix_tm_node_reg_conf(struct nix *nix, struct nix_tm_node *node) req =mbox_alloc_msg_nix_txschq_cfg (mbox); req->lvl =NIX_TXSCH_LVL_TL1 ; - k =nix_tm_tl1_default_prep (node->parent_hw_id, req->reg, + k =nix_tm_tl1_default_prep (nix, node->parent_hw_id, req->reg, req->regval); req->num_regs = k; rc =mbox_process (mbox);
@@ -1281,6 +1281,7 @@ nix_tm_alloc_txschq(struct nix *nix, enum roc_nix_tm_tree tree) }while (pend); nix->tm_link_cfg_lvl = rsp->link_cfg_lvl; + nix->tm_aggr_lvl_rr_prio = rsp->aggr_lvl_rr_prio;return 0 ; alloc_err:for (i =0 ; i <NIX_TXSCH_LVL_CNT ; i++) {
drivers/common/cnxk/roc_nix_tm_utils.c +4 -4
@@ -478,7 +478,7 @@ nix_tm_child_res_valid(struct nix_tm_node_list *list, }uint8_t -nix_tm_tl1_default_prep (uint32_t schq,volatile uint64_t *reg, +nix_tm_tl1_default_prep (struct nix *nix,uint32_t schq,volatile uint64_t *reg,volatile uint64_t *regval) {uint8_t k =0 ;
@@ -496,7 +496,7 @@ nix_tm_tl1_default_prep(uint32_t schq, volatile uint64_t *reg, k++; reg[k] =NIX_AF_TL1X_TOPOLOGY (schq); - regval[k] = (NIX_TM_TL1_DFLT_RR_PRIO <<1 ); + regval[k] = (nix->tm_aggr_lvl_rr_prio <<1 ); k++; reg[k] =NIX_AF_TL1X_CIR (schq);
@@ -540,7 +540,7 @@ nix_tm_topology_reg_prep(struct nix *nix, struct nix_tm_node *node,* Static Priority is disabled */ if (hw_lvl ==NIX_TXSCH_LVL_TL1 && nix->tm_flags &NIX_TM_TL1_NO_SP ) { - rr_prio =NIX_TM_TL1_DFLT_RR_PRIO ; + rr_prio = nix->tm_aggr_lvl_rr_prio; child =0 ; }
@@ -662,7 +662,7 @@ nix_tm_sched_reg_prep(struct nix *nix, struct nix_tm_node *node,*/ if (hw_lvl ==NIX_TXSCH_LVL_TL2 && (!nix_tm_have_tl1_access (nix) || nix->tm_flags &NIX_TM_TL1_NO_SP )) - strict_prio =NIX_TM_TL1_DFLT_RR_PRIO ; + strict_prio = nix->tm_aggr_lvl_rr_prio; plt_tm_dbg("Schedule config node %s(%u) lvl %u id %u, " "prio 0x%" PRIx64 ", rr_quantum/rr_wt 0x%" PRIx64 " (%p)",
Signature · 1 line
2.8.4
PATCH 2/4 net/cnxk: support loopback mode on AF VF's
Support internal loopback mode on AF VF's using RoC by setting Tx channel same as Rx channel.
--- drivers/net/cnxk/cnxk_ethdev.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/net/cnxk/cnxk_ethdev.c +7 -0
@@ -1116,6 +1116,9 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) nb_rxq =RTE_MAX (data->nb_rx_queues,1 ); nb_txq =RTE_MAX (data->nb_tx_queues,1 ); +if (roc_nix_is_lbk (nix)) + nix->enable_loop = eth_dev->data->dev_conf.lpbk_mode; +/* Alloc a nix lf */ rc =roc_nix_lf_alloc (nix, nb_rxq, nb_txq, rx_cfg);if (rc) {
@@ -1239,6 +1242,9 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) } } +if (roc_nix_is_lbk (nix)) + goto skip_lbk_setup; +/* Configure loop back mode */ rc =roc_nix_mac_loopback_enable (nix, eth_dev->data->dev_conf.lpbk_mode);
@@ -1247,6 +1253,7 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev) goto cq_fini; } +skip_lbk_setup:/* Setup Inline security support */ rc =nix_security_setup (dev);if (rc)
Signature · 1 line
2.8.4
PATCH 3/4 net/cnxk: update LBK ethdev link info
In reply to Nithin DabilpuramUpdate link info of LBK ethdev i.e AF's VF's as always up and 100G. This is because there is no phy for the LBK interfaces and we won't get a link update notification for the same.
--- drivers/net/cnxk/cnxk_link.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/net/cnxk/cnxk_link.c +11 -0
@@ -12,6 +12,17 @@ cnxk_nix_toggle_flag_link_cfg(struct cnxk_eth_dev *dev, bool set)else dev->flags &= ~CNXK_LINK_CFG_IN_PROGRESS_F ; +/* Update link info for LBK */ +if (!set &&roc_nix_is_lbk (&dev->nix)) { +struct rte_eth_link link; + + link.link_status =RTE_ETH_LINK_UP ; + link.link_speed =RTE_ETH_SPEED_NUM_100G ; + link.link_autoneg =RTE_ETH_LINK_FIXED ; + link.link_duplex =RTE_ETH_LINK_FULL_DUPLEX ; +rte_eth_linkstatus_set (dev->eth_dev, &link); + } +rte_wmb (); }
Signature · 1 line
2.8.4
PATCH 4/4 net/cnxk: add barrier after meta batch free in scalar
In reply to Nithin DabilpuramAdd barrier after meta batch free in scalar routine when lmt lines are exactly full to make sure that next LMT line user in Tx only starts writing the lines only when previous stoerl's are complete.
--- drivers/net/cnxk/cn10k_rx.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/cnxk/cn10k_rx.h +4 -3
@@ -1007,10 +1007,11 @@ cn10k_nix_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts,plt_write64 ((wdata | nb_pkts), rxq->cq_door);/* Free remaining meta buffers if any */ -if (flags &NIX_RX_OFFLOAD_SECURITY_F && loff) { +if (flags &NIX_RX_OFFLOAD_SECURITY_F && loff)nix_sec_flush_meta (laddr, lmt_id + lnum, loff, aura_handle); -plt_io_wmb (); - } + +if (flags &NIX_RX_OFFLOAD_SECURITY_F ) +rte_io_wmb ();return nb_pkts; }
Signature · 1 line
2.8.4