svn commit: r342026 - head/sys/powerpc/include

[Justin Hibbits]

Author: jhibbits
Date: Thu Dec 13 05:07:39 2018
New Revision: 342026
URL: https://svnweb.freebsd.org/changeset/base/342026

Log:
  powerpc/booke: Change KERNBASE to be physical load address
  
  Previous commits have made VM_MIN_KERNEL_ADDRESS its own separate entity,
  and rebased the kernel around that address instead of KERNBASE.  This commit
  pulls the trigger to rebase KERNBASE to a physical load address.  The
  eventual goal is to align the address with the AIM KERNBASE, but at this
  time that's not an option.
  
  Currently a Book-E kernel must be loaded on a 64MB boundary, due to size
  issues.  The common load address is at the 64MB mark (0x04000000), so simply
  make that the default KERNBASE.
  
  As of this commit, Book-E kernels can be loaded and booted with ubldr.
  
  MFC after:	3 weeks

Modified:
  head/sys/powerpc/include/vmparam.h

Modified: head/sys/powerpc/include/vmparam.h
==============================================================================
--- head/sys/powerpc/include/vmparam.h	Thu Dec 13 04:48:28 2018	(r342025)
+++ head/sys/powerpc/include/vmparam.h	Thu Dec 13 05:07:39 2018	(r342026)
@@ -133,16 +133,9 @@
 
 #else /* Book-E */
 
-#ifdef __powerpc64__
-#ifndef LOCORE
-#define	KERNBASE	0xe000000000000100UL	/* start of kernel virtual */
-#else
-#define	KERNBASE	0xe000000000000100	/* start of kernel virtual */
-#endif
-#else
-#define	KERNBASE		0xc0000000	/* start of kernel virtual */
-
-#define	VM_MIN_KERNEL_ADDRESS	KERNBASE
+#define	KERNBASE		0x04000100	/* start of kernel physical */
+#ifndef __powerpc64__
+#define	VM_MIN_KERNEL_ADDRESS	0xc0000000
 #define	VM_MAX_KERNEL_ADDRESS	0xffffefff
 #define	VM_MAX_SAFE_KERNEL_ADDRESS	VM_MAX_KERNEL_ADDRESS
 #endif