Re: [PATCH v6 1/3] remoteproc: qcom: Compatible string based private resource initialization.

[Bjorn Andersson]

On Fri 30 Dec 05:54 PST 2016, Avaneesh Kumar Dwivedi wrote:

> MSS rproc loader need chip specific resources initialization during probe
> to load and boot modem firmware, this need compatible string based
> differentiation in resources to be initialized. This patch add and provide
> a template struct whose fields represent all those resources which are
> needed to load and boot modem fw and which may differ from chip to chip.
> This patch also add new compatible string for msm8916, msm8974 platform.
> 
> Signed-off-by: Avaneesh Kumar Dwivedi <akdwived@xxxxxxxxxxxxxx>

I applied the patches, with the following changes:

1) Moved disabling of proxy clocks on successful start() to from patch 3
to patch 2.

2) Drop disable of proxy clocks and regulators from stop(), as they are
already disabled by all code paths through start().


Thank you!

Regards,
Bjorn

> ---
>  .../devicetree/bindings/remoteproc/qcom,q6v5.txt   |  4 +++-
>  drivers/remoteproc/qcom_q6v5_pil.c                 | 24 +++++++++++++++++++---
>  2 files changed, 24 insertions(+), 4 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
> index 57cb49e..674ebc6 100644
> --- a/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
> +++ b/Documentation/devicetree/bindings/remoteproc/qcom,q6v5.txt
> @@ -7,7 +7,9 @@ on the Qualcomm Hexagon core.
>  	Usage: required
>  	Value type: <string>
>  	Definition: must be one of:
> -		    "qcom,q6v5-pil"
> +		"qcom,q6v5-pil"
> +		"qcom,msm8916-mss-pil"
> +		"qcom,msm8974-mss-pil"
>  
>  - reg:
>  	Usage: required
> diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
> index 2e0caaa..d875448 100644
> --- a/drivers/remoteproc/qcom_q6v5_pil.c
> +++ b/drivers/remoteproc/qcom_q6v5_pil.c
> @@ -30,13 +30,13 @@
>  #include <linux/reset.h>
>  #include <linux/soc/qcom/smem.h>
>  #include <linux/soc/qcom/smem_state.h>
> +#include <linux/of_device.h>
>  
>  #include "remoteproc_internal.h"
>  #include "qcom_mdt_loader.h"
>  
>  #include <linux/qcom_scm.h>
>  
> -#define MBA_FIRMWARE_NAME		"mba.b00"
>  #define MPSS_FIRMWARE_NAME		"modem.mdt"
>  
>  #define MPSS_CRASH_REASON_SMEM		421
> @@ -93,6 +93,10 @@
>  #define QDSS_BHS_ON			BIT(21)
>  #define QDSS_LDO_BYP			BIT(22)
>  
> +struct rproc_hexagon_res {
> +	const char *hexagon_mba_image;
> +};
> +
>  struct q6v5 {
>  	struct device *dev;
>  	struct rproc *rproc;
> @@ -805,12 +809,17 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc)
>  
>  static int q6v5_probe(struct platform_device *pdev)
>  {
> +	const struct rproc_hexagon_res *desc;
>  	struct q6v5 *qproc;
>  	struct rproc *rproc;
>  	int ret;
>  
> +	desc = of_device_get_match_data(&pdev->dev);
> +	if (!desc)
> +		return -EINVAL;
> +
>  	rproc = rproc_alloc(&pdev->dev, pdev->name, &q6v5_ops,
> -			    MBA_FIRMWARE_NAME, sizeof(*qproc));
> +			    desc->hexagon_mba_image, sizeof(*qproc));
>  	if (!rproc) {
>  		dev_err(&pdev->dev, "failed to allocate rproc\n");
>  		return -ENOMEM;
> @@ -890,8 +899,17 @@ static int q6v5_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> +static const struct rproc_hexagon_res msm8916_mss = {
> +	.hexagon_mba_image = "mba.mbn",
> +};
> +
> +static const struct rproc_hexagon_res msm8974_mss = {
> +	.hexagon_mba_image = "mba.b00",
> +};
>  static const struct of_device_id q6v5_of_match[] = {
> -	{ .compatible = "qcom,q6v5-pil", },
> +	{ .compatible = "qcom,q6v5-pil", .data = &msm8916_mss},
> +	{ .compatible = "qcom,msm8916-mss-pil", .data = &msm8916_mss},
> +	{ .compatible = "qcom,msm8974-mss-pil", .data = &msm8974_mss},
>  	{ },
>  };
>  
> -- 
> Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project.
>