Re: 2.6.5-pre* does not boot on my PReP PPC

[Tom Rini <trini@kernel.crashing.org>]

On Sat, Mar 27, 2004 at 02:55:09PM +0100, Sven Hartge wrote:

> Tom Rini <trini@kernel.crashing.org> wrote:
> > On Fri, Mar 26, 2004 at 08:33:18PM +0200, Meelis Roos wrote:
> 
> >> Recent 2.6.5-pre* and -rc1 and -BK don't boot on my Motorola Powerstack
> >> (PReP with no RTAS but with OF).
> >> 
> >> I use netboot to test new kernels.  Normally, the screen is changed to
> >> VGA text mode and the bootloader speaks some lines of info and asks for
> >> the kernel command line. Now, the image is loaded via tftp (as shown by
> >> tcpdump, the last datagram is smaller) and nothing more happens. The
> >> cursor stays where it is - at the beginning of the Booting ... line in
> >> graphics mode OF environment and that's all.
> 
> > Hmm.  Can you hook up a serial line, enable serial console as well and
> > see if anything pops out there?
> 
> I am seeing the same problem here too (Powerstack II with OF).

Ok.  Can both of you try the following patch on top of the version which
fails?
 arch/ppc/boot/simple/head.S      |    2 +-
 arch/ppc/boot/simple/misc-prep.c |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--- 1.8/arch/ppc/boot/simple/head.S	Mon Mar  1 16:34:28 2004
+++ edited/arch/ppc/boot/simple/head.S	Mon Mar 29 08:14:48 2004
@@ -99,8 +99,8 @@
 	mr	r25,r5
 #else
 	bl	disable_6xx_mmu
-#endif
 	bl	disable_6xx_l1cache
+#endif
 
 	CLEAR_CACHES
 #endif
--- 1.1/arch/ppc/boot/simple/misc-prep.c	Mon Mar  1 16:34:28 2004
+++ edited/arch/ppc/boot/simple/misc-prep.c	Mon Mar 29 08:13:08 2004
@@ -35,6 +35,7 @@
 extern struct bi_record *decompress_kernel(unsigned long load_addr,
 		int num_words, unsigned long cksum);
 extern void disable_6xx_mmu(void);
+extern void disable_6xx_l1cache(void);
 extern unsigned long mpc10x_get_mem_size(void);
 
 static void
@@ -152,8 +153,9 @@
 	}
 
 	/* Now go and clear out the BATs and ensure that our MSR is
-	 * correct .*/
+	 * correct.  Also disable the L1s finally. */
 	disable_6xx_mmu();
+	disable_6xx_l1cache();
 
 	/* Make r3 be a pointer to the residual data. */
 	return (unsigned long)hold_residual;

-- 
Tom Rini
http://gate.crashing.org/~trini/