From cc9035ffbb8a050780e202047500b1580abed0c9 Mon Sep 17 00:00:00 2001 From: Ruifeng Wang Date: Tue, 28 Jul 2020 17:24:04 +0800 Subject: [PATCH] crypto/armv8: remove debug option MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Typo in debug log switch macro caused debug log cannot be enabled. Since no log used in data path, remove the debug option entirely and have logs always enabled. Resolved compilation error when debug log is enabled: rte_armv8_pmd.c: In function ‘process_armv8_chained_op’: rte_armv8_pmd.c:633:22: error: expected ‘)’ before ‘crypto_func’ ARMV8_CRYPTO_ASSERT(crypto_func != NULL); ^ Fixes: 169ca3db550c ("crypto/armv8: add PMD optimized for ARMv8 processors") Cc: stable@dpdk.org Reported-by: David Marchand Signed-off-by: Ruifeng Wang Acked-by: Akhil Goyal --- config/common_base | 1 - drivers/crypto/armv8/armv8_pmd_private.h | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/config/common_base b/config/common_base index f76585f165..c70b8f68bf 100644 --- a/config/common_base +++ b/config/common_base @@ -605,7 +605,6 @@ CONFIG_RTE_CRYPTO_MAX_DEVS=64 # Compile PMD for ARMv8 Crypto device # CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO=n -CONFIG_RTE_LIBRTE_PMD_ARMV8_CRYPTO_DEBUG=n # # Compile NXP CAAM JR crypto Driver diff --git a/drivers/crypto/armv8/armv8_pmd_private.h b/drivers/crypto/armv8/armv8_pmd_private.h index e08d0df781..19940809bc 100644 --- a/drivers/crypto/armv8/armv8_pmd_private.h +++ b/drivers/crypto/armv8/armv8_pmd_private.h @@ -15,7 +15,6 @@ RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \ __func__, __LINE__, ## args) -#ifdef RTE_LIBRTE_ARMV8_CRYPTO_DEBUG #define ARMV8_CRYPTO_LOG_INFO(fmt, args...) \ RTE_LOG(INFO, CRYPTODEV, "[%s] %s() line %u: " fmt "\n", \ RTE_STR(CRYPTODEV_NAME_ARMV8_CRYPTO_PMD), \ @@ -29,17 +28,11 @@ #define ARMV8_CRYPTO_ASSERT(con) \ do { \ if (!(con)) { \ - rte_panic("%s(): " \ - con "condition failed, line %u", __func__); \ + rte_panic("condition failed, line %u", \ + __LINE__); \ } \ } while (0) -#else -#define ARMV8_CRYPTO_LOG_INFO(fmt, args...) -#define ARMV8_CRYPTO_LOG_DBG(fmt, args...) -#define ARMV8_CRYPTO_ASSERT(con) -#endif - #define NBBY 8 /* Number of bits in a byte */ #define BYTE_LENGTH(x) ((x) / NBBY) /* Number of bytes in x (round down) */ -- 2.20.1