| Message ID | 20200423003736.2027371-1-bjorn.andersson@linaro.org |
|---|---|
| Headers | show |
| Series | rpmsg: Refactor Qualcomm glink_ssr | expand |
On 4/22/2020 5:37 PM, Bjorn Andersson wrote: > 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. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Chris Lew <clew@codeaurora.org>
On 4/22/2020 5:37 PM, Bjorn Andersson wrote: > Remove the QCOM_GLINK_SSR option from the arm64 defconfig, as the module > is assimilated by QCOM_GLINK - which is selected by other means. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Chris Lew <clew@codeaurora.org>
On 2020-04-22 17:37, Bjorn Andersson wrote: > 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. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- Acked-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > drivers/remoteproc/qcom_common.c | 8 ++++++++ > drivers/soc/qcom/glink_ssr.c | 24 +++++++++++++++++++----- > include/linux/rpmsg/qcom_glink.h | 6 ++++++ > 3 files changed, 33 insertions(+), 5 deletions(-) > > diff --git a/drivers/remoteproc/qcom_common.c > b/drivers/remoteproc/qcom_common.c > index ff26f2b68752..9028cea2d81e 100644 > --- a/drivers/remoteproc/qcom_common.c > +++ b/drivers/remoteproc/qcom_common.c > @@ -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); > } > diff --git a/drivers/soc/qcom/glink_ssr.c > b/drivers/soc/qcom/glink_ssr.c > index d7babe3d67bc..847d79c935f1 100644 > --- a/drivers/soc/qcom/glink_ssr.c > +++ b/drivers/soc/qcom/glink_ssr.c > @@ -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,8 +94,9 @@ 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, > - void *data) > +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); > struct do_cleanup_msg msg; > @@ -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[] = { > diff --git a/include/linux/rpmsg/qcom_glink.h > b/include/linux/rpmsg/qcom_glink.h > index 96e26d94719f..09daa0acde2c 100644 > --- a/include/linux/rpmsg/qcom_glink.h > +++ b/include/linux/rpmsg/qcom_glink.h > @@ -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
On 2020-04-22 17:37, Bjorn Andersson wrote: > Remove the QCOM_GLINK_SSR option from the arm64 defconfig, as the > module > is assimilated by QCOM_GLINK - which is selected by other means. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- Acked-by: Rishabh Bhatnagar <rishabhb@codeaurora.org> > arch/arm64/configs/defconfig | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/arch/arm64/configs/defconfig > b/arch/arm64/configs/defconfig > index f9eefb5940ca..f26a0b6ea0e8 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -838,7 +838,6 @@ CONFIG_FSL_MC_DPIO=y > CONFIG_IMX_SCU_SOC=y > CONFIG_QCOM_AOSS_QMP=y > CONFIG_QCOM_GENI_SE=y > -CONFIG_QCOM_GLINK_SSR=m > CONFIG_QCOM_RMTFS_MEM=m > CONFIG_QCOM_RPMH=y > CONFIG_QCOM_RPMHPD=y
In order to allow for wider use of the SSR notifier in remoteproc's qcom_common this series internalizes the notifier chain used by glink_ssr. To simplify the Kconfig dependencies it also moves the glink_ssr implementation to rpmsg and merges it with qcom_glink_native, as these do go hand in hand. Bjorn Andersson (4): remoteproc: qcom: Pass ssr_name to glink subdevice soc: qcom: glink_ssr: Internalize ssr_notifiers rpmsg: glink: Integrate glink_ssr in qcom_glink arm64: defconfig: Remove QCOM_GLINK_SSR arch/arm64/configs/defconfig | 1 - drivers/remoteproc/qcom_common.c | 17 ++++++++++- drivers/remoteproc/qcom_common.h | 5 +++- drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- drivers/remoteproc/qcom_q6v5_mss.c | 2 +- drivers/remoteproc/qcom_q6v5_pas.c | 2 +- drivers/rpmsg/Kconfig | 6 ++-- drivers/rpmsg/Makefile | 3 +- .../glink_ssr.c => rpmsg/qcom_glink_ssr.c} | 28 +++++++++++++------ drivers/soc/qcom/Kconfig | 9 ------ drivers/soc/qcom/Makefile | 1 - include/linux/rpmsg/qcom_glink.h | 3 +- 12 files changed, 49 insertions(+), 30 deletions(-) rename drivers/{soc/qcom/glink_ssr.c => rpmsg/qcom_glink_ssr.c} (83%)