12345678910111213141516171819202122232425262728293031323334353637383940 |
- From 505f9c8653fc218ca47a153ec58ebc16bef5502f Mon Sep 17 00:00:00 2001
- From: Mantas Pucka <[email protected]>
- Date: Tue, 16 Jan 2024 10:42:40 +0200
- Subject: [PATCH 16/19] remoteproc: q6v5_wcss: change ssr name for ipq6018 wifi
- subsystem
- On IPQ6018 this string ends up being sent to RPM when remoteproc stops
- (on crash or rmmod ath11k). "q6wcss" is not a valid name (not found by
- `strings` in rpm.mbn), so this causes RPM do 'something' (presumably crash)
- causing a system reboot followed by hang in XBL, with no WDT running.
- Let's change ssr_name to a more sensible 'wcnss', that does not cause such
- issues.
- Signed-off-by: Mantas Pucka <[email protected]>
- ---
- drivers/remoteproc/qcom_q6v5_wcss.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
- --- a/drivers/remoteproc/qcom_q6v5_wcss.c
- +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
- @@ -1142,8 +1142,8 @@ static int q6v5_wcss_probe(struct platfo
- if (ret)
- goto free_rproc;
-
- - qcom_add_glink_subdev(rproc, &wcss->glink_subdev, "q6wcss");
- - qcom_add_ssr_subdev(rproc, &wcss->ssr_subdev, "q6wcss");
- + qcom_add_glink_subdev(rproc, &wcss->glink_subdev, desc->ssr_name);
- + qcom_add_ssr_subdev(rproc, &wcss->ssr_subdev, desc->ssr_name);
-
- if (desc->ssctl_id)
- wcss->sysmon = qcom_add_sysmon_subdev(rproc,
- @@ -1198,7 +1198,7 @@ static const struct wcss_data wcss_ipq60
- .aon_reset_required = true,
- .wcss_q6_reset_required = true,
- .bcr_reset_required = false,
- - .ssr_name = "q6wcss",
- + .ssr_name = "wcnss",
- .ops = &q6v5_wcss_ipq8074_ops,
- .requires_force_stop = true,
- .need_mem_protection = true,
|