Commit 5d1f2e3c authored by Bjorn Andersson's avatar Bjorn Andersson
Browse files

soc: qcom: glink_ssr: Internalize ssr_notifiers 



Rather than carrying a special purpose blocking notifier for glink_ssr
in remoteproc's qcom_common.c, move it into glink_ssr so allow wider
reuse of the common one.

The rpmsg glink header file is used in preparation for the next patch.

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


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

drivers/remoteproc/qcom_common.c

+8 −0
Original line number Diff line number Diff line
@@ -42,6 +42,13 @@ static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed) 
	glink->edge = NULL;

}



static void glink_subdev_unprepare(struct rproc_subdev *subdev)

{

	struct qcom_rproc_glink *glink = to_glink_subdev(subdev);



	qcom_glink_ssr_notify(glink->ssr_name);

}



/**

 * qcom_add_glink_subdev() - try to add a GLINK subdevice to rproc

 * @rproc:	rproc handle to parent the subdevice
@@ -64,6 +71,7 @@ void qcom_add_glink_subdev(struct rproc *rproc, struct qcom_rproc_glink *glink, 
	glink->dev = dev;

	glink->subdev.start = glink_subdev_start;

	glink->subdev.stop = glink_subdev_stop;

	glink->subdev.unprepare = glink_subdev_unprepare;



	rproc_add_subdev(rproc, &glink->subdev);

}

drivers/soc/qcom/glink_ssr.c

+19 −5
Original line number Diff line number Diff line
@@ -54,6 +54,19 @@ struct glink_ssr { 
	struct completion completion;

};



/* Notifier list for all registered glink_ssr instances */

static BLOCKING_NOTIFIER_HEAD(ssr_notifiers);



/**

 * qcom_glink_ssr_notify() - notify GLINK SSR about stopped remoteproc

 * @ssr_name:	name of the remoteproc that has been stopped

 */

void qcom_glink_ssr_notify(const char *ssr_name)

{

	blocking_notifier_call_chain(&ssr_notifiers, 0, (void *)ssr_name);

}

EXPORT_SYMBOL_GPL(qcom_glink_ssr_notify);



static int qcom_glink_ssr_callback(struct rpmsg_device *rpdev,

				   void *data, int len, void *priv, u32 addr)

{
@@ -81,7 +94,8 @@ static int qcom_glink_ssr_callback(struct rpmsg_device *rpdev, 
	return 0;

}



static int qcom_glink_ssr_notify(struct notifier_block *nb, unsigned long event,

static int qcom_glink_ssr_notifier_call(struct notifier_block *nb,

					unsigned long event,

					void *data)

{

	struct glink_ssr *ssr = container_of(nb, struct glink_ssr, nb);
@@ -121,18 +135,18 @@ static int qcom_glink_ssr_probe(struct rpmsg_device *rpdev) 


	ssr->dev = &rpdev->dev;

	ssr->ept = rpdev->ept;

	ssr->nb.notifier_call = qcom_glink_ssr_notify;

	ssr->nb.notifier_call = qcom_glink_ssr_notifier_call;



	dev_set_drvdata(&rpdev->dev, ssr);



	return qcom_register_ssr_notifier(&ssr->nb);

	return blocking_notifier_chain_register(&ssr_notifiers, &ssr->nb);

}



static void qcom_glink_ssr_remove(struct rpmsg_device *rpdev)

{

	struct glink_ssr *ssr = dev_get_drvdata(&rpdev->dev);



	qcom_unregister_ssr_notifier(&ssr->nb);

	blocking_notifier_chain_unregister(&ssr_notifiers, &ssr->nb);

}



static const struct rpmsg_device_id qcom_glink_ssr_match[] = {

include/linux/rpmsg/qcom_glink.h

+6 −0
Original line number Diff line number Diff line
@@ -26,4 +26,10 @@ static inline void qcom_glink_smem_unregister(struct qcom_glink *glink) {} 


#endif



#if IS_ENABLED(CONFIG_RPMSG_QCOM_GLINK_SSR)

void qcom_glink_ssr_notify(const char *ssr_name);

#else

static inline void qcom_glink_ssr_notify(const char *ssr_name) {}

#endif



#endif