target/linux/ipq40xx/patches-5.15/420-firmware-qcom-scm-Add-SDI-disable-support.patch

   1 From b514bc3c0a5a57bc83843dc66c72788b9c9435ac Mon Sep 17 00:00:00 2001
   2 From: Robert Marko <robimarko@gmail.com>
   3 Date: Thu, 18 May 2023 16:02:23 +0200
   4 Subject: [PATCH 1/3] firmware: qcom: scm: Add SDI disable support
   5
   6 Some SoC-s like IPQ5018 require SDI(Secure Debug Image) to be disabled
   7 before trying to reboot, otherwise board will just hang after reboot has
   8 been issued via PSCI.
   9
  10 So, provide a call to SCM that allows disabling it.
  11
  12 Signed-off-by: Robert Marko <robimarko@gmail.com>
  13 Acked-by: Mukesh Ojha <quic_mojha@quicinc.com>
  14 ---
  15  drivers/firmware/qcom_scm.c | 23 +++++++++++++++++++++++
  16  drivers/firmware/qcom_scm.h |  1 +
  17  2 files changed, 24 insertions(+)
  18
  19 --- a/drivers/firmware/qcom_scm.c
  20 +++ b/drivers/firmware/qcom_scm.c
  21 @@ -389,6 +389,29 @@ int qcom_scm_set_remote_state(u32 state,
  22  }
  23  EXPORT_SYMBOL(qcom_scm_set_remote_state);
  24
  25 +static int qcom_scm_disable_sdi(void)
  26 +{
  27 +       int ret;
  28 +       struct qcom_scm_desc desc = {
  29 +               .svc = QCOM_SCM_SVC_BOOT,
  30 +               .cmd = QCOM_SCM_BOOT_SDI_CONFIG,
  31 +               .args[0] = 1, /* Disable watchdog debug */
  32 +               .args[1] = 0, /* Disable SDI */
  33 +               .arginfo = QCOM_SCM_ARGS(2),
  34 +               .owner = ARM_SMCCC_OWNER_SIP,
  35 +       };
  36 +       struct qcom_scm_res res;
  37 +
  38 +       ret = qcom_scm_clk_enable();
  39 +       if (ret)
  40 +               return ret;
  41 +       ret = qcom_scm_call(__scm->dev, &desc, &res);
  42 +
  43 +       qcom_scm_clk_disable();
  44 +
  45 +       return ret ? : res.result[0];
  46 +}
  47 +
  48  static int __qcom_scm_set_dload_mode(struct device *dev, bool enable)
  49  {
  50         struct qcom_scm_desc desc = {
  51 --- a/drivers/firmware/qcom_scm.h
  52 +++ b/drivers/firmware/qcom_scm.h
  53 @@ -77,6 +77,7 @@ extern int scm_legacy_call(struct device
  54  #define QCOM_SCM_SVC_BOOT              0x01
  55  #define QCOM_SCM_BOOT_SET_ADDR         0x01
  56  #define QCOM_SCM_BOOT_TERMINATE_PC     0x02
  57 +#define QCOM_SCM_BOOT_SDI_CONFIG       0x09
  58  #define QCOM_SCM_BOOT_SET_DLOAD_MODE   0x10
  59  #define QCOM_SCM_BOOT_SET_REMOTE_STATE 0x0a
  60  #define QCOM_SCM_FLUSH_FLAG_MASK       0x3