Some prom_init cleanups
cover Some prom_init cleanups
Some patches to make the ibm,client-architecture behaviour more obvious as well as small formatting fixes.
PATCH 1/2 powerpc: Print progress of ibm, client-architecture method
The ibm,client-architecture method will often cause a reconfiguration reboot. When this happens the last thing we see is:
Hypertas detected, assuming LPAR !
Which doesn't explain what just happened. Wrap the ibm,client-architecture so it's clear what is going on:
Calling ibm,client-architecture... done
In order to maintain the law of conservation of screen real estate, downgrade two other messages to debug.
Signed-off-by Anton Blanchard <[email protected]>
---
arch/powerpc/kernel/prom_init.c +5 -3
@@ -732,15 +732,17 @@ static void __init prom_send_capabilities(void) root =call_prom ("open" ,1 ,1 ,ADDR ("/" ));if (root !=0 ) {/* try calling the ibm,client-architecture-support method */ +prom_printf ("Calling ibm,client-architecture..." );if (call_prom_ret ("call-method" ,3 ,2 , &ret,ADDR ("ibm,client-architecture-support" ), root,ADDR (ibm_architecture_vec)) ==0 ) {/* the call exists... */ if (ret) -prom_printf ("WARNING: ibm,client-architecture" +prom_printf ("\nWARNING: ibm,client-architecture" "-support call FAILED!\n" );call_prom ("close" ,1 ,0 , root); +prom_printf (" done\n" );return ; }call_prom ("close" ,1 ,0 , root);
@@ -1495,7 +1497,7 @@ static int __init prom_find_machine_type(void)return PLATFORM_GENERIC ; x =prom_getproplen (rtas,"ibm,hypertas-functions" );if (x !=PROM_ERROR ) { -prom_printf ("Hypertas detected, assuming LPAR !\n" ); +prom_debug ("Hypertas detected, assuming LPAR !\n" );return PLATFORM_PSERIES_LPAR ; }return PLATFORM_PSERIES ;
@@ -1544,7 +1546,7 @@ static void __init prom_check_displays(void) };const unsigned char *clut; -prom_printf ("Looking for displays\n" ); +prom_debug ("Looking for displays\n" );for (node =0 ;prom_next_node (&node); ) {memset (type,0 ,sizeof (type));prom_getprop (node,"device_type" , type,sizeof (type));
PATCH 2/2 powerpc: Clean up some prom printouts
In reply to [email protected]Make all messages consistent, some have spaces before the "...", some do not.
Signed-off-by Anton Blanchard <[email protected]>
---
arch/powerpc/kernel/prom_init.c +4 -4
@@ -1085,7 +1085,7 @@return ; } -prom_printf ("instantiating rtas at 0x%x ..." , base); +prom_printf ("instantiating rtas at 0x%x..." , base); if (call_prom_ret("call-method", 3, 2, &entry, ADDR("instantiate-rtas"),
@@ -1564,7 +1564,7 @@if (call_prom ("package-to-path" ,3 ,1 , node, path,PROM_SCRATCH_SIZE -10 ) ==PROM_ERROR )continue ; -prom_printf ("found display : %s, opening ... " , path); +prom_printf ("found display : %s, opening... " , path); ih =call_prom ("open" ,1 ,1 , path);if (ih ==0 ) {
@@ -2389,7 +2389,7 @@/* * Now finally create the flattened device-tree */ -prom_printf ("copying OF device tree ...\n" ); +prom_printf ("copying OF device tree...\n" );flatten_device_tree ();/*
@@ -2404,7 +2404,7 @@* Call OF "quiesce" method to shut down pending DMA's from * devices etc... */ -prom_printf ("Calling quiesce ...\n" ); +prom_printf ("Calling quiesce...\n" );call_prom ("quiesce" ,0 ,0 );/*