From nobody Wed Dec 17 15:42:00 2025 Received: from fllvem-ot04.ext.ti.com (fllvem-ot04.ext.ti.com [198.47.19.246]) (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 CCFD820D4F4; Tue, 13 May 2025 05:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.19.246 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747115259; cv=none; b=Pq+naEwO/fIxSE7hRg29AUJs8w6r6J7rO+stGipHZc/j4AW6NqFm5RBlV1eHKH0KWt/bgOjlEPc+4DVdk8SPkIVUFv7OZlaK5m7YDPIC9qgmltSnEOgyYoKEj/lH2BE0dE1uI9Qa8GQPswBy6pNvGDKCZiG+B8HvUiNCRg/Rgo4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747115259; c=relaxed/simple; bh=CXJS6mA3yTirj6gnBiIgetvgoP9VnVn8bFb8u+2tMss=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=oXZ4NhXSiYGljeu6be/2o/Qdm0KQWgRB9nY7RxHgZuhu7BVdPRCvnnL/yqPosbyhJnFfwggbI8MNv4zjjgdd8nJ0Jx25oBX4mbCAWdnjpFdG9z6jEeVlJrwivhmfOT4nMYRNZsG+OUKMedGEKaYYStaur+G9jh9GN16aZ/XHu5A= 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=HKYdMZuv; arc=none smtp.client-ip=198.47.19.246 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="HKYdMZuv" Received: from lelvem-sh02.itg.ti.com ([10.180.78.226]) by fllvem-ot04.ext.ti.com (8.15.2/8.15.2) with ESMTP id 54D5lSpj2764705; Tue, 13 May 2025 00:47:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1747115248; bh=eU/c2Xg4tRlyOZWPrgHycbJAYQi68wB1E9XBnV5oaPc=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=HKYdMZuvy9+u7x4rYI5XKxODAUOJ/w1Rv8+fXOCK4iFh85kbZ1sXWr73ONINojiQn +r/cBYvDgDnDiUcD+eEszrN/l1nL4+NvgwJgl6i4h1NfXR4sHZysQLnY63UF7Acv6u 1KDiVDGVB0TZ/Gpv1jqoO70lvxsN+L9DzSPHiMaw= Received: from DLEE107.ent.ti.com (dlee107.ent.ti.com [157.170.170.37]) by lelvem-sh02.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 54D5lShg652480 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Tue, 13 May 2025 00:47:28 -0500 Received: from DLEE114.ent.ti.com (157.170.170.25) by DLEE107.ent.ti.com (157.170.170.37) 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:47:27 -0500 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DLEE114.ent.ti.com (157.170.170.25) 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:47:28 -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 54D5jAqf131001; Tue, 13 May 2025 00:47:24 -0500 From: Beleswar Padhi To: , CC: , , , , , , , , , , Subject: [PATCH v12 32/36] remoteproc: k3: Refactor .da_to_va rproc ops into common driver Date: Tue, 13 May 2025 11:15:06 +0530 Message-ID: <20250513054510.3439842-33-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 .da_to_va rproc ops implementations in TI K3 R5, DSP and M4 remoteproc drivers return the Kernel virtual address for a corresponding rproc device address. Refactor the implementations into the ti_k3_common.c driver as k3_rproc_da_to_va and use this common function for address translation of DDR and internal memory regions in R5, DSP and M4 drivers. Note: The R5 SRAM memory translations are still handled in the .da_to_va ops of the R5 remoteproc driver. Signed-off-by: Beleswar Padhi Tested-by: Judith Mendez Reviewed-by: Andrew Davis --- v12: Changelog: 1. Added R/B tag. Link to v11: https://lore.kernel.org/all/20250425104135.830255-32-b-padhi@ti.com/ v11: Changelog: 1. Carried T/B tag. Link to v10: https://lore.kernel.org/all/20250417182001.3903905-30-b-padhi@ti.com/ v10: Changelog: 1. Updated commit message to call out the changes better. 2. Don't remove dsp func override. Already done by [v10 20/33] patch. Link to v9: https://lore.kernel.org/all/20250317120622.1746415-23-b-padhi@ti.com/ drivers/remoteproc/ti_k3_common.c | 57 ++++++++++++++++++++ drivers/remoteproc/ti_k3_common.h | 4 ++ drivers/remoteproc/ti_k3_dsp_remoteproc.c | 63 +---------------------- drivers/remoteproc/ti_k3_m4_remoteproc.c | 58 +-------------------- drivers/remoteproc/ti_k3_r5_remoteproc.c | 37 +------------ 5 files changed, 65 insertions(+), 154 deletions(-) diff --git a/drivers/remoteproc/ti_k3_common.c b/drivers/remoteproc/ti_k3_c= ommon.c index 1219294b5de69..9762a9af6b5ff 100644 --- a/drivers/remoteproc/ti_k3_common.c +++ b/drivers/remoteproc/ti_k3_common.c @@ -351,5 +351,62 @@ struct resource_table *k3_get_loaded_rsc_table(struct = rproc *rproc, } EXPORT_SYMBOL_GPL(k3_get_loaded_rsc_table); =20 +/* + * Custom function to translate a remote processor device address (internal + * RAMs only) to a kernel virtual address. The remote processors can acce= ss + * their RAMs at either an internal address visible only from a remote + * processor, or at the SoC-level bus address. Both these addresses need t= o be + * looked through for translation. The translated addresses can be used ei= ther + * by the remoteproc core for loading (when using kernel remoteproc loader= ), or + * by any rpmsg bus drivers. + */ +void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, bool *is_= iomem) +{ + struct k3_rproc *kproc =3D rproc->priv; + void __iomem *va =3D NULL; + phys_addr_t bus_addr; + u32 dev_addr, offset; + size_t size; + int i; + + if (len =3D=3D 0) + return NULL; + + for (i =3D 0; i < kproc->num_mems; i++) { + bus_addr =3D kproc->mem[i].bus_addr; + dev_addr =3D kproc->mem[i].dev_addr; + size =3D kproc->mem[i].size; + + /* handle rproc-view addresses */ + if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { + offset =3D da - dev_addr; + va =3D kproc->mem[i].cpu_addr + offset; + return (__force void *)va; + } + + /* handle SoC-view addresses */ + if (da >=3D bus_addr && (da + len) <=3D (bus_addr + size)) { + offset =3D da - bus_addr; + va =3D kproc->mem[i].cpu_addr + offset; + return (__force void *)va; + } + } + + /* handle static DDR reserved memory regions */ + for (i =3D 0; i < kproc->num_rmems; i++) { + dev_addr =3D kproc->rmem[i].dev_addr; + size =3D kproc->rmem[i].size; + + if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { + offset =3D da - dev_addr; + va =3D kproc->rmem[i].cpu_addr + offset; + return (__force void *)va; + } + } + + return NULL; +} +EXPORT_SYMBOL_GPL(k3_rproc_da_to_va); + MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("TI K3 common Remoteproc code"); diff --git a/drivers/remoteproc/ti_k3_common.h b/drivers/remoteproc/ti_k3_c= ommon.h index 61e617d2065e7..cfecbf8fc73c4 100644 --- a/drivers/remoteproc/ti_k3_common.h +++ b/drivers/remoteproc/ti_k3_common.h @@ -21,6 +21,8 @@ #ifndef REMOTEPROC_TI_K3_COMMON_H #define REMOTEPROC_TI_K3_COMMON_H =20 +#define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK (SZ_16M - 1) + /** * struct k3_rproc_mem - internal memory structure * @cpu_addr: MPU virtual address of the memory region @@ -106,4 +108,6 @@ int k3_rproc_attach(struct rproc *rproc); int k3_rproc_detach(struct rproc *rproc); struct resource_table *k3_get_loaded_rsc_table(struct rproc *rproc, size_t *rsc_table_sz); +void *k3_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len, + bool *is_iomem); #endif /* REMOTEPROC_TI_K3_COMMON_H */ diff --git a/drivers/remoteproc/ti_k3_dsp_remoteproc.c b/drivers/remoteproc= /ti_k3_dsp_remoteproc.c index 8a51b304ed1f2..fa1943c39df90 100644 --- a/drivers/remoteproc/ti_k3_dsp_remoteproc.c +++ b/drivers/remoteproc/ti_k3_dsp_remoteproc.c @@ -22,8 +22,6 @@ #include "ti_sci_proc.h" #include "ti_k3_common.h" =20 -#define KEYSTONE_RPROC_LOCAL_ADDRESS_MASK (SZ_16M - 1) - /* * Power up the DSP remote processor. * @@ -58,72 +56,13 @@ static int k3_dsp_rproc_start(struct rproc *rproc) return 0; } =20 -/* - * Custom function to translate a DSP device address (internal RAMs only) = to a - * kernel virtual address. The DSPs can access their RAMs at either an in= ternal - * address visible only from a DSP, or at the SoC-level bus address. Both = these - * addresses need to be looked through for translation. The translated add= resses - * can be used either by the remoteproc core for loading (when using kernel - * remoteproc loader), or by any rpmsg bus drivers. - */ -static void *k3_dsp_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len= , bool *is_iomem) -{ - struct k3_rproc *kproc =3D rproc->priv; - void __iomem *va =3D NULL; - phys_addr_t bus_addr; - u32 dev_addr, offset; - size_t size; - int i; - - if (len =3D=3D 0) - return NULL; - - for (i =3D 0; i < kproc->num_mems; i++) { - bus_addr =3D kproc->mem[i].bus_addr; - dev_addr =3D kproc->mem[i].dev_addr; - size =3D kproc->mem[i].size; - - if (da < KEYSTONE_RPROC_LOCAL_ADDRESS_MASK) { - /* handle DSP-view addresses */ - if (da >=3D dev_addr && - ((da + len) <=3D (dev_addr + size))) { - offset =3D da - dev_addr; - va =3D kproc->mem[i].cpu_addr + offset; - return (__force void *)va; - } - } else { - /* handle SoC-view addresses */ - if (da >=3D bus_addr && - (da + len) <=3D (bus_addr + size)) { - offset =3D da - bus_addr; - va =3D kproc->mem[i].cpu_addr + offset; - return (__force void *)va; - } - } - } - - /* handle static DDR reserved memory regions */ - for (i =3D 0; i < kproc->num_rmems; i++) { - dev_addr =3D kproc->rmem[i].dev_addr; - size =3D kproc->rmem[i].size; - - if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { - offset =3D da - dev_addr; - va =3D kproc->rmem[i].cpu_addr + offset; - return (__force void *)va; - } - } - - return NULL; -} - static const struct rproc_ops k3_dsp_rproc_ops =3D { .start =3D k3_dsp_rproc_start, .stop =3D k3_rproc_stop, .attach =3D k3_rproc_attach, .detach =3D k3_rproc_detach, .kick =3D k3_rproc_kick, - .da_to_va =3D k3_dsp_rproc_da_to_va, + .da_to_va =3D k3_rproc_da_to_va, .get_loaded_rsc_table =3D k3_get_loaded_rsc_table, }; =20 diff --git a/drivers/remoteproc/ti_k3_m4_remoteproc.c b/drivers/remoteproc/= ti_k3_m4_remoteproc.c index d6fbbe3385567..7d1c7d8054738 100644 --- a/drivers/remoteproc/ti_k3_m4_remoteproc.c +++ b/drivers/remoteproc/ti_k3_m4_remoteproc.c @@ -21,62 +21,6 @@ #include "ti_sci_proc.h" #include "ti_k3_common.h" =20 -/* - * Custom function to translate a remote processor device address (internal - * RAMs only) to a kernel virtual address. The remote processors can acce= ss - * their RAMs at either an internal address visible only from a remote - * processor, or at the SoC-level bus address. Both these addresses need t= o be - * looked through for translation. The translated addresses can be used ei= ther - * by the remoteproc core for loading (when using kernel remoteproc loader= ), or - * by any rpmsg bus drivers. - */ -static void *k3_m4_rproc_da_to_va(struct rproc *rproc, u64 da, size_t len,= bool *is_iomem) -{ - struct k3_rproc *kproc =3D rproc->priv; - void __iomem *va =3D NULL; - phys_addr_t bus_addr; - u32 dev_addr, offset; - size_t size; - int i; - - if (len =3D=3D 0) - return NULL; - - for (i =3D 0; i < kproc->num_mems; i++) { - bus_addr =3D kproc->mem[i].bus_addr; - dev_addr =3D kproc->mem[i].dev_addr; - size =3D kproc->mem[i].size; - - /* handle M4-view addresses */ - if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { - offset =3D da - dev_addr; - va =3D kproc->mem[i].cpu_addr + offset; - return (__force void *)va; - } - - /* handle SoC-view addresses */ - if (da >=3D bus_addr && ((da + len) <=3D (bus_addr + size))) { - offset =3D da - bus_addr; - va =3D kproc->mem[i].cpu_addr + offset; - return (__force void *)va; - } - } - - /* handle static DDR reserved memory regions */ - for (i =3D 0; i < kproc->num_rmems; i++) { - dev_addr =3D kproc->rmem[i].dev_addr; - size =3D kproc->rmem[i].size; - - if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { - offset =3D da - dev_addr; - va =3D kproc->rmem[i].cpu_addr + offset; - return (__force void *)va; - } - } - - return NULL; -} - static int k3_m4_rproc_of_get_memories(struct platform_device *pdev, struct k3_rproc *kproc) { @@ -220,7 +164,7 @@ static const struct rproc_ops k3_m4_rproc_ops =3D { .attach =3D k3_rproc_attach, .detach =3D k3_rproc_detach, .kick =3D k3_rproc_kick, - .da_to_va =3D k3_m4_rproc_da_to_va, + .da_to_va =3D k3_rproc_da_to_va, .get_loaded_rsc_table =3D k3_get_loaded_rsc_table, }; =20 diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c b/drivers/remoteproc/= ti_k3_r5_remoteproc.c index 2e9e2312384f1..58c1bc5781d90 100644 --- a/drivers/remoteproc/ti_k3_r5_remoteproc.c +++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c @@ -572,7 +572,6 @@ static void *k3_r5_rproc_da_to_va(struct rproc *rproc, = u64 da, size_t len, bool struct k3_rproc *kproc =3D rproc->priv; struct k3_r5_core *core =3D kproc->priv; void __iomem *va =3D NULL; - phys_addr_t bus_addr; u32 dev_addr, offset; size_t size; int i; @@ -580,27 +579,6 @@ static void *k3_r5_rproc_da_to_va(struct rproc *rproc,= u64 da, size_t len, bool if (len =3D=3D 0) return NULL; =20 - /* handle both R5 and SoC views of ATCM and BTCM */ - for (i =3D 0; i < kproc->num_mems; i++) { - bus_addr =3D kproc->mem[i].bus_addr; - dev_addr =3D kproc->mem[i].dev_addr; - size =3D kproc->mem[i].size; - - /* handle R5-view addresses of TCMs */ - if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { - offset =3D da - dev_addr; - va =3D kproc->mem[i].cpu_addr + offset; - return (__force void *)va; - } - - /* handle SoC-view addresses of TCMs */ - if (da >=3D bus_addr && ((da + len) <=3D (bus_addr + size))) { - offset =3D da - bus_addr; - va =3D kproc->mem[i].cpu_addr + offset; - return (__force void *)va; - } - } - /* handle any SRAM regions using SoC-view addresses */ for (i =3D 0; i < core->num_sram; i++) { dev_addr =3D core->sram[i].dev_addr; @@ -613,19 +591,8 @@ static void *k3_r5_rproc_da_to_va(struct rproc *rproc,= u64 da, size_t len, bool } } =20 - /* handle static DDR reserved memory regions */ - for (i =3D 0; i < kproc->num_rmems; i++) { - dev_addr =3D kproc->rmem[i].dev_addr; - size =3D kproc->rmem[i].size; - - if (da >=3D dev_addr && ((da + len) <=3D (dev_addr + size))) { - offset =3D da - dev_addr; - va =3D kproc->rmem[i].cpu_addr + offset; - return (__force void *)va; - } - } - - return NULL; + /* handle both TCM and DDR memory regions */ + return k3_rproc_da_to_va(rproc, da, len, is_iomem); } =20 static const struct rproc_ops k3_r5_rproc_ops =3D { --=20 2.34.1