patch 'common/cnxk: replace direct API usage in REE' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Sun Oct 22 16:21:46 CEST 2023
Hi,
FYI, your patch has been queued to stable release 22.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 11/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=529b747a92e1ca4df8f74f15e57f5d61ee026f7b
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 529b747a92e1ca4df8f74f15e57f5d61ee026f7b Mon Sep 17 00:00:00 2001
From: Jerin Jacob <jerinj at marvell.com>
Date: Wed, 4 Oct 2023 17:54:32 +0530
Subject: [PATCH] common/cnxk: replace direct API usage in REE
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit 7557e3f5b9facc77247e59ad04ae99f47b0ddb3d ]
The common code is shared between different driver environments,
introduce missing plt_ abstractions of missing rte_ symbols and
use plt symbols to avoid changing roc_* files.
Fixes: c88d3638c7fc ("common/cnxk: support REE")
Signed-off-by: Jerin Jacob <jerinj at marvell.com>
---
drivers/common/cnxk/roc_ree.c | 4 ++--
drivers/common/cnxk/roc_ree.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/common/cnxk/roc_ree.c b/drivers/common/cnxk/roc_ree.c
index 1eb2ae7272..b6392658c3 100644
--- a/drivers/common/cnxk/roc_ree.c
+++ b/drivers/common/cnxk/roc_ree.c
@@ -441,7 +441,7 @@ static void
roc_ree_lf_err_intr_unregister(struct roc_ree_vf *vf, uint16_t msix_off,
uintptr_t base)
{
- struct rte_pci_device *pci_dev = vf->pci_dev;
+ struct plt_pci_device *pci_dev = vf->pci_dev;
/* Disable error interrupts */
plt_write64(~0ull, base + REE_LF_MISC_INT_ENA_W1C);
@@ -468,7 +468,7 @@ static int
roc_ree_lf_err_intr_register(struct roc_ree_vf *vf, uint16_t msix_off,
uintptr_t base)
{
- struct rte_pci_device *pci_dev = vf->pci_dev;
+ struct plt_pci_device *pci_dev = vf->pci_dev;
int ret;
/* Disable error interrupts */
diff --git a/drivers/common/cnxk/roc_ree.h b/drivers/common/cnxk/roc_ree.h
index e138e4de66..bf994e7124 100644
--- a/drivers/common/cnxk/roc_ree.h
+++ b/drivers/common/cnxk/roc_ree.h
@@ -68,7 +68,7 @@ struct roc_ree_qp {
/**< Base address where BAR is mapped */
struct roc_ree_pending_queue pend_q;
/**< Pending queue */
- rte_iova_t iq_dma_addr;
+ plt_iova_t iq_dma_addr;
/**< Instruction queue address */
uint32_t roc_regexdev_jobid;
/**< Job ID */
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-10-22 22:17:37.183224900 +0800
+++ 0077-common-cnxk-replace-direct-API-usage-in-REE.patch 2023-10-22 22:17:34.296723700 +0800
@@ -1 +1 @@
-From 7557e3f5b9facc77247e59ad04ae99f47b0ddb3d Mon Sep 17 00:00:00 2001
+From 529b747a92e1ca4df8f74f15e57f5d61ee026f7b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7557e3f5b9facc77247e59ad04ae99f47b0ddb3d ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
More information about the stable
mailing list