Merge "power: reset: Disable SDI when dload mode is disabled" (24ed2ef0) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/power/reset/msm-poweroff.c

+35 −37

Original line number	Diff line number	Diff line
		/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -56,8 +56,14 @@ static bool scm_deassert_ps_hold_supported;
		/* Download mode master kill-switch */
		static void __iomem *msm_ps_hold;
		static phys_addr_t tcsr_boot_misc_detect;
		/* Runtime could be only changed value once.
		* There is no API from TZ to re-enable the registers.
		* So the SDI cannot be re-enabled when it already by-passed.
		*/
		static int download_mode = 1;
		static struct kobject dload_kobj;
		static void scm_disable_sdi(void);


		#ifdef CONFIG_QCOM_DLOAD_MODE
		#define EDL_MODE_PROP "qcom,msm-imem-emergency_download_mode"
		@@ -144,6 +150,9 @@ static void set_dload_mode(int on)
		if (ret)
		pr_err("Failed to set secure DLOAD mode: %d\n", ret);

		if (!on)
		scm_disable_sdi();

		dload_mode_enabled = on;
		}

		@@ -201,7 +210,10 @@ static int dload_set(const char val, const struct kernel_param kp)
		return 0;
		}
		#else
		#define set_dload_mode(x) do {} while (0)
		static void set_dload_mode(int on)
		{
		scm_disable_sdi();
		}

		static void enable_emergency_dload_mode(void)
		{
		@@ -214,6 +226,26 @@ static bool get_dload_mode(void)
		}
		#endif

		static void scm_disable_sdi(void)
		{
		int ret;
		struct scm_desc desc = {
		.args[0] = 1,
		.args[1] = 0,
		.arginfo = SCM_ARGS(2),
		};

		/* Needed to bypass debug image on some chips */
		if (!is_scm_armv8())
		ret = scm_call_atomic2(SCM_SVC_BOOT,
		SCM_WDOG_DEBUG_BOOT_PART, 1, 0);
		else
		ret = scm_call2_atomic(SCM_SIP_FNID(SCM_SVC_BOOT,
		SCM_WDOG_DEBUG_BOOT_PART), &desc);
		if (ret)
		pr_err("Failed to disable secure wdog debug: %d\n", ret);
		}

		void msm_set_restart_mode(int mode)
		{
		restart_mode = mode;
		@@ -366,13 +398,6 @@ static void deassert_ps_hold(void)

		static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd)
		{
		int ret;
		struct scm_desc desc = {
		.args[0] = 1,
		.args[1] = 0,
		.arginfo = SCM_ARGS(2),
		};

		pr_notice("Going down for restart now\n");

		msm_restart_prepare(cmd);
		@@ -387,16 +412,6 @@ static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd)
		msm_trigger_wdog_bite();
		#endif

		/* Needed to bypass debug image on some chips */
		if (!is_scm_armv8())
		ret = scm_call_atomic2(SCM_SVC_BOOT,
		SCM_WDOG_DEBUG_BOOT_PART, 1, 0);
		else
		ret = scm_call2_atomic(SCM_SIP_FNID(SCM_SVC_BOOT,
		SCM_WDOG_DEBUG_BOOT_PART), &desc);
		if (ret)
		pr_err("Failed to disable secure wdog debug: %d\n", ret);

		halt_spmi_pmic_arbiter();
		deassert_ps_hold();

		@@ -405,27 +420,10 @@ static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd)

		static void do_msm_poweroff(void)
		{
		int ret;
		struct scm_desc desc = {
		.args[0] = 1,
		.args[1] = 0,
		.arginfo = SCM_ARGS(2),
		};

		pr_notice("Powering off the SoC\n");
		#ifdef CONFIG_QCOM_DLOAD_MODE

		set_dload_mode(0);
		#endif
		qpnp_pon_system_pwr_off(PON_POWER_OFF_SHUTDOWN);
		/* Needed to bypass debug image on some chips */
		if (!is_scm_armv8())
		ret = scm_call_atomic2(SCM_SVC_BOOT,
		SCM_WDOG_DEBUG_BOOT_PART, 1, 0);
		else
		ret = scm_call2_atomic(SCM_SIP_FNID(SCM_SVC_BOOT,
		SCM_WDOG_DEBUG_BOOT_PART), &desc);
		if (ret)
		pr_err("Failed to disable wdog debug: %d\n", ret);

		halt_spmi_pmic_arbiter();
		deassert_ps_hold();