From patchwork Fri Apr 12 18:37:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Shah X-Patchwork-Id: 13628254 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D46BFC4345F for ; Fri, 12 Apr 2024 18:37:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KGye2LWFj/JFutQcC5pikaLVbqwdEz47roMucbJOeG0=; b=HCaQn+oEduM4nl FP8Ev6l3IZhTRS9yQuTlGFca3yyUTEIfuMwwRLjBe73NqyQUwPYmkqLgjZaeU6JfQa6z7r91ksRlJ j7QEI38JTT7eGASRcg3erW4zJJRClywLpbeynOadvajB+HbcRny8qiibjsB1MIAoLGCU3kVykICf6 du9poZzNd/Wp74YPkQVSDwcEH8HnnxOHF+JLL1m8sr1SrA904mmPMils11w8lwNCGt4CRCxl2Q97Q nvOJ4hO/tUxwZS94Tr2U3RT7Wl/zbjv9cla4FH8zMNdNpDoGppRg3cMeioHpfmkQGCGfeI0O22hHs FAcyyDQ30T3++HAPPqtQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rvLmM-00000000tYf-0gRQ; Fri, 12 Apr 2024 18:37:38 +0000 Received: from mail-co1nam11on20600.outbound.protection.outlook.com ([2a01:111:f403:2416::600] helo=NAM11-CO1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rvLm9-00000000tRW-16md for linux-arm-kernel@lists.infradead.org; Fri, 12 Apr 2024 18:37:27 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=meA3SV+73xfs5+wklfOA2a6+SxfJLY5vHi4HnIs4RW96p/YjKfRqFR7jXx7Dvm4Lx1fqpLqc1mche9Aa7N5ShxDJb/AcsFwE4yfjoYFfm9KsIKfYQ6BJBe8yf3T1JuF38hoGXOsyWnYgu9iT1xW24lQ9epQ4zrlT+UKLktDqUSg9ta8cYXWn+FeSrKAzwoA1kuw7qhSpWSijFtXNLyy8CPkpdMGR0Q6FVlKd6MhhrqcFSzIXn9tYqBoc8TRyJLROncD69RPvhb/3uJe6lB9208ob2XoSjemYIS2rgGUIJxiKLL44bjs+K1N6faH4Q/slmS+21lI5tbv0Sj7GXxbyiA== 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=4QfMnDW/QzEPpwFyJSHCxQomZGf7WRcybrdxi9ZM3nU=; b=EYA+2TQQM/flRDCAApG3rxbY2mOVJbttqIz+779XJmCH32w01ARez+tL0Z7bkhEO449tjPi+potbBnNepjiZxNwiLRnUOxhGaBfzPT73lRkq5bSPjw5Phd0zjsmAIEnc2QNKlzPx/of3Lh4PhNU7MhdDNjZVvGMCZORlB2D5o8+nYHTD0Z6ZBumA7Mk0FV1HGgA/Ye68lqKPVPiK6OaEMVvIyomBqYmbk98pN4u6xqlIVMtPw0z5z+j5h/0e+XcQefjjLOKa/FDgCtC7t78/5y3mu5t7SVLLTYSbV8E9WzOyEWxQQ1ZcE+e4jzlyT5K6QSvIkeeEVNIpWmr+k5+yIQ== 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=4QfMnDW/QzEPpwFyJSHCxQomZGf7WRcybrdxi9ZM3nU=; b=ra65uTjDOSvcQpIm3M4tCx8eCabJIPuHHX+cS9wfXN3PnIOychBxO6KzubuBniNPmnl7K3Bf0zaJofuTyFMm43eWPJzntOUsGztgcMgX+HybIAtkIpsS2oGNDksCjmfQd1ozDQlKEXfzPHzWeppHqU2q+9UR6OSb4nTqleMl8pc= Received: from CH0P221CA0021.NAMP221.PROD.OUTLOOK.COM (2603:10b6:610:11c::17) by DM4PR12MB6304.namprd12.prod.outlook.com (2603:10b6:8:a2::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Fri, 12 Apr 2024 18:37:15 +0000 Received: from DS3PEPF000099D5.namprd04.prod.outlook.com (2603:10b6:610:11c:cafe::48) by CH0P221CA0021.outlook.office365.com (2603:10b6:610:11c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.26 via Frontend Transport; Fri, 12 Apr 2024 18:37:15 +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=SATLEXMB03.amd.com; pr=C Received: from SATLEXMB03.amd.com (165.204.84.17) by DS3PEPF000099D5.mail.protection.outlook.com (10.167.17.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7452.22 via Frontend Transport; Fri, 12 Apr 2024 18:37:15 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) by SATLEXMB03.amd.com (10.181.40.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 12 Apr 2024 13:37:14 -0500 Received: from SATLEXMB04.amd.com (10.181.40.145) by SATLEXMB05.amd.com (10.181.40.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Fri, 12 Apr 2024 13:37:14 -0500 Received: from xsjtanmays50.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server id 15.1.2507.35 via Frontend Transport; Fri, 12 Apr 2024 13:37:13 -0500 From: Tanmay Shah To: , , , , , , , CC: , , , Subject: [PATCH v15 3/4] dts: zynqmp: add properties for TCM in remoteproc Date: Fri, 12 Apr 2024 11:37:07 -0700 Message-ID: <20240412183708.4036007-4-tanmay.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240412183708.4036007-1-tanmay.shah@amd.com> References: <20240412183708.4036007-1-tanmay.shah@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB05.amd.com: tanmay.shah@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D5:EE_|DM4PR12MB6304:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e2a01d0-6b11-41e6-0a95-08dc5b1f9345 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DJzvPWUbuskGbV6CNRjC5koQKfMPLd6NbA7JhFXT68RupPTWh0cYHVwsYDe/SbmHnoA2lYsroMRwX3vOMs6oWB5JGk6vnT4uO6gJKhecLn+AQoANB7qZlCtjb52gctukDGj4yGSRX6TGbOqQyRfMsVwctHxWG73XpfRtZsud6mRzJ6fOzkVrkNrMkeu768a8y/nIr3fnYeLZkZmNwMpeHeR+t+Dtf6oowIKv5X3L0CJwJrbuJD2f2ENP9yBSc+nSrH1v6Y9ixUuGOmaph1+r1m0cDqPs390CfcfAIAPIJOqTxlIWDRxLAhdQ0pQDG1wJ3g7+E/bHIr4mE5CbhHvOm/csIElIJmkL1Sxfx2pCmcsa2dDhCIZsCh3f35gCwOcpzZAgAdhtC2QFbd5NFZkrRPfmwPSHN2v9/jE3ArK59912bP17YC516plDi+FVjXlVZtm0jgnU82vGqrUpKxKeeeX/7sxcnVnkALKAKcec+eGBgfDyeDIAnxHs8G+WhUViSc/e1z/25bY/lgksKjO82wA22OCdJkw5JCOpyvXGLjIXN5ug6/lPqItE9Jkdjq1VIH4DimhR9/f2GoDWvEltMWAgryKqauqFUcF+45bVXA22kJMDwXD3hEuB5HGzwgRPrcY1A/tX/9Wrd7Fn/9Qcx3VMAvEFp4qXY07WgmnJCxeH7MEqjYQqmTSYtzLxM61vIyezHt8VrSWKCqFPer/tg5KmVlfb/ooKg2VMxy29uA1Zl+EX9EctEVaaFFTcuel6 X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB03.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230031)(376005)(1800799015)(36860700004)(82310400014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2024 18:37:15.1875 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e2a01d0-6b11-41e6-0a95-08dc5b1f9345 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=[SATLEXMB03.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099D5.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6304 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240412_113725_333839_E1C9CF57 X-CRM114-Status: GOOD ( 13.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 Reviewed-by: Mathieu Poirier --- .../boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 8 +++ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 67 +++++++++++++++++-- 2 files changed, 70 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 25d20d803230..ef31b0fc73d1 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -260,19 +260,76 @@ fpga_full: fpga-full { ranges; }; - remoteproc { + rproc_lockstep: remoteproc@ffe00000 { compatible = "xlnx,zynqmp-r5fss"; xlnx,cluster-mode = <1>; + xlnx,tcm-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>; + xlnx,tcm-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>; }; };