Good morning Bjorn,
On Wed, Apr 22, 2020 at 05:37:33PM -0700, Bjorn Andersson wrote:
> Pass ssr_name to glink subdevice in preparation for tying glink_ssr to
> the glink subdevice, rather than having its own "ssr subdevice".
>
> Signed-off-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> ---
> drivers/remoteproc/qcom_common.c | 9 ++++++++-
> 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 +-
> 5 files changed, 15 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
> index 60650bcc8c67..ff26f2b68752 100644
> --- a/drivers/remoteproc/qcom_common.c
> +++ b/drivers/remoteproc/qcom_common.c
> @@ -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;
> +
In case or an error with the allocation of ->ssr_name an
of_node_put(glink->node) needs to be done. That way qcom_add_glink_subdev()
cleans up after itself if things go wrong. On the flip side the same
of_node_put() will be done when the driver is removed. So I'm ambivalent on
this one. With or without this change:
Acked-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> 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);
> diff --git a/drivers/remoteproc/qcom_common.h b/drivers/remoteproc/qcom_common.h
> index 58de71e4781c..34e5188187dc 100644
> --- a/drivers/remoteproc/qcom_common.h
> +++ b/drivers/remoteproc/qcom_common.h
> @@ -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);
> diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c
> index c60dabc6939e..d2a2574dcf35 100644
> --- a/drivers/remoteproc/qcom_q6v5_adsp.c
> +++ b/drivers/remoteproc/qcom_q6v5_adsp.c
> @@ -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,
> diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c
> index 7af1d0c987e0..b5dd36775b77 100644
> --- a/drivers/remoteproc/qcom_q6v5_mss.c
> +++ b/drivers/remoteproc/qcom_q6v5_mss.c
> @@ -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);
> diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c
> index 8ecc157f1ed1..fc6658b523b6 100644
> --- a/drivers/remoteproc/qcom_q6v5_pas.c
> +++ b/drivers/remoteproc/qcom_q6v5_pas.c
> @@ -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,
> --
> 2.24.0
>
