[dpdk-stable] patch 'event/octeontx: fix Rx adapter port id mapping' has been queued to LTS release 17.11.1
Yuanhan Liu
yliu at fridaylinux.org
Fri Jan 26 17:00:29 CET 2018
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 <pbhagavatula at caviumnetworks.com>
> 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 <pbhagavatula at caviumnetworks.com>
> Acked-by: Santosh Shukla <santosh.shukla at caviumnetworks.com>
> ---
> 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
More information about the stable
mailing list