patch 'dma/hisilicon: use common PCI device naming' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/06/22. 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/c6aea57d9987b032f47ddb8ffbd4d848db28804b

Thanks.

Kevin

---
>From c6aea57d9987b032f47ddb8ffbd4d848db28804b Mon Sep 17 00:00:00 2001
From: Chengwen Feng <fengchengwen at huawei.com>
Date: Thu, 17 Feb 2022 10:59:11 +0800
Subject: [PATCH] dma/hisilicon: use common PCI device naming

[ upstream commit 033904450b1d52fd3d09e2bb53e529e3ba0ecf77 ]

For DMA device 0000:7d:0.0, the original generated dmadev name starts
with the "7d:0.0", which is not expected.
This patch uses rte_pci_device_name API to generates the dmadev name.

Signed-off-by: Chengwen Feng <fengchengwen at huawei.com>
---
 doc/guides/dmadevs/hisilicon.rst    |  4 ++--
 drivers/dma/hisilicon/hisi_dmadev.c | 23 +++++++----------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/doc/guides/dmadevs/hisilicon.rst b/doc/guides/dmadevs/hisilicon.rst
index 191e56f2f7..974bc49376 100644
--- a/doc/guides/dmadevs/hisilicon.rst
+++ b/doc/guides/dmadevs/hisilicon.rst
@@ -30,6 +30,6 @@ which can be accessed using API from the ``rte_dmadev`` library.
 The name of the ``dmadev`` created is like "B:D.F-chX", e.g. DMA 0000:7b:00.0
 will create four ``dmadev``,
-the 1st ``dmadev`` name is "7b:00.0-ch0",
-and the 2nd ``dmadev`` name is "7b:00.0-ch1".
+the 1st ``dmadev`` name is "0000:7b:00.0-ch0",
+and the 2nd ``dmadev`` name is "0000:7b:00.0-ch1".
 
 Device Configuration
diff --git a/drivers/dma/hisilicon/hisi_dmadev.c b/drivers/dma/hisilicon/hisi_dmadev.c
index 05066b4d0e..ff80622ec0 100644
--- a/drivers/dma/hisilicon/hisi_dmadev.c
+++ b/drivers/dma/hisilicon/hisi_dmadev.c
@@ -732,22 +732,13 @@ hisi_dma_burst_capacity(const void *dev_private, uint16_t vchan)
 }
 
-static void
-hisi_dma_gen_pci_device_name(const struct rte_pci_device *pci_dev,
-			     char *name, size_t size)
-{
-	memset(name, 0, size);
-	(void)snprintf(name, size, "%x:%x.%x",
-		 pci_dev->addr.bus, pci_dev->addr.devid,
-		 pci_dev->addr.function);
-}
-
 static void
 hisi_dma_gen_dev_name(const struct rte_pci_device *pci_dev,
-		      uint8_t queue_id, char *name, size_t size)
+		      uint8_t queue_id, char *dev_name, size_t size)
 {
-	memset(name, 0, size);
-	(void)snprintf(name, size, "%x:%x.%x-ch%u",
-		 pci_dev->addr.bus, pci_dev->addr.devid,
-		 pci_dev->addr.function, queue_id);
+	char name[RTE_DEV_NAME_MAX_LEN] = { 0 };
+
+	memset(dev_name, 0, size);
+	rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+	(void)snprintf(dev_name, size, "%s-ch%u", name, queue_id);
 }
 
@@ -865,5 +856,5 @@ hisi_dma_probe(struct rte_pci_driver *pci_drv __rte_unused,
 	int ret;
 
-	hisi_dma_gen_pci_device_name(pci_dev, name, sizeof(name));
+	rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
 
 	if (pci_dev->mem_resource[2].addr == NULL) {
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:01.795372577 +0000
+++ 0014-dma-hisilicon-use-common-PCI-device-naming.patch	2022-03-01 10:41:01.249244087 +0000
@@ -1 +1 @@
-From 033904450b1d52fd3d09e2bb53e529e3ba0ecf77 Mon Sep 17 00:00:00 2001
+From c6aea57d9987b032f47ddb8ffbd4d848db28804b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 033904450b1d52fd3d09e2bb53e529e3ba0ecf77 ]
+
@@ -10,2 +11,0 @@
-Cc: stable at dpdk.org
-
@@ -19 +19 @@
-index 81bf090311..8c1f0f8886 100644
+index 191e56f2f7..974bc49376 100644
@@ -22 +22 @@
-@@ -31,6 +31,6 @@ which can be accessed using API from the ``rte_dmadev`` library.
+@@ -30,6 +30,6 @@ which can be accessed using API from the ``rte_dmadev`` library.
@@ -32 +32 @@
-index c36acf01be..9cef2cbfbe 100644
+index 05066b4d0e..ff80622ec0 100644
@@ -35 +35 @@
-@@ -785,22 +785,13 @@ hisi_dma_burst_capacity(const void *dev_private, uint16_t vchan)
+@@ -732,22 +732,13 @@ hisi_dma_burst_capacity(const void *dev_private, uint16_t vchan)
@@ -64 +64 @@
-@@ -918,5 +909,5 @@ hisi_dma_probe(struct rte_pci_driver *pci_drv __rte_unused,
+@@ -865,5 +856,5 @@ hisi_dma_probe(struct rte_pci_driver *pci_drv __rte_unused,