From patchwork Wed Dec 13 16:36:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 135172 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C8135436E3; Wed, 13 Dec 2023 17:43:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 263E543067; Wed, 13 Dec 2023 17:40:38 +0100 (CET) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mails.dpdk.org (Postfix) with ESMTP id 75AAA42FB2 for ; Wed, 13 Dec 2023 17:40:25 +0100 (CET) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1d348653591so11449435ad.1 for ; Wed, 13 Dec 2023 08:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1702485625; x=1703090425; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Esw4OYy1qcg9HbXfER7PoV0yNwzzxZAy7JsjWuYzt08=; b=X5Zm42FtzfBppTPK2TMw/QKDNq1k3jZJtpsirQq2Fa+7/SJD4oBtwi3RxJOT0JbrxP sCmwu5QDD1TUEi9vO1OSK7Qg4zW2dH/riT+asghOqVxafNrqO6c2YqGUy4wCJxJYdMv3 pBU7Bm1G53oUtwH8rimiMIbNKDbeBmi+ooPy/Oenxxmux9ky1BK7qxHuxCkZJEF9kAcu P05IN+ZL2hDbrts1gkvIMyLM02QLHrJ88iEKyz56Uql+I8quldOEe+77b7Kjgrb277T0 LtEz00qbU6fAQNgaHaqg2OsouZQxUP8aUPcIEaCtREYHnGOP1/hiKch0yOk/GtAbenIa O1VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702485625; x=1703090425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Esw4OYy1qcg9HbXfER7PoV0yNwzzxZAy7JsjWuYzt08=; b=cV4LYZxs48MAXkTM3fD88O2JxHVYBQcQZsEVAdY5A2zBhp6xm45YVowUSDhkyP3YV5 fQ4RikZOFjOJxrlGd6aYs+P/vVaUzGcMTFRFi3RTvzJ1W4+/0VgrfSJ+z7bTYPTFqq8D H9wsKbryY6lwPBLWNVnt8un4/GvxNfuJCNcntaM7i5LWjBFfH7o8E0krkto0Ai8lTE4i 4RdbH9C0Ruw/ZN6vvHcB1KXE0y1QgWxItWbpRu/H9Gn6Wn2sn/ZGIfZBsjT22zN5bRW/ H/mrR9saOrfRJcDQbzYL2toCffXM5GhhBXulKKfGROJTUWN4womVPXpNhJv0W0LMdKz7 Oovw== X-Gm-Message-State: AOJu0YwFQefBET85NVIM4NXK4v/1eSp2w3mAVVZ0bvzLR/hSN/uwS5eP 6Pdijhqh0YwQsnSVGftPhB+U0dg2k2HmctXZMTA= X-Google-Smtp-Source: AGHT+IHFpVwfx1Q2IkniJCPE3rU6YY5t4Vsdbc30IRpIsBC8A7AMBAyV7gCWPY4IRpsiJEag1l+miw== X-Received: by 2002:a17:902:e810:b0:1d3:610e:c00f with SMTP id u16-20020a170902e81000b001d3610ec00fmr410894plg.37.1702485624764; Wed, 13 Dec 2023 08:40:24 -0800 (PST) Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id 4-20020a170902c24400b001d0a6f31519sm10749593plg.188.2023.12.13.08.40.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:40:24 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal Subject: [PATCH v3 37/37] crypto/dpaa_sec, crypto/dpaa2_sec: replace use of PMD logtype Date: Wed, 13 Dec 2023 08:36:11 -0800 Message-ID: <20231213163820.894987-38-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231213163820.894987-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20231213163820.894987-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use macro consistently for all logs and rte_log_dp() for datapath. Signed-off-by: Stephen Hemminger Acked-by: Hemant Agrawal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++--- drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h | 4 ++-- drivers/crypto/dpaa_sec/dpaa_sec.c | 4 ++-- drivers/crypto/dpaa_sec/dpaa_sec_log.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index bb5a2c629e53..1cae6c45059e 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -4153,7 +4153,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_opr(dpseci, CMD_PRI_LOW, priv->token, qp_id, OPR_OPT_CREATE, &ocfg); if (ret) { - RTE_LOG(ERR, PMD, "Error setting opr: ret: %d\n", ret); + DPAA2_SEC_ERR("Error setting opr: ret: %d", ret); return ret; } qp->tx_vq.cb_eqresp_free = dpaa2_sec_free_eqresp_buf; @@ -4163,7 +4163,7 @@ dpaa2_sec_eventq_attach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) { - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } @@ -4188,7 +4188,7 @@ dpaa2_sec_eventq_detach(const struct rte_cryptodev *dev, ret = dpseci_set_rx_queue(dpseci, CMD_PRI_LOW, priv->token, qp_id, &cfg); if (ret) - RTE_LOG(ERR, PMD, "Error in dpseci_set_queue: ret: %d\n", ret); + DPAA2_SEC_ERR("Error in dpseci_set_queue: ret: %d", ret); return ret; } diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h index c2e11f9516f9..cd47225f4720 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_logs.h @@ -29,7 +29,7 @@ extern int dpaa2_logtype_sec; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA2_SEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, dpaa2_logtype_sec, fmt, ## args) #define DPAA2_SEC_DP_DEBUG(fmt, args...) \ DPAA2_SEC_DP_LOG(DEBUG, fmt, ## args) @@ -38,7 +38,7 @@ extern int dpaa2_logtype_sec; #define DPAA2_SEC_DP_WARN(fmt, args...) \ DPAA2_SEC_DP_LOG(WARNING, fmt, ## args) #define DPAA2_SEC_DP_ERR(fmt, args...) \ - DPAA2_SEC_DP_LOG(ERR, fmt, ## args) + DPAA2_SEC_DP_LOG(ERR, fmt, ## args) #endif /* _DPAA2_SEC_LOGS_H_ */ diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index a301e8edb2a4..3008ca4dc2f7 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3518,7 +3518,7 @@ dpaa_sec_eventq_detach(const struct rte_cryptodev *dev, qman_oos_fq(&qp->outq); ret = qman_init_fq(&qp->outq, 0, &opts); if (ret) - RTE_LOG(ERR, PMD, "Error in qman_init_fq: ret: %d\n", ret); + DPAA_SEC_ERR("Error in qman_init_fq: ret: %d\n", ret); qp->outq.cb.dqrr = NULL; return ret; @@ -3709,7 +3709,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) dpaa_sec_get_devargs(cryptodev->device->devargs, DRIVER_DUMP_MODE); - RTE_LOG(INFO, PMD, "%s cryptodev init\n", cryptodev->data->name); + DPAA_SEC_INFO("%s cryptodev init\n", cryptodev->data->name); return 0; init_error: diff --git a/drivers/crypto/dpaa_sec/dpaa_sec_log.h b/drivers/crypto/dpaa_sec/dpaa_sec_log.h index fb895a8bc67f..936a61c2c18f 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec_log.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec_log.h @@ -29,7 +29,7 @@ extern int dpaa_logtype_sec; /* DP Logs, toggled out at compile time if level lower than current level */ #define DPAA_SEC_DP_LOG(level, fmt, args...) \ - RTE_LOG_DP(level, PMD, fmt, ## args) + rte_log_dp(RTE_LOG_ ## level, dpaa_logtype_sec, fmt, ## args) #define DPAA_SEC_DP_DEBUG(fmt, args...) \ DPAA_SEC_DP_LOG(DEBUG, fmt, ## args)