patch 'crypto/ccp: remove some dead code for UIO' has been queued to stable release 21.11.4

Kevin Traynor ktraynor at redhat.com
Thu Feb 23 16:05:20 CET 2023


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/bc5f3c068ce22644eee9579e7f723699276e12a0

Thanks.

Kevin

---
>From bc5f3c068ce22644eee9579e7f723699276e12a0 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Tue, 4 Oct 2022 11:51:30 +0200
Subject: [PATCH] crypto/ccp: remove some dead code for UIO

[ upstream commit b211d968f77097c868eb963a7de11b1a244b1a65 ]

uio_fd is unused.

Fixes: 09a0fd736a08 ("crypto/ccp: enable IOMMU")

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 | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c
index 8ca092fa6e..3f00b2522b 100644
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -654,5 +654,4 @@ ccp_probe_device(int ccp_type, struct rte_pci_device *pci_dev)
 {
 	struct ccp_device *ccp_dev = NULL;
-	int uio_fd = -1;
 
 	ccp_dev = rte_zmalloc("ccp_device", sizeof(*ccp_dev),
@@ -672,6 +671,4 @@ ccp_probe_device(int ccp_type, struct rte_pci_device *pci_dev)
 fail:
 	CCP_LOG_ERR("CCP Device probe failed");
-	if (uio_fd >= 0)
-		close(uio_fd);
 	if (ccp_dev)
 		rte_free(ccp_dev);
-- 
2.39.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-02-23 14:46:24.539925660 +0000
+++ 0029-crypto-ccp-remove-some-dead-code-for-UIO.patch	2023-02-23 14:46:23.742235868 +0000
@@ -1 +1 @@
-From b211d968f77097c868eb963a7de11b1a244b1a65 Mon Sep 17 00:00:00 2001
+From bc5f3c068ce22644eee9579e7f723699276e12a0 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b211d968f77097c868eb963a7de11b1a244b1a65 ]
+
@@ -9 +10,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
-index 9c9cb81236..410e62121e 100644
+index 8ca092fa6e..3f00b2522b 100644
@@ -32,2 +33,2 @@
- 	rte_free(ccp_dev);
- 	return -1;
+ 	if (ccp_dev)
+ 		rte_free(ccp_dev);



More information about the stable mailing list