Merge "drivers: firmware: psci: Register with kernel restart handler" (9eadcfc5) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/firmware/psci/psci.c

+10 −2

Original line number	Diff line number	Diff line
		@@ -250,7 +250,8 @@ static int get_set_conduit_method(struct device_node *np)
		return 0;
		}

		static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
		static int psci_sys_reset(struct notifier_block *nb, unsigned long action,
		void *data)
		{
		if ((reboot_mode == REBOOT_WARM \|\| reboot_mode == REBOOT_SOFT) &&
		psci_system_reset2_supported) {
		@@ -263,8 +264,15 @@ static void psci_sys_reset(enum reboot_mode reboot_mode, const char *cmd)
		} else {
		invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0);
		}

		return NOTIFY_DONE;
		}

		static struct notifier_block psci_sys_reset_nb = {
		.notifier_call = psci_sys_reset,
		.priority = 129,
		};

		static void psci_sys_poweroff(void)
		{
		invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0);
		@@ -431,7 +439,7 @@ static void __init psci_0_2_set_functions(void)

		psci_ops.migrate_info_type = psci_migrate_info_type;

		arm_pm_restart = psci_sys_reset;
		register_restart_handler(&psci_sys_reset_nb);

		pm_power_off = psci_sys_poweroff;
		}