svn commit: r348218 - stable/12/sys/powerpc/aim

[Justin Hibbits]

Author: jhibbits
Date: Fri May 24 01:51:58 2019
New Revision: 348218
URL: https://svnweb.freebsd.org/changeset/base/348218

Log:
  MFC r347463:
  
  powerpc: Initialize the Hardware Interrupt Offset Register (HIOR) earlier for
  ppc970
  
  Since we now have a much larger KVA on powerpc64, it's possible to get SLB
  traps earlier in boot, possibly even before the HIOR is properly configured
  for us.  Move the HIOR setup to immediately after reset, so that we use our
  exception handlers instead of Open Firmware's.
  
  PR:		233863

Modified:
  stable/12/sys/powerpc/aim/mp_cpudep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/powerpc/aim/mp_cpudep.c
==============================================================================
--- stable/12/sys/powerpc/aim/mp_cpudep.c	Fri May 24 01:43:35 2019	(r348217)
+++ stable/12/sys/powerpc/aim/mp_cpudep.c	Fri May 24 01:51:58 2019	(r348218)
@@ -68,6 +68,10 @@ cpudep_ap_early_bootstrap(void)
 	case IBM970:
 	case IBM970FX:
 	case IBM970MP:
+		/* Set HIOR to 0 */
+		__asm __volatile("mtspr 311,%0" :: "r"(0));
+		powerpc_sync();
+
 		/* Restore HID4 and HID5, which are necessary for the MMU */
 
 #ifdef __powerpc64__
@@ -307,10 +311,6 @@ cpudep_ap_setup()
 	case IBM970:
 	case IBM970FX:
 	case IBM970MP:
-		/* Set HIOR to 0 */
-		__asm __volatile("mtspr 311,%0" :: "r"(0));
-		powerpc_sync();
-
 		/*
 		 * The 970 has strange rules about how to update HID registers.
 		 * See Table 2-3, 970MP manual