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 9A513C5478C for ; Wed, 28 Feb 2024 17:07:17 +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=bwfsvB4ub9j+7QaQ/IEIkbpejSfyva8J4uSPlj2e4X8=; b=PA0quLJnd7b6e4 OKus5hdd1Ar6sPubVSlxuPkSWJNGHKp8/yTaVfwnJTpCuep0o+qTF9zVvbVgdZMr361WVHO6i+0ts 6FEbYcEgs5C/YBj+WnG8FsVwRMuKZZU4a+fk0rZcE11NorBpLZUDBUobOuo+gA7F3zfPOZHO5kKKJ xfmHH6bI8zYwrqt1Fir8AfFZDO4E8YJPRwLFJijpSAFDRSkm1wp6rRM6v+gKBtWFxLqcUqAy4dUjB 1RXyyT4aRP/AJjfDeLSfsxE1hBhyuV6iL7PHhgZlQAphSIQGfpTgFKSbl40iOmL23D8XcQSmXXVhf LKqBLS9lBzUy08i2ueFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfNOX-0000000AEPL-4036; Wed, 28 Feb 2024 17:07:01 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rfNOU-0000000AEM5-15cB for linux-arm-kernel@lists.infradead.org; Wed, 28 Feb 2024 17:06:59 +0000 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-6da4a923b1bso4634529b3a.2 for ; Wed, 28 Feb 2024 09:06:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709140013; x=1709744813; 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=WFHtXFDlDHWgb7x7MqqruvZua5+x537Mh1k3qADbpRw=; b=pu3XwB81Bj36OGtCmnH4szvH0RQ2FuHskbPXFQ5xPG2UrqXMfdbq6am4MwliLnjc1Z xwYdCL1Cbp7f1V9z1nlb6IwR3FF6GwQDoG52T6XOqMrpoq29r0rVHZC0OyqYXSXKnY8l TRHJTcWfnrTb6p0VmkvtOg6HbIiKtX/z5HEHLmndiCAEe/LtO8zpRKj6LT9yo6TOuQRD Yp5+OjqQP2kxfLpT990NBJI9s9dNdrhPXhsjBwwoivQ0hkIW/UEmcWkT6HlXla0sc4Eh 7z3c8aCG6m2pvOaWUN0xhaNKK+mprIimyf+O7kjCFg98Ljhhv25oOLSVxpPywS59qANF jRfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709140013; x=1709744813; 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=WFHtXFDlDHWgb7x7MqqruvZua5+x537Mh1k3qADbpRw=; b=FByLQ3Ky2WE10C8Z1zH+sYYJzeTFT05VBBID7NSyfHu8/LiPJeC3+xQhVL1oYI1hxY ms268KprXEeNJYnSp75VEdQLW8D4sBPX32ms5UYJKhkSo19qCkMADsczS8C0o5WlVgdU fJaJgL59xj7eyoZ0T2NE3IAYUU+8cIxbZD+imb9OrF+j/IXMG2sO9N2DSX9Fv2Xm6IPL BAKn8cPJuIJVq/ggh7w0FAElbEuYqmjVK7WMKFVsFm7be+jkD6c8n7YqIJbgFb0b9ral 3IH046daYGQ7i01BSb2bKAZRmunHY6/1K0vqCBdrrrGI0rQLP/2ZMQRfEDz1cQuiIHpU 0NPg== X-Forwarded-Encrypted: i=1; AJvYcCUjNDMncO4Op/w9Z1ccjdE1gXug9gbTU7M0az0B9dBmi6Qyp908PsdawLdNraEKn3PY/hYQmQhGaM/3Sm+oB3Ei2yUsV3oj91ayonIVD+PTfux9jng= X-Gm-Message-State: AOJu0Ywuw/AhtJA+Jr1ZGn/qL6xkp2QMyjskC1oPzXR7Pu58oyThnE+N ZT5hPSBjHTXbZyUVowQoNI8alnznIcS07Aw3SsiFlI6SZpL8DHA+TkG7JY4J9iRM3feu6HLJm2Z Z X-Google-Smtp-Source: AGHT+IGUTrBosSI6pOEiV0utU/zlSRWcLnNKLdB5bs5Ix02glwI99H7F4D1FM8jhoLoO8E3LE4syxA== X-Received: by 2002:aa7:93a1:0:b0:6e4:b4ca:992b with SMTP id x1-20020aa793a1000000b006e4b4ca992bmr187287pff.21.1709140012679; Wed, 28 Feb 2024 09:06:52 -0800 (PST) Received: from p14s ([2604:3d09:148c:c800:96d9:3aed:533c:8c94]) by smtp.gmail.com with ESMTPSA id x125-20020a626383000000b006e4d8687f44sm8422772pfb.102.2024.02.28.09.06.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 09:06:52 -0800 (PST) Date: Wed, 28 Feb 2024 10:06:49 -0700 From: Mathieu Poirier To: Tanmay Shah Cc: andersson@kernel.org, robh+dt@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 v11 4/4] remoteproc: zynqmp: parse TCM from device tree Message-ID: References: <20240219174437.3722620-1-tanmay.shah@amd.com> <20240219174437.3722620-10-tanmay.shah@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240219174437.3722620-10-tanmay.shah@amd.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240228_090658_340218_4E34B388 X-CRM114-Status: GOOD ( 31.40 ) 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, Feb 19, 2024 at 09:44:37AM -0800, 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 v11: > - Remove redundant initialization of the variable > - return correct error code if memory allocation failed Where is that? I looked really hard but couldn't find it. > > drivers/remoteproc/xlnx_r5_remoteproc.c | 112 ++++++++++++++++++++++-- > 1 file changed, 107 insertions(+), 5 deletions(-) > > diff --git a/drivers/remoteproc/xlnx_r5_remoteproc.c b/drivers/remoteproc/xlnx_r5_remoteproc.c > index 42b0384d34f2..d4a22caebaad 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 */ > @@ -757,6 +757,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 > @@ -835,9 +932,14 @@ 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]; > + if (of_find_property(r5_core->np, "reg", NULL)) > + ret = zynqmp_r5_get_tcm_node_from_dt(cluster); > + else > + ret = zynqmp_r5_get_tcm_node(cluster); > + > + if (ret) { > + dev_err(dev, "can't get tcm, err %d\n", ret); > return ret; > } > > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel