patch 'baseband/acc: fix common logs' 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/fc8e14108ff23a306f260726365dd39489134e07

Thanks.

Luca Boccassi

---
>From fc8e14108ff23a306f260726365dd39489134e07 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Mon, 18 Dec 2023 16:43:07 +0100
Subject: [PATCH] baseband/acc: fix common logs

[ upstream commit 6bf0c1c2df217d8ad0c933b728aafa40aff58e1b ]

Logs generated by helpers common to acc100 and vrb drivers were
emitted with a RTE_LOG_NOTICE == 6 == RTE_LOGTYPE_HASH.
Register a dedicated logtype for this.

Fixes: 32e8b7ea35dd ("baseband/acc100: refactor to segregate common code")

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/acc_common.c | 7 +++++++
 drivers/baseband/acc/acc_common.h | 4 +++-
 drivers/baseband/acc/meson.build  | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 drivers/baseband/acc/acc_common.c

diff --git a/drivers/baseband/acc/acc_common.c b/drivers/baseband/acc/acc_common.c
new file mode 100644
index 0000000000..f8d2b19570
--- /dev/null
+++ b/drivers/baseband/acc/acc_common.c
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2023 Red Hat, Inc.
+ */
+
+#include <rte_log.h>
+
+RTE_LOG_REGISTER_SUFFIX(acc_common_logtype, common, INFO);
diff --git a/drivers/baseband/acc/acc_common.h b/drivers/baseband/acc/acc_common.h
index c076dc72cc..9336d3fbcf 100644
--- a/drivers/baseband/acc/acc_common.h
+++ b/drivers/baseband/acc/acc_common.h
@@ -131,9 +131,11 @@
 #define ACC_LIM_31 20 /* 0.31 */
 #define ACC_MAX_E (128 * 1024 - 2)
 
+extern int acc_common_logtype;
+
 /* Helper macro for logging */
 #define rte_acc_log(level, fmt, ...) \
-	rte_log(RTE_LOG_ ## level, RTE_LOG_NOTICE, fmt "\n", \
+	rte_log(RTE_LOG_ ## level, acc_common_logtype, fmt "\n", \
 		##__VA_ARGS__)
 
 /* ACC100 DMA Descriptor triplet */
diff --git a/drivers/baseband/acc/meson.build b/drivers/baseband/acc/meson.build
index 77c393b533..1cbb06d107 100644
--- a/drivers/baseband/acc/meson.build
+++ b/drivers/baseband/acc/meson.build
@@ -3,6 +3,6 @@
 
 deps += ['bbdev', 'bus_pci']
 
-sources = files('rte_acc100_pmd.c', 'rte_acc200_pmd.c')
+sources = files('acc_common.c', 'rte_acc100_pmd.c', 'rte_acc200_pmd.c')
 
 headers = files('rte_acc_cfg.h')
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-03-14 00:09:20.952639726 +0000
+++ 0003-baseband-acc-fix-common-logs.patch	2024-03-14 00:09:20.561614189 +0000
@@ -1 +1 @@
-From 6bf0c1c2df217d8ad0c933b728aafa40aff58e1b Mon Sep 17 00:00:00 2001
+From fc8e14108ff23a306f260726365dd39489134e07 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6bf0c1c2df217d8ad0c933b728aafa40aff58e1b ]
+
@@ -36 +38 @@
-index bda2ad2f7a..fddeb0737b 100644
+index c076dc72cc..9336d3fbcf 100644
@@ -39,3 +41,3 @@
-@@ -150,9 +150,11 @@
- 
- #define ACC_MAX_FFT_WIN      16
+@@ -131,9 +131,11 @@
+ #define ACC_LIM_31 20 /* 0.31 */
+ #define ACC_MAX_E (128 * 1024 - 2)
@@ -53 +55 @@
-index 449d1e176c..64fcf1537a 100644
+index 77c393b533..1cbb06d107 100644
@@ -56 +58 @@
-@@ -24,6 +24,6 @@ endif
+@@ -3,6 +3,6 @@
@@ -58 +60 @@
- deps += ['bus_pci']
+ deps += ['bbdev', 'bus_pci']
@@ -60,2 +62,2 @@
--sources = files('rte_acc100_pmd.c', 'rte_vrb_pmd.c')
-+sources = files('acc_common.c', 'rte_acc100_pmd.c', 'rte_vrb_pmd.c')
+-sources = files('rte_acc100_pmd.c', 'rte_acc200_pmd.c')
++sources = files('acc_common.c', 'rte_acc100_pmd.c', 'rte_acc200_pmd.c')