examples/l3fwd: share queue size variables

[dpdk.git] / drivers / event / cnxk / cnxk_eventdev.h

diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h
index b57004c..5564746 100644 (file)
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -38,15 +38,15 @@
 #define CNXK_SSO_XAQ_CACHE_CNT (0x7)
 #define CNXK_SSO_XAQ_SLACK     (8)
 #define CNXK_SSO_WQE_SG_PTR    (9)
-#define CNXK_SSO_SQB_LIMIT     (0x180)
 
 #define CNXK_TT_FROM_TAG(x)        (((x) >> 32) & SSO_TT_EMPTY)
 #define CNXK_TT_FROM_EVENT(x)      (((x) >> 38) & SSO_TT_EMPTY)
 #define CNXK_EVENT_TYPE_FROM_TAG(x) (((x) >> 28) & 0xf)
 #define CNXK_SUB_EVENT_FROM_TAG(x)  (((x) >> 20) & 0xff)
-#define CNXK_CLR_SUB_EVENT(x)      (~(0xffu << 20) & x)
+#define CNXK_CLR_SUB_EVENT(x)      (~(0xffull << 20) & x)
 #define CNXK_GRP_FROM_TAG(x)       (((x) >> 36) & 0x3ff)
 #define CNXK_SWTAG_PEND(x)         (BIT_ULL(62) & x)
+#define CNXK_TAG_IS_HEAD(x)        (BIT_ULL(35) & x)
 
 #define CN9K_SSOW_GET_BASE_ADDR(_GW) ((_GW)-SSOW_LF_GWS_OP_GET_WORK0)
 
@@ -61,7 +61,7 @@
        } while (0)
 
 typedef void *(*cnxk_sso_init_hws_mem_t)(void *dev, uint8_t port_id);
-typedef void (*cnxk_sso_hws_setup_t)(void *dev, void *ws, uintptr_t *grp_base);
+typedef void (*cnxk_sso_hws_setup_t)(void *dev, void *ws, uintptr_t grp_base);
 typedef void (*cnxk_sso_hws_release_t)(void *dev, void *ws);
 typedef int (*cnxk_sso_link_t)(void *dev, void *ws, uint16_t *map,
                               uint16_t nb_link);
@@ -74,9 +74,9 @@ typedef void (*cnxk_sso_hws_flush_t)(void *ws, uint8_t queue_id, uintptr_t base,
 
 struct cnxk_sso_qos {
        uint16_t queue;
-       uint8_t xaq_prcnt;
-       uint8_t taq_prcnt;
-       uint8_t iaq_prcnt;
+       uint16_t xaq_prcnt;
+       uint16_t taq_prcnt;
+       uint16_t iaq_prcnt;
 };
 
 struct cnxk_sso_evdev {
@@ -91,18 +91,18 @@ struct cnxk_sso_evdev {
        uint32_t min_dequeue_timeout_ns;
        uint32_t max_dequeue_timeout_ns;
        int32_t max_num_events;
-       uint64_t *fc_mem;
        uint64_t xaq_lmt;
-       uint64_t nb_xaq_cfg;
        rte_iova_t fc_iova;
-       struct rte_mempool *xaq_pool;
        uint64_t rx_offloads;
        uint64_t tx_offloads;
        uint64_t adptr_xae_cnt;
        uint16_t rx_adptr_pool_cnt;
        uint64_t *rx_adptr_pools;
        uint64_t *tx_adptr_data;
+       size_t tx_adptr_data_sz;
        uint16_t max_port_id;
+       uint16_t max_queue_id[RTE_MAX_ETHPORTS];
+       uint8_t tx_adptr_configured;
        uint16_t tim_adptr_ring_cnt;
        uint16_t *timer_adptr_rings;
        uint64_t *timer_adptr_sz;
@@ -123,6 +123,7 @@ struct cnxk_sso_evdev {
 
 struct cn10k_sso_hws {
        uint64_t base;
+       uint64_t gw_rdata;
        /* PTP timestamp */
        struct cnxk_timesync_info *tstamp;
        void *lookup_mem;
@@ -132,26 +133,17 @@ struct cn10k_sso_hws {
        /* Add Work Fastpath data */
        uint64_t xaq_lmt __rte_cache_aligned;
        uint64_t *fc_mem;
-       uintptr_t grps_base[CNXK_SSO_MAX_HWGRP];
+       uintptr_t grp_base;
        /* Tx Fastpath data */
-       uint64_t tx_base __rte_cache_aligned;
-       uintptr_t lmt_base;
+       uintptr_t lmt_base __rte_cache_aligned;
+       uint64_t lso_tun_fmt;
        uint8_t tx_adptr_data[];
 } __rte_cache_aligned;
 
-/* CN9K HWS ops */
-#define CN9K_SSO_HWS_OPS                                                       \
-       uintptr_t swtag_desched_op;                                            \
-       uintptr_t swtag_flush_op;                                              \
-       uintptr_t swtag_norm_op;                                               \
-       uintptr_t getwrk_op;                                                   \
-       uintptr_t tag_op;                                                      \
-       uintptr_t wqp_op
-
 /* Event port a.k.a GWS */
 struct cn9k_sso_hws {
-       /* Get Work Fastpath data */
-       CN9K_SSO_HWS_OPS;
+       uint64_t base;
+       uint64_t gw_wdata;
        /* PTP timestamp */
        struct cnxk_timesync_info *tstamp;
        void *lookup_mem;
@@ -160,19 +152,15 @@ struct cn9k_sso_hws {
        /* Add Work Fastpath data */
        uint64_t xaq_lmt __rte_cache_aligned;
        uint64_t *fc_mem;
-       uintptr_t grps_base[CNXK_SSO_MAX_HWGRP];
+       uintptr_t grp_base;
        /* Tx Fastpath data */
-       uint64_t base __rte_cache_aligned;
+       uint64_t lso_tun_fmt __rte_cache_aligned;
        uint8_t tx_adptr_data[];
 } __rte_cache_aligned;
 
-struct cn9k_sso_hws_state {
-       CN9K_SSO_HWS_OPS;
-};
-
 struct cn9k_sso_hws_dual {
-       /* Get Work Fastpath data */
-       struct cn9k_sso_hws_state ws_state[2]; /* Ping and Pong */
+       uint64_t base[2]; /* Ping and Pong */
+       uint64_t gw_wdata;
        /* PTP timestamp */
        struct cnxk_timesync_info *tstamp;
        void *lookup_mem;
@@ -182,9 +170,9 @@ struct cn9k_sso_hws_dual {
        /* Add Work Fastpath data */
        uint64_t xaq_lmt __rte_cache_aligned;
        uint64_t *fc_mem;
-       uintptr_t grps_base[CNXK_SSO_MAX_HWGRP];
+       uintptr_t grp_base;
        /* Tx Fastpath data */
-       uint64_t base[2] __rte_cache_aligned;
+       uint64_t lso_tun_fmt __rte_cache_aligned;
        uint8_t tx_adptr_data[];
 } __rte_cache_aligned;