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 48F1943CAD 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 413E840297; Thu, 14 Mar 2024 01:10:06 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 5335D4021E for ; Thu, 14 Mar 2024 01:10:02 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-413ef6985bfso2514415e9.3 for ; Wed, 13 Mar 2024 17:10:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375002; x=1710979802; 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=hBdC9k3cZ5dmV3hiE6asiW4iciWsK1ilV6ieSLW3DZc=; b=DrwNfHGPYqVderBQdeZpp3jgBi8LIhI8a4Fs7FwmCd8fcq8QSO8KYezN4dMe7cnrCV wzISLuTclVdIOARwqr3seOjySQA9uz71G9aHebvPrLuWcgioidPiWTUQ7sN8rgnxYRyB 3SmPi2OwJKPNBV9NLttU8efNvp/VQeHzGAYtPE2ZOVpeTdnsBOT1H2gr9c5nNJu4ip2w GL0bzYAr+mZN/aLntUsxyr3uswMyS95OL2LuzUE0X01P+sA0jYaE5WqWokp49tYUBXfb rp9YlA9CmC/POjZLqRY/KbZVcPVnBOV7pwArR6VjpjlulAVvMkRDx7VYk7vgIGWFOMf/ b0fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375002; x=1710979802; 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=hBdC9k3cZ5dmV3hiE6asiW4iciWsK1ilV6ieSLW3DZc=; b=g+/ytc0O26A/88m0Cqg+ErkdUnIERoDNA9tNzOFT5G77RJJhvOuyH/Ho2He4H9ybni QwrGIubixQFLY0iWAlkd9onT+x/L/jdYvKfFL58YmHcLzC0JOJWMdw3F4SrEyJsVtawa WxRlGya7VSnnfx+eznuRMrteGGc9Ueu7KLm0C3j3Ss2rFKmd5V7+bI1kW3GRYgvAXuKp 6N+4UIpWfQeJUlAyBsw3goFFvDhgG/opiIGSsnH33TND8e1uIPZ7FdX27gMl6oihQHo4 uA9YEyMm3OPvAGFtwM3sdGqcuC+HtQEs5UNLbuif9Lg6s2nV23RCqJ6/kH9MTazTPzqE kcrw== X-Forwarded-Encrypted: i=1; AJvYcCXakqpqHo+IKmxAmAflDQRLBau7U89xkqo6GOXqqPiukoloy1m43zSlRSBblwrEL1aC507H/7SZaBSZx8g0TXE= X-Gm-Message-State: AOJu0YyjwEOXnPhSYI/fwwGxJHIIRLhmANbzAN8cN0y1nom2vjAd9eZ1 IM4JX5seBBNZDqmbQAxZZHV8T4A8r5JC2gp7Udp6j3NcsiRHToA64+3byjUJ X-Google-Smtp-Source: AGHT+IEySmUEMpWT5iOoKrmTxy1R4vRqQ1eIjhNNKVpT0AXPUsgp4Q/CmBTydV4Kq1eX60q4cXCPyg== X-Received: by 2002:a05:600c:4f41:b0:412:b41a:53a2 with SMTP id m1-20020a05600c4f4100b00412b41a53a2mr218271wmq.2.1710375001941; Wed, 13 Mar 2024 17:10:01 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id j16-20020a05600c191000b00413f035d58esm606879wmq.10.2024.03.13.17.10.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:10:01 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Stephen Hemminger , Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc: fix logtypes register' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:08:58 +0000 Message-Id: <20240314000957.2810803-2-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/12cbf90bfae4dd04c623c21fc1f9cc7f935f7ca2 Thanks. Luca Boccassi --- >From 12cbf90bfae4dd04c623c21fc1f9cc7f935f7ca2 Mon Sep 17 00:00:00 2001 From: David Marchand 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 Acked-by: Stephen Hemminger Reviewed-by: Maxime Coquelin --- 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);