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 E792FA04B1 for ; Thu, 5 Nov 2020 13:41:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DF3EEC31B; Thu, 5 Nov 2020 13:41:17 +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 8A00DC804 for ; Thu, 5 Nov 2020 13:41:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580075; 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=++BQBz9R86b1A4RCeos7cStxbOcpUgoCLKXdT1BlYSQ=; b=T8Ig1ZlbiAQ9NVVxnYTS3Xmv/MlsKRTrxavl7mPcyDcljCboAcO1rozjDd7yJrNi/AeQQ2 O+I1/nCfDL5fW8rVEOLyvxmCJxZ6PMRGHojdla08EjbQIsxJNhD7UGjQKRe505Ie/KGHS5 y548Gqz/W6hVMpNPtfZi2PxPHHMC1GE= 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-279-oNj-3AJqPYezezO9o2RLwA-1; Thu, 05 Nov 2020 07:41:11 -0500 X-MC-Unique: oNj-3AJqPYezezO9o2RLwA-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 16CFB805EFD; Thu, 5 Nov 2020 12:41:10 +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 9CDD35C3E1; Thu, 5 Nov 2020 12:41:08 +0000 (UTC) From: Kevin Traynor To: Michal Krawczyk Cc: Igor Chauskin , Guy Tzalik , Stephen Hemminger , dpdk stable Date: Thu, 5 Nov 2020 12:39:29 +0000 Message-Id: <20201105124015.306404-22-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/ena/base: specify delay operations' 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/89236a1daab1b6311c118855eb17e3e191186708 Thanks. Kevin. --- >From 89236a1daab1b6311c118855eb17e3e191186708 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 63d6db5b8a..7be9a254a1 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -55,6 +55,6 @@ 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)) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.667220442 +0000 +++ 0022-net-ena-base-specify-delay-operations.patch 2020-11-05 12:38:54.182895975 +0000 @@ -1 +1 @@ -From 5ec22f97b6300ff65f89c8cb0fa072de139ac520 Mon Sep 17 00:00:00 2001 +From 89236a1daab1b6311c118855eb17e3e191186708 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5ec22f97b6300ff65f89c8cb0fa072de139ac520 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index ba7a098f59..d9b728c4d6 100644 +index 63d6db5b8a..7be9a254a1 100644 @@ -31 +32 @@ -@@ -57,6 +57,6 @@ typedef uint64_t dma_addr_t; +@@ -55,6 +55,6 @@ typedef uint64_t dma_addr_t;