From patchwork Thu Sep 17 06:34:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Rybchenko X-Patchwork-Id: 77993 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F1F16A04B6; Thu, 17 Sep 2020 08:36:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A7D901D56D; Thu, 17 Sep 2020 08:35:35 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 691431D543 for ; Thu, 17 Sep 2020 08:35:21 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.60]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id E2BF760070 for ; Thu, 17 Sep 2020 06:35:20 +0000 (UTC) Received: from us4-mdac16-66.ut7.mdlocal (unknown [10.7.64.78]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id DF9452009A for ; Thu, 17 Sep 2020 06:35:20 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.30]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 68E441C0052 for ; Thu, 17 Sep 2020 06:35:20 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 2075310005E for ; Thu, 17 Sep 2020 06:35:20 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 17 Sep 2020 07:35:12 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 17 Sep 2020 07:35:12 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 08H6ZCrQ002493 for ; Thu, 17 Sep 2020 07:35:12 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 44BFE1613A9 for ; Thu, 17 Sep 2020 07:35:12 +0100 (BST) From: Andrew Rybchenko To: Date: Thu, 17 Sep 2020 07:34:34 +0100 Message-ID: <1600324483-23153-9-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600324483-23153-1-git-send-email-arybchenko@solarflare.com> References: <1599556475-27820-1-git-send-email-arybchenko@solarflare.com> <1600324483-23153-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25670.003 X-TM-AS-Result: No-8.731200-8.000000-10 X-TMASE-MatchedRID: tcizGzo33Igi+Ly1jF96cbsHVDDM5xAPgcsVZH3dOCQGmHr1eMxt2UAc 6DyoS2rIOelg+pLqPPFsGcpYVjbbPr5FkoP8eT9ncaD+wPaBYtZIevoF6P4wcjbpMgyAfh26jGd KRTlT9kLb2VJ5zpbgoR9hkM6DnVcWX+8u+zQ7JmLknMSTG9lH+KIik2/euMx1VWQnHKxp38iUR6 6C6i5v83xL67a3d6gmRT5xeSl5IKJ5OVTeAyRyiLBZAi3nrnzbYCdLkMLwLkPNOks35FeGOaPFj JEFr+olwXCBO/GKkVqOhzOa6g8KrQDfSq9t4KACXbrUBOI3b4zrqJKHagbR08XkP1A0PpolqOOv oFiXspE= X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--8.731200-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25670.003 X-MDID: 1600324520-PnDD_dPTAQr6 Subject: [dpdk-dev] [PATCH v2 08/17] net/sfc: make MCDI logging helper macros local X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Prepare to move MCDI helpers to drivers/common. Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc_log.h | 11 ----------- drivers/net/sfc/sfc_mcdi.c | 21 ++++++++++++++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/sfc/sfc_log.h b/drivers/net/sfc/sfc_log.h index 5383091c76..4bf44b1f15 100644 --- a/drivers/net/sfc/sfc_log.h +++ b/drivers/net/sfc/sfc_log.h @@ -28,9 +28,6 @@ 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 - /* Log PMD message, automatically add prefix and \n */ #define SFC_LOG(sas, level, type, ...) \ do { \ @@ -92,13 +89,5 @@ extern uint32_t sfc_logtype_driver; RTE_FMT_TAIL(__VA_ARGS__ ,))); \ } while (0) -#define sfc_log_mcdi(sa, ...) \ - do { \ - const struct sfc_adapter *_sa = (sa); \ - \ - SFC_LOG(_sa->priv.shared, SFC_LOG_LEVEL_MCDI, \ - _sa->mcdi.logtype, __VA_ARGS__); \ - } while (0) - #endif /* _SFC_LOG_H_ */ diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c index c97a33d558..c716caabdf 100644 --- a/drivers/net/sfc/sfc_mcdi.c +++ b/drivers/net/sfc/sfc_mcdi.c @@ -23,6 +23,17 @@ #define SFC_EFX_MCDI_POLL_INTERVAL_MAX_US (US_PER_S / 10) /* 100ms */ #define SFC_EFX_MCDI_WATCHDOG_INTERVAL_US (10 * US_PER_S) /* 10s */ +/** Level value used by MCDI log statements */ +#define SFC_EFX_LOG_LEVEL_MCDI RTE_LOG_INFO + +#define sfc_efx_log_mcdi(sa, ...) \ + do { \ + const struct sfc_adapter *_sa = (sa); \ + \ + SFC_LOG(_sa->priv.shared, SFC_EFX_LOG_LEVEL_MCDI, \ + _sa->mcdi.logtype, __VA_ARGS__); \ + } while (0) + static void sfc_efx_mcdi_timeout(struct sfc_adapter *sa) { @@ -178,7 +189,7 @@ sfc_efx_mcdi_do_log(const struct sfc_adapter *sa, * at the end which is required by netlogdecode. */ buffer[position] = '\0'; - sfc_log_mcdi(sa, "%s \\", buffer); + sfc_efx_log_mcdi(sa, "%s \\", buffer); /* Preserve prefix for the next log message */ position = pfxsize; } @@ -207,11 +218,11 @@ sfc_efx_mcdi_logger(void *arg, efx_log_msg_t type, * * To avoid wasting time, the actual level is examined in advance. */ - if (rte_log_get_level(sa->mcdi.logtype) < (int)SFC_LOG_LEVEL_MCDI) + if (rte_log_get_level(sa->mcdi.logtype) < (int)SFC_EFX_LOG_LEVEL_MCDI) return; - /* The format including prefix added by sfc_log_mcdi() is the format - * consumed by the Solarflare netlogdecode tool. + /* The format including prefix added by sfc_efx_log_mcdi() is the + * format consumed by the Solarflare netlogdecode tool. */ pfxsize = snprintf(buffer, sizeof(buffer), "MCDI RPC %s:", type == EFX_LOG_MCDI_REQUEST ? "REQ" : @@ -222,7 +233,7 @@ sfc_efx_mcdi_logger(void *arg, efx_log_msg_t type, pfxsize, start); if (start != pfxsize) { buffer[start] = '\0'; - sfc_log_mcdi(sa, "%s", buffer); + sfc_efx_log_mcdi(sa, "%s", buffer); } }