Merge "power:hibernate: KPI marker for Hibernation Success" (faace3be) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/kernel/hibernate.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@
		#include <asm/suspend.h>
		#include <asm/sysreg.h>
		#include <asm/virt.h>
		#include <soc/qcom/boot_stats.h>

		/*
		* Hibernate core relies on this value being 0 on resume, and marks it
		@@ -338,6 +339,7 @@ int swsusp_arch_suspend(void)
		}

		local_dbg_restore(flags);
		place_marker("PM: Kernel restore start!");

		return ret;
		}

+4 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@
		#include <linux/genhd.h>
		#include <linux/ktime.h>
		#include <trace/events/power.h>
		#include <soc/qcom/boot_stats.h>

		#include "power.h"

		@@ -740,6 +741,7 @@ int hibernate(void)
		in_suspend = 0;
		pm_restore_gfp_mask();
		} else {
		place_marker("PM: Image restored!");
		pm_pr_dbg("Image restored successfully.\n");
		}

		@@ -763,6 +765,7 @@ int hibernate(void)
		atomic_inc(&snapshot_device_available);
		Unlock:
		unlock_system_sleep();
		place_marker("PM: Hibernation Exit!");
		pr_info("hibernation exit\n");

		return error;
		@@ -885,6 +888,7 @@ static int software_resume(void)
		goto Close_Finish;
		error = load_image_and_restore();
		thaw_processes();
		place_marker("PM: Thaw completed!");
		Finish:
		__pm_notifier_call_chain(PM_POST_RESTORE, nr_calls, NULL);
		pm_restore_console();