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 C8EA6A04B1 for ; Thu, 5 Nov 2020 13:41:14 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B564FC7F2; Thu, 5 Nov 2020 13:41:13 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 0292DC31B for ; Thu, 5 Nov 2020 13:41:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580070; 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=Q+cAn2xDOBu8sTD7/8QnmJN5/qMc6M4e3bHqzeMAqUU=; b=HUKCzR8qsIzx5VoUVJf0m2Hn7CsFhyL+I65t9WKYPDWFG+SJ83r0rnIKVCoOFUIA4QBXZB cFQ6dER9P7zf6VuiJXY0Lsn+KJ22mIzTkZP4bn30TVqlBiYjbNuVnxQv/wDophSPwjlu/J gkuwOIBjMhu9H/Ehg5TIFuMQOGcISj0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-N03OAYnGNdyU4VcGgF_usQ-1; Thu, 05 Nov 2020 07:41:07 -0500 X-MC-Unique: N03OAYnGNdyU4VcGgF_usQ-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7AC48186DD24; Thu, 5 Nov 2020 12:41:06 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F4215C629; Thu, 5 Nov 2020 12:41:05 +0000 (UTC) From: Kevin Traynor To: Devendra Singh Rawat Cc: Igor Russkikh , Rasesh Mody , dpdk stable Date: Thu, 5 Nov 2020 12:39:27 +0000 Message-Id: <20201105124015.306404-20-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. 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/fca5fea01594d379867068fe45924b092b9deed4 Thanks. Kevin. --- >From fca5fea01594d379867068fe45924b092b9deed4 Mon Sep 17 00:00:00 2001 From: Devendra Singh Rawat Date: Mon, 27 Jul 2020 19:46:44 +0530 Subject: [PATCH] net/qede: fix milliseconds sleep macro [ upstream commit 91979430089bf897881238a168b631f1a81c5477 ] The macro defined for milliseconds sleep was not putting the thread to sleep and was simply calling a delay routine. This fix redefines the macro to call the correct rte sleep API. Fixes: ec94dbc57362 ("qede: add base driver") Signed-off-by: Devendra Singh Rawat Signed-off-by: Igor Russkikh Signed-off-by: Rasesh Mody --- drivers/net/qede/base/bcm_osal.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/qede/base/bcm_osal.h b/drivers/net/qede/base/bcm_osal.h index 1abf44fa72..37b55244ae 100644 --- a/drivers/net/qede/base/bcm_osal.h +++ b/drivers/net/qede/base/bcm_osal.h @@ -82,7 +82,6 @@ typedef int bool; #define DELAY(x) rte_delay_us(x) #define usec_delay(x) DELAY(x) -#define msec_delay(x) DELAY(1000 * (x)) #define OSAL_UDELAY(time) usec_delay(time) -#define OSAL_MSLEEP(time) msec_delay(time) +#define OSAL_MSLEEP(time) rte_delay_us_sleep(1000 * (time)) /* Memory allocations and deallocations */ -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.633976128 +0000 +++ 0020-net-qede-fix-milliseconds-sleep-macro.patch 2020-11-05 12:38:54.181895974 +0000 @@ -1 +1 @@ -From 91979430089bf897881238a168b631f1a81c5477 Mon Sep 17 00:00:00 2001 +From fca5fea01594d379867068fe45924b092b9deed4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 91979430089bf897881238a168b631f1a81c5477 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5d4df5907a..ded4fb0f57 100644 +index 1abf44fa72..37b55244ae 100644 @@ -24 +25 @@ -@@ -82,7 +82,6 @@ typedef intptr_t osal_int_ptr_t; +@@ -82,7 +82,6 @@ typedef int bool;