From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B73E8A0613 for ; Tue, 27 Aug 2019 11:31:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AD24454AE; Tue, 27 Aug 2019 11:31:34 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E44ED54AE for ; Tue, 27 Aug 2019 11:31:32 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5F73BC0568FA; Tue, 27 Aug 2019 09:31:32 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2E4705C1B2; Tue, 27 Aug 2019 09:31:30 +0000 (UTC) From: Kevin Traynor To: Dilshod Urazov Cc: Andrew Rybchenko , David Marchand , dpdk stable Date: Tue, 27 Aug 2019 10:30:11 +0100 Message-Id: <20190827093032.20423-34-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 27 Aug 2019 09:31:32 +0000 (UTC) Subject: [dpdk-stable] patch 'event/opdl: fix error sign' has been queued to LTS release 18.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 09/03/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/f60244c41401dd933962d60a1ae9098ccdcf5bd3 Thanks. Kevin Traynor --- >From f60244c41401dd933962d60a1ae9098ccdcf5bd3 Mon Sep 17 00:00:00 2001 From: Dilshod Urazov Date: Thu, 4 Jul 2019 11:03:32 +0100 Subject: [PATCH] event/opdl: fix error sign [ upstream commit db8bdaeccab9161dd4058e1902458f860fd48c1e ] Fixes: 0bf298e39286 ("event/opdl: add event port config get/set") Fixes: 3c7f3dcfb099 ("event/opdl: add PMD main body and helper function") Fixes: 4236ce9bf5bf ("event/opdl: add OPDL ring infrastructure library") Signed-off-by: Dilshod Urazov Signed-off-by: Andrew Rybchenko Reviewed-by: David Marchand --- drivers/event/opdl/opdl_evdev.c | 10 +++++----- drivers/event/opdl/opdl_evdev_init.c | 12 ++++++------ drivers/event/opdl/opdl_ring.c | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/event/opdl/opdl_evdev.c b/drivers/event/opdl/opdl_evdev.c index d2d2be44b..3beca8957 100644 --- a/drivers/event/opdl/opdl_evdev.c +++ b/drivers/event/opdl/opdl_evdev.c @@ -103,5 +103,5 @@ opdl_port_link(struct rte_eventdev *dev, queues[0], p->id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } @@ -114,5 +114,5 @@ opdl_port_link(struct rte_eventdev *dev, num, p->id); - rte_errno = -EDQUOT; + rte_errno = EDQUOT; return 0; } @@ -124,5 +124,5 @@ opdl_port_link(struct rte_eventdev *dev, p->id, queues[0]); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } @@ -135,5 +135,5 @@ opdl_port_link(struct rte_eventdev *dev, p->external_qid, queues[0]); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } @@ -161,5 +161,5 @@ opdl_port_unlink(struct rte_eventdev *dev, queues[0], p->id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } diff --git a/drivers/event/opdl/opdl_evdev_init.c b/drivers/event/opdl/opdl_evdev_init.c index 582ad698f..15aae4752 100644 --- a/drivers/event/opdl/opdl_evdev_init.c +++ b/drivers/event/opdl/opdl_evdev_init.c @@ -36,5 +36,5 @@ enqueue_check(struct opdl_port *p, ev[i].queue_id, p->next_external_qid); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } @@ -64,5 +64,5 @@ enqueue_check(struct opdl_port *p, if (num > 0 && ev[0].queue_id != p->next_external_qid) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } @@ -117,5 +117,5 @@ opdl_rx_error_enqueue(struct opdl_port *p, RTE_SET_USED(num); - rte_errno = -ENOSPC; + rte_errno = ENOSPC; return 0; @@ -146,5 +146,5 @@ opdl_rx_enqueue(struct opdl_port *p, if (enqueued < num) - rte_errno = -ENOSPC; + rte_errno = ENOSPC; return enqueued; @@ -165,5 +165,5 @@ opdl_tx_error_dequeue(struct opdl_port *p, RTE_SET_USED(num); - rte_errno = -ENOSPC; + rte_errno = ENOSPC; return 0; @@ -241,5 +241,5 @@ opdl_claim(struct opdl_port *p, struct rte_event ev[], uint16_t num) opdl_pmd_dev_id(p->opdl), p->id); - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } diff --git a/drivers/event/opdl/opdl_ring.c b/drivers/event/opdl/opdl_ring.c index 8aca481c9..c0bc4b008 100644 --- a/drivers/event/opdl/opdl_ring.c +++ b/drivers/event/opdl/opdl_ring.c @@ -756,5 +756,5 @@ opdl_stage_disclaim(struct opdl_stage *s, uint32_t num_entries, bool block) { if (num_entries != s->num_event) { - rte_errno = -EINVAL; + rte_errno = EINVAL; return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-08-27 09:40:12.775822849 +0100 +++ 0034-event-opdl-fix-error-sign.patch 2019-08-27 09:40:10.923144315 +0100 @@ -1 +1 @@ -From db8bdaeccab9161dd4058e1902458f860fd48c1e Mon Sep 17 00:00:00 2001 +From f60244c41401dd933962d60a1ae9098ccdcf5bd3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit db8bdaeccab9161dd4058e1902458f860fd48c1e ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -106 +107 @@ -index e988f1cb2..e8b29e2c7 100644 +index 8aca481c9..c0bc4b008 100644 @@ -109 +110 @@ -@@ -757,5 +757,5 @@ opdl_stage_disclaim(struct opdl_stage *s, uint32_t num_entries, bool block) +@@ -756,5 +756,5 @@ opdl_stage_disclaim(struct opdl_stage *s, uint32_t num_entries, bool block)