svn commit: r293128 - head/sys/powerpc/booke

[Justin Hibbits]

Author: jhibbits
Date: Mon Jan  4 01:33:07 2016
New Revision: 293128
URL: https://svnweb.freebsd.org/changeset/base/293128

Log:
  Set the cacheline size before calling powerpc_init()
  
  powerpc_init() initializes the mmu.  Since this may clear pages via
  pmap_zero_page(), set the cacheline size before calling into it, so
  pmap_zero_page() has the right cacheline size.  This isn't completely
  necessary now, but will be when 64-bit book-e is completed.

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

Modified: head/sys/powerpc/booke/booke_machdep.c
==============================================================================
--- head/sys/powerpc/booke/booke_machdep.c	Mon Jan  4 01:16:32 2016	(r293127)
+++ head/sys/powerpc/booke/booke_machdep.c	Mon Jan  4 01:33:07 2016	(r293128)
@@ -316,8 +316,6 @@ booke_init(uint32_t arg1, uint32_t arg2)
 	else					/* U-Boot */
 		mdp = NULL;
 
-	ret = powerpc_init(dtbp, 0, 0, mdp);
-
 	/* Default to 32 byte cache line size. */
 	switch ((mfpvr()) >> 16) {
 	case FSL_E500mc:
@@ -327,6 +325,8 @@ booke_init(uint32_t arg1, uint32_t arg2)
 		break;
 	}
 
+	ret = powerpc_init(dtbp, 0, 0, mdp);
+
 	/* Enable caches */
 	booke_enable_l1_cache();
 	booke_enable_l2_cache();