Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50aeffbc authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sysctl: add boot_reason and cold_boot sysctl entries for arm64" into msm-4.8

parents 4a815baa a1792ad9

Documentation/sysctl/kernel.txt

+4 −4
Original line number Diff line number Diff line
@@ -23,10 +23,10 @@ show up in /proc/sys/kernel: 
- auto_msgmni

- bootloader_type	     [ X86 only ]

- bootloader_version	     [ X86 only ]

- boot_reason		     [ ARM only ]

- boot_reason		     [ ARM and ARM64 only ]

- callhome		     [ S390 only ]

- cap_last_cap

- cold_boot		     [ ARM only ]

- cold_boot		     [ ARM and ARM64 only ]

- core_pattern

- core_pipe_limit

- core_uses_pid
@@ -168,7 +168,7 @@ Documentation/x86/boot.txt for additional information. 


boot_reason:



ARM -- reason for device boot

ARM and ARM64 -- reason for device boot



A single bit will be set in the unsigned integer value to identify the

reason the device was booted / powered on. The value will be zero if this
@@ -203,7 +203,7 @@ CAP_LAST_CAP from the kernel. 


cold_boot



ARM -- indicator for system cold boot

ARM and ARM64 -- indicator for system cold boot



A single bit will be set in the unsigned integer value to identify

whether the device was booted from a cold or warm state. Zero

arch/arm64/include/asm/processor.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ 
extern phys_addr_t arm64_dma_phys_limit;

#define ARCH_LOW_ADDRESS_LIMIT	(arm64_dma_phys_limit - 1)



extern unsigned int boot_reason;

extern unsigned int cold_boot;



struct debug_info {

	/* Have we suspended stepping by a debugger? */

	int			suspended_step;

arch/arm64/kernel/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ 


phys_addr_t __fdt_pointer __initdata;



unsigned int boot_reason;

EXPORT_SYMBOL(boot_reason);



unsigned int cold_boot;

EXPORT_SYMBOL(cold_boot);



const char *machine_name;

/*

 * Standard memory resources

kernel/sysctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ static struct ctl_table kern_table[] = { 
		.extra2		= &one,

	},

#endif

#ifdef CONFIG_ARM

#if defined(CONFIG_ARM) || defined(CONFIG_ARM64)

	{

		.procname	= "boot_reason",

		.data		= &boot_reason,