11225 There are no positrons

Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

1 files changed, 16 insertions, 33 deletions

diff --git a/usr/src/uts/sun4/os/startup.c b/usr/src/uts/sun4/os/startup.c
index 7cc7074c10..5a5dc05291 100644
--- a/usr/src/uts/sun4/os/startup.c
+++ b/usr/src/uts/sun4/os/startup.c
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2016 by Delphix. All rights reserved.
+ * Copyright 2019 Peter Tribble.
  */
 
 #include <sys/machsystm.h>
@@ -275,10 +276,8 @@ uint_t hblk1_min = H1MIN;
 
 
 /*
- * Hooks for unsupported platforms and down-rev firmware
+ * Hook for down-rev firmware
  */
-int iam_positron(void);
-#pragma weak iam_positron
 static void do_prom_version_check(void);
 
 /*
@@ -612,7 +611,7 @@ uint64_t sync_tt;
 void
 sync_handler(void)
 {
-	struct  panic_trap_info 	ti;
+	struct  panic_trap_info	ti;
 	int i;
 
 	/*
@@ -684,7 +683,7 @@ startup_init(void)
 	 * 20 == num of %p substrings
 	 * 16 == max num of chars %p will expand to.
 	 */
-	char 		bp[sizeof (sync_str) + 16 * 20];
+	char		bp[sizeof (sync_str) + 16 * 20];
 
 	/*
 	 * Initialize ptl1 stack for the 1st CPU.
@@ -867,7 +866,7 @@ static size_t boot_physinstalled_len, boot_physavail_len, boot_virtavail_len;
  *
  * pseudo code:
  * if (context != 0) {
- * 	return false
+ *	return false
  * } else if (miss_va in range[kmem64_base, kmem64_end)) {
  *	tte = tte_template +
  *		(((miss_va & pagemask) - kmem64_base));
@@ -976,8 +975,8 @@ startup_memlist(void)
 	 * We're loaded by boot with the following configuration (as
 	 * specified in the sun4u/conf/Mapfile):
 	 *
-	 * 	text:		4 MB chunk aligned on a 4MB boundary
-	 * 	data & bss:	4 MB chunk aligned on a 4MB boundary
+	 *	text:		4 MB chunk aligned on a 4MB boundary
+	 *	data & bss:	4 MB chunk aligned on a 4MB boundary
 	 *
 	 * These two chunks will eventually be mapped by 2 locked 4MB
 	 * ttes and will represent the nucleus of the kernel.  This gives
@@ -1518,22 +1517,6 @@ startup_modules(void)
 	mod_setup();
 
 	/*
-	 * If this is a positron, complain and halt.
-	 */
-	if (&iam_positron && iam_positron()) {
-		cmn_err(CE_WARN, "This hardware platform is not supported"
-		    " by this release of Solaris.\n");
-#ifdef DEBUG
-		prom_enter_mon();	/* Type 'go' to resume */
-		cmn_err(CE_WARN, "Booting an unsupported platform.\n");
-		cmn_err(CE_WARN, "Booting with down-rev firmware.\n");
-
-#else /* DEBUG */
-		halt(0);
-#endif /* DEBUG */
-	}
-
-	/*
 	 * If we are running firmware that isn't 64-bit ready
 	 * then complain and halt.
 	 */
@@ -2438,7 +2421,7 @@ memlist_new(uint64_t start, uint64_t len, struct memlist **memlistp)
  */
 static void
 memlist_add(uint64_t start, uint64_t len, struct memlist **memlistp,
-	struct memlist **curmemlistp)
+    struct memlist **curmemlistp)
 {
 	struct memlist *new = *memlistp;
 
@@ -2905,19 +2888,19 @@ char obp_tte_str[] =
 	"      dup HMEBLK_ENDPA <> if     ( sfmmup hmeblkp ) ( r: hblktag ) "
 	"         dup hmeblk_tag + phys-x@ r@ = if ( sfmmup hmeblkp )	  "
 	"	     dup hmeblk_tag + 8 + phys-x@ 2 pick = if		  "
-	"		  true 	( sfmmup hmeblkp true ) ( r: hblktag )	  "
+	"		  true	( sfmmup hmeblkp true ) ( r: hblktag )	  "
 	"	     else						  "
-	"	     	  hmeblk_next + phys-x@ false 			  "
+	"		  hmeblk_next + phys-x@ false			  "
 	"			( sfmmup hmeblkp false ) ( r: hblktag )   "
-	"	     then  						  "
+	"	     then						  "
 	"	  else							  "
-	"	     hmeblk_next + phys-x@ false 			  "
+	"	     hmeblk_next + phys-x@ false			  "
 	"			( sfmmup hmeblkp false ) ( r: hblktag )   "
-	"	  then 							  "
+	"	  then							  "
 	"      else							  "
-	"         drop 0 true 						  "
-	"      then  							  "
-	"   until r> drop 						  "
+	"         drop 0 true						  "
+	"      then							  "
+	"   until r> drop						  "
 	"; "
 
 	": HME_HASH_TAG ( sfmmup rehash addr -- hblktag ) "