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 6230A41D52 for ; Thu, 23 Feb 2023 16:07:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 45A174326E; Thu, 23 Feb 2023 16:07:43 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 64C5643260 for ; Thu, 23 Feb 2023 16:07:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164860; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kxRralG+Q4GHURQN63gI0BEeyHoDWgMYQxV52T2jFVA=; b=bwh4ZcP1Bc4OCOh3lIsRxGThLiipMyPQZsxMCvqRfMl9DjStGUaDvHL62uhmf/Ov4Fyi3B t011z/EGkECYaIfiNxe/PKf60r0+u4294NhBSp6/EjFMhOKD2y7WCpCkkkB2LbX6TcZlfK 1J/zX0ONks7/L5geNmIL28k4ACHwJsQ= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-633-DLnAd7D8NTibBWVKTSUIJg-1; Thu, 23 Feb 2023 10:07:36 -0500 X-MC-Unique: DLnAd7D8NTibBWVKTSUIJg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E650C3C021B2; Thu, 23 Feb 2023 15:07:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id 12BA22166B29; Thu, 23 Feb 2023 15:07:22 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Sunil Uttarwar , dpdk stable Subject: patch 'crypto/ccp: remove some printf' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:19 +0000 Message-Id: <20230223150631.723699-28-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/ba8923c86e03ff82ff030ac927b8ae332d92c9d5 Thanks. Kevin --- >From ba8923c86e03ff82ff030ac927b8ae332d92c9d5 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 4 Oct 2022 11:51:29 +0200 Subject: [PATCH] crypto/ccp: remove some printf [ upstream commit e946ca8e727424b511fe4ea278d8bec76b800e7a ] A DPDK application must _not_ use printf. Use log framework. Fixes: ef4b04f87fa6 ("crypto/ccp: support device init") Signed-off-by: David Marchand Acked-by: Sunil Uttarwar --- drivers/crypto/ccp/ccp_dev.c | 4 ++-- drivers/crypto/ccp/ccp_pci.c | 3 ++- drivers/crypto/ccp/rte_ccp_pmd.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c index 0eb1b0328e..8ca092fa6e 100644 --- a/drivers/crypto/ccp/ccp_dev.c +++ b/drivers/crypto/ccp/ccp_dev.c @@ -363,5 +363,5 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status) weight++; - printf("Queue %d can access %d LSB regions of mask %lu\n", + CCP_LOG_DBG("Queue %d can access %d LSB regions of mask %lu\n", (int)cmd_q->id, weight, cmd_q->lsbmask); @@ -711,5 +711,5 @@ ccp_probe_devices(struct rte_pci_device *pci_dev, SYSFS_PCI_DEVICES, d->d_name); if (is_ccp_device(dirname, ccp_id, &ccp_type)) { - printf("CCP : Detected CCP device with ID = 0x%x\n", + CCP_LOG_DBG("CCP : Detected CCP device with ID = 0x%x\n", ccp_id[ccp_type].device_id); ret = ccp_probe_device(ccp_type, pci_dev); diff --git a/drivers/crypto/ccp/ccp_pci.c b/drivers/crypto/ccp/ccp_pci.c index 38029a9081..c941e222c7 100644 --- a/drivers/crypto/ccp/ccp_pci.c +++ b/drivers/crypto/ccp/ccp_pci.c @@ -12,4 +12,5 @@ #include "ccp_pci.h" +#include "ccp_pmd_private.h" static const char * const uio_module_names[] = { @@ -42,5 +43,5 @@ ccp_check_pci_uio_module(void) } fclose(fp); - printf("Insert igb_uio or uio_pci_generic kernel module(s)"); + CCP_LOG_DBG("Insert igb_uio or uio_pci_generic kernel module(s)"); return -1;/* uio not inserted */ } diff --git a/drivers/crypto/ccp/rte_ccp_pmd.c b/drivers/crypto/ccp/rte_ccp_pmd.c index a35a8cd775..c5ec952e36 100644 --- a/drivers/crypto/ccp/rte_ccp_pmd.c +++ b/drivers/crypto/ccp/rte_ccp_pmd.c @@ -251,5 +251,5 @@ cryptodev_ccp_create(const char *name, } - printf("CCP : Crypto device count = %d\n", cryptodev_cnt); + CCP_LOG_DBG("CCP : Crypto device count = %d\n", cryptodev_cnt); dev->device = &pci_dev->device; dev->device->driver = &pci_drv->driver; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.517578790 +0000 +++ 0028-crypto-ccp-remove-some-printf.patch 2023-02-23 14:46:23.741235865 +0000 @@ -1 +1 @@ -From e946ca8e727424b511fe4ea278d8bec76b800e7a Mon Sep 17 00:00:00 2001 +From ba8923c86e03ff82ff030ac927b8ae332d92c9d5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e946ca8e727424b511fe4ea278d8bec76b800e7a ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 424ead82c3..9c9cb81236 100644 +index 0eb1b0328e..8ca092fa6e 100644 @@ -31 +32 @@ -@@ -710,5 +710,5 @@ ccp_probe_devices(struct rte_pci_device *pci_dev, +@@ -711,5 +711,5 @@ ccp_probe_devices(struct rte_pci_device *pci_dev, @@ -56 +57 @@ -index 221a0a5235..bcb621234c 100644 +index a35a8cd775..c5ec952e36 100644 @@ -59 +60 @@ -@@ -238,5 +238,5 @@ cryptodev_ccp_create(const char *name, +@@ -251,5 +251,5 @@ cryptodev_ccp_create(const char *name,