From patchwork Mon Mar 11 17:59:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Shah, Tanmay" X-Patchwork-Id: 13589167 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2058.outbound.protection.outlook.com [40.107.94.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51463537E8; Mon, 11 Mar 2024 17:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710180002; cv=fail; b=fkgfNHwOCvrXSgLePgzjMfdyaG0pHI2pLmIcJ/sg1o+2etrcstnjfAbwzMul3NqikKlc5jchXfx2WYgihKf8+oJzT7IPXBs/5oRfj04MoWg39JRPhgbBamE0Qty+tD5oaGuLcz4I9d09I6846nlZNBIEH4Dpjn/ZCLNvnxUs/FU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710180002; c=relaxed/simple; bh=PNG2yGTVDqAX54+DzLfreLsxA5XONm73RBqez1IitUQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=G0fhoD/xx3zvcVAgByN6C3vtTFz7NBWKk5J4uznG1BTHd/mgyocfAoS/7COKHEM3vzkoPMk8v8mkw+qxFkfPPvPEB5vexEhx4LYSbQAPr81oBcB2R1YOUlKp/PzaHGBtI2vy8tbGYYOaS+Is+Gp3l6+KjZBkBND4EtEg60W3oZU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=rDKVb23/; arc=fail smtp.client-ip=40.107.94.58 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="rDKVb23/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fzC74MQ3+aY3he1d2P2W9Xn8H2rPVeC3yRPilpQvcgxx12uhhZJtksIkRtrdfgzxggCZDizI018M2VYJ/bA+objlduwfmmbWH+fE9MVAPxYleDLZXxxg3Fo2jGMt4t0TTMCRYUPaEd7RGNAM6qfTqgT5xwn7/obbjffbKfUviiXexffxADbTW0z1cLOzvXOrGQqz3qO/EMLtO1RueGw1KZbQnsNW4YxZatNoBpcI+SbYAplYdrh/qvJNXMPVbjJ124Y5wAoNEVnBwily8bFRAiy1Fftco1Q/VIwuQJRlBNcZ/Dj1R76tgOW75pV6RwJHqFUcxugJfrHa/WoMoZaYsQ== 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=MreDkp+FxtXut9dSZ/EM5Nwd8OWHoGBIM13dERcOSmM=; b=LNaZOwkucGpWe2mVxL+rISem7EI2asiqsPBX4fuiTNmgHCae545H/NsfP3suN6kV2pEcixlnePqxcoIaQ2R7Yy7x1r+d7arYIJ2y/tYFE7USkx6Mbp8SFmVUCXgvDorlidGd3KtjdEfz+mVymeSrQt4/FF1hrVYrU/ccfhODL9DE9Ch8JRdzoce4y3F9NZSJWImw0t+gHrhav+WHcu7dEFb3v18GX9H0U2VIzh99zSryTRh1ZPwtM4ylT/q7lp81+jrk15gF7p4sCIk8txrMYCtfQ8Pr5t5gM5IcwiOVENi0uG+iqKciOEcQcJNuldXeyBoMmzXYkFauKzCTY7AssA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MreDkp+FxtXut9dSZ/EM5Nwd8OWHoGBIM13dERcOSmM=; b=rDKVb23/p4LIKBC7qgigH/QcKAyTA2u5xM9D1qjUdn+usEsQ0wg8KAip2MPZo2O0dQDOx7OMoVhmVpjpFLJhaG1Z/pb42s+YS9tnBZE+awJpgMI2qrny80TbEe/D8WYxqhna5u2PnEmb6NyV5/ox3mNvn5ZQ9w0yGtNQXPZiiac= Received: from CH0PR03CA0360.namprd03.prod.outlook.com (2603:10b6:610:11a::11) by PH7PR12MB8040.namprd12.prod.outlook.com (2603:10b6:510:26b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.33; Mon, 11 Mar 2024 17:59:57 +0000 Received: from CH2PEPF00000142.namprd02.prod.outlook.com (2603:10b6:610:11a:cafe::33) by CH0PR03CA0360.outlook.office365.com (2603:10b6:610:11a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36 via Frontend Transport; Mon, 11 Mar 2024 17:59:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by CH2PEPF00000142.mail.protection.outlook.com (10.167.244.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7386.12 via Frontend Transport; Mon, 11 Mar 2024 17:59:56 +0000 Received: from SATLEXMB06.amd.com (10.181.40.147) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 11 Mar 2024 12:59:56 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB06.amd.com (10.181.40.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 11 Mar 2024 12:59:55 -0500 Received: from xsjtanmays50.xilinx.com (10.180.168.240) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Mon, 11 Mar 2024 12:59:55 -0500 From: Tanmay Shah To: , , , , , , , CC: , , , Subject: [PATCH v13 3/4] dts: zynqmp: add properties for TCM in remoteproc Date: Mon, 11 Mar 2024 10:59:26 -0700 Message-ID: <20240311175926.1625180-4-tanmay.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240311175926.1625180-1-tanmay.shah@amd.com> References: <20240311175926.1625180-1-tanmay.shah@amd.com> Precedence: bulk X-Mailing-List: linux-remoteproc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH2PEPF00000142:EE_|PH7PR12MB8040:EE_ X-MS-Office365-Filtering-Correlation-Id: dd2a7411-a390-4c03-5ba3-08dc41f50fa8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I9qS+qyrzFcI1IFCebLAYCnIlL5HyS+MUnnKxb1OWRxCLVOD1AhVdoPPWk5QWzxjMOfRgB9rZQsge1qF41M79UTEEkpqZLQxiRj3hFHPtnFKuCsKk7ez6hNwMieMJs8HteT4IuPGtUj0A081c5WdZIL2Pbj8m4swypKyj/WFbyuiv8OYTQdJYJBZVBAPimv+MZXEr/HTGe4x/jQV1+IHE3srMn7jBuC4VbH7sBNehsBqOoLsRpqryKfU1AZGCGZQjrl06ikdvb2mI57Z6cQ8H4JgH2Vr3xZUw/IIU8vE0jtB8bIgnO3IjZX0A52PXVysr75UDBAlTweCFh5dAjh21iIEjudWWAZl8jTF2b9g65c1Pkud2zmWnOGVFNOzo1W1WUuWIIlJY4ox3VGKN1++SIPKZRVYGwoz2HcKEt3ZPwi3r8NgH94du8grKwGvp1XcLd8tbAypIIIiqXGPn2bav0lEUyUk1zTSVGVQIov/O0nDgphDMzTN8o+VET0C5eQtuGq7hKGb6aWB+q2U9w5wh44q8z4aN3GnU5zFbQJWspriiYln/y5nKYxWRg9Lw2wwBe2eZdVIAd295rxZofNyEs9FaAEiUYO0BiEomC+cgvY4bj9RH/lucVbwzQmtljWJ0hlqLxUeKh4r3os9BBcD9WhQYP8jy+0VE86AJHNf3hGj7zx3kGZE3HK0DiS0pzHe7D/V52DBRFAStsOL4/F/hTHj+ozIsP/pTgz/Pwgzpxfwo2XrRwGC7Pri4J3OYzxx X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(376005)(82310400014)(36860700004)(1800799015);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2024 17:59:56.4627 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dd2a7411-a390-4c03-5ba3-08dc41f50fa8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: CH2PEPF00000142.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8040 Add properties as per new bindings in zynqmp remoteproc node to represent TCM address and size. This patch also adds alternative remoteproc node to represent remoteproc cluster in split mode. By default lockstep mode is enabled and users should disable it before using split mode dts. Both device-tree nodes can't be used simultaneously one of them must be disabled. For zcu102-1.0 and zcu102-1.1 board remoteproc split mode dts node is enabled and lockstep mode dts is disabled. Signed-off-by: Tanmay Shah --- .../boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 8 +++ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 65 +++++++++++++++++-- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts index c8f71a1aec89..495ca94b45db 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts @@ -14,6 +14,14 @@ / { compatible = "xlnx,zynqmp-zcu102-rev1.0", "xlnx,zynqmp-zcu102", "xlnx,zynqmp"; }; +&rproc_split { + status = "okay"; +}; + +&rproc_lockstep { + status = "disabled"; +}; + &eeprom { #address-cells = <1>; #size-cells = <1>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index eaba466804bc..c8a7fd0f3a1e 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -248,19 +248,74 @@ fpga_full: fpga-full { ranges; }; - remoteproc { + rproc_lockstep: remoteproc@ffe00000 { compatible = "xlnx,zynqmp-r5fss"; xlnx,cluster-mode = <1>; - r5f-0 { + #address-cells = <2>; + #size-cells = <2>; + + ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x10000>, + <0x0 0x20000 0x0 0xffe20000 0x0 0x10000>, + <0x0 0x10000 0x0 0xffe10000 0x0 0x10000>, + <0x0 0x30000 0x0 0xffe30000 0x0 0x10000>; + + r5f@0 { + compatible = "xlnx,zynqmp-r5f"; + reg = <0x0 0x0 0x0 0x10000>, + <0x0 0x20000 0x0 0x10000>, + <0x0 0x10000 0x0 0x10000>, + <0x0 0x30000 0x0 0x10000>; + reg-names = "atcm0", "btcm0", "atcm1", "btcm1"; + power-domains = <&zynqmp_firmware PD_RPU_0>, + <&zynqmp_firmware PD_R5_0_ATCM>, + <&zynqmp_firmware PD_R5_0_BTCM>, + <&zynqmp_firmware PD_R5_1_ATCM>, + <&zynqmp_firmware PD_R5_1_BTCM>; + memory-region = <&rproc_0_fw_image>; + }; + + r5f@1 { + compatible = "xlnx,zynqmp-r5f"; + reg = <0x1 0x0 0x0 0x10000>, <0x1 0x20000 0x0 0x10000>; + reg-names = "atcm0", "btcm0"; + power-domains = <&zynqmp_firmware PD_RPU_1>, + <&zynqmp_firmware PD_R5_1_ATCM>, + <&zynqmp_firmware PD_R5_1_BTCM>; + memory-region = <&rproc_1_fw_image>; + }; + }; + + rproc_split: remoteproc-split@ffe00000 { + status = "disabled"; + compatible = "xlnx,zynqmp-r5fss"; + xlnx,cluster-mode = <0>; + + #address-cells = <2>; + #size-cells = <2>; + + ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x10000>, + <0x0 0x20000 0x0 0xffe20000 0x0 0x10000>, + <0x1 0x0 0x0 0xffe90000 0x0 0x10000>, + <0x1 0x20000 0x0 0xffeb0000 0x0 0x10000>; + + r5f@0 { compatible = "xlnx,zynqmp-r5f"; - power-domains = <&zynqmp_firmware PD_RPU_0>; + reg = <0x0 0x0 0x0 0x10000>, <0x0 0x20000 0x0 0x10000>; + reg-names = "atcm0", "btcm0"; + power-domains = <&zynqmp_firmware PD_RPU_0>, + <&zynqmp_firmware PD_R5_0_ATCM>, + <&zynqmp_firmware PD_R5_0_BTCM>; memory-region = <&rproc_0_fw_image>; }; - r5f-1 { + r5f@1 { compatible = "xlnx,zynqmp-r5f"; - power-domains = <&zynqmp_firmware PD_RPU_1>; + reg = <0x1 0x0 0x0 0x10000>, <0x1 0x20000 0x0 0x10000>; + reg-names = "atcm0", "btcm0"; + power-domains = <&zynqmp_firmware PD_RPU_1>, + <&zynqmp_firmware PD_R5_1_ATCM>, + <&zynqmp_firmware PD_R5_1_BTCM>; memory-region = <&rproc_1_fw_image>; }; };