From nobody Wed Dec 17 15:40:57 2025 Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C305D1E5B91; Tue, 13 May 2025 05:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.234 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747115172; cv=none; b=lu5sKHn4zUEwet9r50ox0et9qThSYuK6X4Zg2bVC0siR4eWtzd9nwLHxYmAOOoThYEEAh8Ss5b3MUhcfR0hXoHhff1cEcBulglnEvDgD64fr5xy3k55zU3XpEMjvmlYAl1lEbB/56V8iyQ5aOHQGC0PyQLfCOBkslHuE6EDosds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747115172; c=relaxed/simple; bh=Cw1F0n4WvSmS+0jWqTVOg2AUnVZC7UxluaLsZxudYmQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MgieEsWr/H2ZxLc1HFFRXLaMtgwMV1iIzgnDjHUkgzq9Tzmam2jrlMgvIhaXoyiWwpNRVqAqHXK5kmf47xY9R4bkbdmW0H6AFJUmsqCKxnhIjZUSV6FfRgsHCWT60nPF87AE3RWiWX85b5i+rKe2VFHfKJHTd/f6hmCNcpjXRNE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=Yjlq2Eet; arc=none smtp.client-ip=198.47.23.234 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="Yjlq2Eet" Received: from lelvem-sh01.itg.ti.com ([10.180.77.71]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 54D5k1m22226377; Tue, 13 May 2025 00:46:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1747115161; bh=55adndmFTaQK98+CK+JPLpMmfqyz6XjDJoOUGp6S3zk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=Yjlq2EettIl3euGpk8hT5+hrA7yOU5mjGBjoF4Na64xTgicbYeMhvK+MTlcVgnQce 50NygR61P1GYNvxQnIooWGnfiPips4+whk+4rysRc/sLHReIXf+wfvmGOo+MY835gv tYQXGaYHVdRZ1simfaDsdiQk6TFHKbqcyDfJmtRw= Received: from DFLE107.ent.ti.com (dfle107.ent.ti.com [10.64.6.28]) by lelvem-sh01.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 54D5k1J21533650 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 13 May 2025 00:46:01 -0500 Received: from DFLE106.ent.ti.com (10.64.6.27) by DFLE107.ent.ti.com (10.64.6.28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Tue, 13 May 2025 00:46:00 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE106.ent.ti.com (10.64.6.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 13 May 2025 00:46:00 -0500 Received: from uda0510294.dhcp.ti.com (uda0510294.dhcp.ti.com [172.24.227.151]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 54D5jAqK131001; Tue, 13 May 2025 00:45:57 -0500 From: Beleswar Padhi To: , CC: , , , , , , , , , , Subject: [PATCH v12 11/36] remoteproc: k3-m4: Use k3_rproc_mem_data structure for memory info Date: Tue, 13 May 2025 11:14:45 +0530 Message-ID: <20250513054510.3439842-12-b-padhi@ti.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250513054510.3439842-1-b-padhi@ti.com> References: <20250513054510.3439842-1-b-padhi@ti.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea Content-Type: text/plain; charset="utf-8" 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 Tested-by: Judith Mendez Reviewed-by: Andrew Davis --- v12: Changelog: 1. Assign data->num_mems to num_mems. [Mathieu] 2. Move const declaration above variables. [Mathieu] 3. Carried R/B tag. Link to v11: https://lore.kernel.org/all/20250425104135.830255-11-b-padhi@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 99746618e1b96..90c0bff113439 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" =20 -#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 { }; =20 /** - * 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; }; =20 +/** + * 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[] =3D { "iram", "dram" }; - static const u32 mem_addrs[] =3D { K3_M4_IRAM_DEV_ADDR, K3_M4_DRAM_DEV_AD= DR }; + const struct k3_m4_dev_data *data =3D kproc->data; struct device *dev =3D &pdev->dev; struct resource *res; int num_mems; int i; =20 - num_mems =3D ARRAY_SIZE(mem_names); + num_mems =3D data->num_mems; kproc->mem =3D 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 platfor= m_device *pdev, =20 for (i =3D 0; i < num_mems; i++) { res =3D 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; } =20 @@ -369,15 +381,15 @@ static int k3_m4_rproc_of_get_memories(struct platfor= m_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 =3D res->start; - kproc->mem[i].dev_addr =3D mem_addrs[i]; + kproc->mem[i].dev_addr =3D data->mems[i].dev_addr; kproc->mem[i].size =3D resource_size(res); =20 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); } @@ -561,6 +573,7 @@ static const struct rproc_ops k3_m4_rproc_ops =3D { =20 static int k3_m4_rproc_probe(struct platform_device *pdev) { + const struct k3_m4_dev_data *data; struct device *dev =3D &pdev->dev; struct k3_m4_rproc *kproc; struct rproc *rproc; @@ -569,6 +582,10 @@ static int k3_m4_rproc_probe(struct platform_device *p= dev) bool p_state =3D false; int ret; =20 + data =3D of_device_get_match_data(dev); + if (!data) + return -ENODEV; + ret =3D 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 *pd= ev) kproc =3D rproc->priv; kproc->dev =3D dev; kproc->rproc =3D rproc; + kproc->data =3D data; platform_set_drvdata(pdev, rproc); =20 kproc->ti_sci =3D devm_ti_sci_get_by_phandle(dev, "ti,sci"); @@ -650,8 +668,20 @@ static int k3_m4_rproc_probe(struct platform_device *p= dev) return 0; } =20 +static const struct k3_m4_mem_data am64_m4_mems[] =3D { + { .name =3D "iram", .dev_addr =3D 0x0 }, + { .name =3D "dram", .dev_addr =3D 0x30000 }, +}; + +static const struct k3_m4_dev_data am64_m4_data =3D { + .mems =3D am64_m4_mems, + .num_mems =3D ARRAY_SIZE(am64_m4_mems), + .boot_align_addr =3D SZ_1K, + .uses_lreset =3D true, +}; + static const struct of_device_id k3_m4_of_match[] =3D { - { .compatible =3D "ti,am64-m4fss", }, + { .compatible =3D "ti,am64-m4fss", .data =3D &am64_m4_data, }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, k3_m4_of_match); --=20 2.34.1