From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6E5CD43A57; Sat, 3 Feb 2024 05:14:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CCE242EC9; Sat, 3 Feb 2024 05:13:42 +0100 (CET) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mails.dpdk.org (Postfix) with ESMTP id 0125C42EA5 for ; Sat, 3 Feb 2024 05:13:34 +0100 (CET) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1d7431e702dso23986495ad.1 for ; Fri, 02 Feb 2024 20:13:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1706933614; x=1707538414; 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=7b++1J2gLUx6NDJv7+P8qjyP68Z7y4QCIYZi5ANpsi0=; b=hlgKtwIFKS7L8naILc2+xxisTwrcC1RdRLYE2uX7ho57KwfsVecxONipg4KpdYHwcG J5I7LkSPN6CPN4db4ad+7HeQ68GAAWNv1xUd8SpTi03vT56+mRRYI7aDrmyFG3gymLey YXNWIngOoNECpetFTjHBaiuDtkJVjihy98G+IY//3hVC+TpeShYEVZL18qxXB4mbiBU1 J4VkGsupdkrRmQl/eBLmwAFbVTSQQrGgF8LLmyKyZqffmhbHstTyujBSjAB3K3dg5joC 6KAZVqgwKIlLh336uk+IJuXeL9gm91r9WvS4KdMTy0xYdEjvJhsVTZbPuxPqq8SodBHz oW8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706933614; x=1707538414; 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=7b++1J2gLUx6NDJv7+P8qjyP68Z7y4QCIYZi5ANpsi0=; b=qQpbpKyCMxuFiM7l3UOGoMDDX8tpXi1jFJCEfxX9fzVC9GcZ/D6a+V5n//YqMaBo3f 7T7lEnu4eGND+dLB58r1f4kTNFT9HYU5SqM/Lh7NSRYShUpyg4EV/VjdpOBCZcvmmMrm 0SSC26vm9RE0guC8ROAy+h7UVKCr7ngo6xx/urErGomJmKzRf54IR7yizwkHal3t79Wj TrbQUw/4PND1GZ7ZV4x8nVbfb7IBWR8T7oUrnj4Nc5knYzRzkyHe4sNFDdka36izP1iz FFBvEkRLtvg2ONQq+U8hFi/W5X6LauskN3t4IoR0h5nLSy9TV3uQJpD+ugX9HkUjRJ5R dpBA== X-Gm-Message-State: AOJu0Yx07TLrIPCsKglm5tWRno8BXqr1WDLpOL9Sq6/12WdWGK1nxEvG bwHU+aSPye811Imf5IYIt5+pXbKGqZZI7olTtmYXA+CeCMKoTdkBxMWTGfwOVDVSyWAsTJ7EmvA zMBs= X-Google-Smtp-Source: AGHT+IHrvhJXjdJJ6eYVQ8k2pDZKMm7l67V7NM/RHtP/azr0bAv02UkUUmjU6UmYdt5VJvPLjEF6GA== X-Received: by 2002:a17:902:7794:b0:1d0:b1f0:1005 with SMTP id o20-20020a170902779400b001d0b1f01005mr9268921pll.63.1706933614197; Fri, 02 Feb 2024 20:13:34 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXpzBq60qMdj7aEVOoRvyJWS3L7ZKaTPO6GnrNMqP0SXIsqcA81ovQuh8NAGWc4PyLi1QfGlCOzZYNm1z/i9FWUsP64kKKfKegR869uQRAxvKfM92bvGPve/YbkCuiHxOHYQZ6edNOAkivhOyxXZUoG11oOklaD9euFffkT2jnq+A== Received: from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141]) by smtp.gmail.com with ESMTPSA id mf11-20020a170902fc8b00b001d94a3f398esm2361800plb.141.2024.02.02.20.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Feb 2024 20:13:33 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Gagandeep Singh , Hemant Agrawal , Akhil Goyal , Ashish Jain Subject: [PATCH v7 14/19] crypto/dpaa_sec, crypto/dpaa2_sec: use dedicated logtype Date: Fri, 2 Feb 2024 20:11:47 -0800 Message-ID: <20240203041230.285599-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203041230.285599-1-stephen@networkplumber.org> References: <20231213014408.612051-1-stephen@networkplumber.org> <20240203041230.285599-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 A couple of messages were using RTE_LOGTYPE_PMD when dedicated logtype was already available. Fixes: fe3688ba7950 ("crypto/dpaa_sec: support event crypto adapter") Fixes: bffc7d561c81 ("crypto/dpaa2_sec: support event crypto adapter") Signed-off-by: Stephen Hemminger --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 ++--- drivers/crypto/dpaa_sec/dpaa_sec.c | 30 ++++++++++----------- 2 files changed, 17 insertions(+), 19 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/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index a301e8edb2a4..e7ebcbe2af22 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -102,7 +102,7 @@ ern_sec_fq_handler(struct qman_portal *qm __rte_unused, struct qman_fq *fq, const struct qm_mr_entry *msg) { - DPAA_SEC_DP_ERR("sec fq %d error, RC = %x, seqnum = %x\n", + DPAA_SEC_DP_ERR("sec fq %d error, RC = %x, seqnum = %x", fq->fqid, msg->ern.rc, msg->ern.seqnum); } @@ -849,7 +849,7 @@ dpaa_sec_deq(struct dpaa_sec_qp *qp, struct rte_crypto_op **ops, int nb_ops) op->status = RTE_CRYPTO_OP_STATUS_SUCCESS; } else { if (dpaa_sec_dp_dump > DPAA_SEC_DP_NO_DUMP) { - DPAA_SEC_DP_WARN("SEC return err:0x%x\n", + DPAA_SEC_DP_WARN("SEC return err:0x%x", ctx->fd_status); if (dpaa_sec_dp_dump > DPAA_SEC_DP_ERR_DUMP) dpaa_sec_dump(ctx, qp); @@ -1943,8 +1943,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, } } else if (unlikely(ses->qp[rte_lcore_id() % MAX_DPAA_CORES] != qp)) { - DPAA_SEC_DP_ERR("Old:sess->qp = %p" - " New qp = %p\n", + DPAA_SEC_DP_ERR("Old: sess->qp = %p New qp = %p", ses->qp[rte_lcore_id() % MAX_DPAA_CORES], qp); frames_to_send = loop; @@ -2054,7 +2053,7 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops, fd->cmd = 0x80000000 | *((uint32_t *)((uint8_t *)op + ses->pdcp.hfn_ovd_offset)); - DPAA_SEC_DP_DEBUG("Per packet HFN: %x, ovd:%u\n", + DPAA_SEC_DP_DEBUG("Per packet HFN: %x, ovd:%u", *((uint32_t *)((uint8_t *)op + ses->pdcp.hfn_ovd_offset)), ses->pdcp.hfn_ovd); @@ -2095,7 +2094,7 @@ dpaa_sec_dequeue_burst(void *qp, struct rte_crypto_op **ops, dpaa_qp->rx_pkts += num_rx; dpaa_qp->rx_errs += nb_ops - num_rx; - DPAA_SEC_DP_DEBUG("SEC Received %d Packets\n", num_rx); + DPAA_SEC_DP_DEBUG("SEC Received %d Packets", num_rx); return num_rx; } @@ -2158,7 +2157,7 @@ dpaa_sec_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id, NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); if (!qp->ctx_pool) { - DPAA_SEC_ERR("%s create failed\n", str); + DPAA_SEC_ERR("%s create failed", str); return -ENOMEM; } } else @@ -2459,7 +2458,7 @@ dpaa_sec_aead_init(struct rte_cryptodev *dev __rte_unused, session->aead_key.data = rte_zmalloc(NULL, xform->aead.key.length, RTE_CACHE_LINE_SIZE); if (session->aead_key.data == NULL && xform->aead.key.length > 0) { - DPAA_SEC_ERR("No Memory for aead key\n"); + DPAA_SEC_ERR("No Memory for aead key"); return -ENOMEM; } session->aead_key.length = xform->aead.key.length; @@ -2508,7 +2507,7 @@ dpaa_sec_detach_rxq(struct dpaa_sec_dev_private *qi, struct qman_fq *fq) for (i = 0; i < RTE_DPAA_MAX_RX_QUEUE; i++) { if (&qi->inq[i] == fq) { if (qman_retire_fq(fq, NULL) != 0) - DPAA_SEC_DEBUG("Queue is not retired\n"); + DPAA_SEC_DEBUG("Queue is not retired"); qman_oos_fq(fq); qi->inq_attach[i] = 0; return 0; @@ -3483,7 +3482,7 @@ dpaa_sec_eventq_attach(const struct rte_cryptodev *dev, qp->outq.cb.dqrr_dpdk_cb = dpaa_sec_process_atomic_event; break; case RTE_SCHED_TYPE_ORDERED: - DPAA_SEC_ERR("Ordered queue schedule type is not supported\n"); + DPAA_SEC_ERR("Ordered queue schedule type is not supported"); return -ENOTSUP; default: opts.fqd.fq_ctrl |= QM_FQCTRL_AVOIDBLOCK; @@ -3518,7 +3517,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", ret); qp->outq.cb.dqrr = NULL; return ret; @@ -3581,8 +3580,7 @@ check_devargs_handler(__rte_unused const char *key, const char *value, { dpaa_sec_dp_dump = atoi(value); if (dpaa_sec_dp_dump > DPAA_SEC_DP_FULL_DUMP) { - DPAA_SEC_WARN("WARN: DPAA_SEC_DP_DUMP_LEVEL is not " - "supported, changing to FULL error prints\n"); + DPAA_SEC_WARN("WARN: DPAA_SEC_DP_DUMP_LEVEL is not supported, changing to FULL error prints"); dpaa_sec_dp_dump = DPAA_SEC_DP_FULL_DUMP; } @@ -3645,7 +3643,7 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev) ret = munmap(internals->sec_hw, MAP_SIZE); if (ret) - DPAA_SEC_WARN("munmap failed\n"); + DPAA_SEC_WARN("munmap failed"); close(map_fd); cryptodev->driver_id = dpaa_cryptodev_driver_id; @@ -3709,11 +3707,11 @@ 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", cryptodev->data->name); return 0; init_error: - DPAA_SEC_ERR("driver %s: create failed\n", cryptodev->data->name); + DPAA_SEC_ERR("driver %s: create failed", cryptodev->data->name); rte_free(cryptodev->security_ctx); return -EFAULT; -- 2.43.0