d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The highest-order bit of the bootloader cookie is 1, with the result that

Browse Source 
the 32-bit cookie can be sign-extended on its way out of the loader and
through Open Firmware. If sign-extended, the in-kernel check of its value
would fail on 64-bit systems, resulting in a mountroot prompt. Solve this
by telling the kernel to ignore the high-order bits.

PR:		kern/224437
Submitted by:	Gustavo Romero
This commit is contained in:
nwhitehorn 2017-12-19 16:45:40 +00:00
parent 159beebfef
commit 512f57b93c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/powerpc/booke/booke_machdep.c
View File

@ -201,7 +201,7 @@ extern void *int_performance_counter;
mtspr(ivor, (uintptr_t)(&handler) & 0xffffUL);
uintptr_t powerpc_init(vm_offset_t fdt, vm_offset_t, vm_offset_t, void *mdp,
vm_offset_t mdp_cookie);
uint32_t mdp_cookie);
void booke_cpu_init(void);
void

4
sys/powerpc/powerpc/machdep.c
View File

@ -155,7 +155,7 @@ SYSCTL_INT(_machdep, CPU_CACHELINE, cacheline_size,
CTLFLAG_RD, &cacheline_size, 0, "");
uintptr_t powerpc_init(vm_offset_t, vm_offset_t, vm_offset_t, void *,
vm_offset_t);
uint32_t);
long Maxmem = 0;
long realmem = 0;
@ -234,7 +234,7 @@ void booke_cpu_init(void);
uintptr_t
powerpc_init(vm_offset_t fdt, vm_offset_t toc, vm_offset_t ofentry, void *mdp,
vm_offset_t mdp_cookie)
uint32_t mdp_cookie)
{
struct pcpu *pc;
struct cpuref bsp;