From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id B46321B2FD for ; Fri, 26 Jan 2018 17:00:37 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 46DAF211EC; Fri, 26 Jan 2018 11:00:37 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Fri, 26 Jan 2018 11:00:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=aktmjhIswYW+GckJF NtN1aL3tO5x0rJKt5I6qS8HXPk=; b=XyoBh94xlYe90sMyMfXyMzcCnfDC6j8bc PR7d8aR8NIbLtny56CcM2YmUjGdwOFNZWq76oOklTYnKGHBDpG/NIv5eSiyUrwgI E1mg4WR9h0qhwC2j/wtiU4ju1QEJ3rKPVXQxmiSylIJ8Stc8n0GhcuXzgtcTVS7l 1c5DUGQNhFWx68Vg2Bd7djebfKkDpxJJ/iJIK6e4IdJPzfCbh20K+Y5DhJJAt0fO b0D2KIAbbnccx16Jq3VHDMONhL/sYDvY1ZYZFGwQT9Uj1PIZeIWTALJO1qR1/9MI g21421l6M0Vo64oh04fKobZELY+Cp7P21Nv7amlmjO5e9yIrgEkGg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=aktmjh IswYW+GckJFNtN1aL3tO5x0rJKt5I6qS8HXPk=; b=Jw/FrCh/db2MkGR9Z6qdTx KmOXi/1CZG+lHiRkEHxDxJ3+eOdQLQiX8+N6pJ7d3SyCvUW4p1YACRfmMif1t8ML mt2bRpvUXFUQMvrd6w8laKBjPqmFIZCYCM/l+suGc3E4djO5e9ljercqBkaecnSP y3oB52b1Gv+UNFmheHjjEnhfXz35vQDT3xNQtBJay8xdjL/48Dd1QMyj/WAlcZwt 9mMqS2VbRkQ5uOX3hICs+9Il6caaomJfhOl1jaJGcP2nQ4vYkpdaqU8ykSnI7Ot4 xhXjSJmqaq4ng9fcV/slgCi3UnINfc4EIFbfC5EdZzP4gRoVX5nofL8/UgOdcslg == X-ME-Sender: Received: from yliu-mob (unknown [182.84.185.39]) by mail.messagingengine.com (Postfix) with ESMTPA id CA0797E46B; Fri, 26 Jan 2018 11:00:34 -0500 (EST) Date: Sat, 27 Jan 2018 00:00:29 +0800 From: Yuanhan Liu To: Pavan Nikhilesh Cc: Santosh Shukla , dpdk stable Message-ID: <20180126160029.GH29540@yliu-mob> References: <1516808026-25523-1-git-send-email-yliu@fridaylinux.org> <1516808026-25523-72-git-send-email-yliu@fridaylinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1516808026-25523-72-git-send-email-yliu@fridaylinux.org> User-Agent: Mutt/1.5.24 (2015-08-30) Subject: Re: [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: Fri, 26 Jan 2018 16:00:38 -0000 On Wed, Jan 24, 2018 at 11:32:20PM +0800, Yuanhan Liu wrote: > 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. I met an build error with this one: error: ‘rte_octeontx_pchan_map ’ undeclared (first use in this function) This patch is then dropped. If you think it's needed for 17.11.1 LTS release, please do a backport. And sorry for the late notice: it was my fault, I should have done the build before sending it out. --yliu > > 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