leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc: qcom: glink_ssr: Internalize ssr_notifiers

Browse Source 
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: Chris Lew <clew@codeaurora.org>
Acked-by: Rishabh Bhatnagar <rishabhb@codeaurora.org>
Link: https://lore.kernel.org/r/20200423003736.2027371-3-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson 2020-04-22 17:37:34 -07:00
parent cd9fc8f1b3
commit 5d1f2e3c80
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/remoteproc/qcom_common.c
View File

@ -42,6 +42,13 @@ static void glink_subdev_stop(struct rproc_subdev *subdev, bool crashed)
glink->edge = NULL; 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 * qcom_add_glink_subdev() - try to add a GLINK subdevice to rproc
* @rproc: rproc handle to parent the subdevice * @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->dev = dev;
glink->subdev.start = glink_subdev_start; glink->subdev.start = glink_subdev_start;
glink->subdev.stop = glink_subdev_stop; glink->subdev.stop = glink_subdev_stop;
glink->subdev.unprepare = glink_subdev_unprepare;
rproc_add_subdev(rproc, &glink->subdev); rproc_add_subdev(rproc, &glink->subdev);
} }

24
drivers/soc/qcom/glink_ssr.c
View File

@ -54,6 +54,19 @@ struct glink_ssr {
struct completion completion; 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, static int qcom_glink_ssr_callback(struct rpmsg_device *rpdev,
void *data, int len, void *priv, u32 addr) void *data, int len, void *priv, u32 addr)
{ {
@ -81,8 +94,9 @@ static int qcom_glink_ssr_callback(struct rpmsg_device *rpdev,
return 0; 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,
void *data) unsigned long event,
void *data)
{ {
struct glink_ssr *ssr = container_of(nb, struct glink_ssr, nb); struct glink_ssr *ssr = container_of(nb, struct glink_ssr, nb);
struct do_cleanup_msg msg; struct do_cleanup_msg msg;
@ -121,18 +135,18 @@ static int qcom_glink_ssr_probe(struct rpmsg_device *rpdev)
ssr->dev = &rpdev->dev; ssr->dev = &rpdev->dev;
ssr->ept = rpdev->ept; 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); 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) static void qcom_glink_ssr_remove(struct rpmsg_device *rpdev)
{ {
struct glink_ssr *ssr = dev_get_drvdata(&rpdev->dev); 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[] = { static const struct rpmsg_device_id qcom_glink_ssr_match[] = {

6
include/linux/rpmsg/qcom_glink.h
View File

@ -26,4 +26,10 @@ static inline void qcom_glink_smem_unregister(struct qcom_glink *glink) {}
#endif #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 #endif