420-firmware-qcom-scm-Add-SDI-disable-support.patch 1.8 KB

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