Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 19 Dec 2017 16:45:41 +0000 (UTC)
From:      Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r326981 - in head/sys/powerpc: booke powerpc
Message-ID:  <201712191645.vBJGjfeD006333@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: nwhitehorn
Date: Tue Dec 19 16:45:40 2017
New Revision: 326981
URL: https://svnweb.freebsd.org/changeset/base/326981

Log:
  The highest-order bit of the bootloader cookie is 1, with the result that
  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

Modified:
  head/sys/powerpc/booke/booke_machdep.c
  head/sys/powerpc/powerpc/machdep.c

Modified: head/sys/powerpc/booke/booke_machdep.c
==============================================================================
--- head/sys/powerpc/booke/booke_machdep.c	Tue Dec 19 16:20:13 2017	(r326980)
+++ head/sys/powerpc/booke/booke_machdep.c	Tue Dec 19 16:45:40 2017	(r326981)
@@ -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

Modified: head/sys/powerpc/powerpc/machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/machdep.c	Tue Dec 19 16:20:13 2017	(r326980)
+++ head/sys/powerpc/powerpc/machdep.c	Tue Dec 19 16:45:40 2017	(r326981)
@@ -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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712191645.vBJGjfeD006333>