From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9251443CAD for ; Thu, 14 Mar 2024 01:10:06 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B93642E36; Thu, 14 Mar 2024 01:10:06 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 9F27B42E0E for ; Thu, 14 Mar 2024 01:10:03 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-41312232c7aso9385745e9.0 for ; Wed, 13 Mar 2024 17:10:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375003; x=1710979803; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tD4CX8mYymWV9xww3y6EPNiroxhx2WpUj82umq4XS94=; b=fmxo7TL88mzRUyoYE0aC2Sn0zXt+8dPI+K/T8TiCEMch7+Gf3fhnZ+vBn4uzijd60c tGAyo31JI1Oiv33oy3dzzEc4ojJ7iagBTjxVOUPLkvU6T6mytdaCztO3s22KjaJFlhKj d8jCZCNh4W4wGGzqvVkAt7pszWzETAfGeEEQ0I2xgN5nbcg6FBAn5RhQHKApN1OeD8DS uV8n7cy/W9QRr5CslRKcflu3QG8OIrrkz4y38MOfVRVFpVTUCrNeS1S+QzS6OXIuAZh+ Aggbu73clf9BRfAFBZv52mi9SwQ8QLti4X5W3GWN/MK0RzESqCFtY4PqcnI/EaviJ8Xo /TyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375003; x=1710979803; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tD4CX8mYymWV9xww3y6EPNiroxhx2WpUj82umq4XS94=; b=fZMTBKG9XczLFqAUg5EArxIg01f04ugGbdJjPHn//y+KVZjJVTFx55utCG2K0hUqJT xWEFk+mAdcItEd1ZTslOgKwezBg+3zvndxtErb9HXHtRhQvkRVU1v1wslRBhhGmSD2CQ UIDfSykN9CQC++BEZnHYquCtYOR0Qw5kw5Q8DCBgzhvJIyaZbcsGB1Lw+l5B2mZqHqhw 6WIwRuug4JcHRGHDGYu94fX9WXTzKdD79B1J5qkv+ov4HHVOKEo0BFJ48onpMXJ3WcXb 4rSXSsfpPZOA8EuYtDw9JCYBRgfCunhIL86EmjOFrKkgcgitAaqQFuCuWVfyOCa3nHy3 gRFQ== X-Forwarded-Encrypted: i=1; AJvYcCWrGtndkSNTwvtA/FfGnrCkDhFIg34DauFwBLfEULlysLttD+dUv8KUhSt03bqy26cubZ4o+s8HbUNtdVBUUv4= X-Gm-Message-State: AOJu0YyvXKAkOo8iI7UHP1ia/m08Vm01CBVLv77l7OPK0EKbJZo/l3Qc cNRDzdrRDMiEQ2GfQVBt7A/ISHyYZIo9dvOfHQJpzNTaO+pnFFpx X-Google-Smtp-Source: AGHT+IEmG9Pm0fWPnjnZVVgBm8Fp2qdFAJeM9hZhB8ekGun0eQ0tGBpNW/1zB+JK7RxXg5+1OubiEw== X-Received: by 2002:a5d:5707:0:b0:33e:c0f0:c159 with SMTP id a7-20020a5d5707000000b0033ec0f0c159mr1068128wrv.10.1710375003250; Wed, 13 Mar 2024 17:10:03 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id h10-20020a05600c350a00b00412ee8e2f2asm3802711wmq.9.2024.03.13.17.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:10:02 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Stephen Hemminger , Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc: fix common logs' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:08:59 +0000 Message-Id: <20240314000957.2810803-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Stephen Hemminger Reviewed-by: Maxime Coquelin --- 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_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')