patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] net/ena: remove unused macro
@ 2020-10-23  8:43 David Marchand
  2020-10-23 12:56 ` Michał Krawczyk
  0 siblings, 1 reply; 3+ messages in thread
From: David Marchand @ 2020-10-23  8:43 UTC (permalink / raw)
  To: dev
  Cc: stable, Marcin Wojtas, Michal Krawczyk, Guy Tzalik,
	Evgeny Schemeilin, Igor Chauskin, Rafal Kozik, Stephen Hemminger

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")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 drivers/net/ena/base/ena_plat_dpdk.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
index ae4fd8f868..a6782f3732 100644
--- a/drivers/net/ena/base/ena_plat_dpdk.h
+++ b/drivers/net/ena/base/ena_plat_dpdk.h
@@ -73,19 +73,6 @@ typedef uint64_t dma_addr_t;
 	(rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
 
 extern int ena_logtype_com;
-#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
-#define ENA_ASSERT(cond, format, arg...)				\
-	do {								\
-		if (unlikely(!(cond))) {				\
-			rte_log(RTE_LOGTYPE_ERR, ena_logtype_com,	\
-				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))
 #define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y))
-- 
2.23.0


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH] net/ena: remove unused macro
  2020-10-23  8:43 [dpdk-stable] [PATCH] net/ena: remove unused macro David Marchand
@ 2020-10-23 12:56 ` Michał Krawczyk
  2020-10-23 14:10   ` Ferruh Yigit
  0 siblings, 1 reply; 3+ messages in thread
From: Michał Krawczyk @ 2020-10-23 12:56 UTC (permalink / raw)
  To: David Marchand
  Cc: dev, stable, Marcin Wojtas, Guy Tzalik, Evgeny Schemeilin,
	Igor Chauskin, Rafal Kozik, Stephen Hemminger

pt., 23 paź 2020 o 10:44 David Marchand <david.marchand@redhat.com> napisał(a):
>
> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Michal Krawczyk <mk@semihalf.com>
> ---
>  drivers/net/ena/base/ena_plat_dpdk.h | 13 -------------
>  1 file changed, 13 deletions(-)
>
> diff --git a/drivers/net/ena/base/ena_plat_dpdk.h b/drivers/net/ena/base/ena_plat_dpdk.h
> index ae4fd8f868..a6782f3732 100644
> --- a/drivers/net/ena/base/ena_plat_dpdk.h
> +++ b/drivers/net/ena/base/ena_plat_dpdk.h
> @@ -73,19 +73,6 @@ typedef uint64_t dma_addr_t;
>         (rte_get_timer_cycles() * US_PER_S / rte_get_timer_hz())
>
>  extern int ena_logtype_com;
> -#if RTE_LOG_DP_LEVEL >= RTE_LOG_DEBUG
> -#define ENA_ASSERT(cond, format, arg...)                               \
> -       do {                                                            \
> -               if (unlikely(!(cond))) {                                \
> -                       rte_log(RTE_LOGTYPE_ERR, ena_logtype_com,       \
> -                               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))
>  #define ENA_MAX32(x, y) ENA_MAX_T(uint32_t, (x), (y))
> --
> 2.23.0
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH] net/ena: remove unused macro
  2020-10-23 12:56 ` Michał Krawczyk
@ 2020-10-23 14:10   ` Ferruh Yigit
  0 siblings, 0 replies; 3+ messages in thread
From: Ferruh Yigit @ 2020-10-23 14:10 UTC (permalink / raw)
  To: Michał Krawczyk, David Marchand
  Cc: dev, stable, Marcin Wojtas, Guy Tzalik, Evgeny Schemeilin,
	Igor Chauskin, Rafal Kozik, Stephen Hemminger

On 10/23/2020 1:56 PM, Michał Krawczyk wrote:
> pt., 23 paź 2020 o 10:44 David Marchand <david.marchand@redhat.com> napisał(a):
>>
>> 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")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Michal Krawczyk <mk@semihalf.com>
 >

Applied to dpdk-next-net/main, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-10-23 14:10 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-23  8:43 [dpdk-stable] [PATCH] net/ena: remove unused macro David Marchand
2020-10-23 12:56 ` Michał Krawczyk
2020-10-23 14:10   ` Ferruh Yigit

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git