Add support for sc7280 WPSS PIL loading
cover Add support for sc7280 WPSS PIL loading
Add support for PIL loading of WPSS co-processor for SC7280 SOCs.
Rakesh Pillai (2):
dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
.../bindings/remoteproc/qcom,hexagon-v56.txt | 35 +++++----- drivers/remoteproc/qcom_q6v5_adsp.c | 77 +++++++++++++++++++++- 2 files changed, 96 insertions(+), 16 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
Add WPSS PIL loading support for SC7280 SoCs.
--- .../bindings/remoteproc/qcom,hexagon-v56.txt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-)
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +20 -15
@@ -9,6 +9,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be one of: "qcom,qcs404-cdsp-pil", "qcom,sdm845-adsp-pil" + "qcom,sc7280-wpss-pil" - reg: Usage: required
@@ -24,7 +25,13 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - interrupt-names: Usage: required Value type: <stringlist> - Definition: must be "wdog", "fatal", "ready", "handover", "stop-ack" + Definition: The interrupts needed depends on the compatible string + qcom,sdm845-adsp-pil: + qcom,qcs404-cdsp-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + qcom,sc7280-wpss-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + "shutdown-ack" - clocks: Usage: required
@@ -35,19 +42,17 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - clock-names: Usage: required for SDM845 ADSP Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", - "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep" - and "qdsp6ss_core". - -- clock-names: - Usage: required for QCS404 CDSP - Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", - "q6ss_master", "q6_axim". + Definition: The clocks needed depends on the compatible string + qcom,sdm845-adsp-pil: + must be "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", + "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep", + "qdsp6ss_core" + qcom,qcs404-cdsp-pil: + must be "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", + "q6ss_master", "q6_axim" + qcom,sc7280-wpss-pil: + must be "gcc_wpss_ahb_bdg_mst_clk", "gcc_wpss_ahb_clk", + "gcc_wpss_rscp_clk" - power-domains: Usage: required
@@ -65,7 +70,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be "pdc_sync" and "cc_lpass" - reset-names: - Usage: required for QCS404 CDSP + Usage: required for QCS404 CDSP, SC7280 WPSS Value type: <stringlist> Definition: must be "restart"
Signature · 1 line
2.7.4
Re: [PATCH 1/2] dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
Quoted 2 lines · Rakesh Pillai
Add WPSS PIL loading support for SC7280 SoCs.
But can you please follow up with a patch that converts this to yaml?
Regards,
Bjorn
Quoted 75 lines
Signed-off-by Rakesh Pillai <[email protected]>--- .../bindings/remoteproc/qcom,hexagon-v56.txt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-)Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +20
-15@@ -9,6 +9,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be one of: "qcom,qcs404-cdsp-pil", "qcom,sdm845-adsp-pil" + "qcom,sc7280-wpss-pil" - reg: Usage: required@@ -24,7 +25,13 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - interrupt-names: Usage: required Value type: <stringlist> - Definition: must be "wdog", "fatal", "ready", "handover", "stop-ack" + Definition: The interrupts needed depends on the compatible string + qcom,sdm845-adsp-pil: + qcom,qcs404-cdsp-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + qcom,sc7280-wpss-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + "shutdown-ack" - clocks: Usage: required@@ -35,19 +42,17 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - clock-names: Usage: required for SDM845 ADSP Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", - "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep" - and "qdsp6ss_core". - -- clock-names: - Usage: required for QCS404 CDSP - Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", - "q6ss_master", "q6_axim". + Definition: The clocks needed depends on the compatible string + qcom,sdm845-adsp-pil: + must be "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", + "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep", + "qdsp6ss_core" + qcom,qcs404-cdsp-pil: + must be "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", + "q6ss_master", "q6_axim" + qcom,sc7280-wpss-pil: + must be "gcc_wpss_ahb_bdg_mst_clk", "gcc_wpss_ahb_clk", + "gcc_wpss_rscp_clk" - power-domains: Usage: required@@ -65,7 +70,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be "pdc_sync" and "cc_lpass" - reset-names: - Usage: required for QCS404 CDSP + Usage: required for QCS404 CDSP, SC7280 WPSS Value type: <stringlist> Definition: must be "restart"Signature · 1 line
2.7.4
Re: [PATCH 1/2] dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
In reply to Rakesh PillaiQuoted 57 lines · Rakesh Pillai
Add WPSS PIL loading support for SC7280 SoCs.
Signed-off-by Rakesh Pillai <[email protected]>--- .../bindings/remoteproc/qcom,hexagon-v56.txt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-)diff --git
a/Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txtb/Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txtindex 1337a3d..edad5e8 100644Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +11
-14@@ -9,6 +9,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be one of: "qcom,qcs404-cdsp-pil", "qcom,sdm845-adsp-pil" + "qcom,sc7280-wpss-pil" - reg: Usage: required@@ -24,7 +25,13 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - interrupt-names: Usage: required Value type: <stringlist> - Definition: must be "wdog", "fatal", "ready", "handover", "stop-ack" + Definition: The interrupts needed depends on the compatible string + qcom,sdm845-adsp-pil: + qcom,qcs404-cdsp-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + qcom,sc7280-wpss-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + "shutdown-ack" - clocks: Usage: required@@ -35,19 +42,17 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - clock-names: Usage: required for SDM845 ADSP Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", - "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep" - and "qdsp6ss_core". - -- clock-names: - Usage: required for QCS404 CDSP - Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", - "q6ss_master", "q6_axim". + Definition: The clocks needed depends on the compatible string + qcom,sdm845-adsp-pil: + must be "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr",
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt on the Qualcomm Technology Inc. Hexagon v56 core. · line 57
Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +8
-0+ "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep", + "qdsp6ss_core" + qcom,qcs404-cdsp-pil: + must be "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", + "q6ss_master", "q6_axim" + qcom,sc7280-wpss-pil: + must be "gcc_wpss_ahb_bdg_mst_clk", "gcc_wpss_ahb_clk", + "gcc_wpss_rscp_clk" - power-domains:
IIRC wpss requires both cx and mx. So you'll
need to add driver code to support multiple
power-domains.
Quoted 9 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +1
-1Usage: required@@ -65,7 +70,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be "pdc_sync" and "cc_lpass" - reset-names: - Usage: required for QCS404 CDSP + Usage: required for QCS404 CDSP, SC7280 WPSS Value type: <stringlist> Definition: must be "restart"
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Re: [PATCH 1/2] dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
In reply to Rakesh PillaiQuoted 7 lines · Rakesh Pillai
Add WPSS PIL loading support for SC7280 SoCs.
Signed-off-by Rakesh Pillai <[email protected]>--- .../bindings/remoteproc/qcom,hexagon-v56.txt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-)
Re: [PATCH 1/2] dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
In reply to Rakesh PillaiQuoting Rakesh Pillai (2021-03-09 23:28:09)
Quoted 12 lines
Add WPSS PIL loading support for SC7280 SoCs.
Signed-off-by Rakesh Pillai <[email protected]>--- .../bindings/remoteproc/qcom,hexagon-v56.txt | 35 ++++++++++++---------- 1 file changed, 20 insertions(+), 15 deletions(-)Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +0
-0
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt on the Qualcomm Technology Inc. Hexagon v56 core. · line 12
Quoted 4 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +1
-0@@ -9,6 +9,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be one of: "qcom,qcs404-cdsp-pil", "qcom,sdm845-adsp-pil" + "qcom,sc7280-wpss-pil"
alphabet sort please.
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt on the Qualcomm Technology Inc. Hexagon v56 core. · line 32
Quoted 13 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +5
-1- reg: Usage: required@@ -24,7 +25,13 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - interrupt-names: Usage: required Value type: <stringlist> - Definition: must be "wdog", "fatal", "ready", "handover", "stop-ack" + Definition: The interrupts needed depends on the compatible string + qcom,sdm845-adsp-pil: + qcom,qcs404-cdsp-pil: + must be "wdog", "fatal", "ready", "handover", "stop-ack" + qcom,sc7280-wpss-pil:
Alphabet sort too?
Quoted 21 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +2
-12+ must be "wdog", "fatal", "ready", "handover", "stop-ack" + "shutdown-ack" - clocks: Usage: required@@ -35,19 +42,17 @@ on the Qualcomm Technology Inc. Hexagon v56 core. - clock-names: Usage: required for SDM845 ADSP Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", - "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep" - and "qdsp6ss_core". - -- clock-names: - Usage: required for QCS404 CDSP - Value type: <stringlist> - Definition: List of clock input name strings sorted in the same - order as the clocks property. Definition must have - "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave",
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt on the Qualcomm Technology Inc. Hexagon v56 core. · line 53
Quoted 10 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +9
-1- "q6ss_master", "q6_axim". + Definition: The clocks needed depends on the compatible string + qcom,sdm845-adsp-pil: + must be "xo", "sway_cbcr", "lpass_ahbs_aon_cbcr", + "lpass_ahbm_aon_cbcr", "qdsp6ss_xo", "qdsp6ss_sleep", + "qdsp6ss_core" + qcom,qcs404-cdsp-pil: + must be "xo", "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", + "q6ss_master", "q6_axim" + qcom,sc7280-wpss-pil:
Alphabet sort too?
Quoted 17 lines
Documentation/devicetree/bindings/remoteproc/qcom,hexagon-v56.txt +3
-2+ must be "gcc_wpss_ahb_bdg_mst_clk", "gcc_wpss_ahb_clk", + "gcc_wpss_rscp_clk" - power-domains: Usage: required@@ -65,7 +70,7 @@ on the Qualcomm Technology Inc. Hexagon v56 core. Definition: must be "pdc_sync" and "cc_lpass" - reset-names: - Usage: required for QCS404 CDSP + Usage: required for QCS404 CDSP, SC7280 WPSS Value type: <stringlist> Definition: must be "restart" --2.7.4
PATCH 2/2 remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
In reply to Rakesh PillaiAdd support for PIL loading of WPSS processor for SC7280 WPSS boot will be requested by the wifi driver and hence disable auto-boot for WPSS. Also add a separate shutdown sequence handler for WPSS.
--- drivers/remoteproc/qcom_q6v5_adsp.c | 77 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-)
drivers/remoteproc/qcom_q6v5_adsp.c +76 -1
@@ -58,6 +58,8 @@ struct adsp_pil_data {const char *ssr_name;const char *sysmon_name;int ssctl_id; +bool is_wpss; +bool auto_boot;const char **clk_ids;int num_clks;
@@ -96,8 +98,54 @@ struct qcom_adsp {struct qcom_rproc_glink glink_subdev;struct qcom_rproc_ssr ssr_subdev;struct qcom_sysmon *sysmon; + +int (*shutdown)(struct qcom_adsp *adsp); }; +static int qcom_wpss_shutdown (struct qcom_adsp *adsp) +{ +unsigned long timeout; +unsigned int val; +int ret; + +regmap_write (adsp->halt_map, adsp->halt_lpass +LPASS_HALTREQ_REG ,1 ); + +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret =regmap_read (adsp->halt_map, + adsp->halt_lpass +LPASS_HALTACK_REG , &val); +if (ret || val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +/* Place the WPSS processor into reset */ +reset_control_assert (adsp->restart); +/* wait after asserting subsystem restart from AOSS */ +usleep_range (100 ,105 ); +/* Remove the WPSS reset */ +reset_control_deassert (adsp->restart); + +usleep_range (100 ,105 ); + +regmap_write (adsp->halt_map, adsp->halt_lpass +LPASS_HALTREQ_REG ,0 ); + +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret =regmap_read (adsp->halt_map, + adsp->halt_lpass +LPASS_HALTACK_REG , &val); +if (ret || !val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +return 0 ; +} +static int qcom_adsp_shutdown (struct qcom_adsp *adsp) {unsigned long timeout;
@@ -270,7 +318,7 @@ static int adsp_stop(struct rproc *rproc)if (ret == -ETIMEDOUT )dev_err (adsp->dev,"timed out on wait\n" ); - ret =qcom_adsp_shutdown (adsp); + ret = adsp->shutdown (adsp);if (ret)dev_err (adsp->dev,"failed to shutdown: %d\n" , ret);
@@ -439,6 +487,8 @@ static int adsp_probe(struct platform_device *pdev)dev_err (&pdev->dev,"unable to allocate remoteproc\n" );return -ENOMEM ; } + + rproc->auto_boot = desc->auto_boot;rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); adsp = (struct qcom_adsp *)rproc->priv;
@@ -447,6 +497,11 @@ static int adsp_probe(struct platform_device *pdev) adsp->info_name = desc->sysmon_name;platform_set_drvdata (pdev, adsp); +if (desc->is_wpss) + adsp->shutdown = qcom_wpss_shutdown; +else + adsp->shutdown = qcom_adsp_shutdown; + ret =adsp_alloc_memory_region (adsp);if (ret) goto free_rproc;
@@ -515,6 +570,8 @@ static const struct adsp_pil_data adsp_resource_init = { .ssr_name = "lpass", .sysmon_name = "adsp", .ssctl_id = 0x14, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway_cbcr" ,"lpass_ahbs_aon_cbcr" ,"lpass_ahbm_aon_cbcr" ,"qdsp6ss_xo" ,"qdsp6ss_sleep" ,"qdsp6ss_core" ,NULL
@@ -528,6 +585,8 @@ static const struct adsp_pil_data cdsp_resource_init = { .ssr_name = "cdsp", .sysmon_name = "cdsp", .ssctl_id = 0x17, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway" ,"tbu" ,"bimc" ,"ahb_aon" ,"q6ss_slave" ,"q6ss_master" ,"q6_axim" ,NULL
@@ -535,7 +594,23 @@ static const struct adsp_pil_data cdsp_resource_init = { .num_clks = 7, }; +static const struct adsp_pil_data wpss_resource_init = { + .crash_reason_smem =626 , + .firmware_name ="wpss.mdt" , + .ssr_name ="wpss" , + .sysmon_name ="wpss" , + .ssctl_id =0x19 , + .is_wpss = true, + .auto_boot = false; + .clk_ids = (const char *[]) { +"gcc_wpss_ahb_bdg_mst_clk" ,"gcc_wpss_ahb_clk" , +"gcc_wpss_rscp_clk" ,NULL + }, + .num_clks =3 , +}; +static const struct of_device_id adsp_of_match[] = { + { .compatible ="qcom,sc7280-wpss-pil" , .data = &wpss_resource_init }, { .compatible ="qcom,qcs404-cdsp-pil" , .data = &cdsp_resource_init }, { .compatible ="qcom,sdm845-adsp-pil" , .data = &adsp_resource_init }, { },
Signature · 1 line
2.7.4
Re: [PATCH 2/2] remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
Quoted 128 lines · Rakesh Pillai
Add support for PIL loading of WPSS processor for SC7280 WPSS boot will be requested by the wifi driver and hence disable auto-boot for WPSS. Also add a separate shutdown sequence handler for WPSS.
Signed-off-by Rakesh Pillai <[email protected]>--- drivers/remoteproc/qcom_q6v5_adsp.c | 77 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-)drivers/remoteproc/qcom_q6v5_adsp.c +60
-1@@ -58,6 +58,8 @@ struct adsp_pil_data {const char *ssr_name;const char *sysmon_name;int ssctl_id; +bool is_wpss; +bool auto_boot;const char **clk_ids;int num_clks;@@ -96,8 +98,54 @@ struct qcom_adsp {struct qcom_rproc_glink glink_subdev;struct qcom_rproc_ssr ssr_subdev;struct qcom_sysmon *sysmon; + +int (*shutdown)(struct qcom_adsp *adsp); }; +static int qcom_wpss_shutdown (struct qcom_adsp *adsp) +{ +unsigned long timeout; +unsigned int val; +int ret; + +regmap_write (adsp->halt_map, adsp->halt_lpass +LPASS_HALTREQ_REG ,1 ); + +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret =regmap_read (adsp->halt_map, + adsp->halt_lpass +LPASS_HALTACK_REG , &val); +if (ret || val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +/* Place the WPSS processor into reset */ +reset_control_assert (adsp->restart); +/* wait after asserting subsystem restart from AOSS */ +usleep_range (100 ,105 ); +/* Remove the WPSS reset */ +reset_control_deassert (adsp->restart); + +usleep_range (100 ,105 ); + +regmap_write (adsp->halt_map, adsp->halt_lpass +LPASS_HALTREQ_REG ,0 ); + +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret =regmap_read (adsp->halt_map, + adsp->halt_lpass +LPASS_HALTACK_REG , &val); +if (ret || !val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +return 0 ; +} +static int qcom_adsp_shutdown (struct qcom_adsp *adsp) {unsigned long timeout;@@ -270,7 +318,7 @@ static int adsp_stop(struct rproc *rproc)if (ret == -ETIMEDOUT )dev_err (adsp->dev,"timed out on wait\n" ); - ret =qcom_adsp_shutdown (adsp); + ret = adsp->shutdown (adsp);if (ret)dev_err (adsp->dev,"failed to shutdown: %d\n" , ret);@@ -439,6 +487,8 @@ static int adsp_probe(struct platform_device *pdev)dev_err (&pdev->dev,"unable to allocate remoteproc\n" );return -ENOMEM ; } + + rproc->auto_boot = desc->auto_boot;rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); adsp = (struct qcom_adsp *)rproc->priv;@@ -447,6 +497,11 @@ static int adsp_probe(struct platform_device *pdev) adsp->info_name = desc->sysmon_name;platform_set_drvdata (pdev, adsp); +if (desc->is_wpss) + adsp->shutdown = qcom_wpss_shutdown; +else + adsp->shutdown = qcom_adsp_shutdown; + ret =adsp_alloc_memory_region (adsp);if (ret) goto free_rproc;@@ -515,6 +570,8 @@ static const struct adsp_pil_data adsp_resource_init = { .ssr_name = "lpass", .sysmon_name = "adsp", .ssctl_id = 0x14, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway_cbcr" ,"lpass_ahbs_aon_cbcr" ,"lpass_ahbm_aon_cbcr" ,"qdsp6ss_xo" ,"qdsp6ss_sleep" ,"qdsp6ss_core" ,NULL @@ -528,6 +585,8 @@ static const struct adsp_pil_data cdsp_resource_init = { .ssr_name = "cdsp", .sysmon_name = "cdsp", .ssctl_id = 0x17, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway" ,"tbu" ,"bimc" ,"ahb_aon" ,"q6ss_slave" ,"q6ss_master" ,"q6_axim" ,NULL @@ -535,7 +594,23 @@ static const struct adsp_pil_data cdsp_resource_init = { .num_clks = 7,
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = { · line 604
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0}; +static const struct adsp_pil_data wpss_resource_init = { + .crash_reason_smem =626 , + .firmware_name ="wpss.mdt" , + .ssr_name ="wpss" , + .sysmon_name ="wpss" , + .ssctl_id =0x19 , + .is_wpss = true, + .auto_boot = false;
Why is auto_boot false for the WPSS?
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = { · line 613
Quoted 9 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+ .clk_ids = (const char*[]) { +"gcc_wpss_ahb_bdg_mst_clk" ,"gcc_wpss_ahb_clk" , +"gcc_wpss_rscp_clk" ,NULL + }, + .num_clks = 3, +}; +static const struct of_device_id adsp_of_match[] = { + { .compatible ="qcom,sc7280-wpss-pil" , .data = &wpss_resource_init },
Nit. Please keep things like this sorted alphabetically.
Regards,
Bjorn
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0{ .compatible = "qcom,qcs404-cdsp-pil", .data = &cdsp_resource_init }, { .compatible = "qcom,sdm845-adsp-pil", .data = &adsp_resource_init }, { },Signature · 1 line
2.7.4
RE: [PATCH 2/2] remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
Quoted 158 lines
-----Original Message-----
From: Bjorn Andersson <[email protected]>
Sent: Wednesday, March 10, 2021 10:15 PM
To: Rakesh Pillai <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2/2] remoteproc: qcom:q6v5_wpss: Add support for sc7280 WPSSQuoted 8 lines · Rakesh Pillai
Add support for PIL loading of WPSS processor for SC7280 WPSS boot will be requested by the wifi driver and hence disable auto-boot for WPSS. Also add a separate shutdown sequence handler for WPSS.
Signed-off-by Rakesh Pillai <[email protected]>--- drivers/remoteproc/qcom_q6v5_adsp.c | 77++++++++++++++++++++++++++++++++++++-
Review
Quoted 3 lines
1 file changed, 76 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/remoteproc/qcom_q6v5_adsp.cQuoted 17 lines
index e024502..dc6b91d 100644
drivers/remoteproc/qcom_q6v5_adsp.c +3
-0@@ -58,6 +58,8 @@ struct adsp_pil_data {const char *ssr_name;const char *sysmon_name;int ssctl_id; +bool is_wpss; +bool auto_boot;const char **clk_ids;int num_clks;@@ -96,8 +98,54 @@ struct qcom_adsp {struct qcom_rproc_glink glink_subdev;struct qcom_rproc_ssr ssr_subdev;struct qcom_sysmon *sysmon; +drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp { · line 111
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+int (*shutdown)(struct qcom_adsp *adsp); }; +static int qcom_wpss_shutdown (struct qcom_adsp *adsp) +{ +unsigned long timeout; +unsigned int val; +int ret; + + regmap_write(adsp->halt_map, adsp->halt_lpass +
LPASS_HALTREQ_REG, 1);drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+ +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret = regmap_read(adsp->halt_map, + adsp->halt_lpass + LPASS_HALTACK_REG,&val);
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+if (ret || val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } +drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-0+/* Place the WPSS processor into reset */ +reset_control_assert (adsp->restart); +/* wait after asserting subsystem restart from AOSS */ +usleep_range (100 ,105 ); +/* Remove the WPSS reset */ +reset_control_deassert (adsp->restart); + +usleep_range (100 ,105 ); + + regmap_write(adsp->halt_map, adsp->halt_lpass +
LPASS_HALTREQ_REG, 0);drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+ +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret = regmap_read(adsp->halt_map, + adsp->halt_lpass + LPASS_HALTACK_REG,&val);
drivers/remoteproc/qcom_q6v5_adsp.c static int adsp_probe(struct platform_device
Quoted 22 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-1+if (ret || !val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +return 0 ; +} +static int qcom_adsp_shutdown (struct qcom_adsp *adsp) {unsigned long timeout;@@ -270,7 +318,7 @@ static int adsp_stop(struct rproc *rproc)if (ret == -ETIMEDOUT )dev_err (adsp->dev,"timed out on wait\n" ); - ret =qcom_adsp_shutdown (adsp); + ret = adsp->shutdown (adsp);if (ret)dev_err (adsp->dev,"failed to shutdown: %d\n" , ret);@@ -439,6 +487,8 @@ static int adsp_probe(struct platform_device*pdev)
drivers/remoteproc/qcom_q6v5_adsp.c static int adsp_probe(struct platform_device
Quoted 9 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0dev_err (&pdev->dev,"unable to allocate remoteproc\n" );return -ENOMEM ; } + + rproc->auto_boot = desc->auto_boot;rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); adsp = (struct qcom_adsp *)rproc->priv;@@ -447,6 +497,11 @@ static int adsp_probe(struct platform_device*pdev)
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data adsp_resource_init
Quoted 12 lines
drivers/remoteproc/qcom_q6v5_adsp.c +5
-0adsp->info_name = desc->sysmon_name;platform_set_drvdata (pdev, adsp); +if (desc->is_wpss) + adsp->shutdown = qcom_wpss_shutdown; +else + adsp->shutdown = qcom_adsp_shutdown; + ret =adsp_alloc_memory_region (adsp);if (ret) goto free_rproc;@@ -515,6 +570,8 @@ static const struct adsp_pil_data adsp_resource_init= {
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data adsp_resource_init = {
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0.ssr_name = "lpass", .sysmon_name = "adsp", .ssctl_id = 0x14, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway_cbcr" ,"lpass_ahbs_aon_cbcr" ,"
lpass_ahbm_aon_cbcr",drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0"qdsp6ss_xo" ,"qdsp6ss_sleep" ,"qdsp6ss_core" ,NULL @@ -528,6 +585,8 @@ static const struct adsp_pil_data cdsp_resource_init= {
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = {
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0.ssr_name = "cdsp", .sysmon_name = "cdsp", .ssctl_id = 0x17, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway" ,"tbu" ,"bimc" ,"ahb_aon" ,"q6ss_slave" ,"
q6ss_master",drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0"q6_axim" ,NULL @@ -535,7 +594,23 @@ static const struct adsp_pil_data
cdsp_resource_init= {Quoted 3 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0.num_clks = 7, };
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = { · line 604
Quoted 8 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+static const struct adsp_pil_data wpss_resource_init = { + .crash_reason_smem =626 , + .firmware_name ="wpss.mdt" , + .ssr_name ="wpss" , + .sysmon_name ="wpss" , + .ssctl_id =0x19 , + .is_wpss = true, + .auto_boot = false;Why is
auto_bootfalse for the WPSS?
Wifi driver will start the remote processor when it comes up. We do not want to load it at the start.
Quoted 12 lines
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = {
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+ .clk_ids = (const char*[]) { +"gcc_wpss_ahb_bdg_mst_clk" ,"gcc_wpss_ahb_clk" , +"gcc_wpss_rscp_clk" ,NULL + }, + .num_clks = 3, +}; +static const struct of_device_id adsp_of_match[] = { + { .compatible ="qcom,sc7280-wpss-pil" , .data = &wpss_resource_init},
Quoted 1 line
Nit. Please keep things like this sorted alphabetically.
Will fix this in the next patchset.
Thanks,
Rakesh
Quoted 12 lines
Regards,
Bjorndrivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data · line 614
Quoted 1 line
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0{ .compatible = "qcom,qcs404-cdsp-pil", .data = &cdsp_resource_init},
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data · line 615
Quoted 1 line
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0{ .compatible = "qcom,sdm845-adsp-pil", .data =
&adsp_resource_init},Quoted 4 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-1{ }, --2.7.4
Re: [PATCH 2/2] remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
Quoted 169 lines · Rakesh Pillai
Quoted 158 lines
-----Original Message-----
From: Bjorn Andersson <[email protected]>
Sent: Wednesday, March 10, 2021 10:15 PM
To: Rakesh Pillai <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2/2] remoteproc: qcom:q6v5_wpss: Add support for sc7280 WPSSQuoted 8 lines · Rakesh Pillai
Add support for PIL loading of WPSS processor for SC7280 WPSS boot will be requested by the wifi driver and hence disable auto-boot for WPSS. Also add a separate shutdown sequence handler for WPSS.
Signed-off-by Rakesh Pillai <[email protected]>--- drivers/remoteproc/qcom_q6v5_adsp.c | 77++++++++++++++++++++++++++++++++++++-
Review
Quoted 3 lines
1 file changed, 76 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/remoteproc/qcom_q6v5_adsp.cQuoted 17 lines
index e024502..dc6b91d 100644
drivers/remoteproc/qcom_q6v5_adsp.c +3
-0@@ -58,6 +58,8 @@ struct adsp_pil_data {const char *ssr_name;const char *sysmon_name;int ssctl_id; +bool is_wpss; +bool auto_boot;const char **clk_ids;int num_clks;@@ -96,8 +98,54 @@ struct qcom_adsp {struct qcom_rproc_glink glink_subdev;struct qcom_rproc_ssr ssr_subdev;struct qcom_sysmon *sysmon; +drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp { · line 111
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+int (*shutdown)(struct qcom_adsp *adsp); }; +static int qcom_wpss_shutdown (struct qcom_adsp *adsp) +{ +unsigned long timeout; +unsigned int val; +int ret; + + regmap_write(adsp->halt_map, adsp->halt_lpass +
LPASS_HALTREQ_REG, 1);drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+ +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret = regmap_read(adsp->halt_map, + adsp->halt_lpass + LPASS_HALTACK_REG,&val);
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+if (ret || val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } +drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-0+/* Place the WPSS processor into reset */ +reset_control_assert (adsp->restart); +/* wait after asserting subsystem restart from AOSS */ +usleep_range (100 ,105 ); +/* Remove the WPSS reset */ +reset_control_deassert (adsp->restart); + +usleep_range (100 ,105 ); + + regmap_write(adsp->halt_map, adsp->halt_lpass +
LPASS_HALTREQ_REG, 0);drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+ +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret = regmap_read(adsp->halt_map, + adsp->halt_lpass + LPASS_HALTACK_REG,&val);
drivers/remoteproc/qcom_q6v5_adsp.c static int adsp_probe(struct platform_device
Quoted 22 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-1+if (ret || !val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +return 0 ; +} +static int qcom_adsp_shutdown (struct qcom_adsp *adsp) {unsigned long timeout;@@ -270,7 +318,7 @@ static int adsp_stop(struct rproc *rproc)if (ret == -ETIMEDOUT )dev_err (adsp->dev,"timed out on wait\n" ); - ret =qcom_adsp_shutdown (adsp); + ret = adsp->shutdown (adsp);if (ret)dev_err (adsp->dev,"failed to shutdown: %d\n" , ret);@@ -439,6 +487,8 @@ static int adsp_probe(struct platform_device*pdev)
drivers/remoteproc/qcom_q6v5_adsp.c static int adsp_probe(struct platform_device
Quoted 9 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0dev_err (&pdev->dev,"unable to allocate remoteproc\n" );return -ENOMEM ; } + + rproc->auto_boot = desc->auto_boot;rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); adsp = (struct qcom_adsp *)rproc->priv;@@ -447,6 +497,11 @@ static int adsp_probe(struct platform_device*pdev)
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data adsp_resource_init
Quoted 12 lines
drivers/remoteproc/qcom_q6v5_adsp.c +5
-0adsp->info_name = desc->sysmon_name;platform_set_drvdata (pdev, adsp); +if (desc->is_wpss) + adsp->shutdown = qcom_wpss_shutdown; +else + adsp->shutdown = qcom_adsp_shutdown; + ret =adsp_alloc_memory_region (adsp);if (ret) goto free_rproc;@@ -515,6 +570,8 @@ static const struct adsp_pil_data adsp_resource_init= {
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data adsp_resource_init = {
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0.ssr_name = "lpass", .sysmon_name = "adsp", .ssctl_id = 0x14, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway_cbcr" ,"lpass_ahbs_aon_cbcr" ,"
lpass_ahbm_aon_cbcr",drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0"qdsp6ss_xo" ,"qdsp6ss_sleep" ,"qdsp6ss_core" ,NULL @@ -528,6 +585,8 @@ static const struct adsp_pil_data cdsp_resource_init= {
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = {
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0.ssr_name = "cdsp", .sysmon_name = "cdsp", .ssctl_id = 0x17, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway" ,"tbu" ,"bimc" ,"ahb_aon" ,"q6ss_slave" ,"
q6ss_master",drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0"q6_axim" ,NULL @@ -535,7 +594,23 @@ static const struct adsp_pil_data
cdsp_resource_init= {Quoted 3 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0.num_clks = 7, };Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = { · line 604
Quoted 8 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+static const struct adsp_pil_data wpss_resource_init = { + .crash_reason_smem =626 , + .firmware_name ="wpss.mdt" , + .ssr_name ="wpss" , + .sysmon_name ="wpss" , + .ssctl_id =0x19 , + .is_wpss = true, + .auto_boot = false;Why is
auto_bootfalse for the WPSS?
Quoted 3 lines
Wifi driver will start the remote processor when it comes up. We do not want to load it at the start.
Can you please explain this further?
We've had several cases in the past where functional drivers controls a remoteproc instance and makes assumptions about when the remoteproc is up or not. I would like to ensure that we don't design ourselves into such corner (even though I see that the ath11k code for this was merged a long time ago)
Regards,
Bjorn
Quoted 32 lines
Quoted 12 lines
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = {
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+ .clk_ids = (const char*[]) { +"gcc_wpss_ahb_bdg_mst_clk" ,"gcc_wpss_ahb_clk" , +"gcc_wpss_rscp_clk" ,NULL + }, + .num_clks = 3, +}; +static const struct of_device_id adsp_of_match[] = { + { .compatible ="qcom,sc7280-wpss-pil" , .data = &wpss_resource_init},
Quoted 1 line
Nit. Please keep things like this sorted alphabetically.
Will fix this in the next patchset.
Thanks,
RakeshQuoted 12 lines
Regards,
Bjorndrivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data · line 614
Quoted 1 line
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0{ .compatible = "qcom,qcs404-cdsp-pil", .data = &cdsp_resource_init},
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data · line 615
Quoted 1 line
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0{ .compatible = "qcom,sdm845-adsp-pil", .data =
&adsp_resource_init},Quoted 4 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-1{ }, --2.7.4
RE: [PATCH 2/2] remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
Quoted 71 lines
-----Original Message-----
From: Bjorn Andersson <[email protected]>
Sent: Monday, October 4, 2021 8:59 PM
To: Rakesh Pillai <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2/2] remoteproc: qcom:q6v5_wpss: Add support for sc7280 WPSSQuoted 56 lines · Rakesh Pillai
Quoted 56 lines
-----Original Message-----
From: Bjorn Andersson <[email protected]>
Sent: Wednesday, March 10, 2021 10:15 PM
To: Rakesh Pillai <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; robh+linux-
[email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 2/2] remoteproc: qcom:q6v5_wpss: Add support for
sc7280 WPSSQuoted 7 lines · Rakesh Pillai
Add support for PIL loading of WPSS processor for SC7280 WPSS boot will be requested by the wifi driver and hence disable auto-boot for WPSS. Also add a separate shutdown sequence handler for WPSS.
Signed-off-by Rakesh Pillai <[email protected]>--- drivers/remoteproc/qcom_q6v5_adsp.c | 77++++++++++++++++++++++++++++++++++++-
Review
Quoted 3 lines
1 file changed, 76 insertions(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/remoteproc/qcom_q6v5_adsp.cQuoted 16 lines
index e024502..dc6b91d 100644
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0@@ -58,6 +58,8 @@ struct adsp_pil_data {const char *ssr_name;const char *sysmon_name;int ssctl_id; +bool is_wpss; +bool auto_boot;const char **clk_ids;int num_clks;@@ -96,8 +98,54 @@ struct qcom_adsp {struct qcom_rproc_glink glink_subdev;struct qcom_rproc_ssr ssr_subdev;struct qcom_sysmon *sysmon;drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp { · line 110
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+ +int (*shutdown)(struct qcom_adsp *adsp); }; +static int qcom_wpss_shutdown (struct qcom_adsp *adsp) { +unsigned long timeout; +unsigned int val; +int ret; + + regmap_write(adsp->halt_map, adsp->halt_lpass +
LPASS_HALTREQ_REG, 1);
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+ +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret = regmap_read(adsp->halt_map, + adsp->halt_lpass +
LPASS_HALTACK_REG,
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
&val);
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+if (ret || val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } +drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-0+/* Place the WPSS processor into reset */ +reset_control_assert (adsp->restart); +/* wait after asserting subsystem restart from AOSS */ +usleep_range (100 ,105 ); +/* Remove the WPSS reset */ +reset_control_deassert (adsp->restart); + +usleep_range (100 ,105 ); + + regmap_write(adsp->halt_map, adsp->halt_lpass +
LPASS_HALTREQ_REG, 0);
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp {
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +6
-0+ +/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret = regmap_read(adsp->halt_map, + adsp->halt_lpass +
LPASS_HALTACK_REG,
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
&val);
Quoted 15 lines
drivers/remoteproc/qcom_q6v5_adsp.c +9
-0+if (ret || !val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + } + +return 0 ; +} +static int qcom_adsp_shutdown (struct qcom_adsp *adsp) {unsigned long timeout;@@ -270,7 +318,7 @@ static int adsp_stop(struct rproc *rproc)if (ret == -ETIMEDOUT )dev_err (adsp->dev,"timed out on wait\n" );
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/remoteproc/qcom_q6v5_adsp.c static int adsp_probe(struct platform_device
Quoted 6 lines
drivers/remoteproc/qcom_q6v5_adsp.c +1
-1- ret =qcom_adsp_shutdown (adsp); + ret = adsp->shutdown (adsp);if (ret)dev_err (adsp->dev,"failed to shutdown: %d\n" , ret);@@ -439,6 +487,8 @@ static int adsp_probe(struct platform_device*pdev)
Quoted 1 line
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0dev_err(&pdev->dev, "unable to allocate
remoteproc\n");
Quoted 31 lines
Quoted 31 lines
Quoted 31 lines
Quoted 8 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0return -ENOMEM ; } + + rproc->auto_boot = desc->auto_boot;rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); adsp = (struct qcom_adsp *)rproc->priv; @@ -447,6 +497,11 @@static int adsp_probe(struct
platform_device*pdev)
Quoted 12 lines
drivers/remoteproc/qcom_q6v5_adsp.c +5
-0adsp->info_name = desc->sysmon_name;platform_set_drvdata (pdev, adsp); +if (desc->is_wpss) + adsp->shutdown = qcom_wpss_shutdown; +else + adsp->shutdown = qcom_adsp_shutdown; + ret =adsp_alloc_memory_region (adsp);if (ret) goto free_rproc;@@ -515,6 +570,8 @@ static const struct adsp_pil_dataQuoted 1 line
adsp_resource_init= {
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data adsp_resource_init = {
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0.ssr_name = "lpass", .sysmon_name = "adsp", .ssctl_id = 0x14, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway_cbcr" ,"lpass_ahbs_aon_cbcr" ,"
lpass_ahbm_aon_cbcr",
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"
qdsp6ss_xo", "qdsp6ss_sleep", "qdsp6ss_core", NULL
@@ -
Quoted 34 lines
528,6
Quoted 27 lines
Quoted 16 lines
Quoted 1 line
+585,8 @@ static const struct
adsp_pil_datacdsp_resource_init= {
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = {
Quoted 7 lines
drivers/remoteproc/qcom_q6v5_adsp.c +2
-0.ssr_name = "cdsp", .sysmon_name = "cdsp", .ssctl_id = 0x17, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) {"sway" ,"tbu" ,"bimc" ,"ahb_aon" ,"q6ss_slave" ,"
q6ss_master",drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data
Quoted 2 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0"q6_axim" ,NULL @@ -535,7 +594,23 @@ static const struct adsp_pil_data
cdsp_resource_init= {Quoted 3 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0.num_clks = 7, };Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data cdsp_resource_init = { · line 604
Quoted 8 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+static const struct adsp_pil_data wpss_resource_init = { + .crash_reason_smem =626 , + .firmware_name ="wpss.mdt" , + .ssr_name ="wpss" , + .sysmon_name ="wpss" , + .ssctl_id =0x19 , + .is_wpss = true, + .auto_boot = false;Why is
auto_bootfalse for the WPSS?Quoted 3 lines
Wifi driver will start the remote processor when it comes up. We do not want to load it at the start.
Can you please explain this further?
Quoted 9 lines
We've had several cases in the past where functional drivers controls a remoteproc instance and makes assumptions about when the remoteproc is up or not. I would like to ensure that we don't design ourselves into such corner (even though I see that the ath11k code for this was merged a long time ago)
Regards,
Bjorn
Hi Bjorn,
Yes, the wpss remoteproc is used by ath11k, where it takes care of starting the rproc during init.
Ideally the wpss is not supposed to be started until the wifi driver comes up.
If wifi is started/enabled, the wifi driver can take care of starting the wpss.
This is the reason behind keeping auto_boot as false for wpss.
Thanks,
Rakesh Pillai
Quoted 3 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
2.7.4
kernel test robot
build botRe: [PATCH 2/2] remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
In reply to Rakesh PillaiThank you for the patch! Yet something to improve:
Hi Rakesh,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on robh/for-next]
[also build test ERROR on linus/master v5.12-rc2 next-20210310] [cannot apply to hwspinlock/for-next remoteproc/for-next rpmsg/for-next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Rakesh-Pillai/Add-support-for-sc7280-WPSS-PIL-loading/20210310-153802 base: https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git for-next config: arm64-allyesconfig (attached as .config) compiler: aarch64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/870fc6e5ff6910ff2f19d07840e300f66f1fd668
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rakesh-Pillai/Add-support-for-sc7280-WPSS-PIL-loading/20210310-153802 git checkout 870fc6e5ff6910ff2f19d07840e300f66f1fd668
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/remoteproc/qcom_q6v5_adsp.c:574:19: error: expected '}' before ';' token
574 | .auto_boot = true;
| ^
drivers/remoteproc/qcom_q6v5_adsp.c:567:56: note: to match this '{'
567 | static const struct adsp_pil_data adsp_resource_init = {
| ^
drivers/remoteproc/qcom_q6v5_adsp.c:589:19: error: expected '}' before ';' token
589 | .auto_boot = true;
| ^
drivers/remoteproc/qcom_q6v5_adsp.c:582:56: note: to match this '{'
582 | static const struct adsp_pil_data cdsp_resource_init = {
| ^
drivers/remoteproc/qcom_q6v5_adsp.c:604:20: error: expected '}' before ';' token
604 | .auto_boot = false;
| ^
drivers/remoteproc/qcom_q6v5_adsp.c:597:56: note: to match this '{'
597 | static const struct adsp_pil_data wpss_resource_init = {
| ^vim +574 drivers/remoteproc/qcom_q6v5_adsp.c
566
567 static const struct adsp_pil_data adsp_resource_init = {
568 .crash_reason_smem = 423,
569 .firmware_name = "adsp.mdt",
570 .ssr_name = "lpass",
571 .sysmon_name = "adsp",
572 .ssctl_id = 0x14,
573 .is_wpss = false,
> 574 .auto_boot = true;
575 .clk_ids = (const char*[]) {
576 "sway_cbcr", "lpass_ahbs_aon_cbcr", "lpass_ahbm_aon_cbcr",
577 "qdsp6ss_xo", "qdsp6ss_sleep", "qdsp6ss_core", NULL
578 },
579 .num_clks = 7,
580 };
581
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 2/2] remoteproc: qcom: q6v5_wpss: Add support for sc7280 WPSS
In reply to Rakesh PillaiQuoted 42 lines · Rakesh Pillai
Add support for PIL loading of WPSS processor for SC7280 WPSS boot will be requested by the wifi driver and hence disable auto-boot for WPSS. Also add a separate shutdown sequence handler for WPSS.
Signed-off-by Rakesh Pillai <[email protected]>--- drivers/remoteproc/qcom_q6v5_adsp.c | 77 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-)drivers/remoteproc/qcom_q6v5_adsp.c +12
-0@@ -58,6 +58,8 @@ struct adsp_pil_data {const char *ssr_name;const char *sysmon_name;int ssctl_id; +bool is_wpss; +bool auto_boot;const char **clk_ids;int num_clks;@@ -96,8 +98,54 @@ struct qcom_adsp {struct qcom_rproc_glink glink_subdev;struct qcom_rproc_ssr ssr_subdev;struct qcom_sysmon *sysmon; + +int (*shutdown)(struct qcom_adsp *adsp); }; +static int qcom_wpss_shutdown (struct qcom_adsp *adsp) +{ +unsigned long timeout; +unsigned int val; +int ret; + +regmap_write (adsp->halt_map, adsp->halt_lpass +LPASS_HALTREQ_REG ,1 ); +
drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp { · line 123
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-0+/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret =regmap_read (adsp->halt_map, + adsp->halt_lpass +LPASS_HALTACK_REG , &val); +if (ret || val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + }
please use regmap_read_poll_timeout
instead.
drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp { · line 131
Quoted 9 lines
drivers/remoteproc/qcom_q6v5_adsp.c +9
-0+ +/* Place the WPSS processor into reset */ +reset_control_assert (adsp->restart); +/* wait after asserting subsystem restart from AOSS */ +usleep_range (100 ,105 ); +/* Remove the WPSS reset */ +reset_control_deassert (adsp->restart); + +usleep_range (100 ,105 );
usleep shouldn't be required since
aoss-reset drivers put in a usleep
of 200-300 on reset assert and de-assert.
Quoted 4 lines
drivers/remoteproc/qcom_q6v5_adsp.c +3
-0+ +regmap_write (adsp->halt_map, adsp->halt_lpass +LPASS_HALTREQ_REG ,0 ); +
drivers/remoteproc/qcom_q6v5_adsp.c struct qcom_adsp { · line 144
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +10
-0+/* Wait for halt ACK from QDSP6 */ + timeout = jiffies +msecs_to_jiffies (ACK_TIMEOUT ); +for (;;) { + ret =regmap_read (adsp->halt_map, + adsp->halt_lpass +LPASS_HALTACK_REG , &val); +if (ret || !val ||time_after (jiffies, timeout)) +break ; + +usleep_range (1000 ,1100 ); + }
please use regmap_read_poll_timeout
instead.
Quoted 71 lines
drivers/remoteproc/qcom_q6v5_adsp.c +4
-0+ +return 0 ; +} +static int qcom_adsp_shutdown (struct qcom_adsp *adsp){
drivers/remoteproc/qcom_q6v5_adsp.c +8
-1unsigned long timeout;@@ -270,7 +318,7 @@ static int adsp_stop(struct rproc *rproc)if (ret == -ETIMEDOUT )dev_err (adsp->dev,"timed out on wait\n" ); - ret =qcom_adsp_shutdown (adsp); + ret = adsp->shutdown (adsp);if (ret)dev_err (adsp->dev,"failed to shutdown: %d\n" , ret);@@ -439,6 +487,8 @@ static int adsp_probe(struct platform_device *pdev)dev_err (&pdev->dev,"unable to allocate remoteproc\n" );return -ENOMEM ; } + + rproc->auto_boot = desc->auto_boot;rproc_coredump_set_elf_info (rproc,ELFCLASS32 ,EM_NONE ); adsp = (struct qcom_adsp *)rproc->priv;@@ -447,6 +497,11 @@ static int adsp_probe(struct platform_device *pdev) adsp->info_name = desc->sysmon_name;platform_set_drvdata (pdev, adsp); +if (desc->is_wpss) + adsp->shutdown = qcom_wpss_shutdown; +else + adsp->shutdown = qcom_adsp_shutdown; + ret =adsp_alloc_memory_region (adsp);if (ret)drivers/remoteproc/qcom_q6v5_adsp.c +2
-0goto free_rproc;@@ -515,6 +570,8 @@ static const struct adsp_pil_data adsp_resource_init = { .ssr_name = "lpass", .sysmon_name = "adsp", .ssctl_id = 0x14, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) { "sway_cbcr", "lpass_ahbs_aon_cbcr", "lpass_ahbm_aon_cbcr",drivers/remoteproc/qcom_q6v5_adsp.c +2
-0"qdsp6ss_xo" ,"qdsp6ss_sleep" ,"qdsp6ss_core" ,NULL @@ -528,6 +585,8 @@ static const struct adsp_pil_data cdsp_resource_init = { .ssr_name = "cdsp", .sysmon_name = "cdsp", .ssctl_id = 0x17, + .is_wpss = false, + .auto_boot = true; .clk_ids = (const char*[]) { "sway", "tbu", "bimc", "ahb_aon", "q6ss_slave", "q6ss_master",drivers/remoteproc/qcom_q6v5_adsp.c +8
-0"q6_axim" ,NULL @@ -535,7 +594,23 @@ static const struct adsp_pil_data cdsp_resource_init = { .num_clks = 7, }; +static const struct adsp_pil_data wpss_resource_init = { + .crash_reason_smem =626 , + .firmware_name ="wpss.mdt" , + .ssr_name ="wpss" , + .sysmon_name ="wpss" , + .ssctl_id =0x19 , + .is_wpss = true, + .auto_boot = false;
drivers/remoteproc/qcom_q6v5_adsp.c static const struct adsp_pil_data · line 615
Quoted 10 lines
drivers/remoteproc/qcom_q6v5_adsp.c +8
-0+ .clk_ids = (const char*[]) { +"gcc_wpss_ahb_bdg_mst_clk" ,"gcc_wpss_ahb_clk" , +"gcc_wpss_rscp_clk" ,NULL + }, + .num_clks = 3, +}; +static const struct of_device_id adsp_of_match[] = { + { .compatible ="qcom,sc7280-wpss-pil" , .data = &wpss_resource_init },
should be in sort order.
Quoted 5 lines
drivers/remoteproc/qcom_q6v5_adsp.c +0
-0{ .compatible = "qcom,qcs404-cdsp-pil", .data = &cdsp_resource_init},
{ .compatible = "qcom,sdm845-adsp-pil", .data =&adsp_resource_init
},
{ },
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
Quoting Rakesh Pillai (2021-03-09 23:28:08)
Quoted 6 lines
Add support for PIL loading of WPSS co-processor for SC7280 SOCs.
Rakesh Pillai (2):
dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
remoteproc: qcom:q6v5_wpss: Add support for sc7280 WPSS
Is this patch series going to be resent?
Quoted 9 lines · Stephen Boyd
Quoting Rakesh Pillai (2021-03-09 23:28:08)
Quoted 6 lines
Add support for PIL loading of WPSS co-processor for SC7280 SOCs.
Rakesh Pillai (2):
dt-bindings: remoteproc: qcom: Add SC7280 WPSS support
remoteproc: qcom:q6v5_wpss: Add support for sc7280 WPSSIs this patch series going to be resent?
Hi Stephen,
I posted a v2 for this patch series, with the dt-bindings converted to yaml.
Thanks,
Rakesh Pillai.