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 29E32C48BC3 for ; Wed, 14 Feb 2024 17:21:25 +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=tepxzxCpg1OQ0pESgWvtFi4MobRKOZFTNm+kjMa0yBc=; b=EvvZ0kKAT2qhOo P5XMyhi/0iWm5ft5iikILsKHhcE3i/CvvpTeQWwkvhPXyWMUAegLdIyyDXxUrz/FYxwCFfS99O7Hm IzbLzMQQG+aCIabXdcKMwQ443aDXaxySrcOYx/zXIOGUe0oUniEdRz1MlhkMhWlG7eeJxRePzvXJI lDPi06UutoKIQoncMVRWnKUMOKgqmNPhZJH+IXgl8lF89MUah/T/E5q8mJKtl2gNR2mEYS7mUHrF2 ID3/G1Ou3Vdm8M2mHP5r44xvoS6as0PN8PBbxEWY9EocH1ku0k0sA1qSXnIyOPs7L6Hn+ayeKXdYs aT1CfE5JUQQhDYMybiFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raIwY-0000000Dgd3-0BMZ; Wed, 14 Feb 2024 17:21:10 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raIwV-0000000Dgc7-3atx for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2024 17:21:09 +0000 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-2907a17fa34so20053a91.1 for ; Wed, 14 Feb 2024 09:21:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707931267; x=1708536067; 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=y+GLw4edkO69eFBIaZa2fDtYB7rYenDCtOXaRNz8hT8=; b=KB4XgrBEGCIwt2oqn1Hieel/Nq1taPL8t6MmpY+bYcC1kWNwCtMtptu6tOehEI9rzX F8JBWXdBE/E1LiAUsoIerx+vKXa3+Er1Ls8e1GeQD5NQg/mBwg+TwtjDrEy5mUFN9ekc tv7zDom8Hg+cvpBvVX77bhg7/c+wMPC+6f5y/3UdvEFzdZbryX2nFl8kxv1twGkN332u TZQNRR0Vbxk5DY4lsr8NuSGYDGhYR/G4rmUAZ374O5+KGTefzL6301AuENJLn1C/7+q3 ns5nrWVGyC2Dd66g27N1r7H6Wjr+r1P8GiLyLmBVVUHvQGn36AWplmpdisogs3yW4Dkf YHgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707931267; x=1708536067; 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=y+GLw4edkO69eFBIaZa2fDtYB7rYenDCtOXaRNz8hT8=; b=ZmQ3l8wx4Ev0QJAjtvwHF+Ql3uzbkOZO8ulChXi/RJVll9BLRMuBMqOm8JeMEmZirX MbvtKGWNP6kHVy2RjuBzDNwFN/Kv4LLYGVSrAQIEyUvDZmDZUuLSS4rDTq1tVQZiqMFe 813ed3LRc6YQAz6AAINkMCmDEvwh87zJXmkgdCv7XrWCZrgMWLuxPHhmT/5BxqPQ47+P UqK9rl1f3ad6b7V+xMTNm+pF14VYxkwaQcVlcQKHKHR2DeWwAH/xmS08+2wejWJ+I7IQ jenUAmbXhO/l9uOAcVNsFKiWJU4OuiUfNrtPbn+BLvVJ++iHl5kuAAR8sQNkJB+kkXyY hylw== X-Forwarded-Encrypted: i=1; AJvYcCUZkOOHj/ANjMnXUxPkJyq4N/WKVby2ehpYy/hQG8W4+I43J0OC0a3tJbQ3WBfF8b4e2Yr9zWmNpfsCXvq3V/38Kq0eB+Fqp00OcOgq3g6mZpc3HbQ= X-Gm-Message-State: AOJu0YyYJgGkJiC3JchNa9A8WDJpOHePnrXPaiZfe4TY9CcYfG1Vkvvk oHtO8ygNKAQ8cF4HWEsh4HSZ7eFs8Un3fE01CNFzatvjTc2FNmQvG7Hd3Yfs6X0= X-Google-Smtp-Source: AGHT+IE9Pnjo6ou5luyV/r8s33nLYEdd+B7r13dw3T/QzHcEFLNf1/OVaVKnhjctOSPGTGrgO4qEYw== X-Received: by 2002:a17:90a:9b8c:b0:298:c136:2ffc with SMTP id g12-20020a17090a9b8c00b00298c1362ffcmr2584760pjp.45.1707931266846; Wed, 14 Feb 2024 09:21:06 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVWodR54OSPqGD9VrYyvs5GM3YIST40u2Cyby+MBVNL/KbwkBOEjGMst0gElgv3G0ZqBEpDHffJ6Hpf1DN4gmNnrmLLUCCDaD4+j7w9w7X5Kje/6b85htP6dil3TbA71I9c1YSh5Gzyk+CeHHC9ze5cQ7rD6mrpF2246hpzApVpZUv3YecIa7T1M1/1nsSrkCcV/6+YgFzSjx52coZzbD95XLCwXsrU3iaE0s1OSXf4cuiMxGu3JU4GG+8oKg/n2PWl+UOPDSOQu4rOaZ2NVvayNRMAumzkFWoxFxEmg1sdxm44ZQ50/lV3jB6bMIVdGAwtn/CZCqBr2qnQYynJ/ug8j+Pe2Flg6+iAJZNT8c3UPd+Jk9d7EXe2L0JTlfPLUqPIYa4KDPJoTw== Received: from p14s ([2604:3d09:148c:c800:96ea:e45d:5361:78d0]) by smtp.gmail.com with ESMTPSA id ev6-20020a17090aeac600b00298d203d359sm1696864pjb.24.2024.02.14.09.21.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 09:21:06 -0800 (PST) Date: Wed, 14 Feb 2024 10:21:03 -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 v10 4/4] remoteproc: zynqmp: parse TCM from device tree Message-ID: References: <20240213175450.3097308-1-tanmay.shah@amd.com> <20240213175450.3097308-5-tanmay.shah@amd.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240213175450.3097308-5-tanmay.shah@amd.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240214_092107_926273_F878C92D X-CRM114-Status: GOOD ( 36.03 ) 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 Good morning, On Tue, Feb 13, 2024 at 09:54:50AM -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 v10: > - Remove redundant changes to handle TCM in lockstep mode > > Changes in v9: > - Introduce new API to request and release core1 TCM power-domains in > lockstep mode. This will be used during prepare -> add_tcm_banks > callback to enable TCM in lockstep mode. > - Parse TCM from device-tree in lockstep mode and split mode in > uniform way. > - Fix TCM representation in device-tree in lockstep mode. > > Changes in v8: > - Remove pm_domains framework > - Remove checking of pm_domain_id validation to power on/off tcm > - Remove spurious change > - parse power-domains property from device-tree and use EEMI calls > to power on/off TCM instead of using pm domains framework > > Changes in v7: > - move checking of pm_domain_id from previous patch > - fix mem_bank_data memory allocation > > 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..49e8eaf83fce 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 = {0}; Is this really needed? As far as I can tell it isn't. Otherwise and if it wasn't for the modification on the DT side, I would apply this patch. Thanks, Mathieu > + 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) > + ret = -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