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 71583A034C for ; Fri, 25 Feb 2022 18:17:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B15E41152; Fri, 25 Feb 2022 18:17:31 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 836D541150 for ; Fri, 25 Feb 2022 18:17:30 +0100 (CET) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5347B3FCAD for ; Fri, 25 Feb 2022 17:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809450; bh=LWoKy4q2d8IcLpXWzRCId9TvSEsrMJk/vPzfSpxd+5E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=HlVbthqqpcQoLhusNIffgOCRLK8Nct9YBvAd3eSmJRfWd2ukNBz3rw5T+aC9FAGu6 aPdIXf7Pe/flhc7Ktt7E7HFylf+IV+Rze4AYz9u3yoQC0rQNPPnqRp+nfctkFSBkRE msPH5boOexaKt325fEE0BX0x7r5DFSfLyKlHX99qc4rqaTc4rDXx3cs+n5xc2OcM62 HaSpzdUGSko1f0MW1MCwxax3kG96JNsLdUY5GyRP3n/CQn8Y1RUr0OwI9UKBhcQEcG IjYIimTfS1+mLtrfXxIcJjip6DOlxQOAEu9xeb8YBs1qRL+8oqIFkukKd1PiAhzlH1 vFTbtsxaYmGmw== Received: by mail-wm1-f72.google.com with SMTP id i131-20020a1c3b89000000b0037bb9f6feeeso1834992wma.5 for ; Fri, 25 Feb 2022 09:17:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LWoKy4q2d8IcLpXWzRCId9TvSEsrMJk/vPzfSpxd+5E=; b=veRKJyLyOdGTBlbkRo26RQ6QotJ7c9N4rmbWHd+nphizAS+qjwWZoiED/VBfdHu831 PKgU2CE+QzKo27sJMYW4ZJC/TfmeehX06YbK419ATy0saFOGN0RBmDy1Z1qqsDTvSVif A0pXLua3WFbSofLdO6wDeCUTJ7IBFgRte10wn5ZwTfKeXzPkhy85iZZgdr1WzUx+x6Ik TH5gYvu0CZbm4fNUTQk9Px5Kx9FFyVJgvPtpJ5sdYqe9wnDKJkF+MuugnVhracxAJMXs 0Fc9tcpHPUr/1/9bflM1jDqlUib8ZfgBwQs1sBXGDnSvzN+ZpCF4mHo95GLPVlOT+UOG 3emQ== X-Gm-Message-State: AOAM530Pty7z/RocxjTakVjh7ZDa6Zrw59tftQZ8mE8aok/9Uhei0Vz3 A1tXvt2FpodTTioHVpfZqFjNOe/AFeoCmDTe/yF/d+GLbNNV3Rgd7cyPELnu4xC641IoDVfPFgn /ppgm8EItB6lSkEHCpDvQXLz9 X-Received: by 2002:a5d:55c1:0:b0:1ea:961e:2ce4 with SMTP id i1-20020a5d55c1000000b001ea961e2ce4mr7239450wrw.45.1645809449513; Fri, 25 Feb 2022 09:17:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJyzGaiAuWpBwtZ+9XFyZkA0wRAfMQCFIEedFeDViCg2d4q1XagF52BvKyI9QK0p8fNq3O4rvA== X-Received: by 2002:a5d:55c1:0:b0:1ea:961e:2ce4 with SMTP id i1-20020a5d55c1000000b001ea961e2ce4mr7239438wrw.45.1645809449290; Fri, 25 Feb 2022 09:17:29 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id o9-20020adfeac9000000b001e68d090023sm2895646wrn.68.2022.02.25.09.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:17:28 -0800 (PST) From: christian.ehrhardt@canonical.com To: Weiguo Li Cc: dpdk stable Subject: patch 'bus/dpaa: fix C++ include guard' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:15:28 +0100 Message-Id: <20220225171550.3499040-35-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.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 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/f01ea4e120ec3139dd389f4e2896be7914c0d1ae Thanks. Christian Ehrhardt --- >From f01ea4e120ec3139dd389f4e2896be7914c0d1ae Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Mon, 7 Feb 2022 20:36:56 +0800 Subject: [PATCH] bus/dpaa: fix C++ include guard [ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ] Supplement the missing half of braces for the extern "C" block, or remove the incomplete guard in internal header. Fixes: 6d6b4f49a155 ("bus/dpaa: add FMAN hardware operations") Fixes: 919eeaccb2ba ("bus/dpaa: introduce NXP DPAA bus driver skeleton") Signed-off-by: Weiguo Li --- drivers/bus/dpaa/include/fsl_fman.h | 4 ---- drivers/bus/dpaa/rte_dpaa_bus.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/bus/dpaa/include/fsl_fman.h b/drivers/bus/dpaa/include/fsl_fman.h index 1d1ce86719..6b426a7b93 100644 --- a/drivers/bus/dpaa/include/fsl_fman.h +++ b/drivers/bus/dpaa/include/fsl_fman.h @@ -7,10 +7,6 @@ #ifndef __FSL_FMAN_H #define __FSL_FMAN_H -#ifdef __cplusplus -extern "C" { -#endif - /* Status field in FD is updated on Rx side by FMAN with following information. * Refer to field description in FM BG. */ diff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h index 373aca9785..f85bf86cc3 100644 --- a/drivers/bus/dpaa/rte_dpaa_bus.h +++ b/drivers/bus/dpaa/rte_dpaa_bus.h @@ -16,6 +16,10 @@ #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define DPAA_MEMPOOL_OPS_NAME "dpaa" #define DEV_TO_DPAA_DEVICE(ptr) \ -- 2.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:45.601739873 +0100 +++ 0035-bus-dpaa-fix-C-include-guard.patch 2022-02-25 16:58:44.248990421 +0100 @@ -1 +1 @@ -From 1785d9eb62eea2b32c08ea30bfdd318e45b8120c Mon Sep 17 00:00:00 2001 +From f01ea4e120ec3139dd389f4e2896be7914c0d1ae Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1785d9eb62eea2b32c08ea30bfdd318e45b8120c ] + @@ -19 +21 @@ -index acb344584f..20690f8329 100644 +index 1d1ce86719..6b426a7b93 100644 @@ -22,3 +24,3 @@ -@@ -9,10 +9,6 @@ - - #include +@@ -7,10 +7,6 @@ + #ifndef __FSL_FMAN_H + #define __FSL_FMAN_H @@ -34 +36 @@ -index 31a5ea3fca..54bb1436fd 100644 +index 373aca9785..f85bf86cc3 100644 @@ -37 +39 @@ -@@ -17,6 +17,10 @@ +@@ -16,6 +16,10 @@ @@ -45,3 +47,3 @@ - /* This sequence number field is used to store event entry index for - * driver specific usage. For parallel mode queues, invalid - * index will be set and for atomic mode queues, valid value + #define DPAA_MEMPOOL_OPS_NAME "dpaa" + + #define DEV_TO_DPAA_DEVICE(ptr) \