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 91FDDA04DD for ; Wed, 28 Oct 2020 11:49:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 76965C9FE; Wed, 28 Oct 2020 11:49:31 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id AF59AC9F0 for ; Wed, 28 Oct 2020 11:49:29 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id t9so5117309wrq.11 for ; Wed, 28 Oct 2020 03:49:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1weyHY8TIjJ5s5xM3IV4z/3kKoyjVhlI6OuOVTUnAds=; b=K91956al5JSbulvjW3CWGIR5MluXaSjkmZFVgHOXxMFj2bDevqu9NA4F3QCYEZEtAk qP/hCDZJyJ9MzY+f+omOCOBGvNm0Vpo2kpqSJOp6b9vG1/rH1k9r322UgN8112YxInz0 XnlRqjTDaOHZwH6+AinVy7jR0BBjYByHbHaiERdz6yFFSTgruPVysJ93JH7EAkYBt307 1ZBpk/R6NQ1iFXW1H5npu0QPbgtH3hWrwQlk9Mi26jqTLkzpIl6qTWJhFTBXaM+XnAHV OH9FRrKz+F//QDS5qUkjiKIrw1hBC0ufrbLhDI733AuLXPyMhahr+za2wCnR8JI0L/3D TGlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1weyHY8TIjJ5s5xM3IV4z/3kKoyjVhlI6OuOVTUnAds=; b=Doc39RaC0GgA2HfW9C5gi+2jgGFNZC9oEef/HywYnSx/2Nz3eLAs1P816cWauby8tl 3ySMZdEtOg1y1kXjwo5aoT7s+kL1zreN4hoC5Uda/H7PLf5YOm64niNw8ud1QfIWVLsv YinzfTLF1Pxq4LyYRacvHVYc8/qmLjzyiJp6qCXbMJwlqBGDZFMbsvPbQEeH0wisVcL2 At9zmRjCYz7oGysK0HEDpbS0x9kZ3yAIlYfpK6Bm3coVYfIeHq7wnM6Oyim4TkMogTMD 0lC8veVfuSUYG+Zr6Gv7YCMxsPfJAE7YCQIWbezLnhWplr4PC3Su5xNNjKbN3Tz2E2QL /2xg== X-Gm-Message-State: AOAM532ruRRz9q0mLUb8VRocgFFwBybbjQU0YTLUqq+OxGKHlsOKuh0/ Ofs+gMGRmI57WCl9eTzvvWQ= X-Google-Smtp-Source: ABdhPJx4ck/EoV0lnzQ+VWYuW7X5Rs1X/7X7x5NWuCn9IEQNcCy2q3C9s2I+lyeMHfl7vNNWyUKcOQ== X-Received: by 2002:a05:6000:1151:: with SMTP id d17mr8653536wrx.363.1603882168456; Wed, 28 Oct 2020 03:49:28 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i126sm6094370wmi.0.2020.10.28.03.49.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:27 -0700 (PDT) From: luca.boccassi@gmail.com To: Devendra Singh Rawat Cc: Igor Russkikh , Rasesh Mody , dpdk stable Date: Wed, 28 Oct 2020 10:43:43 +0000 Message-Id: <20201028104606.3504127-64-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/qede: fix milliseconds sleep macro' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From b81bfe40219512e9ab74ffd486c02a769bc179cd 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 0f09557cf0..d9f507f233 100644 --- a/drivers/net/qede/base/bcm_osal.h +++ b/drivers/net/qede/base/bcm_osal.h @@ -81,9 +81,8 @@ 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.760016656 +0000 +++ 0064-net-qede-fix-milliseconds-sleep-macro.patch 2020-10-28 10:35:11.532830435 +0000 @@ -1,14 +1,15 @@ -From 91979430089bf897881238a168b631f1a81c5477 Mon Sep 17 00:00:00 2001 +From b81bfe40219512e9ab74ffd486c02a769bc179cd 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") -Cc: stable@dpdk.org Signed-off-by: Devendra Singh Rawat Signed-off-by: Igor Russkikh @@ -18,10 +19,10 @@ 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 5d4df5907a..ded4fb0f57 100644 +index 0f09557cf0..d9f507f233 100644 --- a/drivers/net/qede/base/bcm_osal.h +++ b/drivers/net/qede/base/bcm_osal.h -@@ -81,9 +81,8 @@ typedef intptr_t osal_int_ptr_t; +@@ -81,9 +81,8 @@ typedef int bool; #define DELAY(x) rte_delay_us(x) #define usec_delay(x) DELAY(x)