/* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+ * Copyright(c) 2019-2021 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.
/** 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)
do { \
const struct sfc_adapter *_sa = (sa); \
\
- SFC_LOG(_sa, RTE_LOG_ERR, _sa->priv.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->priv.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->priv.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->priv.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, ...) \
+#define sfc_dbg(sa, ...) \
do { \
const struct sfc_adapter *_sa = (sa); \
\
- SFC_LOG(_sa, RTE_LOG_INFO, _sa->priv.logtype_main, \
- RTE_FMT("%s(): " \
- RTE_FMT_HEAD(__VA_ARGS__ ,), \
- __func__, \
- RTE_FMT_TAIL(__VA_ARGS__ ,))); \
+ SFC_LOG(_sa->priv.shared, RTE_LOG_DEBUG, \
+ _sa->priv.logtype_main, __VA_ARGS__); \
} while (0)
-#define sfc_log_mcdi(sa, ...) \
+#define sfc_log_init(sa, ...) \
do { \
const struct sfc_adapter *_sa = (sa); \
\
- SFC_LOG(_sa, SFC_LOG_LEVEL_MCDI, _sa->mcdi.logtype, \
- __VA_ARGS__); \
+ 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)