patch 'crypto/ccp: remove some printf' has been queued to stable release 20.11.8

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.8

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/25/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/230bbf810bfdcb9a7f728a2b393a8724e5d3188f

Thanks.

Luca Boccassi

---
>From 230bbf810bfdcb9a7f728a2b393a8724e5d3188f Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
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 <david.marchand at redhat.com>
Acked-by: Sunil Uttarwar <sunilprakashrao.uttarwar at amd.com>
---
 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 664ddc1747..c36409a0bc 100644
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -361,7 +361,7 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status)
 		if (ccp_get_bit(&cmd_q->lsbmask, j))
 			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);
 
 	return weight ? 0 : -EINVAL;
@@ -797,7 +797,7 @@ ccp_probe_devices(const struct rte_pci_id *ccp_id)
 		snprintf(dirname, sizeof(dirname), "%s/%s",
 			     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(dirname, domain, bus, devid,
 					       function, ccp_type);
diff --git a/drivers/crypto/ccp/ccp_pci.c b/drivers/crypto/ccp/ccp_pci.c
index 1702a09c4f..6932cb4152 100644
--- a/drivers/crypto/ccp/ccp_pci.c
+++ b/drivers/crypto/ccp/ccp_pci.c
@@ -11,6 +11,7 @@
 #include <rte_string_fns.h>
 
 #include "ccp_pci.h"
+#include "ccp_pmd_private.h"
 
 static const char * const uio_module_names[] = {
 	"igb_uio",
@@ -40,7 +41,7 @@ ccp_check_pci_uio_module(void)
 		rewind(fp);
 	}
 	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 000b2f4fe0..0536994300 100644
--- a/drivers/crypto/ccp/rte_ccp_pmd.c
+++ b/drivers/crypto/ccp/rte_ccp_pmd.c
@@ -342,7 +342,7 @@ cryptodev_ccp_create(const char *name,
 		goto init_error;
 	}
 
-	printf("CCP : Crypto device count = %d\n", cryptodev_cnt);
+	CCP_LOG_DBG("CCP : Crypto device count = %d\n", cryptodev_cnt);
 	dev->driver_id = ccp_cryptodev_driver_id;
 
 	/* register rx/tx burst functions for data path */
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 09:36:29.087317499 +0000
+++ 0020-crypto-ccp-remove-some-printf.patch	2023-02-23 09:36:28.210169645 +0000
@@ -1 +1 @@
-From e946ca8e727424b511fe4ea278d8bec76b800e7a Mon Sep 17 00:00:00 2001
+From 230bbf810bfdcb9a7f728a2b393a8724e5d3188f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit e946ca8e727424b511fe4ea278d8bec76b800e7a ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 424ead82c3..9c9cb81236 100644
+index 664ddc1747..c36409a0bc 100644
@@ -24 +25 @@
-@@ -362,7 +362,7 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status)
+@@ -361,7 +361,7 @@ ccp_find_lsb_regions(struct ccp_queue *cmd_q, uint64_t status)
@@ -33 +34 @@
-@@ -709,7 +709,7 @@ ccp_probe_devices(struct rte_pci_device *pci_dev,
+@@ -797,7 +797,7 @@ ccp_probe_devices(const struct rte_pci_id *ccp_id)
@@ -40,2 +41,2 @@
- 			ret = ccp_probe_device(ccp_type, pci_dev);
- 			if (ret == 0)
+ 			ret = ccp_probe_device(dirname, domain, bus, devid,
+ 					       function, ccp_type);
@@ -43 +44 @@
-index 38029a9081..c941e222c7 100644
+index 1702a09c4f..6932cb4152 100644
@@ -54 +55 @@
-@@ -41,7 +42,7 @@ ccp_check_pci_uio_module(void)
+@@ -40,7 +41,7 @@ ccp_check_pci_uio_module(void)
@@ -64 +65 @@
-index 221a0a5235..bcb621234c 100644
+index 000b2f4fe0..0536994300 100644
@@ -67 +68 @@
-@@ -237,7 +237,7 @@ cryptodev_ccp_create(const char *name,
+@@ -342,7 +342,7 @@ cryptodev_ccp_create(const char *name,
@@ -73,2 +73,0 @@
- 	dev->device = &pci_dev->device;
- 	dev->device->driver = &pci_drv->driver;
@@ -75,0 +75,2 @@
+ 
+ 	/* register rx/tx burst functions for data path */