From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22DBD42ECF for ; Thu, 20 Jul 2023 17:25:31 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E63442BAC; Thu, 20 Jul 2023 17:25:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DD18F40685 for ; Thu, 20 Jul 2023 17:25:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DgpiGy7dP4Gv6p2bT8z7L0tj0oVQUMeh5wYX9nxVJsE=; b=XpWZBmxxb05RX7xLksN4Qg9aJCkBoQ3nP8ZnsJqy9XnOfdpGbxCnp7UI1s6P/YA1yrYam0 JnBdyfDGYwgTmeAtPH21nlYM76hpfX7aj3X3FZ0zsCYZahcm0AlAXnVmud+zTpFa97pSxT ZtTdn7N59hAd7bsMmdBv5dnfYxk+jxY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-433-lWbN4uJgOj-bR6uMHE7eig-1; Thu, 20 Jul 2023 11:20:42 -0400 X-MC-Unique: lWbN4uJgOj-bR6uMHE7eig-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A6B0B88D125; Thu, 20 Jul 2023 15:20:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A0424A9004; Thu, 20 Jul 2023 15:20:20 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix nanoseconds to ticks conversion' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:17:30 +0100 Message-ID: <20230720151942.262154-19-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/15aac364505471ddb651c525d81d3165bf1bafd5 Thanks. Kevin --- >From 15aac364505471ddb651c525d81d3165bf1bafd5 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Wed, 24 May 2023 14:22:32 +0530 Subject: [PATCH] event/cnxk: fix nanoseconds to ticks conversion [ upstream commit 8fecf1febf2c7914f642c50bc03f7860c1787426 ] The number of timeout ticks is dependent on the global dequeue timeout configured. Fixes: 6223ede20361 ("event/cnxk: add event port link and unlink") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cnxk_eventdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index d543fdd14e..74bf39205a 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -357,7 +357,7 @@ cnxk_sso_timeout_ticks(struct rte_eventdev *event_dev, uint64_t ns, uint64_t *tmo_ticks) { - RTE_SET_USED(event_dev); - *tmo_ticks = NSEC2TICK(ns, rte_get_timer_hz()); + struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); + *tmo_ticks = dev->deq_tmo_ns ? ns / dev->deq_tmo_ns : 0; return 0; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:17:57.462305889 +0100 +++ 0019-event-cnxk-fix-nanoseconds-to-ticks-conversion.patch 2023-07-20 16:17:54.466749711 +0100 @@ -1 +1 @@ -From 8fecf1febf2c7914f642c50bc03f7860c1787426 Mon Sep 17 00:00:00 2001 +From 15aac364505471ddb651c525d81d3165bf1bafd5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8fecf1febf2c7914f642c50bc03f7860c1787426 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 99f9cdcd0d..3a05a59c75 100644 +index d543fdd14e..74bf39205a 100644 @@ -21 +22 @@ -@@ -324,7 +324,7 @@ cnxk_sso_timeout_ticks(struct rte_eventdev *event_dev, uint64_t ns, +@@ -357,7 +357,7 @@ cnxk_sso_timeout_ticks(struct rte_eventdev *event_dev, uint64_t ns,