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 A90D6A04DD for ; Wed, 28 Oct 2020 11:49:44 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A01242C2A; Wed, 28 Oct 2020 11:49:43 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by dpdk.org (Postfix) with ESMTP id EEAAF2C2A for ; Wed, 28 Oct 2020 11:49:40 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id t3so1857994wmi.3 for ; Wed, 28 Oct 2020 03:49:40 -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=EfF2URoDHv/uWnCNPKMziyFWKDX0yoCRgk2irJhUgxE=; b=G1lqA2WAIs906ajORzDVgE4wH8jdlbyIJJMmUyXvk6+heuREq5A9r5xeYrfEOL3oqd uIDIl+3LaS6itchNUq0QhgaZ5pKcRqivBNesp84z6nty7u+l03iNAPP3l72tupJ+RokW lzpmt5jM5+9NlJeYNNvuq7H7ziLvgkTGng4jjOHaezpiNCx3g7ufaxUlhlZwhtw0lXfi nNlGaTPmi5i9vlErjOSi4ywG0z07xUabVTn+qAYEzwZgA2Y0YrskLyUeCLuaebWUCrXQ 1at357pAPBTq39O7dVATcrH3Bvp+2N8CNZmTAbOcyz4sNLyLzqcoOWuKCmzEpdrNOfPr ivsw== 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=EfF2URoDHv/uWnCNPKMziyFWKDX0yoCRgk2irJhUgxE=; b=nI32AgSFfZUtoZj5YI1sHtELJanhvDQ8TR5M+usbMnNu2KcNSGaXitZ5JuZCquPO2M V/tRtinG39vQGRDB0OPeUL9AZBdfERXAbmf5jU9PtRf2mXC4wnWPjVZ40O4u3Br/56Qb fEyCh1JrYJfm8msa846c7fIuLxFwdzYGnk+NMAw4IEgC2VUZdxu082RXWCL4e+ZXY2QN CZbv6vhd5b9wQIr1kjKZ5zg2q80zx7J8KVZQsOYyBrRDcxvssD4j8rd0HVxdkBO3yhz1 ZScrzoidQ63/470GXxDfw8DDiE9HJv8FtJRn9+6HJgtjMjWn15Afu6OsbYeRXugyCt28 3Khg== X-Gm-Message-State: AOAM532rFPnZjJhqt4hVZN+cprvq6I+9tOY+uESP03hFZ5oSjl+mKNn0 1hYuWOY2Dd9sKaye6Tfo1o8= X-Google-Smtp-Source: ABdhPJy34j67FTzj/UyVgQOiy2wpMSxQt6mgjFO8SptCpLZnXbWq90X7YsParYbh0yYM5qMTWgVBww== X-Received: by 2002:a7b:c0d3:: with SMTP id s19mr7602021wmh.102.1603882180690; Wed, 28 Oct 2020 03:49:40 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id k16sm5732479wmi.5.2020.10.28.03.49.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:49:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , Stephen Hemminger , dpdk stable Date: Wed, 28 Oct 2020 10:43:45 +0000 Message-Id: <20201028104606.3504127-66-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/ena/base: specify delay operations' 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 6153928dce909b906c4ca47526cb69678a0523c8 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Thu, 17 Sep 2020 07:30:17 +0200 Subject: [PATCH] net/ena/base: specify delay operations [ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ] ENA_MSLEEP() and ENA_UDELAY() were expecting different behavior - the first one is expecting driver to sleep, while the other, to busy wait. For both cases, the rte_delay_(u|m)s() function was used, which could be either sleep or block, depending on the configuration. To make the macros valid, the operations should be specified directly. Because of that, the rte_delay_us_sleep() and rte_delay_us_block() are now being used. Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK") Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin Reviewed-by: Guy Tzalik Reviewed-by: Stephen Hemminger --- drivers/net/ena/base/ena_plat_dpdk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 2090e34adf..5a9d71749e 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -55,8 +55,8 @@ typedef uint64_t dma_addr_t; #define ENA_ABORT() abort() -#define ENA_MSLEEP(x) rte_delay_ms(x) -#define ENA_UDELAY(x) rte_delay_us(x) +#define ENA_MSLEEP(x) rte_delay_us_sleep(x * 1000) +#define ENA_UDELAY(x) rte_delay_us_block(x) #define ENA_TOUCH(x) ((void)(x)) #define memcpy_toio memcpy -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.817609221 +0000 +++ 0066-net-ena-base-specify-delay-operations.patch 2020-10-28 10:35:11.536830495 +0000 @@ -1,8 +1,10 @@ -From 5ec22f97b6300ff65f89c8cb0fa072de139ac520 Mon Sep 17 00:00:00 2001 +From 6153928dce909b906c4ca47526cb69678a0523c8 Mon Sep 17 00:00:00 2001 From: Michal Krawczyk Date: Thu, 17 Sep 2020 07:30:17 +0200 Subject: [PATCH] net/ena/base: specify delay operations +[ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ] + ENA_MSLEEP() and ENA_UDELAY() were expecting different behavior - the first one is expecting driver to sleep, while the other, to busy wait. @@ -14,7 +16,6 @@ now being used. Fixes: 9ba7981ec992 ("ena: add communication layer for DPDK") -Cc: stable@dpdk.org Signed-off-by: Michal Krawczyk Reviewed-by: Igor Chauskin @@ -25,10 +26,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h -index ba7a098f59..d9b728c4d6 100644 +index 2090e34adf..5a9d71749e 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h -@@ -56,8 +56,8 @@ typedef uint64_t dma_addr_t; +@@ -55,8 +55,8 @@ typedef uint64_t dma_addr_t; #define ENA_ABORT() abort()