Commit 8715d4c0 authored by Beleswar Padhi's avatar Beleswar Padhi Committed by Mathieu Poirier
Browse files

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



The .detach rproc ops implementations in TI K3 R5, DSP and M4
remoteproc drivers are NOPs. Refactor the implementations into
ti_k3_common.c driver as k3_rproc_detach() and register this common
function as .detach ops in R5, DSP and M4 drivers.

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-31-b-padhi@ti.com


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

drivers/remoteproc/ti_k3_common.c

+10 −0
Original line number Diff line number Diff line
@@ -308,5 +308,15 @@ EXPORT_SYMBOL_GPL(k3_rproc_stop); 
int k3_rproc_attach(struct rproc *rproc) { return 0; }

EXPORT_SYMBOL_GPL(k3_rproc_attach);



/*

 * Detach from a running remote processor (IPC-only mode)

 *

 * The rproc detach callback is a NOP. The remote processor is not stopped and

 * will be left in booted state in IPC-only mode. This callback is invoked only

 * in IPC-only mode and exists for sanity sake

 */

int k3_rproc_detach(struct rproc *rproc) { return 0; }

EXPORT_SYMBOL_GPL(k3_rproc_detach);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("TI K3 common Remoteproc code");

drivers/remoteproc/ti_k3_common.h

+1 −0
Original line number Diff line number Diff line
@@ -103,4 +103,5 @@ int k3_rproc_unprepare(struct rproc *rproc); 
int k3_rproc_start(struct rproc *rproc);

int k3_rproc_stop(struct rproc *rproc);

int k3_rproc_attach(struct rproc *rproc);

int k3_rproc_detach(struct rproc *rproc);

#endif /* REMOTEPROC_TI_K3_COMMON_H */

drivers/remoteproc/ti_k3_dsp_remoteproc.c

+1 −10
Original line number Diff line number Diff line
@@ -58,15 +58,6 @@ static int k3_dsp_rproc_start(struct rproc *rproc) 
	return 0;

}



/*

 * Detach from a running DSP remote processor (IPC-only mode)

 *

 * This rproc detach callback is a NOP. The DSP core is not stopped and will be

 * left to continue to run its booted firmware. This callback is invoked only in

 * IPC-only mode and exists for sanity sake.

 */

static int k3_dsp_rproc_detach(struct rproc *rproc) { return 0; }



/*

 * This function implements the .get_loaded_rsc_table() callback and is used

 * to provide the resource table for a booted DSP in IPC-only mode. The K3 DSP
@@ -162,7 +153,7 @@ static const struct rproc_ops k3_dsp_rproc_ops = { 
	.start			= k3_dsp_rproc_start,

	.stop			= k3_rproc_stop,

	.attach			= k3_rproc_attach,

	.detach			= k3_dsp_rproc_detach,

	.detach			= k3_rproc_detach,

	.kick			= k3_rproc_kick,

	.da_to_va		= k3_dsp_rproc_da_to_va,

	.get_loaded_rsc_table	= k3_dsp_get_loaded_rsc_table,

drivers/remoteproc/ti_k3_m4_remoteproc.c

+1 −13
Original line number Diff line number Diff line
@@ -244,25 +244,13 @@ static void k3_m4_release_tsp(void *data) 
	ti_sci_proc_release(tsp);

}



/*

 * Detach from a running M4 remote processor (IPC-only mode)

 *

 * This rproc detach callback performs the opposite operation to attach

 * callback, the M4 core is not stopped and will be left to continue to

 * run its booted firmware. This callback is invoked only in IPC-only mode.

 */

static int k3_m4_rproc_detach(struct rproc *rproc)

{

	return 0;

}



static const struct rproc_ops k3_m4_rproc_ops = {

	.prepare = k3_rproc_prepare,

	.unprepare = k3_rproc_unprepare,

	.start = k3_rproc_start,

	.stop = k3_rproc_stop,

	.attach = k3_rproc_attach,

	.detach = k3_m4_rproc_detach,

	.detach = k3_rproc_detach,

	.kick = k3_rproc_kick,

	.da_to_va = k3_m4_rproc_da_to_va,

	.get_loaded_rsc_table = k3_m4_get_loaded_rsc_table,

drivers/remoteproc/ti_k3_r5_remoteproc.c

+1 −10
Original line number Diff line number Diff line
@@ -559,15 +559,6 @@ static int k3_r5_rproc_stop(struct rproc *rproc) 
	return ret;

}



/*

 * Detach from a running R5F remote processor (IPC-only mode)

 *

 * The R5F detach callback is a NOP. The R5F cores are not stopped and will be

 * left in booted state in IPC-only mode. This callback is invoked only in

 * IPC-only mode and exists for sanity sake.

 */

static int k3_r5_rproc_detach(struct rproc *rproc) { return 0; }



/*

 * This function implements the .get_loaded_rsc_table() callback and is used

 * to provide the resource table for the booted R5F in IPC-only mode. The K3 R5F
@@ -1049,7 +1040,7 @@ static int k3_r5_rproc_configure_mode(struct k3_rproc *kproc) 
		kproc->rproc->ops->start = NULL;

		kproc->rproc->ops->stop = NULL;

		kproc->rproc->ops->attach = k3_rproc_attach;

		kproc->rproc->ops->detach = k3_r5_rproc_detach;

		kproc->rproc->ops->detach = k3_rproc_detach;

		kproc->rproc->ops->get_loaded_rsc_table =

						k3_r5_get_loaded_rsc_table;

	} else if (!c_state) {