git.ipfire.org Git - thirdparty/openwrt.git/blob

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