From mboxrd@z Thu Jan 1 00:00:00 1970 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 770CDCD11C2 for ; Wed, 10 Apr 2024 17:00:04 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VJ4GolgokNEZwR6W4aOCFFHeJMlo0dkanRoxopz60Qk=; b=gaYNNyD2SDmzDK iuEpAKK0kteHckG+YgvxLCyS45D9BFvIJCVyW3qD/sYLsBGFmSlBSHewkzGCamPz8+QBnpzDW8a/R BL5WTAajmoTQjknQv/LAJFxiPRLjbl/r6wmfLhaNTqOTSaM4zkDv2vDLxNz6LXZAY5SR3YoezN5H7 SWnTqVAtUCEuRfnhbnotfsNjo7JkEp0LntzMckeY++HfO2xGtZDvzgReRQpUlkNfAj/Im6LTnObC+ Nl9gZvkURDTnFhhk0NVAETBawtd5HchGmhV6s6meZP2KFHc9LOBzbT8VP5AOTPW2YkEfnXyLzd7eg 6eaf00RINB/TeYHgezug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rubId-000000087Uh-0vCd; Wed, 10 Apr 2024 16:59:51 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rubIa-000000087T3-1ySz for linux-arm-kernel@lists.infradead.org; Wed, 10 Apr 2024 16:59:50 +0000 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6ecf8ebff50so24724b3a.1 for ; Wed, 10 Apr 2024 09:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712768384; x=1713373184; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=h3gItgeLsk2aRGs3t/MREgHfzrOkwTRstIedEsXUwnU=; b=O2HsRtzhPboTgHakwOdxvz9rahh/+Gf9abDfndG7jh4xs1IvZgrWLVftcVyVP3649i 1bIvpzU2XJ+jMswtGe/DznP31AfoDKMWHDhpjqoBfHnYa1TOTyO5xjSJ7PeOLmkSaYxB Uo4QAElVN1hQDzq7vUJqKWd1dF2hWttDXCFqYQfWaDoO2tSa4fvlDuuxWgCfdmZIfZvi DpBw/2T6xD5mYeKF96f422Xc7YbVMjV4kEez6YSSr+26Be7KZmVYKiBdMkW1SUxk3Ssg bcuK4sNHz2RMH+1PfqsdK/78sTZ8vVnSFd6L0N4hrcChRCUHIN6pgOKQrrBL6k4vjCLM Divg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712768384; x=1713373184; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=h3gItgeLsk2aRGs3t/MREgHfzrOkwTRstIedEsXUwnU=; b=VDg8X+PSw6V4PCFKgnNNCYi9nappRLkDBY69E3SBdfI7jVAs3X6hXoBOfo9T++pbBI bIEj0Gi1Zf3RA5iRjFrmdSYa/A15VDufp9k0wjOfR2NyXXdFBdufwtWcATAmgPmoAjTt 9JdaOJSx837IZqm/c6GwjDmEgwuTyzrzs//gX4TXd+iBcJ+23UjKxgnj36jyy6Uv9qpC 8VE8nh5Lt8oRQUypYrtWW64VelnhoE6mzVfY4Z+APt1b2qhOX44OlUfS0k0uXojbQ85j bvgHXI2zDgT4njmtJqYRa/h1K8u56Qfm7n8AeKnk9Yl6GZ38cNsOgcuO89eDEZr8oRa9 Fn9Q== X-Forwarded-Encrypted: i=1; AJvYcCWZkNtKP/ssER3RIMXnsZpffhIvrSSi3QUh2hY2oAe1jhYObrUe8go5A5w4aDCcF7ayXG0SCKvzjFf2ifYhIf05YGtq2X+Yb5N+69/ZhQDGm9VY/jc= X-Gm-Message-State: AOJu0Yw0qmtqEl3culBGmSVXiaH+9QoqSF5/OMdF83O6sQtbA07JVv5l woSBt6k3K7Op0c+jt8i6xNccJQXBQy6fX/Xe3HDZr0HTOiCDaB9Jb5ZU9KpBpno= X-Google-Smtp-Source: AGHT+IE5o+gUZozO1h4woiYku5yj5y3nVSzJGKLeMDoZ2AlzdCShO3rGN6p/XCqyq50JVOiZlFJY7w== X-Received: by 2002:a05:6a21:788d:b0:1a3:a821:f297 with SMTP id bf13-20020a056a21788d00b001a3a821f297mr300212pzc.2.1712768383787; Wed, 10 Apr 2024 09:59:43 -0700 (PDT) Received: from p14s ([2604:3d09:148c:c800:2912:b981:fe1d:e9ef]) by smtp.gmail.com with ESMTPSA id q22-20020aa79836000000b006ea6f189976sm10343619pfl.163.2024.04.10.09.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Apr 2024 09:59:43 -0700 (PDT) Date: Wed, 10 Apr 2024 10:59:40 -0600 From: Mathieu Poirier To: Tanmay Shah Cc: andersson@kernel.org, robh@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, michal.simek@amd.com, ben.levinsky@amd.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v14 4/4] remoteproc: zynqmp: parse TCM from device tree Message-ID: References: <20240408205313.3552165-1-tanmay.shah@amd.com> <20240408205313.3552165-5-tanmay.shah@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240408205313.3552165-5-tanmay.shah@amd.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240410_095948_718509_FF0873E3 X-CRM114-Status: GOOD ( 42.12 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Apr 08, 2024 at 01:53:14PM -0700, Tanmay Shah wrote: > ZynqMP TCM information was 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 > --- > > Changes in v14: > - Add Versal platform support > - Add Versal-NET platform support > - Maintain backward compatibility for ZynqMP platform and use hardcode > TCM addresses > - Configure TCM based on xlnx,tcm-mode property for Versal > - Avoid TCM configuration if that property isn't available in DT > > drivers/remoteproc/xlnx_r5_remoteproc.c | 173 ++++++++++++++++++------ > 1 file changed, 132 insertions(+), 41 deletions(-) > > diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c > index 0f942440b4e2..504492f930ac 100644 > --- a/drivers/remoteproc/xlnx_r5_remoteproc.c > +++ b/drivers/remoteproc/xlnx_r5_remoteproc.c > @@ -74,8 +74,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 */ > @@ -300,36 +300,6 @@ static void zynqmp_r5_rproc_kick(struct rproc *rproc, int vqid) > dev_warn(dev, "failed to send message\n"); > } > > -/* > - * zynqmp_r5_set_mode() > - * > - * set RPU cluster and TCM operation mode > - * > - * @r5_core: pointer to zynqmp_r5_core type object > - * @fw_reg_val: value expected by firmware to configure RPU cluster mode > - * @tcm_mode: value expected by fw to configure TCM mode (lockstep or split) > - * > - * Return: 0 for success and < 0 for failure > - */ > -static int zynqmp_r5_set_mode(struct zynqmp_r5_core *r5_core, > - enum rpu_oper_mode fw_reg_val, > - enum rpu_tcm_comb tcm_mode) > -{ > - int ret; > - > - ret = zynqmp_pm_set_rpu_mode(r5_core->pm_domain_id, fw_reg_val); > - if (ret < 0) { > - dev_err(r5_core->dev, "failed to set RPU mode\n"); > - return ret; > - } > - > - ret = zynqmp_pm_set_tcm_config(r5_core->pm_domain_id, tcm_mode); > - if (ret < 0) > - dev_err(r5_core->dev, "failed to configure TCM\n"); > - > - return ret; > -} > - > /* > * zynqmp_r5_rproc_start() > * @rproc: single R5 core's corresponding rproc instance > @@ -761,6 +731,103 @@ 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, tcm_pd_idx, pd_count; > + struct of_phandle_args out_args; > + struct zynqmp_r5_core *r5_core; > + struct platform_device *cpdev; > + struct mem_bank_data *tcm; > + struct device_node *np; > + struct resource *res; > + u64 abs_addr, size; > + struct device *dev; > + > + for (i = 0; i < cluster->core_count; i++) { > + r5_core = cluster->r5_cores[i]; > + dev = r5_core->dev; > + np = r5_core->np; > + > + pd_count = of_count_phandle_with_args(np, "power-domains", > + "#power-domain-cells"); > + > + if (pd_count <= 0) { > + dev_err(dev, "invalid power-domains property, %d\n", pd_count); > + return -EINVAL; > + } > + > + /* First entry in power-domains list is for r5 core, rest for TCM. */ > + tcm_bank_count = pd_count - 1; > + > + if (tcm_bank_count <= 0) { > + dev_err(dev, "invalid TCM count %d\n", tcm_bank_count); > + return -EINVAL; > + } > + > + r5_core->tcm_banks = devm_kcalloc(dev, tcm_bank_count, > + sizeof(struct mem_bank_data *), > + GFP_KERNEL); > + if (!r5_core->tcm_banks) > + return -ENOMEM; > + > + r5_core->tcm_bank_count = tcm_bank_count; > + for (j = 0, tcm_pd_idx = 1; j < tcm_bank_count; j++, tcm_pd_idx++) { > + tcm = devm_kzalloc(dev, sizeof(struct mem_bank_data), > + GFP_KERNEL); > + if (!tcm) > + return -ENOMEM; > + > + r5_core->tcm_banks[j] = tcm; > + > + /* Get power-domains id of TCM. */ > + ret = of_parse_phandle_with_args(np, "power-domains", > + "#power-domain-cells", > + tcm_pd_idx, &out_args); > + if (ret) { > + dev_err(r5_core->dev, > + "failed to get tcm %d pm domain, ret %d\n", > + tcm_pd_idx, ret); > + return ret; > + } > + tcm->pm_domain_id = out_args.args[0]; > + of_node_put(out_args.np); > + > + /* 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"); > + return ret; > + } > + > + /* > + * 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"); > + return -EINVAL; > + } > + > + 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"); > + return -EINVAL; > + } > + } > + } > + > + return 0; > +} > + > /** > * zynqmp_r5_get_tcm_node() > * Ideally this function should parse tcm node and store information > @@ -839,9 +906,16 @@ 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); > + r5_core = cluster->r5_cores[0]; > + > + /* Maintain backward compatibility for zynqmp by using hardcode TCM address. */ > + if (device_is_compatible(dev, "xlnx,zynqmp-r5fss")) The previous patch moved the definition of the R5FSS to the new bindings but this is forcing to use the old bindings - did I something? > + ret = zynqmp_r5_get_tcm_node(cluster); > + else > + ret = zynqmp_r5_get_tcm_node_from_dt(cluster); > + > + if (ret) { > + dev_err(dev, "can't get tcm, err %d\n", ret); > return ret; > } > > @@ -856,12 +930,18 @@ static int zynqmp_r5_core_init(struct zynqmp_r5_cluster *cluster, > return ret; > } > > - ret = zynqmp_r5_set_mode(r5_core, fw_reg_val, tcm_mode); > - if (ret) { > - dev_err(dev, "failed to set r5 cluster mode %d, err %d\n", > - cluster->mode, ret); > + ret = zynqmp_pm_set_rpu_mode(r5_core->pm_domain_id, fw_reg_val); > + if (ret < 0) { > + dev_err(r5_core->dev, "failed to set RPU mode\n"); > return ret; > } > + > + if (device_is_compatible(dev, "xlnx,zynqmp-r5fss") || > + of_find_property(dev_of_node(dev), "xlnx,tcm-mode", NULL)) { > + ret = zynqmp_pm_set_tcm_config(r5_core->pm_domain_id, tcm_mode); > + if (ret < 0) > + dev_err(r5_core->dev, "failed to configure TCM\n"); > + } > } > > return 0; > @@ -906,16 +986,25 @@ static int zynqmp_r5_cluster_init(struct zynqmp_r5_cluster *cluster) > * fail driver probe if either of that is not set in dts. > */ > if (cluster_mode == LOCKSTEP_MODE) { > - tcm_mode = PM_RPU_TCM_COMB; > fw_reg_val = PM_RPU_MODE_LOCKSTEP; > } else if (cluster_mode == SPLIT_MODE) { > - tcm_mode = PM_RPU_TCM_SPLIT; > fw_reg_val = PM_RPU_MODE_SPLIT; > } else { > dev_err(dev, "driver does not support cluster mode %d\n", cluster_mode); > return -EINVAL; > } > > + if (device_is_compatible(dev, "xlnx,zynqmp-r5fss")) { > + if (cluster_mode == LOCKSTEP_MODE) > + tcm_mode = PM_RPU_TCM_COMB; > + else > + tcm_mode = PM_RPU_TCM_SPLIT; > + } else if (of_find_property(dev_node, "xlnx,tcm-mode", NULL)) { > + ret = of_property_read_u32(dev_node, "xlnx,tcm-mode", (u32 *)&tcm_mode); > + if (ret) > + return ret; > + } > + > /* > * Number of cores is decided by number of child nodes of > * r5f subsystem node in dts. If Split mode is used in dts > @@ -1100,6 +1189,8 @@ static int zynqmp_r5_remoteproc_probe(struct platform_device *pdev) > /* Match table for OF platform binding */ > static const struct of_device_id zynqmp_r5_remoteproc_match[] = { > { .compatible = "xlnx,zynqmp-r5fss", }, > + { .compatible = "xlnx,versal-r5fss", }, > + { .compatible = "xlnx,versal-net-r52fss", }, > { /* end of list */ }, > }; > MODULE_DEVICE_TABLE(of, zynqmp_r5_remoteproc_match); > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel