New upstream version 17.11.1

[deb_dpdk.git] / drivers / event / octeontx / ssovf_worker.h

diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h
index bf76ac8..4c9a4c4 100644 (file)
--- a/drivers/event/octeontx/ssovf_worker.h
+++ b/drivers/event/octeontx/ssovf_worker.h
@@ -53,7 +53,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;
@@ -69,7 +69,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;
 }
@@ -89,7 +89,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;
        }