X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=o-du%2Fphy.git;a=blobdiff_plain;f=fhi_lib%2Flib%2Fethernet%2Fethdi.h;fp=fhi_lib%2Flib%2Fethernet%2Fethdi.h;h=1e5d4f5f6e43c4096fefb6b9e5d416753bd9499c;hp=d47dd76ab002e0ab5c172cb1ed06f460f4638912;hb=70d9d920dd4e575f085f1f1a9050fefd1c10e127;hpb=331df2273a6667941167c9bcc141a517369bdf43

diff --git a/fhi_lib/lib/ethernet/ethdi.h b/fhi_lib/lib/ethernet/ethdi.h
index d47dd76..1e5d4f5 100644
--- a/fhi_lib/lib/ethernet/ethdi.h
+++ b/fhi_lib/lib/ethernet/ethdi.h
@@ -51,10 +51,6 @@ extern "C" {
 
 #define XRAN_THREAD_DEFAULT_PRIO (98)
 
-/* How often to ping? */
-#define PING_INTERVAL 300   /* (us) */
-#define PING_BUSY_POLL 50   /* (us) how long to actively wait for response */
-
 /* If we're not receiving packets for more then this threshold... */
 //#define SLEEP_THRESHOLD (rte_get_tsc_hz() / 30)    /* = 33.3(3)ms */
 /* we go to sleep for this long (usleep). Undef SLEEP_TRESHOLD to disable. */
@@ -64,72 +60,47 @@ extern "C" {
 #define TX_TIMER_INTERVAL ((rte_get_timer_hz() / 1000000000L)*interval_us*1000) /* nanosec */
 #define TX_RX_LOOP_TIME rte_get_timer_hz() / 1
 
-enum xran_ping_states
-{
-    PING_IDLE,
-    PING_NEEDED,
-    AWAITING_PONG
-};
-
-enum xran_ethdi_vf_ports
-{
-    ETHDI_UP_VF = 0,
-    ETHDI_CP_VF,
-    ETHDI_VF_MAX
-};
-
-struct xran_io_loop_cfg
-{
-    uint8_t id;
-    char *dpdk_dev[ETHDI_VF_MAX];
-    char *bbdev_dev[1];
-    int bbdev_mode;
-    int core;
-    int system_core;    /* Needed as DPDK will change your starting core. */
-    int pkt_proc_core;  /* Needed for packet processing thread. */
-    int pkt_aux_core;   /* Needed for packet dumping for debug purposes. */
-    int timing_core;    /* Needed for getting precise time */
-    int port[ETHDI_VF_MAX];           /* This is auto-detected, no need to set. */
-};
-
 /* CAUTION: Keep in sync with the string table below. */
 enum xran_entities_id
 {
-    ID_LLS_CU,
-    ID_RU,
+    ID_O_DU,
+    ID_O_RU,
     ID_BROADCAST,
     ID_MAX
 };
 
 static char *const entity_names[] = {
-    "xRAN lls-CU sim app",
-    "xRAN RU sim app",
+    "ORAN O-DU sim app",
+    "ORAN O-RU sim app",
 };
 
 typedef int (*PROCESS_CB)(void * arg);
 
+/**
+ * Structure storing internal configuration of workers
+ */
+struct xran_worker_config {
+    lcore_function_t *f;
+    void *arg;
+    int32_t state;
+};
+
 struct xran_ethdi_ctx
 {
-    struct xran_io_loop_cfg io_cfg;
-    struct ether_addr entities[ID_BROADCAST + 1];
-    uint8_t ping_state;
-    int ping_times;
-    int known_peers;
-
-    struct rte_ring *tx_ring[ETHDI_VF_MAX];
-    struct rte_ring *rx_ring[ETHDI_VF_MAX];
-    struct rte_ring *pkt_dump_ring[ETHDI_VF_MAX];
+    struct xran_io_cfg io_cfg;
+    struct rte_ether_addr entities[XRAN_VF_MAX][ID_BROADCAST + 1];
+
+    struct rte_ring *tx_ring[XRAN_VF_MAX];
+    struct rte_ring *rx_ring[XRAN_VF_MAX];
+    struct rte_ring *pkt_dump_ring[XRAN_VF_MAX];
     struct rte_timer timer_autodetect;
     struct rte_timer timer_ping;
     struct rte_timer timer_sync;
     struct rte_timer timer_tx;
 
-    uint64_t busy_poll_till;
+    struct xran_worker_config pkt_wrk_cfg[RTE_MAX_LCORE];
 
     unsigned pkt_stats[PKT_LAST + 1];
-
-    uint16_t cp_vtag;
-    uint16_t up_vtag;
 };
 
 enum {
@@ -138,8 +109,6 @@ enum {
 };
 
 extern enum xran_if_state xran_if_current_state;
-extern uint8_t ping_dst_id;
-extern struct ether_addr entities_addrs[];
 
 static inline struct xran_ethdi_ctx *xran_ethdi_get_ctx(void)
 {
@@ -151,27 +120,19 @@ typedef int (*xran_ethdi_handler)(struct rte_mbuf *, int sender, uint64_t rx_tim
 
 typedef int (*ethertype_handler)(struct rte_mbuf *, uint64_t rx_time);
 typedef int (*xran_ethdi_handler)(struct rte_mbuf *, int sender, uint64_t rx_time);
-typedef void (xran_ethdi_tx_callback)(struct rte_timer *tim, void *arg);
-
 
 int xran_register_ethertype_handler(uint16_t ethertype, ethertype_handler callback);
 
+int32_t xran_ethdi_init_dpdk_io(char *name, const struct xran_io_cfg *io_cfg,
+    int *lcore_id, struct rte_ether_addr *p_o_du_addr,
+    struct rte_ether_addr *p_ru_addr);
 
-int xran_ethdi_init_dpdk_io(char *name, const struct xran_io_loop_cfg *io_cfg,
-    int *lcore_id, struct ether_addr *p_lls_cu_addr, struct ether_addr *p_ru_addr,
-    uint16_t cp_vlan, uint16_t up_vlan);
 struct rte_mbuf *xran_ethdi_mbuf_alloc(void);
-int xran_ethdi_mbuf_send(struct rte_mbuf *mb, uint16_t ethertype);
-int xran_ethdi_mbuf_send_cp(struct rte_mbuf *mb, uint16_t ethertype);
-#if 0
-void xran_ethdi_stop_tx(void);
-void xran_ethdi_ports_stats(void);
-int xran_ethdi_dpdk_io_loop(void *);
-#endif
-int xran_ethdi_filter_packet(struct rte_mbuf *pkt, uint64_t rx_time);
+int32_t xran_ethdi_mbuf_send(struct rte_mbuf *mb, uint16_t ethertype, uint16_t vf_id);
+int32_t xran_ethdi_mbuf_send_cp(struct rte_mbuf *mb, uint16_t ethertype, uint16_t vf_id);
+int32_t xran_ethdi_filter_packet(struct rte_mbuf *pkt, uint64_t rx_time);
 int32_t process_dpdk_io(void);
 
-
 #ifdef __cplusplus
 }
 #endif