From patchwork Thu Sep 28 15:58:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Shah X-Patchwork-Id: 13403298 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04069E732E7 for ; Thu, 28 Sep 2023 15:59:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231593AbjI1P73 (ORCPT ); Thu, 28 Sep 2023 11:59:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230274AbjI1P72 (ORCPT ); Thu, 28 Sep 2023 11:59:28 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2043.outbound.protection.outlook.com [40.107.243.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFA55D6; Thu, 28 Sep 2023 08:59:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IZ2BDr5YJ/Y3MgsSYHzq4wFp6WXF33NACGuBxH0kTyjcmqONfjxW3oMrQVNV1LuH2mMdwURS2klyYxVGoziXiH6nAG48jxh0FIxDNQAfbJ+gXgHbsnJTGaYda1aAkFgMRK/Gx+3tsMYWVnHajE/ecbthpkQb1PNIxY5oj04wA6oKI3EIAZWEhCAbMASXWx3MArdwApsPXum9/bATezPyx1AnWewh18WzRiKJ15+tetlonWV4wEm70ngdqk+7EHemoc/tfCPkTrhTvxMXygfA2oJTUAogyBgOFhISCqvBfV+Kp/SE45SaJS7C/Z75O7wAcRqpfhguzK2j+3iB4hMgKA== 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=iq269o5QOQbJhUiqAzKMEPjpeVXDjObs0TmQ+z0/BiA=; b=IoJBa7XpBxhzSw6d8PRlQmtYfe1Cc75bOx/aLzFjAZFl/1aAy9FM2gc9s5Zl8h9M8lsfU9P1D8ABb7/KTzH32nDdF3ozE+DKrpDCv4oXhnmXLZxMBHllFPdWo1qxy+MQ0H7Ic8Pn23APKoKvhBJcGLJLAxScRJf+/ir0uIiFqrKJ8XBbYGMu0dpk8OSG0N6EHHFaV5aZcrTwYTMWirq8Ki+3+ROWRK9gKps7kfCzeCjLVCW5BVzW178PmC+21ll1TjpvL4xHH5WTFcQoPBE8EPkFwij7MNKlr+yX5n/icJ0UHK8CNaJGWIZBnjOjpV7Wdu4RGRooFTbXV3ybvok8YQ== 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 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=iq269o5QOQbJhUiqAzKMEPjpeVXDjObs0TmQ+z0/BiA=; b=whxpF1Znx3oNhKT2+zJWICHqXtXkfIhdSxxHwyMZouNFCxctVqrWTOFElP+do1X6Tb5ZktrgaoDErgcDMNeQLDM72IhG5sIp32ykqlHvJksEraqd7dWVBx/8cLLJp/ZVGI9qzLCntYKJrWwyEQ606jaB675dvKlE47QFavIM2+A= Received: from CH0PR03CA0349.namprd03.prod.outlook.com (2603:10b6:610:11a::33) by SA0PR12MB4349.namprd12.prod.outlook.com (2603:10b6:806:98::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 15:59:23 +0000 Received: from DS3PEPF000099E0.namprd04.prod.outlook.com (2603:10b6:610:11a:cafe::d6) by CH0PR03CA0349.outlook.office365.com (2603:10b6:610:11a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 15:59:23 +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 DS3PEPF000099E0.mail.protection.outlook.com (10.167.17.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 15:59:23 +0000 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.27; Thu, 28 Sep 2023 10:59:21 -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.27 via Frontend Transport; Thu, 28 Sep 2023 10:59:21 -0500 From: Tanmay Shah To: , , , , CC: , , , , , , "Rob Herring" Subject: [PATCH v5 1/4] dt-bindings: remoteproc: add Tightly Coupled Memory (TCM) bindings Date: Thu, 28 Sep 2023 08:58:57 -0700 Message-ID: <20230928155900.3987103-2-tanmay.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230928155900.3987103-1-tanmay.shah@amd.com> References: <20230928155900.3987103-1-tanmay.shah@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E0:EE_|SA0PR12MB4349:EE_ X-MS-Office365-Filtering-Correlation-Id: c5668bfa-d919-491f-d27d-08dbc03be228 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LLRvokKEifVFYKhe4MvlqJv55PVwEY/M9sKkRkDfnU1nCJANhB7BVPK12UW/nlLbXx5HASIv9HMqdpt8u50yf5sHPGmAcv7qMDP7nepHZ7PewKwevujHaJpTsyyBdhQTXrrbAk9SlOA2cwzmBrkUk8Kksp1yHcbc3v7q9mV8AM13c+td4UycgrfDB/mS4+VjBeSB6q4jnZiZIjuSvYd3uQbElL5qpV+RDbNLrfR0jRjFZQ0TwC8bLBUMZR8YJajq8clxp98p3qjaWZsCHnSDZJoYieuSrdu3VfCggat8TXRfjpu92Vv745x9AgQ8elY9ooRYB0mQch5lbPFwwe9PRsOI4wmmpqjaGweLn1zuZq/w2BnBPRqGWoO5zrkH06JcIY4XI3KHx9anyegL49rVlVCgD7Ef4zGa0pn7r7i7dxMdJAt9YmkdKdVkFuK94cGaxTr4du946LCy2y9Zx8AJsBaFTkuwrnZYW6df1SIM0onuQOWtDdaF9jbxOqoCJAvf55lcv4/+S5YKPUNLp0yndc3tf8s3kAF8yXjd14PxJmGn7X4aPjGoezW4jbM0/lQa1WKA27PvcpWroDVyRD85DCY7zQ+7lFJ/OT4+s+uLy3WY3OZlb/af+p9mXlWHfyz8cBeYrhATTbpb5VcOdLjNPoDHuYApWykvCFdoBtn1Bp7Pp/VrUzbV58rWz7nVluKwDHHBZFbh4XBXBfxJ/k+XGyf1zzhfDi93nrQh2N059CS/X7Kq1ZwRijpR6VZdTutzZJEnK0HLr1BMw+U4G3BWkA== 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)(4636009)(39860400002)(396003)(136003)(376002)(346002)(230922051799003)(451199024)(64100799003)(1800799009)(82310400011)(186009)(40470700004)(36840700001)(46966006)(36860700001)(2906002)(336012)(426003)(36756003)(83380400001)(47076005)(86362001)(26005)(82740400003)(2616005)(1076003)(356005)(81166007)(6666004)(40460700003)(478600001)(44832011)(5660300002)(6636002)(316002)(8676002)(8936002)(4326008)(40480700001)(54906003)(110136005)(70206006)(70586007)(41300700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 15:59:23.2205 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c5668bfa-d919-491f-d27d-08dbc03be228 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: DS3PEPF000099E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4349 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org From: Radhey Shyam Pandey Introduce bindings for TCM memory address space on AMD-xilinx Zynq UltraScale+ platform. It will help in defining TCM in device-tree and make it's access platform agnostic and data-driven. Tightly-coupled memories(TCMs) are low-latency memory that provides predictable instruction execution and predictable data load/store timing. Each Cortex-R5F processor contains two 64-bit wide 64 KB memory banks on the ATCM and BTCM ports, for a total of 128 KB of memory. The TCM resources(reg, reg-names and power-domain) are documented for each TCM in the R5 node. The reg and reg-names are made as required properties as we don't want to hardcode TCM addresses for future platforms and for zu+ legacy implementation will ensure that the old dts w/o reg/reg-names works and stable ABI is maintained. It also extends the examples for TCM split and lockstep modes. Signed-off-by: Radhey Shyam Pandey Signed-off-by: Tanmay Shah Acked-by: Rob Herring --- .../remoteproc/xlnx,zynqmp-r5fss.yaml | 131 +++++++++++++++--- 1 file changed, 113 insertions(+), 18 deletions(-) diff --git a/Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml b/Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml index 78aac69f1060..9ecd63ea1b38 100644 --- a/Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml +++ b/Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml @@ -20,6 +20,17 @@ properties: compatible: const: xlnx,zynqmp-r5fss + "#address-cells": + const: 2 + + "#size-cells": + const: 2 + + ranges: + description: | + Standard ranges definition providing address translations for + local R5F TCM address spaces to bus addresses. + xlnx,cluster-mode: $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2] @@ -37,7 +48,7 @@ properties: 2: single cpu mode patternProperties: - "^r5f-[a-f0-9]+$": + "^r5f@[0-9a-f]+$": type: object description: | The RPU is located in the Low Power Domain of the Processor Subsystem. @@ -54,8 +65,19 @@ patternProperties: compatible: const: xlnx,zynqmp-r5f + reg: + items: + - description: ATCM internal memory region + - description: BTCM internal memory region + + reg-names: + items: + - const: atcm + - const: btcm + power-domains: - maxItems: 1 + minItems: 1 + maxItems: 3 mboxes: minItems: 1 @@ -102,34 +124,107 @@ patternProperties: required: - compatible - power-domains + - reg + - reg-names unevaluatedProperties: false required: - compatible + - "#address-cells" + - "#size-cells" + - ranges additionalProperties: false examples: - | - remoteproc { - compatible = "xlnx,zynqmp-r5fss"; - xlnx,cluster-mode = <1>; - - r5f-0 { - compatible = "xlnx,zynqmp-r5f"; - power-domains = <&zynqmp_firmware 0x7>; - memory-region = <&rproc_0_fw_image>, <&rpu0vdev0buffer>, <&rpu0vdev0vring0>, <&rpu0vdev0vring1>; - mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>; - mbox-names = "tx", "rx"; + #include + + //Split mode configuration + soc { + #address-cells = <2>; + #size-cells = <2>; + + remoteproc@ffe00000 { + 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"; + reg = <0x0 0x0 0x0 0x10000>, <0x0 0x20000 0x0 0x10000>; + reg-names = "atcm", "btcm"; + 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>, <&rpu0vdev0buffer>, + <&rpu0vdev0vring0>, <&rpu0vdev0vring1>; + mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>; + mbox-names = "tx", "rx"; + }; + + r5f@1 { + compatible = "xlnx,zynqmp-r5f"; + reg = <0x1 0x0 0x0 0x10000>, <0x1 0x20000 0x0 0x10000>; + reg-names = "atcm", "btcm"; + 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>, <&rpu1vdev0buffer>, + <&rpu1vdev0vring0>, <&rpu1vdev0vring1>; + mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>; + mbox-names = "tx", "rx"; + }; }; + }; - r5f-1 { - compatible = "xlnx,zynqmp-r5f"; - power-domains = <&zynqmp_firmware 0x8>; - memory-region = <&rproc_1_fw_image>, <&rpu1vdev0buffer>, <&rpu1vdev0vring0>, <&rpu1vdev0vring1>; - mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>; - mbox-names = "tx", "rx"; + - | + //Lockstep configuration + soc { + #address-cells = <2>; + #size-cells = <2>; + + remoteproc@ffe00000 { + compatible = "xlnx,zynqmp-r5fss"; + xlnx,cluster-mode = <1>; + + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x0 0x0 0x0 0xffe00000 0x0 0x20000>, + <0x0 0x20000 0x0 0xffe20000 0x0 0x20000>; + + r5f@0 { + compatible = "xlnx,zynqmp-r5f"; + reg = <0x0 0x0 0x0 0x20000>, <0x0 0x20000 0x0 0x20000>; + reg-names = "atcm", "btcm"; + 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>, <&rpu0vdev0buffer>, + <&rpu0vdev0vring0>, <&rpu0vdev0vring1>; + mboxes = <&ipi_mailbox_rpu0 0>, <&ipi_mailbox_rpu0 1>; + mbox-names = "tx", "rx"; + }; + + r5f@1 { + compatible = "xlnx,zynqmp-r5f"; + reg = <0x1 0x0 0x0 0x10000>, <0x1 0x20000 0x0 0x10000>; + reg-names = "atcm", "btcm"; + 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>, <&rpu1vdev0buffer>, + <&rpu1vdev0vring0>, <&rpu1vdev0vring1>; + mboxes = <&ipi_mailbox_rpu1 0>, <&ipi_mailbox_rpu1 1>; + mbox-names = "tx", "rx"; + }; }; }; ... From patchwork Thu Sep 28 15:58:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Shah X-Patchwork-Id: 13403299 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8A6ABE732E7 for ; Thu, 28 Sep 2023 16:00:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231953AbjI1QAB (ORCPT ); Thu, 28 Sep 2023 12:00:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231875AbjI1QAA (ORCPT ); Thu, 28 Sep 2023 12:00:00 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2083.outbound.protection.outlook.com [40.107.94.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A7B7B7; Thu, 28 Sep 2023 08:59:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LqzgqIjY2y7QPpiFTo0rAgQjweS3YK3Rl0/JfZV1rySVknFyijNVXEL322ls3KoGHH8B8Do8MNMYlhdQqTP8KF3ROx/gr1mP4f7q0m0vmNksCkKtYcFhuyvICcFbL/lXJBAQcMok65qyN+nj5C/SSM9jnxPvmM3Vt2uE9Km9mXnkJi68PHvIxHYTlLq/Yj/w8WYPtL7Rpu9pQixaUXhI7dhF5Uun0LkEmSU+PxnrMQvwmGWQIoEzWItWjbigO7X5c1nNx7ovMfBho9erTXTjC3IIjIdiMPDgvynyWSCyKS/9UC98pyjEddXV1ruIBCVfQLjcWIwo8aFVtj/JBBgFxQ== 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=pF8+IWYeriw0LQnx0jGuiPItXyw8p32Ljtb8liy00V8=; b=hquYgIWnOmntO74mFPo5F63r/TUZC877sR+yNOXx0YFH5ginZXuFVDaIk0MqVGSVz3D3ToIC1DwpewxssQ3pD5xWflgYjxYPZ2tp3uXd7q1SeOSF3dk2MakUdbFOxWeRcmzzTNVfFyFH+HJJMRRvRzg9xcE0g2FXDPXt/HRa1ISjsVIrIArDPxmJiQw5d3kVRAQv/wGy2t1f/1FVM9n1R5x1/MKWQEhw16vxiABjhB3Z2TlAKOGNjO6/qDAywzDimydF0Byf5JbdG7JGMhZ+fdFGVKMWCFfR4+reHImgmKjULpxHtORHXCnBXUkTz/C8EnW01unc0t6IfLJXWoGtpA== 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 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=pF8+IWYeriw0LQnx0jGuiPItXyw8p32Ljtb8liy00V8=; b=bPKtWf/j5BDK/nMD7LS3hf1r3FQFPIZJ8kk4FG60tWV1ii88jo/MHfKmycH8b2aTaQXo4xRFaMpHvzs0Px7jFkcnYFhSGs0FBRgY5nUEhPvA7zu3/TOTK6Y+GXUx0kKVQeKNTYjfPxk+3R5BdmFn/TFIXqh+N6B9x8SOuqznnY8= Received: from DM6PR02CA0080.namprd02.prod.outlook.com (2603:10b6:5:1f4::21) by SN7PR12MB6813.namprd12.prod.outlook.com (2603:10b6:806:267::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 15:59:56 +0000 Received: from DS3PEPF000099D3.namprd04.prod.outlook.com (2603:10b6:5:1f4:cafe::4c) by DM6PR02CA0080.outlook.office365.com (2603:10b6:5:1f4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 15: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 DS3PEPF000099D3.mail.protection.outlook.com (10.167.17.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 15:59:56 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.27; Thu, 28 Sep 2023 10:59:55 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 28 Sep 2023 08:59:22 -0700 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.27 via Frontend Transport; Thu, 28 Sep 2023 10:59:22 -0500 From: Tanmay Shah To: , , , , CC: , , , , , Subject: [PATCH v5 2/4] dts: zynqmp: add properties for TCM in remoteproc Date: Thu, 28 Sep 2023 08:58:58 -0700 Message-ID: <20230928155900.3987103-3-tanmay.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230928155900.3987103-1-tanmay.shah@amd.com> References: <20230928155900.3987103-1-tanmay.shah@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D3:EE_|SN7PR12MB6813:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b0f744d-a293-4cc9-0ca8-08dbc03bf5c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pPKLuo19cHKSfgOJ65h1qtGV+0tDPHbBKAK+KmNuKMGvxA07zDix1/RuA60WJMI3uzutEdLfksqPCDRorc7xOZorgYuiao01Nl/vhAgOx8mVKKsGaqu6Eg1by7hsMkfMNt3jBb2w+77PXuuGMqV3LzHqNdoywhtIKOi/K6nQt9WWwB+/zVnHa+rJBYD1qM7OW4TfbAWk3sqzGE6ye3vQniMaMJeYJzHTEL90UaWc+05Mj+oCJKS0on9nwGbEIE57AU7JkDVv8VdP8MRxa9U/z2eSUzWtDjVJaUMaHv5dWThNah5sBur2zsAOR0CPeMOwTsp9HllZSaPoFRwf9pQXCbrIUZScNffHtqqF+XkdeXFJtB4B9fbR0UL2xho4F50glJohSDyAXWgUTgBkd8FAaMG8nzTLzJdYM+u3hWtbFE4EbrE1PdYSm6l3odbbbJUi0gZhhHRgShPKDqqyU56m/8dWp+hAKmq0hKx4WB5Ma2zmR1WFwB/hps4ghykFmlbWnTyqDLbtLfT/DlbIdgLhSbR/Qg5h9maMSn6uMV9z1rwiSxTQly3Q5+JTtmFuYZX6fOr3yeyWR4wZCUzwmlNsjqLPcZQr41/0wZgMPsQg8xhiD8Tb8PyoPfZMVsv0R1frQOAvaOSHSl9oAkHG4A7rQKbgWULFtNU1RsfG8y2zPkUrJ5RfL5S3dwcaqlHq/rLNyN3mXHOjOZeEkbA5b3N9EFN+fL8ZqHKI2R7iwiaqM7XVkH4Bq/YIHSpk2uL4C+lhLwLbrd4w10XT+bpEWZO/+g== 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)(4636009)(376002)(396003)(346002)(39860400002)(136003)(230922051799003)(64100799003)(82310400011)(186009)(451199024)(1800799009)(36840700001)(40470700004)(46966006)(336012)(6636002)(54906003)(316002)(70206006)(1076003)(70586007)(110136005)(26005)(83380400001)(2616005)(82740400003)(426003)(36756003)(6666004)(86362001)(356005)(47076005)(40480700001)(81166007)(36860700001)(478600001)(40460700003)(2906002)(44832011)(8936002)(8676002)(4326008)(5660300002)(41300700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 15:59:56.0883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b0f744d-a293-4cc9-0ca8-08dbc03bf5c0 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: DS3PEPF000099D3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6813 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Add properties as per new bindings in zynqmp remoteproc node to represent TCM address and size. This patch configures RPU in split mode and adds TCM information accordingly. Signed-off-by: Tanmay Shah --- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 28 ++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index b61fc99cd911..01e12894c88e 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -247,19 +247,35 @@ fpga_full: fpga-full { ranges; }; - remoteproc { + remoteproc@ffe00000 { compatible = "xlnx,zynqmp-r5fss"; - xlnx,cluster-mode = <1>; + xlnx,cluster-mode = <0>; - r5f-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 = "atcm", "btcm"; + 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 = "atcm", "btcm"; + 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>; }; }; From patchwork Thu Sep 28 15:58:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Shah X-Patchwork-Id: 13403300 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8A33E732E9 for ; Thu, 28 Sep 2023 16:00:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231875AbjI1QAC (ORCPT ); Thu, 28 Sep 2023 12:00:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbjI1QAB (ORCPT ); Thu, 28 Sep 2023 12:00:01 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2044.outbound.protection.outlook.com [40.107.93.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8D0CD6; Thu, 28 Sep 2023 08:59:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=auj+jT753LMms/vJXI7gHhXtImVx53ei3rhAt1MABoFOIDq78h3efeB3m4nQ4nX5Hk3zJdeFt/NoMnnbqAFCZDdub4Q3RAt4pDbSI6nwKfYXwSwEDoL57yBglGaFZQzv/h9xM/e0bYyPD8UUrnrlSiZxtfS2IApFfLp5RWiwV6DRgH1JvW4evRTzyifqYM7OEk6Gx6iBiuHyVlhPcIlRHu6kvjcS6Xz/02MMhaUvn+Pi/H208mg3MIDscItzgAwFLwrY0XDyBZYGSYj9BYlCBy6kzF9Vr0DUxmfLualDaX/Zs+e4YWz6PIw4PQ+GM0kikrO8p9SmVgD0Qm038+/VTw== 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=+jHgV347eJb960s+ewl0DsRFPKGiNqcwAmiilwfAxk4=; b=JUnJgIEQ/2aG0YxERk/MIokCCTmRy+hGyN7Icu71cLXhSni/XGCMc1hrYj3Zet/FTTvCeSG4bwgqCFq7x/2vxfX1mLLpyAUUN78qvcHnGSLeNC5tOEjKBbMVH5vVUDHbfbwBjgjOa4HGIUSeMv6gjXk4XdOjB/NsoVV9gSD2AmC/kuJVlIRUXUjIQoQbe0cAW2RC7pxFYTl1MjudIDtn7c0Z5A1CYpcrEdPNj7xJlU1N5oZmCailXMzb5sCMPQ+uaD4u0s82Lw7Z2ZRBmxzAWLznbdJKmDhEg5JMwX7TjIC4sqCjK143Bzs8vGhGBliiogHp8hu9Wks/3kowBbNIDw== 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 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=+jHgV347eJb960s+ewl0DsRFPKGiNqcwAmiilwfAxk4=; b=HoeakUjpNExMib9wuqTiDmd7N8sCOEK++1AlOML8OB9cw+amymKtwUDBh/kUvQw+Akx9ffMQIcssIvIqr6XgbNa2IliCsB3HPrRoe2fKjKHjHtCxD/1yHU+pucC6GstZCkCZ93F5pD9l5fUL17NzVHNhAKgXaAa+jJxGYd+2wUg= Received: from DM6PR02CA0093.namprd02.prod.outlook.com (2603:10b6:5:1f4::34) by PH7PR12MB7843.namprd12.prod.outlook.com (2603:10b6:510:27e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.21; Thu, 28 Sep 2023 15:59:57 +0000 Received: from DS3PEPF000099D3.namprd04.prod.outlook.com (2603:10b6:5:1f4:cafe::cd) by DM6PR02CA0093.outlook.office365.com (2603:10b6:5:1f4::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 15:59:57 +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 DS3PEPF000099D3.mail.protection.outlook.com (10.167.17.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 15:59:57 +0000 Received: from SATLEXMB08.amd.com (10.181.40.132) 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.27; Thu, 28 Sep 2023 10:59:55 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) by SATLEXMB08.amd.com (10.181.40.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Thu, 28 Sep 2023 08:59:23 -0700 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.27 via Frontend Transport; Thu, 28 Sep 2023 10:59:23 -0500 From: Tanmay Shah To: , , , , CC: , , , , , Subject: [PATCH v5 3/4] remoteproc: zynqmp: add pm domains support Date: Thu, 28 Sep 2023 08:58:59 -0700 Message-ID: <20230928155900.3987103-4-tanmay.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230928155900.3987103-1-tanmay.shah@amd.com> References: <20230928155900.3987103-1-tanmay.shah@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D3:EE_|PH7PR12MB7843:EE_ X-MS-Office365-Filtering-Correlation-Id: fc554264-c10f-40bb-f0a2-08dbc03bf666 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ma3L2emzTVD99zdiEuE6Sx/xFGkFDWx1nNoLXTVOoWu/0ERNrWDYHpkzUfWcm+wefmly8cd6DhSmdjxhedoLM7yWKsxXUdOqa4UlDFo9ocd/w8fbhAFIVT6fpbOa/8CyOvyzVUbDvvEAPRWVcbcDsDb6gFR9WZVkcSVrF9bLJ5Oesf2bBPURfn+EuVZCGNlNm9hNSsa6s0HoiXHHN93b3EDPFUmJF0jEcl92DHOJhltRPewv63kkjQEKII9RJekiz0tK5+l8ykqxQZpZ1N/GKHwNnpue3VfF8SKr020NT7G8SYLK1Kl1VlcWPYiijLj8RD6sineHFuCULVNMoIV0mAh0vC7g5am5ZzaJXSUJ8C2RnsrjQz6qiUduMSTNoHEHf7DgPvE1KFD30hKTKNiQXMa86aWzWGiHFwCgce6s0v+H+XzJx8Zqu5HFUdlqEcpOuXa0PG5yAt29QY51GJeJ9nB4a4xRaUV5AMzAiNEMdF57QLCC0idnXcn97zHrunFuL5H3YevysNoIe+5zaH8g/2y1VMm8RbmOGVRGUH640/6s7uFaNhNoTVB1ARsIIX4VcUYPkFy2tHZ0rhCmwRngxQ7MWh7hXXQNdyPENLnh1cK4eOtTs+O6A3NbLw4Brd4cKPGIKlYzi6vHw35HJei1xpIGgcfs+lP/iuNb27uXFz0MUwkrzbkwS+Vg7bETWfmifEVxJyY4k7LLlkRkBdqKMWUn/zfa18TIJBz+gUGIIbue8j+xcYa2NID0/C99GQ65Fcor4bOgI2P+HLy8X7PRag== 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)(4636009)(396003)(376002)(136003)(39860400002)(346002)(230922051799003)(64100799003)(82310400011)(186009)(1800799009)(451199024)(40470700004)(36840700001)(46966006)(356005)(8676002)(2616005)(41300700001)(2906002)(26005)(82740400003)(36756003)(8936002)(44832011)(6666004)(36860700001)(1076003)(6636002)(47076005)(478600001)(81166007)(4326008)(86362001)(316002)(54906003)(40460700003)(426003)(336012)(110136005)(5660300002)(40480700001)(83380400001)(70206006)(70586007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 15:59:57.1977 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc554264-c10f-40bb-f0a2-08dbc03bf666 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: DS3PEPF000099D3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7843 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Use TCM pm domains extracted from device-tree to power on/off TCM using general pm domain framework Signed-off-by: Tanmay Shah --- drivers/remoteproc/xlnx_r5_remoteproc.c | 224 ++++++++++++++++++++++-- 1 file changed, 205 insertions(+), 19 deletions(-) diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c index 4395edea9a64..27ed2c070ebb 100644 --- a/drivers/remoteproc/xlnx_r5_remoteproc.c +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c @@ -16,6 +16,7 @@ #include #include #include +#include #include "remoteproc_internal.h" @@ -102,6 +103,12 @@ static const struct mem_bank_data zynqmp_tcm_banks_lockstep[] = { * @rproc: rproc handle * @pm_domain_id: RPU CPU power domain id * @ipi: pointer to mailbox information + * @num_pm_dev: number of tcm pm domain devices for this core + * @pm_dev1: pm domain virtual devices for power domain framework + * @pm_dev_link1: pm domain device links after registration + * @pm_dev2: used only in lockstep mode. second core's pm domain virtual devices + * @pm_dev_link2: used only in lockstep mode. second core's pm device links after + * registration */ struct zynqmp_r5_core { struct device *dev; @@ -111,6 +118,11 @@ struct zynqmp_r5_core { struct rproc *rproc; u32 pm_domain_id; struct mbox_info *ipi; + int num_pm_dev; + struct device **pm_dev1; + struct device_link **pm_dev_link1; + struct device **pm_dev2; + struct device_link **pm_dev_link2; }; /** @@ -575,12 +587,21 @@ static int add_tcm_carveout_split_mode(struct rproc *rproc) bank_size = r5_core->tcm_banks[i]->size; pm_domain_id = r5_core->tcm_banks[i]->pm_domain_id; - ret = zynqmp_pm_request_node(pm_domain_id, - ZYNQMP_PM_CAPABILITY_ACCESS, 0, - ZYNQMP_PM_REQUEST_ACK_BLOCKING); - if (ret < 0) { - dev_err(dev, "failed to turn on TCM 0x%x", pm_domain_id); - goto release_tcm_split; + /* + * If TCM information is available in device-tree then + * in that case, pm domain framework will power on/off TCM. + * In that case pm_domain_id is set to 0. If hardcode + * bindings from driver is used, then only this driver will + * use pm_domain_id. + */ + if (pm_domain_id) { + ret = zynqmp_pm_request_node(pm_domain_id, + ZYNQMP_PM_CAPABILITY_ACCESS, 0, + ZYNQMP_PM_REQUEST_ACK_BLOCKING); + if (ret < 0) { + dev_err(dev, "failed to turn on TCM 0x%x", pm_domain_id); + goto release_tcm_split; + } } dev_dbg(dev, "TCM carveout split mode %s addr=%llx, da=0x%x, size=0x%lx", @@ -646,13 +667,16 @@ static int add_tcm_carveout_lockstep_mode(struct rproc *rproc) for (i = 0; i < num_banks; i++) { pm_domain_id = r5_core->tcm_banks[i]->pm_domain_id; - /* Turn on each TCM bank individually */ - ret = zynqmp_pm_request_node(pm_domain_id, - ZYNQMP_PM_CAPABILITY_ACCESS, 0, - ZYNQMP_PM_REQUEST_ACK_BLOCKING); - if (ret < 0) { - dev_err(dev, "failed to turn on TCM 0x%x", pm_domain_id); - goto release_tcm_lockstep; + if (pm_domain_id) { + /* Turn on each TCM bank individually */ + ret = zynqmp_pm_request_node(pm_domain_id, + ZYNQMP_PM_CAPABILITY_ACCESS, 0, + ZYNQMP_PM_REQUEST_ACK_BLOCKING); + if (ret < 0) { + dev_err(dev, "failed to turn on TCM 0x%x", + pm_domain_id); + goto release_tcm_lockstep; + } } bank_size = r5_core->tcm_banks[i]->size; @@ -687,8 +711,10 @@ static int add_tcm_carveout_lockstep_mode(struct rproc *rproc) /* If failed, Turn off all TCM banks turned on before */ for (i--; i >= 0; i--) { pm_domain_id = r5_core->tcm_banks[i]->pm_domain_id; - zynqmp_pm_release_node(pm_domain_id); + if (pm_domain_id) + zynqmp_pm_release_node(pm_domain_id); } + return ret; } @@ -758,6 +784,153 @@ static int zynqmp_r5_parse_fw(struct rproc *rproc, const struct firmware *fw) return ret; } +static void zynqmp_r5_remove_pm_domains(struct rproc *rproc) +{ + struct zynqmp_r5_core *r5_core = rproc->priv; + struct device *dev = r5_core->dev; + struct zynqmp_r5_cluster *cluster; + int i; + + cluster = platform_get_drvdata(to_platform_device(dev->parent)); + + for (i = 0; i < r5_core->num_pm_dev; i++) { + if (r5_core->pm_dev_link1 && r5_core->pm_dev_link1[i]) + device_link_del(r5_core->pm_dev_link1[i]); + if (r5_core->pm_dev1 && !IS_ERR_OR_NULL(r5_core->pm_dev1[i])) + dev_pm_domain_detach(r5_core->pm_dev1[i], false); + } + + kfree(r5_core->pm_dev1); + r5_core->pm_dev1 = NULL; + kfree(r5_core->pm_dev_link1); + r5_core->pm_dev_link1 = NULL; + + if (cluster->mode == SPLIT_MODE) { + r5_core->num_pm_dev = 0; + return; + } + + for (i = 0; i < r5_core->num_pm_dev; i++) { + if (r5_core->pm_dev_link2 && r5_core->pm_dev_link2[i]) + device_link_del(r5_core->pm_dev_link2[i]); + if (r5_core->pm_dev2 && !IS_ERR_OR_NULL(r5_core->pm_dev2[i])) + dev_pm_domain_detach(r5_core->pm_dev2[i], false); + } + + kfree(r5_core->pm_dev2); + r5_core->pm_dev2 = NULL; + kfree(r5_core->pm_dev_link2); + r5_core->pm_dev_link2 = NULL; + r5_core->num_pm_dev = 0; +} + +static int zynqmp_r5_add_pm_domains(struct rproc *rproc) +{ + struct zynqmp_r5_core *r5_core = rproc->priv; + struct device *dev = r5_core->dev, *dev2; + struct zynqmp_r5_cluster *cluster; + struct platform_device *pdev; + struct device_node *np; + int i, num_pm_dev, ret; + + cluster = platform_get_drvdata(to_platform_device(dev->parent)); + + /* get number of power-domains */ + num_pm_dev = of_count_phandle_with_args(r5_core->np, "power-domains", + "#power-domain-cells"); + + if (num_pm_dev <= 0) + return -EINVAL; + + r5_core->pm_dev1 = kcalloc(num_pm_dev, + sizeof(struct device *), + GFP_KERNEL); + if (!r5_core->pm_dev1) + ret = -ENOMEM; + + r5_core->pm_dev_link1 = kcalloc(num_pm_dev, + sizeof(struct device_link *), + GFP_KERNEL); + if (!r5_core->pm_dev_link1) + return -ENOMEM; + + r5_core->num_pm_dev = num_pm_dev; + + /* for zynqmp we only add TCM power domains and not core's power domain */ + for (i = 1; i < r5_core->num_pm_dev; i++) { + r5_core->pm_dev1[i] = dev_pm_domain_attach_by_id(dev, i); + if (IS_ERR(r5_core->pm_dev1[i])) { + dev_dbg(dev, "failed to attach pm domain %d\n", i); + return PTR_ERR(r5_core->pm_dev1[i]); + } + if (!r5_core->pm_dev1[i]) { + dev_dbg(dev, "can't attach to pm domain %d\n", i); + return -EINVAL; + } + + r5_core->pm_dev_link1[i] = device_link_add(dev, r5_core->pm_dev1[i], + DL_FLAG_STATELESS | + DL_FLAG_RPM_ACTIVE | + DL_FLAG_PM_RUNTIME); + if (!r5_core->pm_dev_link1[i]) { + dev_pm_domain_detach(r5_core->pm_dev1[i], true); + r5_core->pm_dev1[i] = NULL; + return -EINVAL; + } + } + + if (cluster->mode == SPLIT_MODE) + return 0; + + r5_core->pm_dev2 = kcalloc(num_pm_dev, + sizeof(struct device *), + GFP_KERNEL); + if (!r5_core->pm_dev2) + return -ENOMEM; + + r5_core->pm_dev_link2 = kcalloc(num_pm_dev, + sizeof(struct device_link *), + GFP_KERNEL); + if (!r5_core->pm_dev_link2) + return -ENOMEM; + + /* get second core's device to detach its power-domains */ + np = of_get_next_child(cluster->dev->of_node, of_node_get(dev->of_node)); + + pdev = of_find_device_by_node(np); + if (!pdev) { + dev_err(cluster->dev, "core1 platform device not available\n"); + return -EINVAL; + } + + dev2 = &pdev->dev; + + /* for zynqmp we only add TCM power domains and not core's power domain */ + for (i = 1; i < r5_core->num_pm_dev; i++) { + r5_core->pm_dev2[i] = dev_pm_domain_attach_by_id(dev2, i); + if (IS_ERR(r5_core->pm_dev2[i])) { + dev_dbg(dev, "can't attach to pm domain %d\n", i); + return PTR_ERR(r5_core->pm_dev2[i]); + } + if (!r5_core->pm_dev2[i]) { + dev_dbg(dev, "can't attach to pm domain %d\n", i); + return -EINVAL; + } + + r5_core->pm_dev_link2[i] = device_link_add(dev, r5_core->pm_dev2[i], + DL_FLAG_STATELESS | + DL_FLAG_RPM_ACTIVE | + DL_FLAG_PM_RUNTIME); + if (!r5_core->pm_dev_link2[i]) { + dev_pm_domain_detach(r5_core->pm_dev2[i], true); + r5_core->pm_dev2[i] = NULL; + return -ENODEV; + } + } + + return 0; +} + /** * zynqmp_r5_rproc_prepare() * adds carveouts for TCM bank and reserved memory regions @@ -770,19 +943,30 @@ static int zynqmp_r5_rproc_prepare(struct rproc *rproc) { int ret; + ret = zynqmp_r5_add_pm_domains(rproc); + if (ret) { + dev_err(&rproc->dev, "failed to add pm domains\n"); + goto fail_prepare; + } + ret = add_tcm_banks(rproc); if (ret) { dev_err(&rproc->dev, "failed to get TCM banks, err %d\n", ret); - return ret; + goto fail_prepare; } ret = add_mem_regions_carveout(rproc); if (ret) { dev_err(&rproc->dev, "failed to get reserve mem regions %d\n", ret); - return ret; + goto fail_prepare; } return 0; + +fail_prepare: + zynqmp_r5_remove_pm_domains(rproc); + + return ret; } /** @@ -801,11 +985,13 @@ static int zynqmp_r5_rproc_unprepare(struct rproc *rproc) r5_core = rproc->priv; + zynqmp_r5_remove_pm_domains(rproc); + for (i = 0; i < r5_core->tcm_bank_count; i++) { pm_domain_id = r5_core->tcm_banks[i]->pm_domain_id; - if (zynqmp_pm_release_node(pm_domain_id)) - dev_warn(r5_core->dev, - "can't turn off TCM bank 0x%x", pm_domain_id); + if (pm_domain_id && zynqmp_pm_release_node(pm_domain_id)) + dev_dbg(r5_core->dev, + "can't turn off TCM bank 0x%x", pm_domain_id); } return 0; From patchwork Thu Sep 28 15:59:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanmay Shah X-Patchwork-Id: 13403301 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10BD3E732E5 for ; Thu, 28 Sep 2023 16:00:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231875AbjI1QAI (ORCPT ); Thu, 28 Sep 2023 12:00:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34568 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231263AbjI1QAH (ORCPT ); Thu, 28 Sep 2023 12:00:07 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2045.outbound.protection.outlook.com [40.107.244.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A209D6; Thu, 28 Sep 2023 09:00:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ePvu5+jR7kg1r0fcsC5/Vh/JVOD2cevMnVo3wXxe9ppjdTOr6mwUGfo7ZwbSkOjqtY0WWTX+XiyvImTclD0wEYovxaG47AfLhKObmuXfAwbsUSPvD57+2r1XUnRrxK8I3YThI64iwldW7wvdqEUjmL+aviun7Ef1K22KNMrAbnZ8B4eao5K1OmkJBxC6WFGlw0Hg84M58P+a95QAx49epbGgiI5C8jf3mtW4lwtZFQ4DBwKCJLODzw3EoHTHBI1vuc5TYh7LgnFZiniQOexJvPAHWKtbUM5p5/FlSukM5JBTHeFjrh1nbFruPsP98exS8YyL3FEmt1xpkBTa3EsJgA== 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=Vo001g7G0kjh1Xv6JBDuR7MoVZ4U9Nspzq3Mt29IKjM=; b=JyWFJJavmVBw7PJqWfMFbkvkfu9e9uz1GXrc1KeD4fQE+XbZ9FwaooDlXN7V4dxaDIpKPny1nMnh8816QDa+rU1p2433TkifeATkyxht0NxY4zNNQzHLrn8qQH6FJrPEZaTxwKCk7WBwa5B4qHatcbyJ/9lJlAAq9MbeG10rZhk5cNuL9uwVhZaqC+SugoqBdSVNwT3AhDwz3x/pty4asm0Nz+l4iDgpjUvy+u2YdP+7FdA0lPXvsOniS33fVQ9iriB6n9799xMK2wG77QNzDrJWZDsyS2sSEKBBFnJsmmgyIaYJksFiGh6Sf279hAuTXs0CLjVuiz8K1zCoaJOVuw== 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 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=Vo001g7G0kjh1Xv6JBDuR7MoVZ4U9Nspzq3Mt29IKjM=; b=GZXerfGxBaXNqNJgR2aiNGJUvCxVH/KBP+1cJo6vX1ZDs5Zz2qk2Kq/NeLGvMb6uzB1jhKBfwviCARgeaDixpAQcuvLOQtYURM+PQqW21EWs3HqcGkTRntawWcnFg5EEh2eNNUU4SF7r68LX7a6a0E/ck51rDtACKKe5N4Cw8ro= Received: from DS7PR03CA0227.namprd03.prod.outlook.com (2603:10b6:5:3ba::22) by PH0PR12MB8773.namprd12.prod.outlook.com (2603:10b6:510:28d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25; Thu, 28 Sep 2023 16:00:03 +0000 Received: from DS3PEPF000099D3.namprd04.prod.outlook.com (2603:10b6:5:3ba:cafe::ac) by DS7PR03CA0227.outlook.office365.com (2603:10b6:5:3ba::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.25 via Frontend Transport; Thu, 28 Sep 2023 16:00:03 +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 DS3PEPF000099D3.mail.protection.outlook.com (10.167.17.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6838.14 via Frontend Transport; Thu, 28 Sep 2023 16:00:03 +0000 Received: from SATLEXMB05.amd.com (10.181.40.146) 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.27; Thu, 28 Sep 2023 10:59:56 -0500 Received: from SATLEXMB03.amd.com (10.181.40.144) 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.27; Thu, 28 Sep 2023 10:59:56 -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.27 via Frontend Transport; Thu, 28 Sep 2023 10:59:55 -0500 From: Tanmay Shah To: , , , , CC: , , , , , Subject: [PATCH v5 4/4] remoteproc: zynqmp: parse TCM from device tree Date: Thu, 28 Sep 2023 08:59:00 -0700 Message-ID: <20230928155900.3987103-5-tanmay.shah@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230928155900.3987103-1-tanmay.shah@amd.com> References: <20230928155900.3987103-1-tanmay.shah@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099D3:EE_|PH0PR12MB8773:EE_ X-MS-Office365-Filtering-Correlation-Id: e4c86d00-6ec9-4941-38de-08dbc03bf9ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pzKR42/shRYe7oFKOeQ4Fkd5vLKQ7yl7D8wAf//LMPQP5lohxVpVQWkyF7KN/N+mgrUiqO+7P1MXiLkFX7B1lsqDr5VZEHrjvZx0ZGLHXIOoeVGOaex7RcBpwo2vlnyAsZceWF+eqxgX7Se5tkFZ4ZSpOPWcmGxb/eUK8FDRfcd1aGQpAd89i+5tmY5SOfTSpbVZSjDCKBc+GgO6ZvLZY0wsxWni3XpYxWNSJs4BzGbdkueB2N55fPVyWKWKA1KhayitOoixiqZw7LvE5twdsy8xZDaYl/xFHO1ETD7DFmXFvEKKYnmQrvVgw7BX6Es7eH2r2bgXfkGPvufoRJnRF6SF2zkuv9otVNAYt628E1bfXWP3CB/RycPbq6/phpDneTCfMX0QhKCgWAssBanPPMMcg6p0qRrXVLMf4PKSBMYfaYQqoDgFeZlFVbW4cyoSCRUsCNbBk4oQir6cainEl3KwhFzieImazT3JbN6wAMAux7lAF80nNml3p3nOcqiOeaZvPUfBsQoTS9ieMjxn4YG2mOqM7Bb6SGdpSsBymyMNIpUz5Dyb6e8qofg/hAd0xyP+HSjo8jUGHHEaLBHgvgeHu4wy0nI7S+TObQXVhoOQbrOURp8WQczSsLWoVbAoqUzgwkZEQuTGsoi+vRy0AfQG3JPD8VgYvDnnRgkXZAmAdpqcFR1W2Zy3IWRU3pOI1u3wZ76WJTT/IjrSYcRJST8bFe+nsHi2+2dPujfXenxkG916pi82bVt1oDU0ETI+svUvGoOiLo7gKh5a8/WyWw== 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)(4636009)(136003)(396003)(376002)(346002)(39860400002)(230922051799003)(186009)(1800799009)(64100799003)(82310400011)(451199024)(40470700004)(36840700001)(46966006)(40460700003)(2906002)(6666004)(1076003)(2616005)(110136005)(70206006)(70586007)(86362001)(478600001)(54906003)(47076005)(36860700001)(336012)(426003)(82740400003)(26005)(83380400001)(356005)(81166007)(6636002)(36756003)(5660300002)(44832011)(40480700001)(316002)(4326008)(41300700001)(8676002)(8936002)(66899024)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 16:00:03.2132 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e4c86d00-6ec9-4941-38de-08dbc03bf9ff 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: DS3PEPF000099D3.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8773 Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org ZynqMP TCM information is fixed in driver. Now ZynqMP TCM information is available in device-tree. Parse TCM information in driver as per new bindings Signed-off-by: Tanmay Shah --- drivers/remoteproc/xlnx_r5_remoteproc.c | 122 ++++++++++++++++++++++-- 1 file changed, 114 insertions(+), 8 deletions(-) diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c index 27ed2c070ebb..749e9da68906 100644 --- a/drivers/remoteproc/xlnx_r5_remoteproc.c +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c @@ -75,8 +75,8 @@ struct mbox_info { }; /* - * Hardcoded TCM bank values. This will be removed once TCM bindings are - * accepted for system-dt specifications and upstreamed in linux kernel + * Hardcoded TCM bank values. This will stay in driver to maintain backward + * compatibility with device-tree that does not have TCM information. */ static const struct mem_bank_data zynqmp_tcm_banks_split[] = { {0xffe00000UL, 0x0, 0x10000UL, PD_R5_0_ATCM, "atcm0"}, /* TCM 64KB each */ @@ -613,7 +613,8 @@ static int add_tcm_carveout_split_mode(struct rproc *rproc) bank_name); if (!rproc_mem) { ret = -ENOMEM; - zynqmp_pm_release_node(pm_domain_id); + if (pm_domain_id) + zynqmp_pm_release_node(pm_domain_id); goto release_tcm_split; } @@ -626,7 +627,8 @@ static int add_tcm_carveout_split_mode(struct rproc *rproc) /* If failed, Turn off all TCM banks turned on before */ for (i--; i >= 0; i--) { pm_domain_id = r5_core->tcm_banks[i]->pm_domain_id; - zynqmp_pm_release_node(pm_domain_id); + if (pm_domain_id) + zynqmp_pm_release_node(pm_domain_id); } return ret; } @@ -1064,6 +1066,107 @@ static struct zynqmp_r5_core *zynqmp_r5_add_rproc_core(struct device *cdev) return ERR_PTR(ret); } +static int zynqmp_r5_get_tcm_node_from_dt(struct zynqmp_r5_cluster *cluster) +{ + int i, j, tcm_bank_count, ret = -EINVAL; + struct zynqmp_r5_core *r5_core; + struct platform_device *cpdev; + struct resource *res = NULL; + u64 abs_addr = 0, size = 0; + struct mem_bank_data *tcm; + struct device_node *np; + struct device *dev; + + for (i = 0; i < cluster->core_count; i++) { + r5_core = cluster->r5_cores[i]; + dev = r5_core->dev; + np = dev_of_node(dev); + + /* we have address cell 2 and size cell as 2 */ + ret = of_property_count_elems_of_size(np, "reg", + 4 * sizeof(u32)); + if (ret == 0) { + ret = -EINVAL; + goto fail_tcm; + } + if (ret < 0) + goto fail_tcm; + + tcm_bank_count = ret; + + r5_core->tcm_banks = devm_kcalloc(dev, tcm_bank_count, + sizeof(struct mem_bank_data *), + GFP_KERNEL); + if (!r5_core->tcm_banks) { + ret = -ENOMEM; + goto fail_tcm; + } + + r5_core->tcm_bank_count = tcm_bank_count; + for (j = 0; j < tcm_bank_count; j++) { + tcm = devm_kzalloc(dev, sizeof(struct mem_bank_data *), + GFP_KERNEL); + if (!tcm) { + ret = -ENOMEM; + goto fail_tcm; + } + + r5_core->tcm_banks[j] = tcm; + + /* get tcm address without translation */ + ret = of_property_read_reg(np, j, &abs_addr, &size); + if (ret) { + dev_err(dev, "failed to get reg property\n"); + goto fail_tcm; + } + + /* + * remote processor can address only 32 bits + * so convert 64-bits into 32-bits. This will discard + * any unwanted upper 32-bits. + */ + tcm->da = (u32)abs_addr; + tcm->size = (u32)size; + + cpdev = to_platform_device(dev); + res = platform_get_resource(cpdev, IORESOURCE_MEM, j); + if (!res) { + dev_err(dev, "failed to get tcm resource\n"); + ret = -EINVAL; + goto fail_tcm; + } + + tcm->addr = (u32)res->start; + tcm->bank_name = (char *)res->name; + res = devm_request_mem_region(dev, tcm->addr, tcm->size, + tcm->bank_name); + if (!res) { + dev_err(dev, "failed to request tcm resource\n"); + ret = -EINVAL; + goto fail_tcm; + } + } + } + + return 0; + +fail_tcm: + while (i >= 0) { + r5_core = cluster->r5_cores[i]; + for (j = 0; j < r5_core->tcm_bank_count; j++) { + if (!r5_core->tcm_banks || !r5_core->tcm_banks[j]) + continue; + tcm = r5_core->tcm_banks[j]; + devm_kfree(r5_core->dev, tcm); + } + devm_kfree(r5_core->dev, r5_core->tcm_banks); + r5_core->tcm_banks = NULL; + i--; + } + + return ret; +} + /** * zynqmp_r5_get_tcm_node() * Ideally this function should parse tcm node and store information @@ -1142,10 +1245,13 @@ static int zynqmp_r5_core_init(struct zynqmp_r5_cluster *cluster, struct zynqmp_r5_core *r5_core; int ret, i; - ret = zynqmp_r5_get_tcm_node(cluster); - if (ret < 0) { - dev_err(dev, "can't get tcm node, err %d\n", ret); - return ret; + ret = zynqmp_r5_get_tcm_node_from_dt(cluster); + if (ret) { + ret = zynqmp_r5_get_tcm_node(cluster); + if (ret < 0) { + dev_err(dev, "can't get tcm node, err %d\n", ret); + return ret; + } } for (i = 0; i < cluster->core_count; i++) {