From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 822C0A0A0E
for <public@inbox.dpdk.org>; Mon, 10 May 2021 18:10:28 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 7D2A74003E;
Mon, 10 May 2021 18:10:28 +0200 (CEST)
Received: from NAM10-BN7-obe.outbound.protection.outlook.com
(mail-bn7nam10on2043.outbound.protection.outlook.com [40.107.92.43])
by mails.dpdk.org (Postfix) with ESMTP id 0B1EE4003E
for <stable@dpdk.org>; Mon, 10 May 2021 18:10:27 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=glAINhyCVX9lkEslL9nMim61f8Q4D5m7UNFGpmrJc9ovy21EmGSY4DXPiEbPhmTVp5fZAdf6T9+Ds6JVhBDJkJ6BgoPKexXa05cY5cwUiy2qfcIB/1r41RasBLhzA5jfpWmVTtPdHeez8e5cCC/0rfmEbRzchrpJkEZq9bixEznr7srCa4k2TxUhfDezYS9Xe8pNWDoz9xViRcBAZKPPthaEb59kVFonVPNYbD71L3qDQOyBw0+28RaD1/cFYmC0fSpXIbwKlf9u7irQppEBJkFJ3VTXOhI+2PU0Vrvov7ztDcSW07GHLn+/53wkQvyCW+I1puDlpC+oknoQTC5DUQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=yDnP8W95jyUtOBi5WruHL5s6yrA8rl/B490dnxw8SJ4=;
b=VezAlbwt8nv/S3xlc5Xb+hHFt6rwuRtReLtrKE027ziSfUcXfxc4AghQZ49vgA3pbC+RTffRRrC+uleW0mbeGxYVv8ss6zBUHDuLb9VTCzLEnkhXZvSom61tS8ucubHuiSj+znskmI6ttDn27zxkbehuBiocOUKo/7gattbIVNjMdn+6n27D9Lu0uDy3caOZVpWJX7kyPsudjuosU/xxiikAm+PA3WyxmxXArYvNvjdrbRmgz5JZsl+CqV1DzJMiFc3AyppfBymVv+mFLzEgitC8TZKFrZLGNhspq3ouASQh8BBBSuqc0z0zzZIoNqcY8/fbfELQUjWqAZjgWLA3zQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com;
dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com;
dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=yDnP8W95jyUtOBi5WruHL5s6yrA8rl/B490dnxw8SJ4=;
b=aQvLGg/OS2i87//H4aX//8EV2pQZZWXGToKjsgBvWp3OD3vcS5ysD6IzRJcK7RtfHI3JO56UjHsed31lcnWnlnluSPBQBWSYNE7CojeU7mKcZigWpZFxOw9NjfNmp1Giu/m2jrefMFrMWt6EGN/graAbpbEUXi8IuoitfvTWxYyHA/bJPm58BE913ZgxccPRtcJ5tmbae8Aaa1q+l0re68sjaswXEIZymzfO+XY1vNoP2fORJYmi9ErGprvmT6Vx1HWUL5rgrWykIDLGwKB7kqCd6kk4riz9ujUwxszx/9w6g2SSVRTGRzG0hGVI3j6Lknm9x+tKkzf8ryPSIq7XaQ==
Received: from BN9PR03CA0585.namprd03.prod.outlook.com (2603:10b6:408:10d::20)
by CH2PR12MB4120.namprd12.prod.outlook.com (2603:10b6:610:7b::13)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.26; Mon, 10 May
2021 16:10:25 +0000
Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com
(2603:10b6:408:10d:cafe::a7) by BN9PR03CA0585.outlook.office365.com
(2603:10b6:408:10d::20) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend
Transport; Mon, 10 May 2021 16:10:25 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed)
header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:10:24 +0000
Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May
2021 16:10:22 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Natanael Copa <ncopa@alpinelinux.org>
CC: Luca Boccassi <bluca@debian.org>, Hemant Agrawal <hemant.agrawal@nxp.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>, David Marchand
<david.marchand@redhat.com>, dpdk stable <stable@dpdk.org>
Date: Tue, 11 May 2021 00:00:21 +0800
Message-ID: <20210510160258.30982-72-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com>
References: <20210510160258.30982-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.145.6]
X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 09a65f59-d046-4e79-0ecd-08d913ce1ecd
X-MS-TrafficTypeDiagnostic: CH2PR12MB4120:
X-Microsoft-Antispam-PRVS: <CH2PR12MB41209842049FDEBD17F21E10A1549@CH2PR12MB4120.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:10000;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 2xIBKfW0hACxlQkUH2hS0hamrgaoKq2cZig/ZF1y6FsLIWkpBsjl7Ee0jnSckY2boc4q+YcwrjIstSbJ10nFMqA7e82bbwvmjgCnkEaSwbjG2/taBY6IZqJ7ThrpQmSO9J3RAIGNFA2NM8h0YCh3w/wPJSDm3O+0xWTbU/cxaxb/yjKJejQPHoZkHtjgaz0jZzeIel7YCbeZMUb7QpdLuRvtrllKZKT+nmoJuOMKcgAfnkyIrZOGbxbZB/xRBrtoUbr+EInfCMOarqABFnMJTHBh+PbyBi9P+UxY+9qtaHnC993hxpBEvcrCRawg/z3/9Mzp7NAUrVuAc3H5M/pwGlXcgPYo5+3EqKDGnEx3Wtv73qBxZEebluQLBrnlykc8CKsB+0bg3Ox+nID+bhlq87hdE3nwgx3QvSZxkGLnUSPqDSpg8soGY/f9W2Og1uk2Xqp4cT1elwKx3AYr36653rJNFjZjBM7/u1gTX94al46olAKMf9oVAG8SGmpXJxgG8wccy+cxBhLjQP6UbwzDAQ2M8v9L16+jN2TYJHlAZ0YCY9+3y6EUecZtQ19IJOmkW9DgKgsccuQA3vckIeQ1m65cXQv76fwXz9jLYBcwu2rnBW+e9aDHuxeK377qWSVDTcQjTrTOZtx3yYkDV+ojaG/9aHudULQ5juG7POUrSkjylJCJwqCWimymKWpWbfI3RotV11XNyCacf1ai27wI96enNGpm7Y07CXQgS9VQoXV8Cmy0lqmSDf/q8jlU9WTe8xT788VzyGkxK98bu8cDhA==
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(39860400002)(376002)(346002)(136003)(396003)(46966006)(36840700001)(82740400003)(6286002)(2616005)(426003)(36860700001)(966005)(186003)(336012)(1076003)(47076005)(6916009)(7696005)(4326008)(7636003)(26005)(16526019)(478600001)(5660300002)(70206006)(54906003)(2906002)(8676002)(83380400001)(36756003)(55016002)(36906005)(316002)(53546011)(70586007)(8936002)(82310400003)(86362001)(356005);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:10:24.8932 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 09a65f59-d046-4e79-0ecd-08d913ce1ecd
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4120
Subject: [dpdk-stable] patch 'bus/dpaa: fix 64-bit arch detection' has been
queued to stable release 20.11.2
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.11.2
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/12/21. 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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/a01c94a0c3b1ecbd48a3cfd1e04e760d8fa9707a
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From a01c94a0c3b1ecbd48a3cfd1e04e760d8fa9707a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 5 Nov 2020 22:17:13 +0100
Subject: [PATCH] bus/dpaa: fix 64-bit arch detection
Cc: Luca Boccassi <bluca@debian.org>
[ upstream commit a4ab65e75beecbebafdca91aa6aac1f091b4460c ]
There is no standard saying that __WORDSIZE should be defined or in
what include it should be defined. Use RTE_ARCH_64 instead.
This solves a warning when building with musl libc:
warning: "__WORDSIZE" is not defined, evaluates to 0 [-Wundef]
Fixes: 847ee3bd0d1f ("bus/dpaa: support FMAN frame queue lookup")
Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Acked-by: David Marchand <david.marchand@redhat.com>
---
drivers/bus/dpaa/include/fsl_qman.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h
index 10212f0fd5..7ef2f3b2e3 100644
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -16,7 +16,7 @@ extern "C" {
#include <rte_eventdev.h>
/* FQ lookups (turn this on for 64bit user-space) */
-#if (__WORDSIZE == 64)
+#ifdef RTE_ARCH_64
#define CONFIG_FSL_QMAN_FQ_LOOKUP
/* if FQ lookups are supported, this controls the number of initialised,
* s/w-consumed FQs that can be supported at any one time.
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-05-10 23:59:28.514480000 +0800
+++ 0073-bus-dpaa-fix-64-bit-arch-detection.patch 2021-05-10 23:59:26.430000000 +0800
@@ -1 +1 @@
-From a4ab65e75beecbebafdca91aa6aac1f091b4460c Mon Sep 17 00:00:00 2001
+From a01c94a0c3b1ecbd48a3cfd1e04e760d8fa9707a Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca@debian.org>
+
+[ upstream commit a4ab65e75beecbebafdca91aa6aac1f091b4460c ]
@@ -14 +16,0 @@
-Cc: stable@dpdk.org