X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fsfc%2Fsfc_log.h;h=a2d714afb79e86875cc8c7a539881580d11d9485;hb=f30e69b41f949cd4a9afb6ff39de196e661708e2;hp=b11fbfb0a6dc6a2f1dee6f0450f2f74ae50985de;hpb=5a88b9b3f0ca0578779c3efad2e362c8770353b4;p=dpdk.git

diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h
index b11fbfb0a6..a2d714afb7 100644
--- a/drivers/net/sfc/sfc_log.h
+++ b/drivers/net/sfc/sfc_log.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
@@ -28,23 +28,16 @@ extern uint32_t sfc_logtype_driver;
 /** Device MCDI log type name prefix */
 #define SFC_LOGTYPE_MCDI_STR	SFC_LOGTYPE_PREFIX "mcdi"
 
-/** Level value used by MCDI log statements */
-#define SFC_LOG_LEVEL_MCDI	RTE_LOG_INFO
+#define SFC_LOG_PREFIX_MAX	32
 
 /* Log PMD message, automatically add prefix and \n */
-#define SFC_LOG(sa, level, type, ...) \
+#define SFC_LOG(sas, level, type, ...) \
 	do {								\
-		const struct sfc_adapter *__sa = (sa);			\
+		const struct sfc_adapter_shared *_sas = (sas);		\
 									\
 		rte_log(level, type,					\
-			RTE_FMT("PMD: sfc_efx "				\
-				PCI_PRI_FMT " #%" PRIu16		\
-				": " RTE_FMT_HEAD(__VA_ARGS__ ,) "\n",	\
-				__sa->pci_addr.domain,			\
-				__sa->pci_addr.bus,			\
-				__sa->pci_addr.devid,			\
-				__sa->pci_addr.function,		\
-				__sa->port_id,				\
+			RTE_FMT("%s" RTE_FMT_HEAD(__VA_ARGS__ ,) "\n",	\
+				_sas->log_prefix,			\
 				RTE_FMT_TAIL(__VA_ARGS__,)));		\
 	} while (0)
 
@@ -52,52 +45,45 @@ extern uint32_t sfc_logtype_driver;
 	do {								\
 		const struct sfc_adapter *_sa = (sa);			\
 									\
-		SFC_LOG(_sa, RTE_LOG_ERR, _sa->logtype_main,		\
-			__VA_ARGS__);					\
+		SFC_LOG(_sa->priv.shared, RTE_LOG_ERR,			\
+			_sa->priv.logtype_main, __VA_ARGS__);		\
 	} while (0)
 
 #define sfc_warn(sa, ...) \
 	do {								\
 		const struct sfc_adapter *_sa = (sa);			\
 									\
-		SFC_LOG(_sa, RTE_LOG_WARNING, _sa->logtype_main,	\
-			__VA_ARGS__);					\
+		SFC_LOG(_sa->priv.shared, RTE_LOG_WARNING,		\
+			_sa->priv.logtype_main, __VA_ARGS__);		\
 	} while (0)
 
 #define sfc_notice(sa, ...) \
 	do {								\
 		const struct sfc_adapter *_sa = (sa);			\
 									\
-		SFC_LOG(_sa, RTE_LOG_NOTICE, _sa->logtype_main,		\
-			__VA_ARGS__);					\
+		SFC_LOG(_sa->priv.shared, RTE_LOG_NOTICE,		\
+			_sa->priv.logtype_main, __VA_ARGS__);		\
 	} while (0)
 
 #define sfc_info(sa, ...) \
 	do {								\
 		const struct sfc_adapter *_sa = (sa);			\
 									\
-		SFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main,		\
-			__VA_ARGS__);					\
+		SFC_LOG(_sa->priv.shared, RTE_LOG_INFO,			\
+			_sa->priv.logtype_main, __VA_ARGS__);		\
 	} while (0)
 
 #define sfc_log_init(sa, ...) \
 	do {								\
 		const struct sfc_adapter *_sa = (sa);			\
 									\
-		SFC_LOG(_sa, RTE_LOG_INFO, _sa->logtype_main,		\
+		SFC_LOG(_sa->priv.shared, RTE_LOG_INFO,			\
+			_sa->priv.logtype_main,				\
 			RTE_FMT("%s(): "				\
 				RTE_FMT_HEAD(__VA_ARGS__ ,),		\
 				__func__,				\
 				RTE_FMT_TAIL(__VA_ARGS__ ,)));		\
 	} while (0)
 
-#define sfc_log_mcdi(sa, ...) \
-	do {								\
-		const struct sfc_adapter *_sa = (sa);			\
-									\
-		SFC_LOG(_sa, SFC_LOG_LEVEL_MCDI, _sa->mcdi.logtype,	\
-			__VA_ARGS__);					\
-	} while (0)
-
 
 #endif /* _SFC_LOG_H_ */