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 EC5A245CE3 for ; Mon, 11 Nov 2024 07:41:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B0B564067A; Mon, 11 Nov 2024 07:41:43 +0100 (CET) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2086.outbound.protection.outlook.com [40.107.100.86]) by mails.dpdk.org (Postfix) with ESMTP id 3EB054067A for ; Mon, 11 Nov 2024 07:41:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XI4jMxj2z+97y1APRgeoEHw7RfQeyfUnF4QYFTgbDebliXUPp5d7bP0SKllzedyKqAERVOHdRCyOtBUFx/dGZr9SvRM/obELhRmfGvmg7tdKdizZJgC1BJVpILKa448k6gOXP2aANNnnNUAPPFfdYe7x3LMOUG3MnlBbt3LiHT5gNgXMlCGM3CqY8/IYKLpmU6fOOBCgsNu2EWaPcK6idp4UvpuEmwS3DqvUTOhViCRMQdDBPZ2rQ5V2ebYAvOcc4ovZTII/yWVIeO7iqO2j00p/CZxTDDupe5rFmpEC2tGJVytJtO/urfY9ckF/Z0sWI8RSQb6z/wletceZdbU/jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=U2HgM4aJ3Yi6xyiu375g/6ilLI3bA6PpN/fmhwnIOko=; b=ArrHCP/ZVtd4NLEOk1GUXn4q+NDjVcq7rE0kwJVEYNeCqrpu0DTmemjz33I1QV3ifEU7zsSWGZrCoMLNOULKhhkIhqPrlZMmFGiBWqpwZxeT2PG9vtv2Eld1MgKJz9PY94S35lXkNExrjyj1Euxr3Q51K1yRPVJpx0ij2FMgJoNPorTFtoLYNXn5mXjfSi4GrB8QMk282VEYJpInPrAtjBAEyhMybLY1iw16KznccVVOA46ATqjwunNCDoxmyHj196C4TWAZhsDolGyGzXEfgC4rQUlfdyAP+flgkNG+FLXG+rO/pC6sQ3y2KHdIukNHhDNAGHuMWYD8noXhpJV14Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=U2HgM4aJ3Yi6xyiu375g/6ilLI3bA6PpN/fmhwnIOko=; b=O9kr3bxYAaE/e3VWWW8f11Vjf2rq4aEbC8y9DTrKAD3p+TyHnNMZ/fXrqWn9FdIuuTotbaMG1S4ajcXcLwvM24EyRX1i2HndTO6FE1Ml2/i1hLaiCQX0zDs5G8BYvaU9l5Bz6YhRlwRM9GbpQqoVWSKgrcTWQsY7NQVlB+MMxjbWJ2FFa9y5A/VI8TInkc2Iw+gmzxrb7EjaR6TE/URhqG6ddxwAAUgDREZUno3r1HhBDt7iOP9sYxm1EdZEUVG/9mzheGf145e3Fl+Q07Y4iIEmZ+trD+ft+X9BLhvkMH0thDMmp0nj28/5kbUi+zURKn9o5DnVCtVpZxsu9RoXDQ== Received: from SA1P222CA0033.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::6) by DM4PR12MB7743.namprd12.prod.outlook.com (2603:10b6:8:101::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.27; Mon, 11 Nov 2024 06:41:37 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:2d0:cafe::8e) by SA1P222CA0033.outlook.office365.com (2603:10b6:806:2d0::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:41:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF00026369.mail.protection.outlook.com (10.167.241.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:41:37 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:41:28 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:41:26 -0800 From: Xueming Li To: Timothy Redaelli CC: , dpdk stable Subject: patch 'net/ionic: fix build with Fedora Rawhide' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:46 +0800 Message-ID: <20241111062847.216344-121-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026369:EE_|DM4PR12MB7743:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ac1f128-ebdb-4780-3a92-08dd021be45c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Gw0ZTouParvSbyiD7K5TAJauRPFfW05oj9+WKFH0nidtChWP9VrOc3rj5zsX?= =?us-ascii?Q?qfKNgkuy9F2HF5Uc17tkEiTFjjX9uivSDljkWgTV6pKG0f83MKXHtD1HT4Ao?= =?us-ascii?Q?E2syI+1z7wodq9hhDBg7xLcEYbIzFNQvYRrngfmpGn9eOM65PzTnfhtbdtaN?= =?us-ascii?Q?+p1Qavy5WJMaiOM8rmh6bMMTm+VKbkph4q8iqOYbnS00nJBLXbylCPf2dYzJ?= =?us-ascii?Q?UxOIKswQDaMobGTKoij7XFV/TwlyPnsBXrJfCq7GbbF2+n9b2hry2vMw3hJy?= =?us-ascii?Q?0d2YWwbZpldu2n2nqUSw7tvW83vexDGursFQJ2rOw7a4QpBDlB25RmCShr6E?= =?us-ascii?Q?z9YsTf9diD9nXk2ro3s34LRXTSva2CosqXF7nLjRaM/AmGeWYkKEbAYYzIiL?= =?us-ascii?Q?gUVR5RGLzUeGfHWbIygP9eY85WpgB6YPqp3vu2ESaIGYPFRXX8flDQajZPzX?= =?us-ascii?Q?1jHLssPQDnJhvkGVYJvMnGIX4V2PHoLUZOBpid+V76JIihGsX1yinVuv8eiH?= =?us-ascii?Q?lHJ9KnZYXFBOUrYtjtzSYWzIPc4gtroB9kQViUATRMNhseVR1FDvfFmVyQO7?= =?us-ascii?Q?E1/jp7pEwuDRiAe9SGIVCrNA8xZHp+Ff0BsO9xs6yxaCxopz6ItNZYh0MwJA?= =?us-ascii?Q?iP5AfBZM7Ct8FXPjkTJb/gmzceQ8ZC1Cr+6/7cDPOHk24+4xeIAt7FugGd+5?= =?us-ascii?Q?XgAZkLccTvYR5oOsGZ9LvkiMiS+yA6NuXyWDYOyQWyDM33jYsK/WhUsaes74?= =?us-ascii?Q?8adrZErYxBJnIYRVKI76fjz1CivDslDfICSAjiC6GALHDsKFBwke60xTXoB4?= =?us-ascii?Q?5KX1u7ynnkLGjDMIZLsTEF+YqJjSKPAQrG2eGjD/ucJayx6qoPB5l244NDCk?= =?us-ascii?Q?o/pZ7MbTRsi04yDC7pRTNhKNt7uEyG+cpZKMA909cKtCpQovKC/KI1K5CL4U?= =?us-ascii?Q?N4t9fbLV5FFkVLj1MmX9DtZZKEXkCMtU1beQZcyT5k+s/t39LVUrU2rPBXpJ?= =?us-ascii?Q?Y97klbGsfzpDlcOkkC0WEqS05o37fl14peFqt7yw3P+Ygs3SoDPvFlyBpA6k?= =?us-ascii?Q?ctZOaGV/dqqD3n9L6ASxDp7njw46hBikrBHk7eQUySn9VZ+44t4G+T4HdQnP?= =?us-ascii?Q?OVReAe+n1xjEL4sHQW6uk3bFTsIJepqCOtRO7ki6Sk7/eqNupFOhu0iAtqKm?= =?us-ascii?Q?DkS9dUw25kQTDHYK46BVUflCopoDmeE+qTEYDM8StT7dGLtZShQaWaZhK0k4?= =?us-ascii?Q?d6q1cuc37xnXnBTZEuJPK0RVol/RDKdrlTZclwL8l9LDEveONUxdfF6MX/K/?= =?us-ascii?Q?o0zIoIWxg5pIoCnwTh17VAwZ7pv+RjKZglCAbW/dWf7Xq7TU178dr8SrLUYs?= =?us-ascii?Q?4DzvAkXSUSHovNNZiPxEuTHSLAW2yoegHcOUylstloN+d2vtBA=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(376014)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:41:37.3694 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ac1f128-ebdb-4780-3a92-08dd021be45c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026369.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7743 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 23.11.3 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/30/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e837f2e7286f9cae9004abae1b6b6f1c99a1b876 Thanks. Xueming Li --- >From e837f2e7286f9cae9004abae1b6b6f1c99a1b876 Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Thu, 24 Oct 2024 11:30:06 +0200 Subject: [PATCH] net/ionic: fix build with Fedora Rawhide Cc: Xueming Li Currently, a number of integer types are typedef'd to their corresponding userspace or RTE values. This can be problematic if these types are already defined somewhere else, as it would cause type collisions. This patch changes the typedefs to #define macros which are only defined if the types are not defined already. Fixes: 5ef518098ec6 ("net/ionic: register and initialize adapter") Signed-off-by: Timothy Redaelli --- drivers/net/ionic/ionic_osdep.h | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/drivers/net/ionic/ionic_osdep.h b/drivers/net/ionic/ionic_osdep.h index 68f767b920..97188dfd59 100644 --- a/drivers/net/ionic/ionic_osdep.h +++ b/drivers/net/ionic/ionic_osdep.h @@ -30,14 +30,28 @@ #define __iomem -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -typedef uint64_t u64; - -typedef uint16_t __le16; -typedef uint32_t __le32; -typedef uint64_t __le64; +#ifndef u8 +#define u8 uint8_t +#endif +#ifndef u16 +#define u16 uint16_t +#endif +#ifndef u32 +#define u32 uint32_t +#endif +#ifndef u64 +#define u64 uint64_t +#endif + +#ifndef __le16 +#define __le16 rte_le16_t +#endif +#ifndef __le32 +#define __le32 rte_le32_t +#endif +#ifndef __le64 +#define __le64 rte_le64_t +#endif #define ioread8(reg) rte_read8(reg) #define ioread32(reg) rte_read32(rte_le_to_cpu_32(reg)) -- 2.34.1