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 122F045CE3 for ; Mon, 11 Nov 2024 07:38:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 04E564067A; Mon, 11 Nov 2024 07:38:07 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2075.outbound.protection.outlook.com [40.107.92.75]) by mails.dpdk.org (Postfix) with ESMTP id 0B96B4067A for ; Mon, 11 Nov 2024 07:38:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=aXrLgV1fZoBppkbMF+xTWHc2SeK67KjVOSmnrEFMAKs42qRJiAfHd1ykcDmgs5YIprzFLHYjRtshMLbaetoIjywGfUxYFlQVDg2t5sPM1miTix8zQJq/14CoKy7xY4fVwEIsO9RIJZwYn7G+GRSCZWDYX+81rz0ySH2jlbuo5oRVYc4/Dj77qcmwy//Ha6KMz1a1GagY5SQ9/5KsfMpB//Z3JtIQxQhAObw429TJ9/7TVFk1REe1Bgm6Nc6H9Q2YjnTvieDGUXBeoALOftOJeWfc85iM4ynGK2lcXRFKXRTrYlUqJ/uh7Dsd8bLu9gDTGG1tas62BvsA2UNIjRiRkw== 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=nQIr5R/kMt/efhelUuW+2UsBZDzbNUiJYrRO44iDdjg=; b=Aa4W8FRXw8cmWv1omKqdUwWCwRIIej3mvzBc64CbcZk9OvQSuoGheae5PtXuj8ZNt/c3qPBpmWMWlVdZlF6w8pcxPs9qRux+pUoieQURFzivEY1K44bshQ+A5vyGpH5Z4xLBruCRGbcFMD5Wud461Thnz8Y+d2iMCKMArznubgEWYF45RuSOCW+6PmxqSpKU2KkeXGNCunjeA1bSeFC2JNM9YZnfyzoGD8kIT8Y0CYxV57GS6S1+zIfg5HeH7aFGxammtYChQ81H7Rdz34lpNWO7gHuO2CTywy3H/FBOUdoqp7WH1G6BVyuHwvzB1svXZufYAXLyZl9+rZHBb/M2zg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=nxp.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=nQIr5R/kMt/efhelUuW+2UsBZDzbNUiJYrRO44iDdjg=; b=Zqc2QCzXxcddEpqiWTERoThem6XZqIzt3aWHl1ttusMzW0nq40QfrNA3P4Wf3J+sbw1Z+9UKa9gexuXUS+qnBQBG1e+Ig2gP0T/E2sGKk3rmuEukQPBAu6xAsL1sbvt/mXKUc7DLM2UTxjg31uXZRgI7gms1qbMjKorRkTRs+3iDMfLBaeBVvmBPwIvI+gZP5i6XzeCi6G9KGOr98ggH7yv/49ge+9MYyP67tLAMplOtczuXp7CwSfWVX9iWUcF8ucC6Xa7Yd0qqNEzjitu7Km91+RArnKFUWHZh+a4+oFjl9nLKr5sYI6lt6EPbIim0goTm4ixymE0ju6Wxvw0hlQ== Received: from SN7PR04CA0057.namprd04.prod.outlook.com (2603:10b6:806:120::32) by CY8PR12MB7515.namprd12.prod.outlook.com (2603:10b6:930:93::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:38:00 +0000 Received: from SN1PEPF00026369.namprd02.prod.outlook.com (2603:10b6:806:120:cafe::74) by SN7PR04CA0057.outlook.office365.com (2603:10b6:806:120::32) 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:38:00 +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:37:59 +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:37:50 -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:37:49 -0800 From: Xueming Li To: Hemant Agrawal CC: , dpdk stable Subject: patch 'bus/dpaa: fix VSP for 1G fm1-mac9 and 10' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:11 +0800 Message-ID: <20241111062847.216344-86-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_|CY8PR12MB7515:EE_ X-MS-Office365-Filtering-Correlation-Id: 043d641c-a77a-437b-2286-08dd021b62bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0XwDO7FlW2uDGWSE292OmjfmKG+sx/NJeBoMRPGe1/ijp4+bkNpYoKl+Nge4?= =?us-ascii?Q?uJn9c7Tj7bWVSDGWo7K97iWmlkyf+Ps4BtqAXepUj7sG8vmVrMmufgaYbG0M?= =?us-ascii?Q?L+NvX/uI/UKFOQiiysfcheWidBtfjjZIuCX5MXOEP77euNNMjxSFq3UvI2ke?= =?us-ascii?Q?MZKzbUidoCcGLzvEsyTUHmSQEoWnoHjFfExr6L1EuPYRXLXJ6GQrf4KwBt0r?= =?us-ascii?Q?p4ASbkOLpP7+Mu8VInSZn7o08RwcfIApy6bAENgumkfW/eCYy6uxs4PHT1EC?= =?us-ascii?Q?MBL4PWIsPwR0t5oUw9/6L8LxkTnbMfwiKkVTS5uA/fPX/Bu4hKqOnhWZLQbM?= =?us-ascii?Q?lRjFroE+a64jKa5JL1dh2AxLqF0UIAkpFCeA0XK5S31mNYCLogchhFioQZgl?= =?us-ascii?Q?AVcGTOEXo5Vb2gnk6zNHhRBhWj2h6GUTDQlwvS7G0WM5oHLOh68RVeK4pZgL?= =?us-ascii?Q?ccVy9iuwryo6bJyBjgWPkfSmKPCGgh30iTwVFBN0t2l+WQZPjGXrKggDOQFv?= =?us-ascii?Q?YGhkUgTPLkCSlkIzYujZq7EWF/n3hMrgMHIr8K7rsUOR9ASUshishuBzko83?= =?us-ascii?Q?YZgU+H/Hq43G4mr1B4sWYHu0o3YTy/jVPoxeQO5X4srzBgPAQ4L11lBpoHFE?= =?us-ascii?Q?IIbdIeQuWp7l53mZtLle402NcJwP0yGi5dUeepn2uLScyacqtb0oFD1Ru35A?= =?us-ascii?Q?PLJwJ8TD9tuEKRHrqCN7WkjZZ5iK3elK3hMIHYAxXNpIjX9vHYOA4Tj135pi?= =?us-ascii?Q?AzoLOfM+6UCctWZfSlj7MVkAq4+z+krx+Sp7ufZrMWd10bBNYDJQ12onj3pH?= =?us-ascii?Q?4Gs9pLDD+2J0ZzrMePOTT4dyk0qUTiYYhbz19XfyJ+vQcBLPz/6c0C3pTb2B?= =?us-ascii?Q?5bNGP5QAfbRb0RgkYdEqj4yMfOzZd0/vRGFIN36cZzobV5+gsHPTY3axcKiQ?= =?us-ascii?Q?J47SsdJdIhSL8zr1OAfpn5K21ZygISUuLtxHr7o/e4dQ0I21V9iRqQKxVwP2?= =?us-ascii?Q?1o26wXLZbeK1rjRIMEjtr3NaQrcw8VEkzuc8hImplay4i8dvSq3kHQZPNIbW?= =?us-ascii?Q?y4ncgt3wRSYCzp0LI5AehiFRove4R5K4/hnPQ/kJ7RiKLIlJM9icBx+DieSp?= =?us-ascii?Q?tLrbjcPKMCmjYxinzQp9SIi7Vdm2VyhkPsreQ6zctLB1Q6I7YLKWBKSJsW4L?= =?us-ascii?Q?G8VVZgCE04iRJI6pxc1C72LVXvU8KeB9a8KsZmZltmyK3Gk7c4Wx4I6NFsnY?= =?us-ascii?Q?G/NKdudlnQtEitp5SdLLcXZMB73cin9uvdjTlKwXT2P4ahXNUz2SRoaLJICy?= =?us-ascii?Q?6E20/myJXVd74cBRztR15IxDMRweAU1Zb0JRerdc6lpVEa83Gfn2RT2YQ6jF?= =?us-ascii?Q?fUnTIK7Tt6YFporX1zp7XJvlu+wgoCLeKz3DLmqwhRqo8C7BhA=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)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:37:59.9319 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 043d641c-a77a-437b-2286-08dd021b62bd 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: CY8PR12MB7515 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=747cfbc98b9ef13dcd7aeaecbf439f2a12cfbf85 Thanks. Xueming Li --- >From 747cfbc98b9ef13dcd7aeaecbf439f2a12cfbf85 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Tue, 1 Oct 2024 16:33:10 +0530 Subject: [PATCH] bus/dpaa: fix VSP for 1G fm1-mac9 and 10 Cc: Xueming Li [ upstream commit 25434831ca958583fb79e1e8b06e83274c68fc93 ] No need to classify interface separately for 1G and 10G Note that VSP or Virtual storage profile are DPAA equivalent for SRIOV config to logically divide a physical ports in virtual ports. Fixes: e0718bb2ca95 ("bus/dpaa: add virtual storage profile port init") Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/base/fman/fman.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/bus/dpaa/base/fman/fman.c b/drivers/bus/dpaa/base/fman/fman.c index 1814372a40..8263d42bed 100644 --- a/drivers/bus/dpaa/base/fman/fman.c +++ b/drivers/bus/dpaa/base/fman/fman.c @@ -153,7 +153,7 @@ static void fman_if_vsp_init(struct __fman_if *__if) size_t lenp; const uint8_t mac_idx[] = {-1, 0, 1, 2, 3, 4, 5, 6, 7, 0, 1}; - if (__if->__if.mac_type == fman_mac_1g) { + if (__if->__if.mac_idx <= 8) { for_each_compatible_node(dev, NULL, "fsl,fman-port-1g-rx-extended-args") { prop = of_get_property(dev, "cell-index", &lenp); @@ -176,7 +176,32 @@ static void fman_if_vsp_init(struct __fman_if *__if) } } } - } else if (__if->__if.mac_type == fman_mac_10g) { + + for_each_compatible_node(dev, NULL, + "fsl,fman-port-op-extended-args") { + prop = of_get_property(dev, "cell-index", &lenp); + + if (prop) { + cell_index = of_read_number(&prop[0], + lenp / sizeof(phandle)); + + if (cell_index == __if->__if.mac_idx) { + prop = of_get_property(dev, + "vsp-window", + &lenp); + + if (prop) { + __if->__if.num_profiles = + of_read_number(&prop[0], + 1); + __if->__if.base_profile_id = + of_read_number(&prop[1], + 1); + } + } + } + } + } else { for_each_compatible_node(dev, NULL, "fsl,fman-port-10g-rx-extended-args") { prop = of_get_property(dev, "cell-index", &lenp); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:09.033905660 +0800 +++ 0085-bus-dpaa-fix-VSP-for-1G-fm1-mac9-and-10.patch 2024-11-11 14:23:05.222192838 +0800 @@ -1 +1 @@ -From 25434831ca958583fb79e1e8b06e83274c68fc93 Mon Sep 17 00:00:00 2001 +From 747cfbc98b9ef13dcd7aeaecbf439f2a12cfbf85 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 25434831ca958583fb79e1e8b06e83274c68fc93 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 41195eb0a7..beeb03dbf2 100644 +index 1814372a40..8263d42bed 100644