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 1F41BA00C2 for ; Thu, 3 Nov 2022 10:31:35 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 166EC4069B; Thu, 3 Nov 2022 10:31:35 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 386F240694 for ; Thu, 3 Nov 2022 10:31:33 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id o4so1723366wrq.6 for ; Thu, 03 Nov 2022 02:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=sUXveEJOFQspTAcMTAZnyPM+2uuDrBz9J93Vz5rzgaQ=; b=EfFwNPYWkwNmaM+9RBhsJ5XMdrV+zHDZb4WAumqlSbjg1AgeF6/S3/P0NXJkwKzFE/ uY9W2GfBmXwtA/OSKltuxs8YWs2CiHQm6V5NfdfKd1vm1syQi5CyHTPtM9h4Tsm6Kjek l//zziaCyRbc0kmi9UDRRDm9mV7UHZrKbBTwiIjnuEYLeKY35Kw3Glqg+4nate03EBE0 /vVj5Rtj9Hyw4M7FKKKpcTT6XUNoyqHcLqNn8QhYLIzQ6btEl5JlEGfckkLhhacpM7o6 752fzdJLoZAomAoX0HHlGBn/zr2/v96HJ2w9KegzbYNecAVrWaVcDdjo2vFIPtbXKspI TBCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=sUXveEJOFQspTAcMTAZnyPM+2uuDrBz9J93Vz5rzgaQ=; b=kXqBhvl4pG0+guw71wt9aWtcjdk1g3gLEzEz8OmuxO/UpxZk06gXHenqrJN76HBav7 ws0YYV7DB6L7hmSwSG1b51ZyGI5WwKULrl0+IuHnG1iLw98GI5zCpZGy7N1K5ahdMc4V gMoQpaMm9e3t8pK3N3oDAWrMZv4dbduwCMzxpAwHhr7oifvAAGLAw1jAmwqJ/C4jU4eJ vYIY/UHrgbYXY/dBUL2HN882vzYIAwIgTWElO4eQYf2QBoEjIgzYpG9CF0Eceheh1q/C 9pHAukVwq405w6FkNd8vVUfF8Fxy9yKgPbe6XVFclSlWPBW8sU4M1IauVVE4zQ2/KxQB 9nzQ== X-Gm-Message-State: ACrzQf2iDd0owFAmurKiQgpasoNvMDHKbd13b9RCjuaEFrf7ZXwTXzfG bkh6G8XuegM0py+ArrX+5c63JzFUOW6G5l1b X-Google-Smtp-Source: AMsMyM4AOfbjtIzKie22gFun6or3tIU6EWimvQgzkAeLTtBDcTBxYl/Unvt7yQvGgCKkslOwk/Xv7g== X-Received: by 2002:adf:b612:0:b0:236:5d1f:143a with SMTP id f18-20020adfb612000000b002365d1f143amr17467307wre.364.1667467892917; Thu, 03 Nov 2022 02:31:32 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id f17-20020a05600c4e9100b003cf7292c553sm816482wmq.13.2022.11.03.02.31.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Nov 2022 02:31:32 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix build with GCC 13' has been queued to stable release 20.11.7 Date: Thu, 3 Nov 2022 09:27:19 +0000 Message-Id: <20221103092758.1099402-61-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221103092758.1099402-1-luca.boccassi@gmail.com> References: <20221103092758.1099402-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 20.11.7 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/05/22. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2c7dd3db0baa82d682be5dc122931c17a66ae95d Thanks. Luca Boccassi --- >From 2c7dd3db0baa82d682be5dc122931c17a66ae95d Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 3 Oct 2022 18:57:44 +0200 Subject: [PATCH] net/bnxt: fix build with GCC 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit bb7e1f17a6f3419725d11184e68749298205a8dc ] GCC 13 complains with: ../../../dpdk/drivers/net/bnxt/tf_ulp/ulp_flow_db.c:962:1: error: conflicting types for ‘ulp_flow_db_flush_flows’ due to enum/integer mismatch; have ‘int32_t(struct bnxt_ulp_context *, enum bnxt_ulp_fdb_type)’ {aka ‘int(struct bnxt_ulp_context *, enum bnxt_ulp_fdb_type)’} [-Werror=enum-int-mismatch] 962 | ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from ../../../dpdk/drivers/net/bnxt/tf_ulp/ulp_flow_db.c:12: ../../../dpdk/drivers/net/bnxt/tf_ulp/ulp_flow_db.h:211:1: note: previous declaration of ‘ulp_flow_db_flush_flows’ with type ‘int32_t(struct bnxt_ulp_context *, uint32_t)’ {aka ‘int(struct bnxt_ulp_context *, unsigned int)’} 211 | ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Fixes: 30683082a8ed ("net/bnxt: combine default and regular flows") Signed-off-by: David Marchand Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h index a2a04cef42..ce33f5da90 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h @@ -199,13 +199,13 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt, * Flush all flows in the flow database. * * ulp_ctxt [in] Ptr to ulp context - * tbl_idx [in] The index to table + * flow_type [in] - specify default or regular * * returns 0 on success or negative number on failure */ int32_t ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, - uint32_t idx); + enum bnxt_ulp_fdb_type flow_type); /* * Flush all flows in the flow database that belong to a device function. -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-03 09:27:29.090164878 +0000 +++ 0061-net-bnxt-fix-build-with-GCC-13.patch 2022-11-03 09:27:25.477424454 +0000 @@ -1 +1 @@ -From bb7e1f17a6f3419725d11184e68749298205a8dc Mon Sep 17 00:00:00 2001 +From 2c7dd3db0baa82d682be5dc122931c17a66ae95d Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit bb7e1f17a6f3419725d11184e68749298205a8dc ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index b27678dae9..2b02836a40 100644 +index a2a04cef42..ce33f5da90 100644 @@ -41 +42 @@ -@@ -203,13 +203,13 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt, +@@ -199,13 +199,13 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt,