Received-SPF: pass (google.com: domain of linux-kernel+bounces-85418-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <693569eb-55d2-4e6b-b03b-f48ad2a51be1@amd.com>
Date: Wed, 28 Feb 2024 11:12:05 -0600
User-Agent: Mozilla Thunderbird Beta
Subject: Re: [PATCH v11 4/4] remoteproc: zynqmp: parse TCM from device tree
Content-Language: en-US
To: Mathieu Poirier <mathieu.poirier@linaro.org>
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
References: <20240219174437.3722620-1-tanmay.shah@amd.com>
 <20240219174437.3722620-10-tanmay.shah@amd.com> <Zd9oKWz073OJxKwp@p14s>
From: Tanmay Shah <tanmay.shah@amd.com>
In-Reply-To: <Zd9oKWz073OJxKwp@p14s>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?WDRHVXpRc2FndzYrS3JRRjFNdHI2ekszS1JhWjZxSG45TnRIdXFqWWNOcmt4?=
 =?utf-8?B?ZTlPWTRvcVFLYVl5WWdYUk92TGNqRXZUV0xuZkZ6b045TzRwQVdUTnNhUjJ3?=
 =?utf-8?B?ZlhKZTFOc2FEVUNVV3J2NEZIOTVHaWtBb3VTZEk3WXB3bGM1ZzVoTHRLT1pn?=
 =?utf-8?B?cnpTbEE0bzRUeWZodllhWXRpWXR0Qk44V016R2tQTE1OUm5WcjNaTUJrakFP?=
 =?utf-8?B?MUJZTFplWHZkdkpNRkEvd3phQlB6M094Ym12ZGJYK3FnelVGRDRHQzJBS0Vt?=
 =?utf-8?B?RzNrMEpIUmh0TFRZMkNjbWY5dWVuQnhXejNJalZ4THM2Z3NRN0duNnZ6eHR5?=
 =?utf-8?B?RzErSVlabEdTbGllUkRLM1h4UG5rVFpsRi9PWVRrdFZncS9CeTh4RE1QcnJV?=
 =?utf-8?B?VzBTQm53c1haZUI1NHRzOXdJelBlU2dGbFRDbWdCUUJNcXp6aTkxWXczb09U?=
 =?utf-8?B?aFJobmlwdUNGOXBBU2M3cHJOZlpGSlJRV1dWQnpNUUgzSElkK2lxOVBkeFRQ?=
 =?utf-8?B?Q1c0a0V4dTB3dHc4RnZyVkxBS1VsNkJiaE0yNFlGdjl5ZlhsOHJ4UmszMXRw?=
 =?utf-8?B?ZkNyUDIrL2dBTFRKM2F1T0ltZkJKUXVJMmRjQlZ1SHdiTGhpaXFwWlh2bXhJ?=
 =?utf-8?B?Vm45MFVrWEFPdU92WlIrTTRpTjllUzlqUlBMTzV1Mm9WcWdmWnA0YnRGdWFv?=
 =?utf-8?B?NnVUSitkMEc5dUpaV2owQ3p2UWU1YzlVdy93QjlMbEFQb2p4UFJ5YnhPMmxO?=
 =?utf-8?B?TXNxaWRpNThYdXZCM2d4N3BLK1k2OWp0Rkc0WVNYWHc1YWQvek1tTTNJU3VL?=
 =?utf-8?B?d3p6bmd2bVcvdllTZUhqVFVEcUJYZmp4QjVpUEc5V204TzBwYzU5NStZR0hw?=
 =?utf-8?B?bk81K2syMW1JZW5ncURTWTNIVHRqblJ1aHk5WGlkV0o5VC9kOXBBcklJdFZy?=
 =?utf-8?B?cW92Q1hEeUdiemkvMFU1NlNOWllQNklJc01pNlJqQXJxbXdBZDdzcWVpODNJ?=
 =?utf-8?B?WnV6YTRpdGlmMXhPdzV6ckEyNlRUMUNDdlBHTnlDSm5FYjNsTEk3eGNPN3N5?=
 =?utf-8?B?UUtqTTB4VHRzcytYL0RRRy9sb21DZmlFaHpNQm41dVEvb2xteXdjbFZ3eUpV?=
 =?utf-8?B?U1c1YjlRUjMycklueTh4STRscGZGNEpSVUZOT3FnMGdPOHZVdlVQd2VINUJI?=
 =?utf-8?B?b2JlTkg2Q1M1Ym5WbTYyMXlxRmRWQXRIZ3lTMTJGZG5ITjVvNmNqUXNrVlRq?=
 =?utf-8?B?SWFMK0ttSml0b2x6N25qR05Gb3NkYmdZTVBZSkRjdVhmSEZXd3pTNlg2VURy?=
 =?utf-8?B?aEJSZEl0YzVvVXNPZlhFZDRIVnRwM1hkd1VhMlpacTlOZkxRVE5JTVRsSnVq?=
 =?utf-8?B?RTFzRDRqMUhlclVUT2xBUVp6K2lFOVphZnE2RjR0S216aU40NkZXRVdWQkFQ?=
 =?utf-8?B?L1Z5UE9GNmd1bFhndmN1ME92RytsS1dOUXdhZjNEOXV0alU5QTJNM1JQYUxs?=
 =?utf-8?B?UzFHZDZRZHdVckx4Ty9KcFZqcDJtcTIwZk9CNVFiL25PYU16Kzg0cmdWY004?=
 =?utf-8?B?d1hDL3JPOG80LzJSYXE3R3JuZC9EOWZnSHpVOG84RWJ4QVZHR3YzalA4T08z?=
 =?utf-8?B?OFR0ekhWWWxvL0FaRnpZL3ZEU1hrOTNXdmw2QVZnTXVPSlV3TTZVYUpWRDkr?=
 =?utf-8?B?OWNzMFBRdmxzNFJXWWYwek5qK2xYcGxhaWlHUnBBdkJKRVlrOUdwb1ZIVEt3?=
 =?utf-8?B?S1lLQW5BOVpxdURUOFBjN01pMCtOVUxkdXowenkwSjM3T3BwZkdkMDlXTFJs?=
 =?utf-8?B?NUJtT0NXOU5PS0Y3ZU1GRkFFbmVGd2JCZE5nU3RjRkhWSFFnMzh5OU1zVVlC?=
 =?utf-8?B?WVFDWThWdWUxQk0vSjhraFdmbEpPV0Q2bDQxWHFLUVFPTk82RWtvSzFrZFph?=
 =?utf-8?B?VE9NZXEwQnBxKzBldDRTd2VCaXl4V08vWjA0Ymd6N2dLOHc3MHBvL3ZRVnp3?=
 =?utf-8?B?U2txR1o3VjcwR2Qyanl6NXJZellFejhueXlDRDkyT0htencrWEtlQktaMWFC?=
 =?utf-8?B?aXM5V3NReUkrV1B1VGRpenVXd2tOTjVNOUc0d0lDUTRMSFRxWmpJbENCZUpO?=
 =?utf-8?Q?F4KczyxVCWuH2x3xVi6RUzwgC?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1166cb27-12fc-446b-cb55-08dc38806583
X-MS-Exchange-CrossTenant-AuthSource: BL1PR12MB5874.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 17:12:09.1267
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: B2Bw2QPmH/V/DYPw4Tnw5WJCOAh4b3V0+crkLtrJGCdd/gm+q4B/bD9M9bfufdwP
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5390


On 2/28/24 11:06 AM, Mathieu Poirier wrote:
> 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 <tanmay.shah@amd.com>
> > ---
> > 
> > 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.

Hi Mathieu,

Thanks for reviews. Please find my comment below.

>
> > 
> >  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;

Hi Mathiue,

Here: in v10 it was following:

+		if (!r5_core->tcm_banks)
+			ret = -ENOMEM;

Which is not correct. Somehow I missed to return the error code instead it was just storing the error in variable.


> > +
> > +		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
> >