nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement BootReason config

Browse source
This commit is contained in:
Michael Scire 2018-03-08 01:48:57 -08:00
parent ff9322a468
commit 3d8ff446ad
5 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
exosphere/src/bootconfig.c
View file

@ -8,6 +8,8 @@
#include "fuse.h" #include "fuse.h"
#include "bootconfig.h" #include "bootconfig.h"
static boot_reason_t g_boot_reason = {0};
bool bootconfig_matches_hardware_info(void) { bool bootconfig_matches_hardware_info(void) {
uint32_t hardware_info[4]; uint32_t hardware_info[4];
fuse_get_hardware_info(hardware_info); fuse_get_hardware_info(hardware_info);
@ -107,3 +109,15 @@ uint64_t bootconfig_get_kernel_memory_configuration(void) {
return 0ull; return 0ull;
} }
} }
void bootconfig_load_boot_reason(volatile boot_reason_t *boot_reason) {
g_boot_reason = *boot_reason;
}
bool bootconfig_is_recovery_boot(void) {
return (g_boot_reason.is_recovery_boot != 0);
}
uint64_t bootconfig_get_boot_reason(void) {
return ((uint64_t)g_boot_reason.boot_reason_high << 24) | (g_boot_reason.boot_reason_low & 0xFFFFFF);
}

13
exosphere/src/bootconfig.h
View file

@ -34,9 +34,19 @@ static inline bootconfig_t *get_loaded_bootconfig(void) {
return (bootconfig_t *)(TZRAM_GET_SEGMENT_ADDRESS(TZRAM_SEGEMENT_ID_SECMON_EVT) + 0x180); return (bootconfig_t *)(TZRAM_GET_SEGMENT_ADDRESS(TZRAM_SEGEMENT_ID_SECMON_EVT) + 0x180);
} }
typedef struct {
uint64_t _0x00;
uint32_t _0x08;
uint32_t is_recovery_boot;
uint32_t boot_reason_low;
uint32_t boot_reason_high;
} boot_reason_t;
void bootconfig_load_and_verify(const bootconfig_t *bootconfig); void bootconfig_load_and_verify(const bootconfig_t *bootconfig);
void bootconfig_clear(void); void bootconfig_clear(void);
void bootconfig_load_boot_reason(volatile boot_reason_t *boot_reason);
/* Actual configuration getters. */ /* Actual configuration getters. */
bool bootconfig_is_package2_plaintext(void); bool bootconfig_is_package2_plaintext(void);
bool bootconfig_is_package2_unsigned(void); bool bootconfig_is_package2_unsigned(void);
@ -48,4 +58,7 @@ bool bootconfig_take_extabt_serror_to_el3(void);
uint64_t bootconfig_get_memory_arrangement(void); uint64_t bootconfig_get_memory_arrangement(void);
uint64_t bootconfig_get_kernel_memory_configuration(void); uint64_t bootconfig_get_kernel_memory_configuration(void);
bool bootconfig_is_recovery_boot(void);
uint64_t bootconfig_get_boot_reason(void);
#endif #endif

5
exosphere/src/configitem.c
View file

@ -73,14 +73,13 @@ uint32_t configitem_get(ConfigItem item, uint64_t *p_outvalue) {
*p_outvalue = fuse_get_retail_type(); *p_outvalue = fuse_get_retail_type();
break; break;
case CONFIGITEM_ISRECOVERYBOOT: case CONFIGITEM_ISRECOVERYBOOT:
/* TODO: This requires reading values passed to crt0 via NX_Bootloader. TBD pending crt0 implementation. */ *p_outvalue = (int)(bootconfig_is_recovery_boot());
*p_outvalue = 0;
break; break;
case CONFIGITEM_DEVICEID: case CONFIGITEM_DEVICEID:
*p_outvalue = fuse_get_device_id(); *p_outvalue = fuse_get_device_id();
break; break;
case CONFIGITEM_BOOTREASON: case CONFIGITEM_BOOTREASON:
/* TODO: This requires reading values passed to crt0 via NX_Bootloader. TBD pending crt0 implementation. */ *p_outvalue = bootconfig_get_boot_reason();
break; break;
case CONFIGITEM_MEMORYARRANGE: case CONFIGITEM_MEMORYARRANGE:
*p_outvalue = bootconfig_get_memory_arrangement(); *p_outvalue = bootconfig_get_memory_arrangement();

3
exosphere/src/package2.c
View file

@ -364,7 +364,8 @@ void load_package2(coldboot_crt0_reloc_list_t *reloc_list) {
setup_current_core_state(); setup_current_core_state();
/* TODO: Read and save BOOTREASON stored by NX_BOOTLOADER at 0x1F009FE00 */ /* Save boot reason to global. */
bootconfig_load_boot_reason((volatile boot_reason_t *)(MAILBOX_NX_BOOTLOADER_BOOT_REASON));
/* Initialize cache'd random bytes for kernel. */ /* Initialize cache'd random bytes for kernel. */
randomcache_init(); randomcache_init();

2
exosphere/src/package2.h
View file

@ -31,6 +31,8 @@ static inline uintptr_t get_nx_bootloader_mailbox_base(void) {
/* Physaddr 0x40002EFC */ /* Physaddr 0x40002EFC */
#define MAILBOX_NX_BOOTLOADER_IS_SECMON_AWAKE MAKE_REG32(MAILBOX_NX_BOOTLOADER_BASE + 0xEFCULL) #define MAILBOX_NX_BOOTLOADER_IS_SECMON_AWAKE MAKE_REG32(MAILBOX_NX_BOOTLOADER_BASE + 0xEFCULL)
#define MAILBOX_NX_BOOTLOADER_BOOT_REASON (MAILBOX_NX_BOOTLOADER_BASE + 0xE10ULL)
#define NX_BOOTLOADER_BOOTCONFIG_POINTER ((void *)(0x4003D000ull)) #define NX_BOOTLOADER_BOOTCONFIG_POINTER ((void *)(0x4003D000ull))
#define NX_BOOTLOADER_PACKAGE2_LOAD_ADDRESS ((void *)(0xA9800000ull)) #define NX_BOOTLOADER_PACKAGE2_LOAD_ADDRESS ((void *)(0xA9800000ull))