Commit ce6acb22 authored by Andrew Davis's avatar Andrew Davis Committed by Mathieu Poirier
Browse files

remoteproc: k3: Factor out TI-SCI processor control OF get function 



Building the TSP structure is common for users of the TI-SCI processor
control interface. Factor out this function and put it with the rest
of the TI-SCI processor control functions.

Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Tested-by: default avatarWadim Egorov <w.egorov@phytec.de>
Link: https://lore.kernel.org/r/20240802152109.137243-3-afd@ti.com


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

drivers/remoteproc/ti_k3_dsp_remoteproc.c

+1 −27
Original line number Diff line number Diff line
@@ -610,32 +610,6 @@ static void k3_dsp_release_tsp(void *data) 
	ti_sci_proc_release(tsp);

}



static

struct ti_sci_proc *k3_dsp_rproc_of_get_tsp(struct device *dev,

					    const struct ti_sci_handle *sci)

{

	struct ti_sci_proc *tsp;

	u32 temp[2];

	int ret;



	ret = of_property_read_u32_array(dev->of_node, "ti,sci-proc-ids",

					 temp, 2);

	if (ret < 0)

		return ERR_PTR(ret);



	tsp = devm_kzalloc(dev, sizeof(*tsp), GFP_KERNEL);

	if (!tsp)

		return ERR_PTR(-ENOMEM);



	tsp->dev = dev;

	tsp->sci = sci;

	tsp->ops = &sci->ops.proc_ops;

	tsp->proc_id = temp[0];

	tsp->host_id = temp[1];



	return tsp;

}



static int k3_dsp_rproc_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -689,7 +663,7 @@ static int k3_dsp_rproc_probe(struct platform_device *pdev) 
		return dev_err_probe(dev, PTR_ERR(kproc->reset),

				     "failed to get reset\n");



	kproc->tsp = k3_dsp_rproc_of_get_tsp(dev, kproc->ti_sci);

	kproc->tsp = ti_sci_proc_of_get_tsp(dev, kproc->ti_sci);

	if (IS_ERR(kproc->tsp))

		return dev_err_probe(dev, PTR_ERR(kproc->tsp),

				     "failed to construct ti-sci proc control\n");

drivers/remoteproc/ti_k3_r5_remoteproc.c

+1 −27
Original line number Diff line number Diff line
@@ -1509,32 +1509,6 @@ static int k3_r5_core_of_get_sram_memories(struct platform_device *pdev, 
	return 0;

}



static

struct ti_sci_proc *k3_r5_core_of_get_tsp(struct device *dev,

					  const struct ti_sci_handle *sci)

{

	struct ti_sci_proc *tsp;

	u32 temp[2];

	int ret;



	ret = of_property_read_u32_array(dev_of_node(dev), "ti,sci-proc-ids",

					 temp, 2);

	if (ret < 0)

		return ERR_PTR(ret);



	tsp = devm_kzalloc(dev, sizeof(*tsp), GFP_KERNEL);

	if (!tsp)

		return ERR_PTR(-ENOMEM);



	tsp->dev = dev;

	tsp->sci = sci;

	tsp->ops = &sci->ops.proc_ops;

	tsp->proc_id = temp[0];

	tsp->host_id = temp[1];



	return tsp;

}



static int k3_r5_core_of_init(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -1609,7 +1583,7 @@ static int k3_r5_core_of_init(struct platform_device *pdev) 
		goto err;

	}



	core->tsp = k3_r5_core_of_get_tsp(dev, core->ti_sci);

	core->tsp = ti_sci_proc_of_get_tsp(dev, core->ti_sci);

	if (IS_ERR(core->tsp)) {

		ret = PTR_ERR(core->tsp);

		dev_err(dev, "failed to construct ti-sci proc control, ret = %d\n",

drivers/remoteproc/ti_sci_proc.h

+26 −0
Original line number Diff line number Diff line
@@ -28,6 +28,32 @@ struct ti_sci_proc { 
	u8 host_id;

};



static inline

struct ti_sci_proc *ti_sci_proc_of_get_tsp(struct device *dev,

					   const struct ti_sci_handle *sci)

{

	struct ti_sci_proc *tsp;

	u32 temp[2];

	int ret;



	ret = of_property_read_u32_array(dev_of_node(dev), "ti,sci-proc-ids",

					 temp, 2);

	if (ret < 0)

		return ERR_PTR(ret);



	tsp = devm_kzalloc(dev, sizeof(*tsp), GFP_KERNEL);

	if (!tsp)

		return ERR_PTR(-ENOMEM);



	tsp->dev = dev;

	tsp->sci = sci;

	tsp->ops = &sci->ops.proc_ops;

	tsp->proc_id = temp[0];

	tsp->host_id = temp[1];



	return tsp;

}



static inline int ti_sci_proc_request(struct ti_sci_proc *tsp)

{

	int ret;