Commit 9179f8bf authored by Beleswar Padhi's avatar Beleswar Padhi Committed by Mathieu Poirier
Browse files

remoteproc: k3: Refactor .da_to_va rproc ops into common driver 



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: default avatarBeleswar Padhi <b-padhi@ti.com>
Tested-by: default avatarJudith Mendez <jm@ti.com>
Reviewed-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250513054510.3439842-33-b-padhi@ti.com


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 1d7f38dd

drivers/remoteproc/ti_k3_common.c

+57 −0
Original line number Diff line number Diff line
@@ -351,5 +351,62 @@ struct resource_table *k3_get_loaded_rsc_table(struct rproc *rproc, 
}

EXPORT_SYMBOL_GPL(k3_get_loaded_rsc_table);



/*

 * Custom function to translate a remote processor device address (internal

 * RAMs only) to a kernel virtual address.  The remote processors can access

 * their RAMs at either an internal address visible only from a remote

 * processor, or at the SoC-level bus address. Both these addresses need to be

 * looked through for translation. The translated addresses can be used either

 * 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 = rproc->priv;

	void __iomem *va = NULL;

	phys_addr_t bus_addr;

	u32 dev_addr, offset;

	size_t size;

	int i;



	if (len == 0)

		return NULL;



	for (i = 0; i < kproc->num_mems; i++) {

		bus_addr = kproc->mem[i].bus_addr;

		dev_addr = kproc->mem[i].dev_addr;

		size = kproc->mem[i].size;



		/* handle rproc-view addresses */

		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = kproc->mem[i].cpu_addr + offset;

			return (__force void *)va;

		}



		/* handle SoC-view addresses */

		if (da >= bus_addr && (da + len) <= (bus_addr + size)) {

			offset = da - bus_addr;

			va = kproc->mem[i].cpu_addr + offset;

			return (__force void *)va;

		}

	}



	/* handle static DDR reserved memory regions */

	for (i = 0; i < kproc->num_rmems; i++) {

		dev_addr = kproc->rmem[i].dev_addr;

		size = kproc->rmem[i].size;



		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = 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");

drivers/remoteproc/ti_k3_common.h

+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#ifndef REMOTEPROC_TI_K3_COMMON_H

#define REMOTEPROC_TI_K3_COMMON_H



#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 */

drivers/remoteproc/ti_k3_dsp_remoteproc.c

+1 −62
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include "ti_sci_proc.h"

#include "ti_k3_common.h"



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

}



/*

 * 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 internal

 * 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 addresses

 * 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 = rproc->priv;

	void __iomem *va = NULL;

	phys_addr_t bus_addr;

	u32 dev_addr, offset;

	size_t size;

	int i;



	if (len == 0)

		return NULL;



	for (i = 0; i < kproc->num_mems; i++) {

		bus_addr = kproc->mem[i].bus_addr;

		dev_addr = kproc->mem[i].dev_addr;

		size = kproc->mem[i].size;



		if (da < KEYSTONE_RPROC_LOCAL_ADDRESS_MASK) {

			/* handle DSP-view addresses */

			if (da >= dev_addr &&

			    ((da + len) <= (dev_addr + size))) {

				offset = da - dev_addr;

				va = kproc->mem[i].cpu_addr + offset;

				return (__force void *)va;

			}

		} else {

			/* handle SoC-view addresses */

			if (da >= bus_addr &&

			    (da + len) <= (bus_addr + size)) {

				offset = da - bus_addr;

				va = kproc->mem[i].cpu_addr + offset;

				return (__force void *)va;

			}

		}

	}



	/* handle static DDR reserved memory regions */

	for (i = 0; i < kproc->num_rmems; i++) {

		dev_addr = kproc->rmem[i].dev_addr;

		size = kproc->rmem[i].size;



		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = kproc->rmem[i].cpu_addr + offset;

			return (__force void *)va;

		}

	}



	return NULL;

}



static const struct rproc_ops k3_dsp_rproc_ops = {

	.start			= k3_dsp_rproc_start,

	.stop			= k3_rproc_stop,

	.attach			= k3_rproc_attach,

	.detach			= k3_rproc_detach,

	.kick			= k3_rproc_kick,

	.da_to_va		= k3_dsp_rproc_da_to_va,

	.da_to_va		= k3_rproc_da_to_va,

	.get_loaded_rsc_table	= k3_get_loaded_rsc_table,

};

drivers/remoteproc/ti_k3_m4_remoteproc.c

+1 −57
Original line number Diff line number Diff line
@@ -21,62 +21,6 @@ 
#include "ti_sci_proc.h"

#include "ti_k3_common.h"



/*

 * Custom function to translate a remote processor device address (internal

 * RAMs only) to a kernel virtual address.  The remote processors can access

 * their RAMs at either an internal address visible only from a remote

 * processor, or at the SoC-level bus address. Both these addresses need to be

 * looked through for translation. The translated addresses can be used either

 * 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 = rproc->priv;

	void __iomem *va = NULL;

	phys_addr_t bus_addr;

	u32 dev_addr, offset;

	size_t size;

	int i;



	if (len == 0)

		return NULL;



	for (i = 0; i < kproc->num_mems; i++) {

		bus_addr = kproc->mem[i].bus_addr;

		dev_addr = kproc->mem[i].dev_addr;

		size = kproc->mem[i].size;



		/* handle M4-view addresses */

		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = kproc->mem[i].cpu_addr + offset;

			return (__force void *)va;

		}



		/* handle SoC-view addresses */

		if (da >= bus_addr && ((da + len) <= (bus_addr + size))) {

			offset = da - bus_addr;

			va = kproc->mem[i].cpu_addr + offset;

			return (__force void *)va;

		}

	}



	/* handle static DDR reserved memory regions */

	for (i = 0; i < kproc->num_rmems; i++) {

		dev_addr = kproc->rmem[i].dev_addr;

		size = kproc->rmem[i].size;



		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = 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 = { 
	.attach = k3_rproc_attach,

	.detach = k3_rproc_detach,

	.kick = k3_rproc_kick,

	.da_to_va = k3_m4_rproc_da_to_va,

	.da_to_va = k3_rproc_da_to_va,

	.get_loaded_rsc_table = k3_get_loaded_rsc_table,

};

drivers/remoteproc/ti_k3_r5_remoteproc.c

+2 −35
Original line number Diff line number Diff line
@@ -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 = rproc->priv;

	struct k3_r5_core *core = kproc->priv;

	void __iomem *va = 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 == 0)

		return NULL;



	/* handle both R5 and SoC views of ATCM and BTCM */

	for (i = 0; i < kproc->num_mems; i++) {

		bus_addr = kproc->mem[i].bus_addr;

		dev_addr = kproc->mem[i].dev_addr;

		size = kproc->mem[i].size;



		/* handle R5-view addresses of TCMs */

		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = kproc->mem[i].cpu_addr + offset;

			return (__force void *)va;

		}



		/* handle SoC-view addresses of TCMs */

		if (da >= bus_addr && ((da + len) <= (bus_addr + size))) {

			offset = da - bus_addr;

			va = kproc->mem[i].cpu_addr + offset;

			return (__force void *)va;

		}

	}



	/* handle any SRAM regions using SoC-view addresses */

	for (i = 0; i < core->num_sram; i++) {

		dev_addr = 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 
		}

	}



	/* handle static DDR reserved memory regions */

	for (i = 0; i < kproc->num_rmems; i++) {

		dev_addr = kproc->rmem[i].dev_addr;

		size = kproc->rmem[i].size;



		if (da >= dev_addr && ((da + len) <= (dev_addr + size))) {

			offset = da - dev_addr;

			va = 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);

}



static const struct rproc_ops k3_r5_rproc_ops = {