patch 'baseband/acc: fix logtypes register' has been queued to stable release 22.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.5

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/16/24. 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/12cbf90bfae4dd04c623c21fc1f9cc7f935f7ca2

Thanks.

Luca Boccassi

---
>From 12cbf90bfae4dd04c623c21fc1f9cc7f935f7ca2 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 18 Dec 2023 16:43:06 +0100
Subject: [PATCH] baseband/acc: fix logtypes register

[ upstream commit 05e45d129f8035f35f0cdbf59c5a996c4a191b35 ]

This library was calling RTE_LOG_REGISTER_DEFAULT twice, which means that
all logs for both acc100 and vrb drivers would be emitted for
pmd.baseband.acc logtype.

It seems the intent was to have dedicated logtypes per driver, so
register one for each with a suffix.

Fixes: c2d93488c7c3 ("baseband/acc200: introduce ACC200")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/baseband/acc/rte_acc100_pmd.c | 4 ++--
 drivers/baseband/acc/rte_acc200_pmd.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c
index 56a11e98b8..955c0236e4 100644
--- a/drivers/baseband/acc/rte_acc100_pmd.c
+++ b/drivers/baseband/acc/rte_acc100_pmd.c
@@ -26,9 +26,9 @@
 #include "acc200_cfg.h"
 
 #ifdef RTE_LIBRTE_BBDEV_DEBUG
-RTE_LOG_REGISTER_DEFAULT(acc100_logtype, DEBUG);
+RTE_LOG_REGISTER_SUFFIX(acc100_logtype, acc100, DEBUG);
 #else
-RTE_LOG_REGISTER_DEFAULT(acc100_logtype, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(acc100_logtype, acc100, NOTICE);
 #endif
 
 /* Calculate the offset of the enqueue register */
diff --git a/drivers/baseband/acc/rte_acc200_pmd.c b/drivers/baseband/acc/rte_acc200_pmd.c
index 4fc078fe26..8bda3a8e07 100644
--- a/drivers/baseband/acc/rte_acc200_pmd.c
+++ b/drivers/baseband/acc/rte_acc200_pmd.c
@@ -24,9 +24,9 @@
 #include "acc200_pmd.h"
 
 #ifdef RTE_LIBRTE_BBDEV_DEBUG
-RTE_LOG_REGISTER_DEFAULT(acc200_logtype, DEBUG);
+RTE_LOG_REGISTER_SUFFIX(acc200_logtype, acc200, DEBUG);
 #else
-RTE_LOG_REGISTER_DEFAULT(acc200_logtype, NOTICE);
+RTE_LOG_REGISTER_SUFFIX(acc200_logtype, acc200, NOTICE);
 #endif
 
 /* Calculate the offset of the enqueue register. */
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-14 00:09:20.901088149 +0000
+++ 0002-baseband-acc-fix-logtypes-register.patch	2024-03-14 00:09:20.557614110 +0000
@@ -1 +1 @@
-From 05e45d129f8035f35f0cdbf59c5a996c4a191b35 Mon Sep 17 00:00:00 2001
+From 12cbf90bfae4dd04c623c21fc1f9cc7f935f7ca2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 05e45d129f8035f35f0cdbf59c5a996c4a191b35 ]
+
@@ -20 +22 @@
- drivers/baseband/acc/rte_vrb_pmd.c    | 4 ++--
+ drivers/baseband/acc/rte_acc200_pmd.c | 4 ++--
@@ -24 +26 @@
-index 292537e24d..b837f7d7cd 100644
+index 56a11e98b8..955c0236e4 100644
@@ -27,2 +29,2 @@
-@@ -27,9 +27,9 @@
- #endif
+@@ -26,9 +26,9 @@
+ #include "acc200_cfg.h"
@@ -39,6 +41,6 @@
-diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c
-index 686e086a5c..6a89f9d4b3 100644
---- a/drivers/baseband/acc/rte_vrb_pmd.c
-+++ b/drivers/baseband/acc/rte_vrb_pmd.c
-@@ -22,9 +22,9 @@
- #include "vrb_pmd.h"
+diff --git a/drivers/baseband/acc/rte_acc200_pmd.c b/drivers/baseband/acc/rte_acc200_pmd.c
+index 4fc078fe26..8bda3a8e07 100644
+--- a/drivers/baseband/acc/rte_acc200_pmd.c
++++ b/drivers/baseband/acc/rte_acc200_pmd.c
+@@ -24,9 +24,9 @@
+ #include "acc200_pmd.h"
@@ -47,2 +49,2 @@
--RTE_LOG_REGISTER_DEFAULT(vrb_logtype, DEBUG);
-+RTE_LOG_REGISTER_SUFFIX(vrb_logtype, vrb, DEBUG);
+-RTE_LOG_REGISTER_DEFAULT(acc200_logtype, DEBUG);
++RTE_LOG_REGISTER_SUFFIX(acc200_logtype, acc200, DEBUG);
@@ -50,2 +52,2 @@
--RTE_LOG_REGISTER_DEFAULT(vrb_logtype, NOTICE);
-+RTE_LOG_REGISTER_SUFFIX(vrb_logtype, vrb, NOTICE);
+-RTE_LOG_REGISTER_DEFAULT(acc200_logtype, NOTICE);
++RTE_LOG_REGISTER_SUFFIX(acc200_logtype, acc200, NOTICE);