From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 45B5D1B173 for ; Wed, 24 Jan 2018 16:39:08 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id F17C92242D; Wed, 24 Jan 2018 10:39:07 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Wed, 24 Jan 2018 10:39:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=LN9YhZzh2VSmGyMoj 0RfN+rME61//APCY0kkgPUfvuo=; b=dbwulhzVMYRkJ+z0zG6q/EK+tghHNxryn 4DTk7g4bPlhGNoRClSOSMNRYm/H+CULUFCLBgEu6Wptk6VpEgucbxbY5aT2pGn8c /5jKekeyxHD/YeZtOJhQpzSEnx1FVI55Lq2z6X8zHXs5rgf6ZCTunIsiEuntWrNI rNOXawqiSjkiL4DHxxjl4Q6kRxV3prHrNDP5GWSK/6l98awdrLjRThdrzs5CX7kY 4hWARd7EpApELhc5xx+wJ8YVeQss3mJjhRGB+3BvDr73YElxUYkrYWy58K74+mbQ lgZqYlCS6fRCBGj8t09vKD7Za0iLOLcH3b0TtuYijytcoxh2Ss8Uw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=LN9YhZzh2VSmGyMoj0RfN+rME61//APCY0kkgPUfvuo=; b=Vbiv2EfO eMdqSaZ2U/RF/tXV3v1UIP2dLz9pPFep+zABa5XoJyr99rTID76SbpR1II6PXsGu 8pv32VdsuHB2dmwMwwf4OwEUeU7GvYa6T0i3nJ/fjdNIHuZTjmnBgXdjmDjIZyEF EJbtw0DtcfCZaweS00LMSXc35f4AlzpMbpDvotQfOPA/6uOXF0eCpdJQ0FjhI0Ln EZ4H1qiJFVuoxRWKSe3rMCjEm6SQN8wENOYMA45AAEIYCjLtuNyZucS4ztuNC4br GJi9+tyTCvZaCkxLGnktiQesjt+gbYqK4QiIt6obvyedC1TJZxlRkYumY5bRmoei 5K/gYGt9V5sHkg== X-ME-Sender: Received: from localhost.localdomain (unknown [115.150.27.206]) by mail.messagingengine.com (Postfix) with ESMTPA id D3CC37E354; Wed, 24 Jan 2018 10:39:05 -0500 (EST) From: Yuanhan Liu To: Pavan Nikhilesh Cc: Santosh Shukla , dpdk stable Date: Wed, 24 Jan 2018 23:32:20 +0800 Message-Id: <1516808026-25523-72-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> References: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'event/octeontx: fix Rx adapter port id mapping' has been queued to LTS release 17.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Jan 2018 15:39:08 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 01/26/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 3ab8effa1fd5b07c88688ff14e816e0a314d7778 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Tue, 19 Dec 2017 23:31:45 +0530 Subject: [PATCH] event/octeontx: fix Rx adapter port id mapping [ upstream commit 9b4298339652c5f4c3a1391ed26caa5bbb26c158 ] 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 Acked-by: Santosh Shukla --- drivers/event/octeontx/Makefile | 2 +- drivers/event/octeontx/ssovf_worker.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/event/octeontx/Makefile b/drivers/event/octeontx/Makefile index fdf1b73..2604412 100644 --- a/drivers/event/octeontx/Makefile +++ b/drivers/event/octeontx/Makefile @@ -41,7 +41,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 bf76ac8..4c9a4c4 100644 --- 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; } -- 2.7.4