Commit cd9fc8f1 authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

remoteproc: qcom: Pass ssr_name to glink subdevice 



Pass ssr_name to glink subdevice in preparation for tying glink_ssr to
the glink subdevice, rather than having its own "ssr subdevice".

Acked-by: default avatarChris Lew <clew@codeaurora.org>
Acked-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: default avatarRishabh Bhatnagar <rishabhb@codeaurora.org>
Link: https://lore.kernel.org/r/20200423003736.2027371-2-bjorn.andersson@linaro.org


Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
parent 2fb75cea

drivers/remoteproc/qcom_common.c

+8 −1
Original line number Diff line number Diff line
@@ -46,8 +46,10 @@ static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed) 
 * qcom_add_glink_subdev() - try to add a GLINK subdevice to rproc

 * @rproc:	rproc handle to parent the subdevice

 * @glink:	reference to a GLINK subdev context

 * @ssr_name:	identifier of the associated remoteproc for ssr notifications

 */

void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink)

void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink,

			   const char *ssr_name)

{

	struct device *dev = &rproc->dev;
@@ -55,6 +57,10 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink) 
	if (!glink->node)

		return;



	glink->ssr_name = kstrdup_const(ssr_name, GFP_KERNEL);

	if (!glink->ssr_name)

		return;



	glink->dev = dev;

	glink->subdev.start = glink_subdev_start;

	glink->subdev.stop = glink_subdev_stop;
@@ -74,6 +80,7 @@ void qcom_remove_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glin 
		return;



	rproc_remove_subdev(rproc, &glink->subdev);

	kfree_const(glink->ssr_name);

	of_node_put(glink->node);

}

EXPORT_SYMBOL_GPL(qcom_remove_glink_subdev);

drivers/remoteproc/qcom_common.h

+4 −1
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ struct qcom_sysmon; 
struct qcom_rproc_glink {

	struct rproc_subdev subdev;



	const char *ssr_name;



	struct device *dev;

	struct device_node *node;

	struct qcom_glink *edge;
@@ -30,7 +32,8 @@ struct qcom_rproc_ssr { 
	const char *name;

};



void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink);

void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink,

			   const char *ssr_name);

void qcom_remove_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink);



int qcom_register_dump_segments(struct rproc *rproc, const struct firmware *fw);

drivers/remoteproc/qcom_q6v5_adsp.c

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ static int adsp_probe(struct platform_device *pdev) 
	if (ret)

		goto disable_pm;



	qcom_add_glink_subdev(rproc, &adsp->glink_subdev);

	qcom_add_glink_subdev(rproc, &adsp->glink_subdev, desc->ssr_name);

	qcom_add_ssr_subdev(rproc, &adsp->ssr_subdev, desc->ssr_name);

	adsp->sysmon = qcom_add_sysmon_subdev(rproc,

					      desc->sysmon_name,

drivers/remoteproc/qcom_q6v5_mss.c

+1 −1
Original line number Diff line number Diff line
@@ -1762,7 +1762,7 @@ static int q6v5_probe(struct platform_device *pdev) 


	qproc->mpss_perm = BIT(QCOM_SCM_VMID_HLOS);

	qproc->mba_perm = BIT(QCOM_SCM_VMID_HLOS);

	qcom_add_glink_subdev(rproc, &qproc->glink_subdev);

	qcom_add_glink_subdev(rproc, &qproc->glink_subdev, "mpss");

	qcom_add_smd_subdev(rproc, &qproc->smd_subdev);

	qcom_add_ssr_subdev(rproc, &qproc->ssr_subdev, "mpss");

	qcom_add_ipa_notify_subdev(rproc, &qproc->ipa_notify_subdev);

drivers/remoteproc/qcom_q6v5_pas.c

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static int adsp_probe(struct platform_device *pdev) 
	if (ret)

		goto detach_proxy_pds;



	qcom_add_glink_subdev(rproc, &adsp->glink_subdev);

	qcom_add_glink_subdev(rproc, &adsp->glink_subdev, desc->ssr_name);

	qcom_add_smd_subdev(rproc, &adsp->smd_subdev);

	qcom_add_ssr_subdev(rproc, &adsp->ssr_subdev, desc->ssr_name);

	adsp->sysmon = qcom_add_sysmon_subdev(rproc,