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

Commit 7596e762 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Id2d4ff5b,I2bc5d80c into msm-next 

* changes:
  sysctl: add boot_reason and cold_boot sysctl entries for arm64
  sysctl: add cold_boot sysctl entry
parents 1025d9ad 482ca38c

Documentation/sysctl/kernel.txt

+13 −2
Original line number Diff line number Diff line
@@ -23,9 +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 and ARM64 only ]

- core_pattern

- core_pipe_limit

- core_uses_pid
@@ -166,7 +167,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
@@ -197,6 +198,16 @@ cap_last_cap 
Highest valid capability of the running kernel.  Exports

CAP_LAST_CAP from the kernel.



===============================================================



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

indicating a warm boot and one indicating a cold boot.



==============================================================



core_pattern:

arch/arm/include/asm/processor.h

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#endif



extern unsigned int boot_reason;

extern unsigned int cold_boot;



struct debug_info {

#ifdef CONFIG_HAVE_HW_BREAKPOINT

arch/arm/kernel/setup.c

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ EXPORT_SYMBOL(arch_read_hardware_id); 
unsigned int boot_reason;

EXPORT_SYMBOL(boot_reason);



unsigned int cold_boot;

EXPORT_SYMBOL(cold_boot);



#ifdef MULTI_CPU

struct processor processor __ro_after_init;

#endif

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 {

#ifdef CONFIG_HAVE_HW_BREAKPOINT

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

arch/arm64/kernel/setup.c

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


phys_addr_t __fdt_pointer __initdata;



unsigned int boot_reason;

EXPORT_SYMBOL(boot_reason);



unsigned int cold_boot;

EXPORT_SYMBOL(cold_boot);



/*

 * Standard memory resources

 */