target/linux/ipq807x/patches-6.1/0114-remoteproc-qcom-Add-support-for-split-q6-m3-wlan-fir.patch

   1 From b422c9d4f048b086ce83f44a7cfcddcce162897f Mon Sep 17 00:00:00 2001
   2 From: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
   3 Date: Sat, 30 Jan 2021 10:50:07 +0530
   4 Subject: [PATCH] remoteproc: qcom: Add support for split q6 + m3 wlan firmware
   5
   6 IPQ8074 supports split firmware for q6 and m3 as well.
   7 So add support for loading the m3 firmware before q6.
   8 Now the drivers works fine for both split and unified
   9 firmwares.
  10
  11 Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
  12 Signed-off-by: Sricharan R <sricharan@codeaurora.org>
  13 Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
  14 ---
  15  drivers/remoteproc/qcom_q6v5_wcss.c | 33 +++++++++++++++++++++++++----
  16  1 file changed, 29 insertions(+), 4 deletions(-)
  17
  18 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
  19 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
  20 @@ -139,6 +139,7 @@ struct q6v5_wcss {
  21         u32 version;
  22         bool requires_force_stop;
  23         bool need_mem_protection;
  24 +       const char *m3_firmware_name;
  25
  26         struct qcom_rproc_glink glink_subdev;
  27         struct qcom_rproc_ssr ssr_subdev;
  28 @@ -147,7 +148,8 @@ struct q6v5_wcss {
  29  struct wcss_data {
  30         int (*init_clock)(struct q6v5_wcss *wcss);
  31         int (*init_regulator)(struct q6v5_wcss *wcss);
  32 -       const char *firmware_name;
  33 +       const char *q6_firmware_name;
  34 +       const char *m3_firmware_name;
  35         unsigned int crash_reason_smem;
  36         u32 version;
  37         bool aon_reset_required;
  38 @@ -789,8 +791,29 @@ static void *q6v5_wcss_da_to_va(struct r
  39  static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
  40  {
  41         struct q6v5_wcss *wcss = rproc->priv;
  42 +       const struct firmware *m3_fw;
  43         int ret;
  44
  45 +       if (wcss->m3_firmware_name) {
  46 +               ret = request_firmware(&m3_fw, wcss->m3_firmware_name,
  47 +                                      wcss->dev);
  48 +               if (ret)
  49 +                       goto skip_m3;
  50 +
  51 +               ret = qcom_mdt_load_no_init(wcss->dev, m3_fw,
  52 +                                           wcss->m3_firmware_name, 0,
  53 +                                           wcss->mem_region, wcss->mem_phys,
  54 +                                           wcss->mem_size, &wcss->mem_reloc);
  55 +
  56 +               release_firmware(m3_fw);
  57 +
  58 +               if (ret) {
  59 +                       dev_err(wcss->dev, "can't load m3_fw.bXX\n");
  60 +                       return ret;
  61 +               }
  62 +       }
  63 +
  64 +skip_m3:
  65         if (wcss->need_mem_protection)
  66                 ret = qcom_mdt_load(wcss->dev, fw, rproc->firmware,
  67                                     WCNSS_PAS_ID, wcss->mem_region,
  68 @@ -1072,7 +1095,7 @@ static int q6v5_wcss_probe(struct platfo
  69                 return -EPROBE_DEFER;
  70
  71         rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
  72 -                           desc->firmware_name, sizeof(*wcss));
  73 +                           desc->q6_firmware_name, sizeof(*wcss));
  74         if (!rproc) {
  75                 dev_err(&pdev->dev, "failed to allocate rproc\n");
  76                 return -ENOMEM;
  77 @@ -1085,6 +1108,7 @@ static int q6v5_wcss_probe(struct platfo
  78         wcss->version = desc->version;
  79         wcss->requires_force_stop = desc->requires_force_stop;
  80         wcss->need_mem_protection = desc->need_mem_protection;
  81 +       wcss->m3_firmware_name = desc->m3_firmware_name;
  82
  83         ret = q6v5_wcss_init_mmio(wcss, pdev);
  84         if (ret)
  85 @@ -1150,7 +1174,8 @@ static int q6v5_wcss_remove(struct platf
  86
  87  static const struct wcss_data wcss_ipq8074_res_init = {
  88         .init_clock = ipq8074_init_clock,
  89 -       .firmware_name = "IPQ8074/q6_fw.mdt",
  90 +       .q6_firmware_name = "IPQ8074/q6_fw.mdt",
  91 +       .m3_firmware_name = "IPQ8074/m3_fw.mdt",
  92         .crash_reason_smem = WCSS_CRASH_REASON,
  93         .aon_reset_required = true,
  94         .wcss_q6_reset_required = true,
  95 @@ -1163,7 +1188,7 @@ static const struct wcss_data wcss_qcs40
  96         .init_clock = qcs404_init_clock,
  97         .init_regulator = qcs404_init_regulator,
  98         .crash_reason_smem = WCSS_CRASH_REASON,
  99 -       .firmware_name = "wcnss.mdt",
 100 +       .q6_firmware_name = "wcnss.mdt",
 101         .version = WCSS_QCS404,
 102         .aon_reset_required = false,
 103         .wcss_q6_reset_required = false,