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 DAD07A04DD for ; Wed, 18 Nov 2020 17:38:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 76A79160; Wed, 18 Nov 2020 17:38:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 66CBF160 for ; Wed, 18 Nov 2020 17:38:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717499; 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=LSprpOWLJLj59XAT9Loan3Eo/dPcpOf+Xnp33uaJS1U=; b=UAJeBh1BQSgdG+oMkf2QuoqUOFxvdnag2arSmdD1aXKRLA+91rX6g9WLsLoGZbmxctSzzj ZdcZaPBaueKrjMl8yOklsJEWDxxuj/7iPrzlhC6UzMjmU7k+Wxbc1fCCtHkdlcEqq5SdVc hmlPzxEKnIpzFESdFhxc1zelBnjSqVc= 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-182-kVStsdCDNay4IDdHk_KyEA-1; Wed, 18 Nov 2020 11:38:15 -0500 X-MC-Unique: kVStsdCDNay4IDdHk_KyEA-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 D67B0CEC62; Wed, 18 Nov 2020 16:38:14 +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 C9A915C1A3; Wed, 18 Nov 2020 16:38:07 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Michal Krawczyk , dpdk stable Date: Wed, 18 Nov 2020 16:35:46 +0000 Message-Id: <20201118163558.1101823-60-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-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: remove unused 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/24/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/820571e6ccc0082bbf9b677903cdd57a46119888 Thanks. Kevin. --- >From 820571e6ccc0082bbf9b677903cdd57a46119888 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Fri, 23 Oct 2020 10:43:51 +0200 Subject: [PATCH] net/ena: remove unused macro [ upstream commit 8bb7b198297d4d33b720b69480e2b41fb9ca91fb ] This assert macro is not called anymore. This also fixes an invalid reference to RTE_LOGTYPE_ERR that does not exist. Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version") Fixes: 6f1c9df9e9cc ("net/ena: use dynamic log type for debug logging") Signed-off-by: David Marchand Acked-by: Michal Krawczyk --- drivers/net/ena/base/ena_plat_dpdk.h | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h index 7be9a254a1..4bc2a2b553 100644 --- a/drivers/net/ena/base/ena_plat_dpdk.h +++ b/drivers/net/ena/base/ena_plat_dpdk.h @@ -69,16 +69,4 @@ typedef uint64_t dma_addr_t; (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz()) -#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG -#define ENA_ASSERT(cond, format, arg...) \ - do { \ - if (unlikely(!(cond))) { \ - RTE_LOG(ERR, PMD, format, ##arg); \ - rte_panic("line %d\tassert \"" #cond "\"" \ - "failed\n", __LINE__); \ - } \ - } while (0) -#else -#define ENA_ASSERT(cond, format, arg...) do {} while (0) -#endif #define ENA_MAX_T(type, x, y) RTE_MAX((type)(x), (type)(y)) -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:39.064393633 +0000 +++ 0060-net-ena-remove-unused-macro.patch 2020-11-18 16:33:37.984215097 +0000 @@ -1 +1 @@ -From 8bb7b198297d4d33b720b69480e2b41fb9ca91fb Mon Sep 17 00:00:00 2001 +From 820571e6ccc0082bbf9b677903cdd57a46119888 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8bb7b198297d4d33b720b69480e2b41fb9ca91fb ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,2 +18,2 @@ - drivers/net/ena/base/ena_plat_dpdk.h | 13 ------------- - 1 file changed, 13 deletions(-) + drivers/net/ena/base/ena_plat_dpdk.h | 12 ------------ + 1 file changed, 12 deletions(-) @@ -21 +22 @@ -index ae4fd8f868..a6782f3732 100644 +index 7be9a254a1..4bc2a2b553 100644 @@ -24 +25,2 @@ -@@ -74,17 +74,4 @@ typedef uint64_t dma_addr_t; +@@ -69,16 +69,4 @@ typedef uint64_t dma_addr_t; + (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz()) @@ -26 +27,0 @@ - extern int ena_logtype_com; @@ -31,2 +32 @@ -- rte_log(RTE_LOGTYPE_ERR, ena_logtype_com, \ -- format, ##arg); \ +- RTE_LOG(ERR, PMD, format, ##arg); \