event/octeontx: fix Rx adapter port id mapping

When octeontx event dev receives a packet for the event Rx adapter, the
mbuf port id should contain the appropriate ethdev id instead of
internal channel info.

Fixes: 45a914c5bd71 ("event/octeontx: support event Rx adapter")

Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Acked-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>

diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile
index 842927d..9ad44b0 100644 (file)
--- a/drivers/event/octeontx/Makefile
+++ b/drivers/event/octeontx/Makefile
@@ -13,7 +13,7 @@ CFLAGS += $(WERROR_FLAGS)
 CFLAGS += -I$(RTE_SDK)/drivers/mempool/octeontx/
 CFLAGS += -I$(RTE_SDK)/drivers/net/octeontx/
 
-LDLIBS += -lrte_eal -lrte_eventdev -lrte_mempool_octeontx
+LDLIBS += -lrte_eal -lrte_eventdev -lrte_mempool_octeontx -lrte_pmd_octeontx
 LDLIBS += -lrte_bus_pci
 LDLIBS += -lrte_bus_vdev
 

diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h
index f165242..d55018a 100644 (file)
--- a/drivers/event/octeontx/ssovf_worker.h
+++ b/drivers/event/octeontx/ssovf_worker.h
@@ -24,7 +24,7 @@ enum {
 /* SSO Operations */
 
 static __rte_always_inline struct rte_mbuf *
-ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_id)
+ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info)
 {
        struct rte_mbuf *mbuf;
        octtx_wqe_t *wqe = (octtx_wqe_t *)(uintptr_t)work;
@@ -40,7 +40,7 @@ ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_id)
        mbuf->data_len = mbuf->pkt_len;
        mbuf->nb_segs = 1;
        mbuf->ol_flags = 0;
-       mbuf->port = port_id;
+       mbuf->port = rte_octeontx_pchan_map[port_info >> 4][port_info & 0xF];
        rte_mbuf_refcnt_set(mbuf, 1);
        return mbuf;
 }
@@ -60,7 +60,7 @@ ssows_get_work(struct ssows *ws, struct rte_event *ev)
        ev->event = sched_type_queue | (get_work0 & 0xffffffff);
        if (get_work1 && ev->event_type == RTE_EVENT_TYPE_ETHDEV) {
                ev->mbuf = ssovf_octeontx_wqe_to_pkt(get_work1,
-                               (ev->event >> 20) & 0xF);
+                               (ev->event >> 20) & 0x7F);
        } else {
                ev->u64 = get_work1;
        }