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 E894FC433F5 for ; Mon, 13 Dec 2021 19:17:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242191AbhLMTRZ (ORCPT ); Mon, 13 Dec 2021 14:17:25 -0500 Received: from mail-bn7nam10on2040.outbound.protection.outlook.com ([40.107.92.40]:22849 "EHLO NAM10-BN7-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S242152AbhLMTRY (ORCPT ); Mon, 13 Dec 2021 14:17:24 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DaaBS29uYnmUwZgtyvkN2eAG8ipckvgXrQ038Zo0H/VXW/tmWuJKV0AkdFML5pgl3kQB9aJtkfgFRJczsVDos/LN+2KcFbE2ofFCxGp7nJqHZ+YAWbjqM1FRT//5ao6HSEgKKJayAyol8L0BeZmml8uKmU+vLTsK6pwgU7NIaN6B01iss8o95W4tTy3e1O5xHemPFMRpnCZ6LVZQ9bpYe6IVqqllN0zYuuZXLHtkiKREuDmNYDv+jhvTfJtX86vJxkVKG/ESJwlvINoigr2um4RQ0rwx9zEekh05QtuKrpXt2eo+BFlwiLKl0LaxXYqgxtI69zu+JcmvfVDHUAv4bg== 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=TmERxat/7G2D5CUc+Fm1hcqAkukYASzQHt2ZcHWf8cI=; b=bxpaeboJAydJ9PK84q4R83TXFuqGP1D5oeW4vMqBB6xuoB4HV4nktskE8rWjIoittMDzREX/O7jF/m1g1fNUUO1wvA/xqiMw/RWdhz6onGWE6POQiseNfWQChL70808cwLFa3Agoa1wKvdhfF6xS/r2rVf0SFZA5PTPaomN/xN35gOW1jtQUhxkeMj1Jgo2tsGcpzru8Iys3Rj6G8QsIBFAH7bn/x7tuBaSebQw/ieZZsWTWQT681df3iZitt/BQ2iyzHDbWweTq4EkAVmhmFH0WZXI4O+qE1Jd6UC2rFsyOft5dFTEkHv9q0YLJ5sz5GZybkOthDUxBNDOlI+B96A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 149.199.80.198) smtp.rcpttodomain=linaro.org smtp.mailfrom=xilinx.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=xilinx.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector2-xilinx-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TmERxat/7G2D5CUc+Fm1hcqAkukYASzQHt2ZcHWf8cI=; b=HyCLkuqW5eYQj4bYYWEiI/KtAxCVjbH2V0yxhFo8Px/PKVnavFN+Qs3vXM6Vn+85vbtavrBPnIsuAwDccvLKDCRONe9/2EXhyEhirOtiOJenY1Emgyw/t+HmHfRH/u0aYBe9IpX2dvBnGJHv/0EAt44d62FAKUe8f/YFkjyApiQ= Received: from DM6PR07CA0108.namprd07.prod.outlook.com (2603:10b6:5:330::14) by BY5PR02MB6244.namprd02.prod.outlook.com (2603:10b6:a03:1b0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.15; Mon, 13 Dec 2021 19:17:20 +0000 Received: from DM3NAM02FT007.eop-nam02.prod.protection.outlook.com (2603:10b6:5:330:cafe::20) by DM6PR07CA0108.outlook.office365.com (2603:10b6:5:330::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12 via Frontend Transport; Mon, 13 Dec 2021 19:17:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 149.199.80.198) smtp.mailfrom=xilinx.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.80.198 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.80.198; helo=xir-pvapexch02.xlnx.xilinx.com; Received: from xir-pvapexch02.xlnx.xilinx.com (149.199.80.198) by DM3NAM02FT007.mail.protection.outlook.com (10.13.4.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Mon, 13 Dec 2021 19:17:19 +0000 Received: from xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) by xir-pvapexch02.xlnx.xilinx.com (172.21.17.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.14; Mon, 13 Dec 2021 19:17:18 +0000 Received: from smtp.xilinx.com (172.21.105.198) by xir-pvapexch01.xlnx.xilinx.com (172.21.17.15) with Microsoft SMTP Server id 15.1.2176.14 via Frontend Transport; Mon, 13 Dec 2021 19:17:18 +0000 Envelope-to: michal.simek@xilinx.com, ben.levinsky@xilinx.com, sergei.korneichuk@xilinx.com, mathieu.poirier@linaro.org, bjorn.andersson@linaro.org, robh+dt@kernel.org, laurent.pinchart@ideasonboard.com, bill.mills@linaro.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Received: from [10.71.116.145] (port=61586) by smtp.xilinx.com with esmtp (Exim 4.90) (envelope-from ) id 1mwqp3-0001Pj-94; Mon, 13 Dec 2021 19:17:18 +0000 Message-ID: <320faee0-9019-66d1-7c0c-639d958cae56@xilinx.com> Date: Tue, 14 Dec 2021 00:47:14 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.3.2 Subject: Re: [PATCH v2 6/6] drivers: remoteproc: Add Xilinx r5 remoteproc driver Content-Language: en-US To: Mathieu Poirier CC: Bjorn Andersson , Rob Herring , Michal Simek , "Laurent Pinchart" , Ben Levinsky , Bill Mills , "Sergei Korneichuk" , , , , References: <20211123062050.1442712-1-tanmay.shah@xilinx.com> <20211123062050.1442712-7-tanmay.shah@xilinx.com> <20211207183118.GA1099463@p14s> From: Tanmay Shah In-Reply-To: <20211207183118.GA1099463@p14s> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 7bit X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2494cb21-1206-46a2-c176-08d9be6d2ef6 X-MS-TrafficTypeDiagnostic: BY5PR02MB6244:EE_ X-Microsoft-Antispam-PRVS: X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P5P9JDp9RDwrqU2FiuCZefV8cQMCKtJL6ENinLGJnSkJPUBCz/Xip5snMMAb/WLljtw73B5hbr6EQE3kJcul8slH7Qi+C3KXd4xkoX2Zzd0BvdXQ/A/YqfNhXNiAeMihwPopExRTdeHrfikXSNpxrtQ95QMaLIdOIAoHL7Zh+Ib3nyGqN39Eo6QGsUAb/wOhWmtvt1EUE8UzcPa+iziXwhu4eRvw54a4XnqQu6Fv+8s+sAUZFmKykrY9M+bbaD7nw69ZR+3cOOAN+uc9WA+AhaLbTfvDIYpccULZSIflkdEWerQFv8L22VXuz+q29lVOhPggh80qM/N8LvOvCoKjg+IoHHuglR2r2ZPZ4I/Uoi1nXgra2xUcSvDsjQAe+Uos4bcZB9jmQmqa836SQQsvlfTKy+2Mews4tjomnDAnhPgh8/fiKHj4TmWjYKwKQ5zsmTEQ46KDAfVNjo8o+b+h95jPrDgs6T0hPsacqicQ0v1gPVWfhhX/xAoRaN/g5IQcGAiy94zRD8ZIpeYcRzHlEedXr2TrzaYfy2YG2RtZ3gsU6slj6q0cB8UUurloR3sYQnZewXJLp9pwSQos64gSgAkPROClRVq5Rkm7KOeKCcoSHo+qeH4cvTGnIxUtWwFWYgTyXURPYJQ42cQsy+kjjxBmWnNsPaSMIecTo442lsVF6g4Y/F69Y3082CjEHIjnLgTfgzaW7/7B3m75oi2hA1qDhV1qUnCPzPbM+yyiVIgLknwpWqXoyAc36MJxz2Vh X-Forefront-Antispam-Report: CIP:149.199.80.198;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:xir-pvapexch02.xlnx.xilinx.com;PTR:unknown-80-198.xilinx.com;CAT:NONE;SFS:(46966006)(36840700001)(54906003)(6666004)(2906002)(26005)(36860700001)(2616005)(70206006)(426003)(5660300002)(70586007)(53546011)(186003)(336012)(30864003)(36756003)(6916009)(44832011)(4326008)(508600001)(82310400004)(8936002)(8676002)(9786002)(316002)(47076005)(31696002)(31686004)(7636003)(83380400001)(356005)(50156003)(43740500002);DIR:OUT;SFP:1101; X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Dec 2021 19:17:19.6240 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2494cb21-1206-46a2-c176-08d9be6d2ef6 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.80.198];Helo=[xir-pvapexch02.xlnx.xilinx.com] X-MS-Exchange-CrossTenant-AuthSource: DM3NAM02FT007.eop-nam02.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR02MB6244 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/8/21 12:01 AM, Mathieu Poirier wrote: [...] >> + >> +/* >> + * zynqmp_r5_rproc_start >> + * @rproc: single R5 core's corresponding rproc instance >> + * >> + * Start R5 Core from designated boot address. >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int zynqmp_r5_rproc_start(struct rproc *rproc) >> +{ >> + struct zynqmp_r5_core *r5_core = rproc->priv; >> + enum rpu_boot_mem bootmem; >> + int ret; >> + >> + if (!r5_core) { >> + pr_err("can't get r5 core\n"); >> + return -EINVAL; >> + } > Please remove. > >> + >> + bootmem = (rproc->bootaddr >= 0xFFFC0000) ? >> + PM_RPU_BOOTMEM_HIVEC : PM_RPU_BOOTMEM_LOVEC; > Some comments as to what is happening here would be appreciated. > >> + >> + dev_dbg(r5_core->dev, "RPU boot addr 0x%llx from %s.", rproc->bootaddr, >> + bootmem == PM_RPU_BOOTMEM_HIVEC ? "OCM" : "TCM"); >> + >> + ret = zynqmp_pm_request_wake(r5_core->pm_domain_id, 1, >> + bootmem, ZYNQMP_PM_REQUEST_ACK_NO); >> + if (ret) >> + pr_err("failed to start RPU = %d\n", r5_core->pm_domain_id); >> + return ret; >> +} >> + >> +/* >> + * zynqmp_r5_rproc_stop >> + * @rproc: single R5 core's corresponding rproc instance >> + * >> + * Power down R5 Core. >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int zynqmp_r5_rproc_stop(struct rproc *rproc) >> +{ >> + struct zynqmp_r5_core *r5_core = rproc->priv; >> + int ret; >> + >> + ret = zynqmp_pm_force_pwrdwn(r5_core->pm_domain_id, >> + ZYNQMP_PM_REQUEST_ACK_BLOCKING); >> + if (ret) >> + pr_err("failed to stop remoteproc RPU %d\n", ret); >> + >> + return ret; >> +} >> + >> +/* >> + * zynqmp_r5_rproc_mem_map >> + * @rproc: single R5 core's corresponding rproc instance >> + * @mem: mem entry to map >> + * >> + * Callback to map va for memory-region's carveout. >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int zynqmp_r5_rproc_mem_map(struct rproc *rproc, >> + struct rproc_mem_entry *mem) >> +{ >> + void __iomem *va; >> + >> + va = ioremap_wc(mem->dma, mem->len); >> + if (IS_ERR_OR_NULL(va)) >> + return -ENOMEM; >> + >> + mem->va = (void *)va; >> + >> + return 0; >> +} >> + >> +/* >> + * zynqmp_r5_rproc_mem_unmap >> + * @rproc: single R5 core's corresponding rproc instance >> + * @mem: mem entry to unmap >> + * >> + * Unmap memory-region carveout >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int zynqmp_r5_rproc_mem_unmap(struct rproc *rproc, >> + struct rproc_mem_entry *mem) >> +{ >> + iounmap((void __iomem *)mem->va); >> + return 0; >> +} >> + >> +/* >> + * add_mem_regions >> + * @rproc: single R5 core's corresponding rproc instance >> + * >> + * Construct rproc mem carveouts from carveout provided in >> + * memory-region property >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int add_mem_regions(struct rproc *rproc) >> +{ >> + struct device *dev; >> + struct rproc_mem_entry *mem; >> + struct reserved_mem *rmem; >> + struct zynqmp_r5_core *r5_core; >> + int i; >> + >> + r5_core = rproc->priv; >> + dev = r5_core->dev; >> + >> + /* Register associated reserved memory regions */ >> + for (i = 0; i < r5_core->res_mem_count; i++) { >> + rmem = &r5_core->res_mem[i]; > Indentation problem > >> + mem = rproc_mem_entry_init(dev, NULL, >> + (dma_addr_t)rmem->base, >> + rmem->size, rmem->base, >> + zynqmp_r5_rproc_mem_map, >> + zynqmp_r5_rproc_mem_unmap, >> + rmem->name); >> + if (IS_ERR_OR_NULL(mem)) >> + return -ENOMEM; >> + >> + rproc_add_carveout(rproc, mem); >> + } > Not sure why this wasn't done in zynqmp_r5_get_mem_region_node()... That would > prevent the need to keep a copy of the reserved memories in the zynqmp_r5_core > structure. Sure, I will analyze this optimization. >> + >> + return 0; >> +} >> + >> +/* >> + * zynqmp_r5_rproc_mem_unmap >> + * @rproc: single R5 core's corresponding rproc instance >> + * @mem: mem entry to unmap >> + * >> + * Unmap TCM banks when powering down R5 core. >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int tcm_mem_unmap(struct rproc *rproc, struct rproc_mem_entry *mem) >> +{ >> + struct zynqmp_r5_core *r5_core; >> + int i; >> + enum pm_node_id pm_domain_id; >> + >> + r5_core = rproc->priv; >> + if (!r5_core) { >> + pr_err("r5 core is not available\n"); >> + return -EINVAL; >> + } >> + >> + iounmap((void __iomem *)mem->va); >> + >> + 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)) >> + pr_warn("can't turn off TCM bank %d", pm_domain_id); >> + } >> + >> + return 0; >> +} >> + >> +/* >> + * tcm_mem_map >> + * @rproc: single R5 core's corresponding rproc instance >> + * @mem: mem entry to initialize the va and da fields of >> + * >> + * Given TCM bank entry, this callback will set device address for R5 >> + * running on TCM and also setup virtual address for TCM bank >> + * remoteproc carveout. >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int tcm_mem_map(struct rproc *rproc, >> + struct rproc_mem_entry *mem) > Indentation problem > >> +{ >> + void __iomem *va; >> + >> + va = ioremap_wc(mem->dma, mem->len); >> + if (IS_ERR_OR_NULL(va)) >> + return -ENOMEM; >> + >> + /* Update memory entry va */ >> + mem->va = (void *)va; >> + >> + /* clear TCMs */ >> + memset_io(va, 0, mem->len); >> + >> + /* >> + * The R5s expect their TCM banks to be at address 0x0 and 0x2000, >> + * while on the Linux side they are at 0xffexxxxx. >> + * >> + * Zero out the high 12 bits of the address. This will give >> + * expected values for TCM Banks 0A and 0B (0x0 and 0x20000). >> + */ >> + mem->da &= 0x000fffff; >> + >> + /* >> + * TCM Banks 1A and 1B still have to be translated. >> + * >> + * Below handle these two banks' absolute addresses (0xffe90000 and >> + * 0xffeb0000) and convert to the expected relative addresses >> + * (0x0 and 0x20000). >> + */ >> + if (mem->da == 0x90000 || mem->da == 0xB0000) >> + mem->da -= 0x90000; >> + >> + /* if translated TCM bank address is not valid report error */ >> + if (mem->da != 0x0 && mem->da != 0x20000) { >> + dev_err(&rproc->dev, "invalid TCM address: %x\n", mem->da); >> + return -EINVAL; >> + } >> + return 0; >> +} >> + >> +static int add_tcm_carveout_split_mode(struct rproc *rproc) >> +{ >> + int i, num_banks, ret; >> + struct rproc_mem_entry *mem; >> + enum pm_node_id pm_domain_id; >> + u32 bank_addr; > phys_addr_t bank_addr; > >> + size_t bank_size = 0; > No initialisation needed. > >> + char *bank_name; >> + struct device *dev; >> + struct zynqmp_r5_core *r5_core; >> + >> + r5_core = (struct zynqmp_r5_core *)rproc->priv; >> + if (!r5_core) >> + return -EINVAL; > Remove. > >> + >> + dev = r5_core->dev; >> + >> + /* go through zynqmp banks for r5 node */ >> + num_banks = r5_core->tcm_bank_count; >> + if (num_banks <= 0) { >> + dev_err(dev, "need to specify TCM banks\n"); >> + return -EINVAL; >> + } >> + >> + for (i = 0; i < num_banks; i++) { >> + bank_addr = (u32)r5_core->tcm_banks[i].addr; >> + bank_name = r5_core->tcm_banks[i].bank_name; >> + 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 %d", pm_domain_id); >> + return ret; >> + } >> + >> + dev_dbg(dev, "TCM carveout split mode %s addr=%x, size=0x%lx", >> + bank_name, bank_addr, bank_size); >> + >> + /* add carveout */ >> + mem = rproc_mem_entry_init(dev, NULL, bank_addr, >> + bank_size, bank_addr, >> + tcm_mem_map, tcm_mem_unmap, >> + bank_name); > I'm pretty sure that if you run the sparse checker on this you will get a lot of > angry warnings. > > >> + if (IS_ERR_OR_NULL(mem)) { > Function rproc_mem_entry_init() does not return an error code. > >> + /* Turn off all TCM banks turned on before */ >> + do { >> + pm_domain_id = r5_core->tcm_banks[i].pm_domain_id; >> + ret = zynqmp_pm_release_node((u32)pm_domain_id); > Here @pm_domain_id is casted as a u32 but it isn't above when calling > zynqmp_pm_request_node(), and that despite both functions taking a "const u32 > node". Again, I'm sure the sparse checker will complain here. > > >> + if (ret) >> + dev_warn(dev, >> + "fail to release node: %x, %x\n", >> + (u32)pm_domain_id, ret); >> + } while (i--); >> + return -ENOMEM; >> + } >> + >> + rproc_add_carveout(rproc, mem); >> + } >> + >> + return 0; >> +} >> + >> +static int add_tcm_carveout_lockstep_mode(struct rproc *rproc) >> +{ >> + int i, num_banks, ret; >> + struct rproc_mem_entry *mem; >> + enum pm_node_id pm_domain_id; >> + u32 bank_addr; >> + size_t bank_size = 0; > Same as above. > >> + char *bank_name; >> + struct device *dev; >> + struct platform_device *parent_pdev; >> + struct zynqmp_r5_cluster *cluster; >> + struct zynqmp_r5_core *r5_core; >> + >> + r5_core = (struct zynqmp_r5_core *)rproc->priv; >> + if (!r5_core) >> + return -EINVAL; >> + >> + dev = r5_core->dev; >> + if (!dev) { >> + pr_err("r5 core device unavailable\n"); >> + return -ENODEV; >> + } >> + > Same as above. > >> + /* go through zynqmp banks for r5 node */ >> + num_banks = r5_core->tcm_bank_count; >> + if (num_banks <= 0) { >> + dev_err(dev, "need to specify TCM banks\n"); >> + return -EINVAL; >> + } >> + >> + bank_addr = (u32)r5_core->tcm_banks[0].addr; >> + bank_name = r5_core->tcm_banks[0].bank_name; >> + for (i = 0; i < num_banks; i++) { >> + 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 %d", pm_domain_id); >> + return ret; >> + } >> + } > I know what is happening above but in 6 months it will all be gone from > memory. Please add enough documentation for someone not familiar with the > platform to understand why things are done that way. Here and throughout the > driver. > >> + >> + dev_dbg(dev, "TCM add carveout lockstep mode %s addr=0x%x, size=0x%lx", >> + bank_name, bank_addr, bank_size); >> + >> + /* add carveout */ >> + mem = rproc_mem_entry_init(dev, NULL, bank_addr, >> + bank_size, bank_addr, >> + tcm_mem_map, tcm_mem_unmap, >> + bank_name); >> + if (IS_ERR_OR_NULL(mem)) { >> + for (i = 0; i < num_banks; i++) { >> + pm_domain_id = r5_core->tcm_banks[i].pm_domain_id; >> + ret = zynqmp_pm_release_node((u32)pm_domain_id); >> + if (ret) >> + dev_warn(dev, >> + "fail to release node: %x ret: %x\n", >> + (u32)pm_domain_id, ret); >> + } >> + return -ENOMEM; >> + } >> + >> + rproc_add_carveout(rproc, mem); >> + >> + return 0; >> +} >> + >> +/* >> + * add_tcm_banks() >> + * @rproc: single R5 core's corresponding rproc instance >> + * >> + * Given R5 node in remoteproc instance >> + * allocate remoteproc carveout for TCM memory >> + * needed for firmware to be loaded >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int add_tcm_banks(struct rproc *rproc) >> +{ >> + struct device *dev; >> + struct platform_device *parent_pdev; >> + struct zynqmp_r5_cluster *cluster; >> + struct zynqmp_r5_core *r5_core; >> + >> + r5_core = (struct zynqmp_r5_core *)rproc->priv; >> + if (!r5_core) >> + return -EINVAL; >> + >> + dev = r5_core->dev; >> + if (!dev) { >> + pr_err("r5 core device unavailable\n"); >> + return -ENODEV; >> + } > Remove. > >> + >> + parent_pdev = to_platform_device(dev->parent); >> + if (!parent_pdev) { >> + dev_err(dev, "parent platform dev unavailable\n"); >> + return -ENODEV; >> + } >> + >> + cluster = platform_get_drvdata(parent_pdev); >> + if (!cluster) { >> + dev_err(&parent_pdev->dev, "Invalid driver data\n"); >> + return -EINVAL; >> + } > Why not simply calling dev_get_drvdata(dev->parent) instead of going through the > platform API? > >> + >> + if (cluster->mode == SPLIT_MODE) >> + return add_tcm_carveout_split_mode(rproc); >> + else if (cluster->mode == LOCKSTEP_MODE) >> + return add_tcm_carveout_lockstep_mode(rproc); >> + >> + dev_err(cluster->dev, "invalid cluster mode\n"); >> + return -EINVAL; >> +} >> + >> +/* >> + * zynqmp_r5_parse_fw() >> + * @rproc: single R5 core's corresponding rproc instance >> + * @fw: ptr to firmware to be loaded onto r5 core >> + * >> + * When loading firmware, ensure the necessary carveouts are in remoteproc >> + * >> + * return 0 on success, otherwise non-zero value on failure >> + */ >> +static int zynqmp_r5_parse_fw(struct rproc *rproc, const struct firmware *fw) >> +{ >> + int ret; >> + struct zynqmp_r5_core *r5_core; >> + struct device *dev; >> + >> + r5_core = rproc->priv; >> + if (!r5_core) { >> + dev_err(&rproc->dev, "r5 core not available\n"); >> + return -EINVAL; >> + } > Same as above and throughout. > > I am done reviewing this set - the overall structure is sound but there is a > fair amount of work to be done. There is no need to rush another revision as I > won't have time to review it before the holidays. On that front, change > _only_ the things I have commented on. We can address other issues as we move > forward. Last but not least, please run the sparse checker on your work. > > Thanks, > Mathieu > Sure Mathieu. I will address all the comments you have posted. Running sparse checker is also good idea. I will run it for all the next revisions. Thanks, Tanmay >> + >> + dev = r5_core->dev; >> + >> + ret = add_tcm_banks(rproc); >> + if (ret) { >> + dev_err(dev, "failed to get TCM banks, err %d\n", ret); >> + return ret; >> + } >> + >> + ret = add_mem_regions(rproc); >> + if (ret) >> + dev_warn(dev, "failed to get reserve mem regions %d\n", ret); >> + >> + ret = rproc_elf_load_rsc_table(rproc, fw); >> + if (ret == -EINVAL) { >> + /* >> + * resource table only required for IPC. >> + * if not present, this is not necessarily an error; >> + * for example, loading r5 hello world application >> + * so simply inform user and keep going. >> + */ >> + dev_info(&rproc->dev, "no resource table found.\n"); >> + ret = 0; >> + } >> + return ret; >> +} >> + >> +static struct rproc_ops zynqmp_r5_rproc_ops = { >> + .start = zynqmp_r5_rproc_start, >> + .stop = zynqmp_r5_rproc_stop, >> + .load = rproc_elf_load_segments, >> + .parse_fw = zynqmp_r5_parse_fw, >> + .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, >> + .sanity_check = rproc_elf_sanity_check, >> + .get_boot_addr = rproc_elf_get_boot_addr, >> +}; >> + >> +static void zynqmp_r5_print_dt_node_info(struct zynqmp_r5_cluster *cluster) >> +{ >> + int i, j, k; >> + struct zynqmp_r5_core *r5_core; >> + >> + dev_dbg(cluster->dev, "Printing dt node info\n"); >> + >> + pr_debug("cluster mode = %d\n", cluster->mode); >> + pr_debug("r5f cluster in %s mode\n", (cluster->mode == 0) ? "SPLIT" : >> + cluster->mode == 1 ? "LOCKSTEP" : "SINGLE_CPU"); >> + pr_debug("r5f num cores = %d\n", cluster->core_count); >> + >> + for (i = 0; i < cluster->core_count; i++) { >> + r5_core = &cluster->r5_cores[i]; >> + if (!r5_core) { >> + pr_err("can't get r5_core\n"); >> + continue; >> + } >> + >> + pr_debug("r5 core %d nodes\n", i); >> + pr_debug("TCM banks = %d\n", r5_core->tcm_bank_count); >> + for (k = 0; k < r5_core->tcm_bank_count; k++) { >> + pr_debug("tcm %d addr=0x%llx size=0x%lx, pm_id=%d, %s\n", >> + k, r5_core->tcm_banks[k].addr, >> + r5_core->tcm_banks[k].size, >> + r5_core->tcm_banks[k].pm_domain_id, >> + r5_core->tcm_banks[k].bank_name); >> + } >> + >> + pr_debug("reserve mem regions = %d\n", r5_core->res_mem_count); >> + >> + for (j = 0; j < r5_core->res_mem_count; j++) { >> + pr_debug("mem %d addr=0x%llx, size=0x%llx, name=%s\n", >> + j, r5_core->res_mem[j].base, >> + r5_core->res_mem[j].size, >> + r5_core->res_mem[j].name); >> + } >> + } >> +} >> + >> +/** >> + * zynqmp_r5_add_rproc_core() - Probes ZynqMP R5 processor device node >> + * this is called for each individual R5 core to >> + * set up mailbox, Xilinx platform manager unique ID, >> + * add to rproc core >> + * >> + * @r5_core: zynqmp_r5_core r5 core object to initialize >> + * >> + * Return: 0 for success, negative value for failure. >> + */ >> +static int zynqmp_r5_add_rproc_core(struct zynqmp_r5_core *r5_core) >> +{ >> + int ret; >> + struct rproc *r5_rproc; >> + struct device *dev; >> + >> + dev = r5_core->dev; >> + >> + /* Set up DMA mask */ >> + ret = dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); >> + if (ret) >> + return ret; >> + >> + /* Allocate remoteproc instance */ >> + r5_rproc = devm_rproc_alloc(dev, dev_name(dev), &zynqmp_r5_rproc_ops, >> + NULL, sizeof(struct zynqmp_r5_core)); >> + if (IS_ERR_OR_NULL(r5_rproc)) >> + return -ENOMEM; >> + >> + r5_rproc->auto_boot = false; >> + r5_rproc->priv = r5_core; >> + >> + /* Add R5 remoteproc */ >> + ret = devm_rproc_add(dev, r5_rproc); >> + if (ret) { >> + pr_err("failed to add r5 remoteproc\n"); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static int zynqmp_r5_get_tcm_node(struct zynqmp_r5_cluster *cluster) >> +{ >> + int tcm_bank_count, tcm_node; >> + int i = 0, j; >> + struct zynqmp_r5_core *r5_core; >> + const struct mem_bank_data *tcm = zynqmp_tcm_banks; >> + struct device *dev = cluster->dev; >> + >> + /* ToDo: Use predefined TCM address space values from driver until >> + * system-dt spec is not final fot TCM >> + */ >> + tcm_bank_count = ARRAY_SIZE(zynqmp_tcm_banks); >> + >> + /* count per core tcm banks */ >> + tcm_bank_count = tcm_bank_count / cluster->core_count; >> + >> + /* r5 core 0 will use all of TCM banks in lockstep mode. >> + * In split mode, r5 core0 will use 128k and r5 core1 will use another >> + * 128k. Assign TCM banks to each core accordingly >> + */ >> + tcm_node = 0; >> + for (j = 0; j < cluster->core_count; j++) { >> + r5_core = &cluster->r5_cores[j]; >> + r5_core->tcm_banks = devm_kzalloc(dev, sizeof(struct mem_bank_data) * >> + tcm_bank_count, GFP_KERNEL); >> + if (IS_ERR_OR_NULL(r5_core->tcm_banks)) >> + return -ENOMEM; >> + >> + for (i = 0; i < tcm_bank_count; i++) { >> + /* Use pre-defined TCM reg values. >> + * Eventually this should be replaced by values >> + * parsed from dts. >> + */ >> + r5_core->tcm_banks[i].addr = tcm[tcm_node].addr; >> + r5_core->tcm_banks[i].size = tcm[tcm_node].size; >> + r5_core->tcm_banks[i].pm_domain_id = tcm[tcm_node].pm_domain_id; >> + r5_core->tcm_banks[i].bank_name = tcm[tcm_node].bank_name; >> + tcm_node++; >> + } >> + >> + r5_core->tcm_bank_count = tcm_bank_count; >> + } >> + >> + return 0; >> +} >> + >> +static int zynqmp_r5_get_mem_region_node(struct zynqmp_r5_core *r5_core) >> +{ >> + int res_mem_count, i; >> + struct device *dev; >> + struct device_node *np, *rmem_np; >> + struct reserved_mem *rmem; >> + >> + dev = r5_core->dev; >> + >> + np = r5_core->np; >> + if (IS_ERR_OR_NULL(np)) { >> + pr_err("invalid device node of r5 core\n"); >> + return -EINVAL; >> + } >> + >> + res_mem_count = of_property_count_elems_of_size(np, "memory-region", >> + sizeof(phandle)); >> + if (res_mem_count <= 0) { >> + dev_warn(dev, "failed to get memory-region property %d\n", >> + res_mem_count); >> + return -EINVAL; >> + } >> + >> + r5_core->res_mem = devm_kzalloc(dev, >> + res_mem_count * sizeof(struct reserved_mem), >> + GFP_KERNEL); >> + if (!r5_core->res_mem) { >> + dev_err(dev, "failed to allocate mem region memory\n"); >> + return -ENOMEM; >> + } >> + >> + for (i = 0; i < res_mem_count; i++) { >> + rmem_np = of_parse_phandle(np, "memory-region", i); >> + if (!rmem_np) >> + return -EINVAL; >> + >> + rmem = of_reserved_mem_lookup(rmem_np); >> + if (!rmem) { >> + of_node_put(rmem_np); >> + return -EINVAL; >> + } >> + >> + memcpy(&r5_core->res_mem[i], rmem, >> + sizeof(struct reserved_mem)); >> + of_node_put(rmem_np); >> + } >> + >> + r5_core->res_mem_count = res_mem_count; >> + >> + return 0; >> +} >> + >> +static int zynqmp_r5_core_init(struct zynqmp_r5_cluster *cluster) >> +{ >> + int ret, i; >> + struct zynqmp_r5_core *r5_core; >> + struct device *dev = cluster->dev; >> + >> + 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++) { >> + r5_core = &cluster->r5_cores[i]; >> + if (!r5_core) { >> + pr_err("invalid r5 core\n"); >> + return -EINVAL; >> + } >> + >> + ret = zynqmp_r5_get_mem_region_node(r5_core); >> + if (ret) >> + dev_warn(dev, "memory-region prop failed %d\n", ret); >> + >> + ret = of_property_read_u32_index(r5_core->np, "power-domains", >> + 1, &r5_core->pm_domain_id); >> + if (ret) { >> + dev_err(dev, "failed to get power-domains property\n"); >> + return ret; >> + } >> + >> + ret = zynqmp_r5_set_mode(r5_core, cluster->mode); >> + if (ret) >> + return ret; >> + >> + ret = zynqmp_r5_add_rproc_core(r5_core); >> + if (ret) { >> + dev_err(dev, "failed to init r5 core %d\n", i); >> + return ret; >> + } >> + } >> + >> + return 0; >> +} >> + >> +static int zynqmp_r5_cluster_init(struct zynqmp_r5_cluster *cluster) >> +{ >> + struct device *dev = cluster->dev; >> + struct device_node *dev_node = dev_of_node(dev); >> + struct device_node *child; >> + struct platform_device *child_pdev; >> + int core_count = 0, ret, i; >> + enum zynqmp_r5_cluster_mode cluster_mode = LOCKSTEP_MODE; >> + struct zynqmp_r5_core *r5_cores; >> + >> + ret = of_property_read_u32(dev_node, "xlnx,cluster-mode", &cluster_mode); >> + >> + /* on success returns 0, if not defined then returns -EINVAL, >> + * In that case, default is LOCKSTEP mode >> + */ >> + if (ret != -EINVAL && ret != 0) { >> + dev_err(dev, "Invalid xlnx,cluster-mode property\n"); >> + return -EINVAL; >> + } >> + >> + if (cluster_mode == SINGLE_CPU_MODE) { >> + dev_err(dev, "driver does not support single cpu mode\n"); >> + return -EINVAL; >> + } else if ((cluster_mode != SPLIT_MODE && >> + cluster_mode != LOCKSTEP_MODE)) { >> + dev_err(dev, "Invalid cluster mode\n"); >> + return -EINVAL; >> + } >> + >> + core_count = of_get_available_child_count(dev_node); >> + if (core_count <= 0) { >> + dev_err(dev, "Invalid number of r5 cores %d", core_count); >> + return -EINVAL; >> + } else if (cluster_mode == SPLIT_MODE && core_count != 2) { >> + dev_err(dev, "Invalid number of r5 cores for split mode\n"); >> + return -EINVAL; >> + } else if (cluster_mode == LOCKSTEP_MODE && core_count == 2) { >> + dev_warn(dev, "Only r5 core0 will be used\n"); >> + core_count = 1; >> + } >> + >> + r5_cores = devm_kzalloc(dev, sizeof(struct zynqmp_r5_core) * >> + core_count, GFP_KERNEL); >> + if (IS_ERR_OR_NULL(r5_cores)) { >> + dev_err(dev, "can't allocate memory for cores\n"); >> + return -ENOMEM; >> + } >> + >> + i = 0; >> + for_each_available_child_of_node(dev_node, child) { >> + child_pdev = of_find_device_by_node(child); >> + if (!child_pdev) >> + return -ENODEV; >> + >> + r5_cores[i].dev = &child_pdev->dev; >> + if (!r5_cores[i].dev) { >> + pr_err("can't get device for r5 core %d\n", i); >> + return -ENODEV; >> + } >> + >> + r5_cores[i].np = dev_of_node(r5_cores[i].dev); >> + if (!r5_cores[i].np) { >> + pr_err("can't get device node for r5 core %d\n", i); >> + return -ENODEV; >> + } >> + >> + i++; >> + if (i == core_count) >> + break; >> + } >> + >> + cluster->mode = cluster_mode; >> + cluster->core_count = core_count; >> + cluster->r5_cores = r5_cores; >> + >> + ret = zynqmp_r5_core_init(cluster); >> + if (ret < 0) { >> + dev_err(dev, "failed to init r5 core err %d\n", ret); >> + return ret; >> + } >> + >> + zynqmp_r5_print_dt_node_info(cluster); >> + >> + return 0; >> +} >> + >> +static void zynqmp_r5_cluster_exit(void *data) >> +{ >> + struct platform_device *pdev = (struct platform_device *)data; >> + >> + platform_set_drvdata(pdev, NULL); >> + >> + pr_info("Exit r5f subsystem driver\n"); >> +} >> + >> +/* >> + * zynqmp_r5_remoteproc_probe() >> + * >> + * @pdev: domain platform device for R5 cluster >> + * >> + * called when driver is probed, for each R5 core specified in DT, >> + * setup as needed to do remoteproc-related operations >> + * >> + * Return: 0 for success, negative value for failure. >> + */ >> +static int zynqmp_r5_remoteproc_probe(struct platform_device *pdev) >> +{ >> + int ret; >> + struct zynqmp_r5_cluster *cluster; >> + struct device *dev = &pdev->dev; >> + >> + cluster = devm_kzalloc(dev, sizeof(*cluster), GFP_KERNEL); >> + if (IS_ERR_OR_NULL(cluster)) >> + return -ENOMEM; >> + >> + cluster->dev = dev; >> + >> + ret = devm_of_platform_populate(dev); >> + if (ret) { >> + dev_err(dev, "failed to populate platform dev %d\n", ret); >> + return ret; >> + } >> + >> + /* wire in so each core can be cleaned up at driver remove */ >> + platform_set_drvdata(pdev, cluster); >> + >> + ret = devm_add_action_or_reset(dev, zynqmp_r5_cluster_exit, pdev); >> + if (ret) >> + return ret; >> + >> + ret = zynqmp_r5_cluster_init(cluster); >> + if (ret) { >> + dev_err(dev, "Invalid r5f subsystem device tree\n"); >> + return ret; >> + } >> + >> + dev_info(dev, "Xilinx r5f remoteproc driver probe success\n"); >> + return 0; >> +} >> + >> +/* Match table for OF platform binding */ >> +static const struct of_device_id zynqmp_r5_remoteproc_match[] = { >> + { .compatible = "xlnx,zynqmp-r5fss", }, >> + { /* end of list */ }, >> +}; >> +MODULE_DEVICE_TABLE(of, zynqmp_r5_remoteproc_match); >> + >> +static struct platform_driver zynqmp_r5_remoteproc_driver = { >> + .probe = zynqmp_r5_remoteproc_probe, >> + .driver = { >> + .name = "zynqmp_r5_remoteproc", >> + .of_match_table = zynqmp_r5_remoteproc_match, >> + }, >> +}; >> +module_platform_driver(zynqmp_r5_remoteproc_driver); >> + >> +MODULE_DESCRIPTION("Xilinx R5F remote processor driver"); >> +MODULE_AUTHOR("Xilinx Inc."); >> +MODULE_LICENSE("GPL v2"); >> -- >> 2.25.1 >>