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 E4FF8431D5 for ; Sun, 22 Oct 2023 16:29:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DF9B340DCB; Sun, 22 Oct 2023 16:29:47 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2082.outbound.protection.outlook.com [40.107.223.82]) by mails.dpdk.org (Postfix) with ESMTP id 10D3E402C8 for ; Sun, 22 Oct 2023 16:29:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UTfEBiq7iSXPgWmx4eys7VxONcUO56AR+LBp4pFRUS9U5Au2FFqHURhWP7tmuKn9cpgBgZ/fTyAsjrgk2Ifk7FcdccrlMyk8chUzoXo5JCtxvWZcoUHD+hLRi/oApa+HKGnqKIoqnSOpO8pcHdJCzA8xBn7bOFYb9dahK4iBFmpsoKdnvZTO3f0758lhdplfk/oKh4WvVYHjHB9ijfRidkkXrPntCuglCUV5mIm8MdKmxO8zygNbqI17V/Nvayrvx3EwUF2tDca8ccQL743QLbOkwc8SoxXXSgraB7ZJLL+ZZFXslpCwGzSLAfsyuPm2pODQlpMSkP72zl0J9Zwr3A== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cg+UoFWtCIROAowWbNNvOGAaghMPuLKA3xHZXqg6WLg=; b=c0SEoyUlpCEO/7smAAeGMzS4df0edF0szGAgDVwdHieDz4o5UmLwItkNtd92hCzTQUze4Ds2RHdENFjA2Vy9qVHmPBuAwFapBarf0l2AhyAZpIGehKDo8QTexqnsk9HO4BFE2C9it+dD0y76e02acgdTBqkK3ajkuaCbXxxlRJ18jVPGJ/x1u7Av7VmfVDrVoeLdYn1J43uiplZD8MCNOmEm91Z0xban9fpQoX23zwMSPihKcnSAbXIgn6yypjJzKBymPnLndbnzAtY7H8+N+5lkCtJP73benlcuDoiNTs3xydcYs4S+682ZdQC3GIm0tMgj8XTuCBwk+OfzIphPSw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=marvell.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 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=cg+UoFWtCIROAowWbNNvOGAaghMPuLKA3xHZXqg6WLg=; b=jPT3urFt/vkaE56DOjW74X+unaarVoOFoWFkD7oE58qDNYP/SPEA1AMeHV6CDFPwgR1SKQEG17bCfmbskC3aRaBCu8cOy3O09p9vNwM6C5rxBrOuHSkDSvZ25JMbA6/qclMptI6Hl8sspvQmikWkK/cwHiAs1RZ/4DrpiqqiheKQDL2quEObgaEgY2FTBXeQFxa4Hidy7y5ZNH1TdqBf/KY0qXbw5yOReviT0qkoVeC8szqW9CYadBJ9ejPEGNu1TrDMGeZ2/CNR8OpYR9XOJYtIai4dEigi9RTVdgEghyaWVOOYDH7yDFUxikFA7HAj2FKF5CNuB38nSSGzwB1lHA== Received: from DS7PR05CA0015.namprd05.prod.outlook.com (2603:10b6:5:3b9::20) by SN7PR12MB6768.namprd12.prod.outlook.com (2603:10b6:806:268::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36; Sun, 22 Oct 2023 14:29:44 +0000 Received: from DS1PEPF00017091.namprd03.prod.outlook.com (2603:10b6:5:3b9:cafe::92) by DS7PR05CA0015.outlook.office365.com (2603:10b6:5:3b9::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:29:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by DS1PEPF00017091.mail.protection.outlook.com (10.167.17.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:29:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:29:41 -0700 Received: from nvidia.com (10.126.231.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.986.41; Sun, 22 Oct 2023 07:29:40 -0700 From: Xueming Li To: Jerin Jacob CC: dpdk stable Subject: patch 'common/cnxk: replace direct API usage in REE' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:46 +0800 Message-ID: <20231022142250.10324-78-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF00017091:EE_|SN7PR12MB6768:EE_ X-MS-Office365-Filtering-Correlation-Id: 184ff1cd-bff7-4905-78c1-08dbd30b54b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: taUS+C3Y1BT9aYBCK8So+FpFm2x3ZzSsM15pXk04vZJ6cNplVyfMW8L31LgZ+pZCxZMA912kwKZp8Pa2Z/DF+kGuqoJL7xch/rRnvPYmG4ierM+ySqa9lDnFvj0qhivb84xdMR3xOi+I9cpopgPODSY5bto+uIKyfhzZ+SDpC5W/W5Qf91HhN0Xq7s99famOb1TYvvXKvlOin0wGrCVUdFhIfsrr97CVNe7V2+x9PSwzpI8W4mObo5D0ZMmMWxQOuwj2bIyTYjWytZlfq1k2iEgqqChqvMKB6JnZRPg4vHZzNZsukaFRNnslS3Rqf4ai6Z5ROVFPW04WG2ZrSWLq/91QDie+qZ8i8eCn+0hWlFXkPcJAGa8zRznN76QvBtEtyGK/ZW3PMjTTB257XrbgapNt9v/hKq5vdh4aYI24SRI+LBkhIsgQwyjmuUmAFoB00OSqaaMS7Ev2RkCWLLAJOWwoT0HU5WfJrUt9Dw5NeE/uKmaISm9Sgpid6mL3MeNvRDlHVLQnMLoA4wm+hN87oS7X+Dj+7Ceu+m8OteJ6ZvlGTL+K+FQ6zEkG/eqFlLTsvNWGPP1SCuJOSFLdtghKRkCXZzkAZqmZs9DmVSb33souLPK/aW7q7qoevW55y2+Egzn4Gg0IAcPWaGgDBCjZ97ebDlMA0qAErNbc07Bg+d6kKIy59KE4wO7TdKU7jfcxGubqTiGY2fDjluuAIeoXJzx6nIgSsQ1jsob3wE7KWgTOyGK/fRg0v0CdBZkvIC9G X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(376002)(136003)(346002)(39860400002)(396003)(230922051799003)(451199024)(64100799003)(1800799009)(82310400011)(186009)(46966006)(36840700001)(316002)(26005)(55016003)(6286002)(1076003)(8936002)(426003)(16526019)(2616005)(966005)(53546011)(478600001)(83380400001)(336012)(70206006)(36860700001)(5660300002)(4001150100001)(41300700001)(47076005)(8676002)(82740400003)(2906002)(4326008)(6916009)(7696005)(86362001)(70586007)(356005)(7636003)(40480700001)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:29:42.0930 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 184ff1cd-bff7-4905-78c1-08dbd30b54b5 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF00017091.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6768 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.4 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/15/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=529b747a92e1ca4df8f74f15e57f5d61ee026f7b Thanks. Xueming Li --- >From 529b747a92e1ca4df8f74f15e57f5d61ee026f7b Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Wed, 4 Oct 2023 17:54:32 +0530 Subject: [PATCH] common/cnxk: replace direct API usage in REE Cc: Xueming Li [ upstream commit 7557e3f5b9facc77247e59ad04ae99f47b0ddb3d ] The common code is shared between different driver environments, introduce missing plt_ abstractions of missing rte_ symbols and use plt symbols to avoid changing roc_* files. Fixes: c88d3638c7fc ("common/cnxk: support REE") Signed-off-by: Jerin Jacob --- drivers/common/cnxk/roc_ree.c | 4 ++-- drivers/common/cnxk/roc_ree.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/common/cnxk/roc_ree.c b/drivers/common/cnxk/roc_ree.c index 1eb2ae7272..b6392658c3 100644 --- a/drivers/common/cnxk/roc_ree.c +++ b/drivers/common/cnxk/roc_ree.c @@ -441,7 +441,7 @@ static void roc_ree_lf_err_intr_unregister(struct roc_ree_vf *vf, uint16_t msix_off, uintptr_t base) { - struct rte_pci_device *pci_dev = vf->pci_dev; + struct plt_pci_device *pci_dev = vf->pci_dev; /* Disable error interrupts */ plt_write64(~0ull, base + REE_LF_MISC_INT_ENA_W1C); @@ -468,7 +468,7 @@ static int roc_ree_lf_err_intr_register(struct roc_ree_vf *vf, uint16_t msix_off, uintptr_t base) { - struct rte_pci_device *pci_dev = vf->pci_dev; + struct plt_pci_device *pci_dev = vf->pci_dev; int ret; /* Disable error interrupts */ diff --git a/drivers/common/cnxk/roc_ree.h b/drivers/common/cnxk/roc_ree.h index e138e4de66..bf994e7124 100644 --- a/drivers/common/cnxk/roc_ree.h +++ b/drivers/common/cnxk/roc_ree.h @@ -68,7 +68,7 @@ struct roc_ree_qp { /**< Base address where BAR is mapped */ struct roc_ree_pending_queue pend_q; /**< Pending queue */ - rte_iova_t iq_dma_addr; + plt_iova_t iq_dma_addr; /**< Instruction queue address */ uint32_t roc_regexdev_jobid; /**< Job ID */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.183224900 +0800 +++ 0077-common-cnxk-replace-direct-API-usage-in-REE.patch 2023-10-22 22:17:34.296723700 +0800 @@ -1 +1 @@ -From 7557e3f5b9facc77247e59ad04ae99f47b0ddb3d Mon Sep 17 00:00:00 2001 +From 529b747a92e1ca4df8f74f15e57f5d61ee026f7b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7557e3f5b9facc77247e59ad04ae99f47b0ddb3d ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org