remoteproc: Populate hardcoded param using driver data
Subsystems (2)
PATCH 1/1 remoteproc: Populate hardcoded param using driver data
Q6 based WiFi fw loading is supported across different targets, ex: IPQ8074/QCS404. In order to support different fw names/pas id etc, populate hardcoded param using driver data.
--- drivers/remoteproc/qcom_q6v5_wcss.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)
drivers/remoteproc/qcom_q6v5_wcss.c +32 -4
@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/mfd/syscon.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/regmap.h>
@@ -16,7 +17,6 @@#include "qcom_common.h" #include "qcom_q6v5.h" -#define WCSS_CRASH_REASON 421/* Q6SS Register Offsets */ #define Q6SS_RESET_REG 0x014
@@ -70,6 +70,14 @@#define TCSR_WCSS_CLK_MASK 0x1F#define TCSR_WCSS_CLK_ENABLE 0x14 +struct wcss_data { +void (*pas_handover)(struct qcom_q6v5 *q6v5); +const char *firmware_name; +int crash_reason_smem; +int version; +int pas_id; +}; +struct q6v5_wcss {struct device *dev;
@@ -91,6 +99,10 @@ struct q6v5_wcss {phys_addr_t mem_reloc;void *mem_region;size_t mem_size; + +int crash_reason_smem; +int pas_id; +int version; };static int q6v5_wcss_reset (struct q6v5_wcss *wcss)
@@ -527,12 +539,17 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)static int q6v5_wcss_probe (struct platform_device *pdev) { +const struct wcss_data *desc;struct q6v5_wcss *wcss;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_wcss_ops, -"IPQ8074/q6_fw.mdt" ,sizeof (*wcss)); + desc->firmware_name,sizeof (*wcss));if (!rproc) {dev_err (&pdev->dev,"failed to allocate rproc\n" );return -ENOMEM ;
@@ -540,6 +557,9 @@ static int q6v5_wcss_probe(struct platform_device *pdev) wcss = rproc->priv; wcss->dev = &pdev->dev; + wcss->pas_id = desc->pas_id; + wcss->version = desc->version; + wcss->crash_reason_smem = desc->crash_reason_smem; ret =q6v5_wcss_init_mmio (wcss, pdev);if (ret)
@@ -553,7 +573,8 @@ static int q6v5_wcss_probe(struct platform_device *pdev)if (ret) goto free_rproc; - ret =qcom_q6v5_init (&wcss->q6v5, pdev, rproc,WCSS_CRASH_REASON ,NULL ); + ret =qcom_q6v5_init (&wcss->q6v5, pdev, rproc, desc->crash_reason_smem, + desc->pas_handover);if (ret) goto free_rproc;
@@ -581,8 +602,15 @@ static int q6v5_wcss_remove(struct platform_device *pdev)return 0 ; } +static const struct wcss_data wcss_ipq8074_res_init = { + .firmware_name ="IPQ8074/q6_fw.mdt" , + .crash_reason_smem =421 , + .pas_handover =NULL , +}; +static const struct of_device_id q6v5_wcss_of_match[] = { - { .compatible ="qcom,ipq8074-wcss-pil" }, + { .compatible ="ipq8074-wcss-pil" , .data = &wcss_ipq8074_res_init }, + { }, };MODULE_DEVICE_TABLE (of, q6v5_wcss_of_match);
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Hi Govind,
Quoted 4 lines · Govind Singh
Q6 based WiFi fw loading is supported across different targets, ex: IPQ8074/QCS404. In order to support different fw names/pas id etc, populate hardcoded param using driver data.
The patch title suggests a core remoteproc change, but the change is platform-specific. Can you fix up the title accordingly?
Quoted 19 lines
Signed-off-by Govind Singh <[email protected]>--- drivers/remoteproc/qcom_q6v5_wcss.c | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-)drivers/remoteproc/qcom_q6v5_wcss.c +1
-0@@ -8,6 +8,7 @@#include <linux/kernel.h> #include <linux/mfd/syscon.h> #include <linux/module.h> +#include <linux/of_device.h> #include <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/regmap.h>
drivers/remoteproc/qcom_q6v5_wcss.c line 19
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_wcss.c +0
-1@@ -16,7 +17,6 @@#include "qcom_common.h" #include "qcom_q6v5.h" -#define WCSS_CRASH_REASON 421
You can still use the macro as is even in the new data structure.
Quoted 32 lines
drivers/remoteproc/qcom_q6v5_wcss.c +12
-0/* Q6SS Register Offsets */ #define Q6SS_RESET_REG 0x014@@ -70,6 +70,14 @@#define TCSR_WCSS_CLK_MASK 0x1F#define TCSR_WCSS_CLK_ENABLE 0x14 +struct wcss_data { +void (*pas_handover)(struct qcom_q6v5 *q6v5); +const char *firmware_name; +int crash_reason_smem; +int version; +int pas_id; +}; +struct q6v5_wcss {struct device *dev;@@ -91,6 +99,10 @@ struct q6v5_wcss {phys_addr_t mem_reloc;void *mem_region;size_t mem_size; + +int crash_reason_smem; +int pas_id; +int version; };static int q6v5_wcss_reset (struct q6v5_wcss *wcss)@@ -527,12 +539,17 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)static int q6v5_wcss_probe (struct platform_device *pdev)
drivers/remoteproc/qcom_q6v5_wcss.c static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss) · line 550
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss.c +5
-0{ +const struct wcss_data *desc;struct q6v5_wcss *wcss;struct rproc *rproc;int ret; + desc =of_device_get_match_data (&pdev->dev); +if (!desc) +return -EINVAL ; +
You may want to check for NULL firmware name as well before invoking rproc_alloc.
Quoted 29 lines
drivers/remoteproc/qcom_q6v5_wcss.c +6
-2rproc =rproc_alloc (&pdev->dev, pdev->name, &q6v5_wcss_ops, -"IPQ8074/q6_fw.mdt" ,sizeof (*wcss)); + desc->firmware_name,sizeof (*wcss));if (!rproc) {dev_err (&pdev->dev,"failed to allocate rproc\n" );return -ENOMEM ;@@ -540,6 +557,9 @@ static int q6v5_wcss_probe(struct platform_device *pdev) wcss = rproc->priv; wcss->dev = &pdev->dev; + wcss->pas_id = desc->pas_id; + wcss->version = desc->version; + wcss->crash_reason_smem = desc->crash_reason_smem; ret =q6v5_wcss_init_mmio (wcss, pdev);if (ret)@@ -553,7 +573,8 @@ static int q6v5_wcss_probe(struct platform_device *pdev)if (ret) goto free_rproc; - ret =qcom_q6v5_init (&wcss->q6v5, pdev, rproc,WCSS_CRASH_REASON ,NULL ); + ret =qcom_q6v5_init (&wcss->q6v5, pdev, rproc, desc->crash_reason_smem, + desc->pas_handover);if (ret) goto free_rproc;@@ -581,8 +602,15 @@ static int q6v5_wcss_remove(struct platform_device *pdev)return 0 ; }
drivers/remoteproc/qcom_q6v5_wcss.c static int q6v5_wcss_remove(struct platform_device *pdev) · line 612
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_wcss.c +7
-1+static const struct wcss_data wcss_ipq8074_res_init = { + .firmware_name ="IPQ8074/q6_fw.mdt" , + .crash_reason_smem =421 , + .pas_handover =NULL , +}; +static const struct of_device_id q6v5_wcss_of_match[] = { - { .compatible ="qcom,ipq8074-wcss-pil" }, + { .compatible ="ipq8074-wcss-pil" , .data = &wcss_ipq8074_res_init },
Why is your compatible changing?
regards
Suman
Quoted 5 lines
drivers/remoteproc/qcom_q6v5_wcss.c +1
-0+ { }, };MODULE_DEVICE_TABLE (of, q6v5_wcss_of_match);
Quoted 5 lines · Govind Singh
Q6 based WiFi fw loading is supported across different targets, ex: IPQ8074/QCS404. In order to support different fw names/pas id etc, populate hardcoded param using driver data.
This patch prepares the driver for the introduction of some variation of some of the given parameters. Please submit this patch together with the patch introducing that new code.
Quoted 1 line
drivers/remoteproc/qcom_q6v5_wcss.c +0
-0
[..]
drivers/remoteproc/qcom_q6v5_wcss.c static int q6v5_wcss_remove(struct platform_device *pdev) · line 608
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_wcss.c +4
-0+static const struct wcss_data wcss_ipq8074_res_init = { + .firmware_name ="IPQ8074/q6_fw.mdt" , + .crash_reason_smem =421 , + .pas_handover =NULL ,
Please don't inherit my broken indentation from the adsp driver ;)
drivers/remoteproc/qcom_q6v5_wcss.c static int q6v5_wcss_remove(struct platform_device *pdev) · line 612
Quoted 5 lines
drivers/remoteproc/qcom_q6v5_wcss.c +3
-1+}; +static const struct of_device_id q6v5_wcss_of_match[] = { - { .compatible ="qcom,ipq8074-wcss-pil" }, + { .compatible ="ipq8074-wcss-pil" , .data = &wcss_ipq8074_res_init },
You lost qcom, in the compatible here.
Quoted 1 line
+
Regards,
Bjorn