Re: [PATCH v11 10/35] remoteproc: k3-m4: Use k3_rproc_mem_data structure for memory info

[Mathieu Poirier <mathieu.poirier@linaro.org>]

On Fri, Apr 25, 2025 at 04:11:10PM +0530, Beleswar Padhi wrote:
> The ti_k3_m4_remoteproc.c driver previously hardcoded device memory
> region addresses and names. Change this to use the k3_rproc_mem_data
> structure to store memory information. This aligns with DSP and R5
> drivers, and can be refactored out later.
> 
> Signed-off-by: Beleswar Padhi <b-padhi@ti.com>
> Tested-by: Judith Mendez <jm@ti.com>
> ---
> v11: Changelog:
> 1. Carried T/B tag.
> 
> Link to v10:
> https://lore.kernel.org/all/20250417182001.3903905-11-b-padhi@ti.com/
> 
> v10: Changelog:
> None
> 
> Link to v9:
> https://lore.kernel.org/all/20250317120622.1746415-6-b-padhi@ti.com/
> 
>  drivers/remoteproc/ti_k3_m4_remoteproc.c | 60 ++++++++++++++++++------
>  1 file changed, 45 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> index d0ee7a8d460d4..e83bef7cfddfd 100644
> --- a/drivers/remoteproc/ti_k3_m4_remoteproc.c
> +++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c
> @@ -20,9 +20,6 @@
>  #include "remoteproc_internal.h"
>  #include "ti_sci_proc.h"
>  
> -#define K3_M4_IRAM_DEV_ADDR 0x00000
> -#define K3_M4_DRAM_DEV_ADDR 0x30000
> -
>  /**
>   * struct k3_m4_rproc_mem - internal memory structure
>   * @cpu_addr: MPU virtual address of the memory region
> @@ -38,15 +35,29 @@ struct k3_m4_rproc_mem {
>  };
>  
>  /**
> - * struct k3_m4_rproc_mem_data - memory definitions for a remote processor
> + * struct k3_m4_mem_data - memory definitions for a remote processor
>   * @name: name for this memory entry
>   * @dev_addr: device address for the memory entry
>   */
> -struct k3_m4_rproc_mem_data {
> +struct k3_m4_mem_data {
>  	const char *name;
>  	const u32 dev_addr;
>  };
>  
> +/**
> + * struct k3_m4_dev_data - device data structure for a M4 core
> + * @mems: pointer to memory definitions for a M4 core
> + * @num_mems: number of memory regions in @mems
> + * @boot_align_addr: boot vector address alignment granularity
> + * @uses_lreset: flag to denote the need for local reset management
> + */
> +struct k3_m4_dev_data {
> +	const struct k3_m4_mem_data *mems;
> +	u32 num_mems;
> +	u32 boot_align_addr;
> +	bool uses_lreset;
> +};
> +
>  /**
>   * struct k3_m4_rproc - k3 remote processor driver structure
>   * @dev: cached device pointer
> @@ -56,6 +67,7 @@ struct k3_m4_rproc_mem_data {
>   * @rmem: reserved memory regions data
>   * @num_rmems: number of reserved memory regions
>   * @reset: reset control handle
> + * @data: pointer to M4-specific device data
>   * @tsp: TI-SCI processor control handle
>   * @ti_sci: TI-SCI handle
>   * @ti_sci_id: TI-SCI device identifier
> @@ -71,6 +83,7 @@ struct k3_m4_rproc {
>  	struct k3_m4_rproc_mem *rmem;
>  	int num_rmems;
>  	struct reset_control *reset;
> +	const struct k3_m4_dev_data *data;
>  	struct ti_sci_proc *tsp;
>  	const struct ti_sci_handle *ti_sci;
>  	u32 ti_sci_id;
> @@ -336,14 +349,13 @@ static void *k3_m4_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool
>  static int k3_m4_rproc_of_get_memories(struct platform_device *pdev,
>  				       struct k3_m4_rproc *kproc)
>  {
> -	static const char * const mem_names[] = { "iram", "dram" };
> -	static const u32 mem_addrs[] = { K3_M4_IRAM_DEV_ADDR, K3_M4_DRAM_DEV_ADDR };
> +	const struct k3_m4_dev_data *data = kproc->data;
>  	struct device *dev = &pdev->dev;
>  	struct resource *res;
>  	int num_mems;
>  	int i;
>  
> -	num_mems = ARRAY_SIZE(mem_names);
> +	num_mems = kproc->data->num_mems;
>  	kproc->mem = devm_kcalloc(kproc->dev, num_mems,
>  				  sizeof(*kproc->mem), GFP_KERNEL);
>  	if (!kproc->mem)
> @@ -351,17 +363,17 @@ static int k3_m4_rproc_of_get_memories(struct platform_device *pdev,
>  
>  	for (i = 0; i < num_mems; i++) {
>  		res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
> -						   mem_names[i]);
> +						   data->mems[i].name);
>  		if (!res) {
>  			dev_err(dev, "found no memory resource for %s\n",
> -				mem_names[i]);
> +				data->mems[i].name);
>  			return -EINVAL;
>  		}
>  		if (!devm_request_mem_region(dev, res->start,
>  					     resource_size(res),
>  					     dev_name(dev))) {
>  			dev_err(dev, "could not request %s region for resource\n",
> -				mem_names[i]);
> +				data->mems[i].name);
>  			return -EBUSY;
>  		}
>  
> @@ -369,15 +381,15 @@ static int k3_m4_rproc_of_get_memories(struct platform_device *pdev,
>  							 resource_size(res));
>  		if (!kproc->mem[i].cpu_addr) {
>  			dev_err(dev, "failed to map %s memory\n",
> -				mem_names[i]);
> +				data->mems[i].name);
>  			return -ENOMEM;
>  		}
>  		kproc->mem[i].bus_addr = res->start;
> -		kproc->mem[i].dev_addr = mem_addrs[i];
> +		kproc->mem[i].dev_addr = data->mems[i].dev_addr;
>  		kproc->mem[i].size = resource_size(res);
>  
>  		dev_dbg(dev, "memory %8s: bus addr %pa size 0x%zx va %pK da 0x%x\n",
> -			mem_names[i], &kproc->mem[i].bus_addr,
> +			data->mems[i].name, &kproc->mem[i].bus_addr,
>  			kproc->mem[i].size, kproc->mem[i].cpu_addr,
>  			kproc->mem[i].dev_addr);
>  	}
> @@ -563,12 +575,17 @@ static int k3_m4_rproc_probe(struct platform_device *pdev)
>  {
>  	struct device *dev = &pdev->dev;
>  	struct k3_m4_rproc *kproc;
> +	const struct k3_m4_dev_data *data;

Please move to the top of the variable declarations, i.e before struct device.

>  	struct rproc *rproc;
>  	const char *fw_name;
>  	bool r_state = false;
>  	bool p_state = false;
>  	int ret;
>  
> +	data = of_device_get_match_data(dev);
> +	if (!data)
> +		return -ENODEV;
> +
>  	ret = rproc_of_parse_firmware(dev, 0, &fw_name);
>  	if (ret)
>  		return dev_err_probe(dev, ret, "failed to parse firmware-name property\n");
> @@ -583,6 +600,7 @@ static int k3_m4_rproc_probe(struct platform_device *pdev)
>  	kproc = rproc->priv;
>  	kproc->dev = dev;
>  	kproc->rproc = rproc;
> +	kproc->data = data;
>  	platform_set_drvdata(pdev, rproc);
>  
>  	kproc->ti_sci = devm_ti_sci_get_by_phandle(dev, "ti,sci");
> @@ -650,8 +668,20 @@ static int k3_m4_rproc_probe(struct platform_device *pdev)
>  	return 0;
>  }
>  
> +static const struct k3_m4_mem_data am64_m4_mems[] = {
> +	{ .name = "iram", .dev_addr = 0x0 },
> +	{ .name = "dram", .dev_addr = 0x30000 },
> +};
> +
> +static const struct k3_m4_dev_data am64_m4_data = {
> +	.mems = am64_m4_mems,
> +	.num_mems = ARRAY_SIZE(am64_m4_mems),
> +	.boot_align_addr = SZ_1K,
> +	.uses_lreset = true,
> +};
> +
>  static const struct of_device_id k3_m4_of_match[] = {
> -	{ .compatible = "ti,am64-m4fss", },
> +	{ .compatible = "ti,am64-m4fss", .data = &am64_m4_data, },
>  	{ /* sentinel */ },
>  };
>  MODULE_DEVICE_TABLE(of, k3_m4_of_match);
> -- 
> 2.34.1
>