[POWERPC] Fix xmon=off and cleanup xmon initialisation

My patch to make the early xmon logic work with earlier early param
parsing (480f6f35a149802a94ad5c1a2673ed6ec8d2c158) breaks xmon=off.

No one does this obviously as xmon rocks, but it should really work
as documented.

While fixing that it struck me that we could move the xmon param
handling into xmon.c, and also consolidate the
xmon_init()/do_early_xmon logic into xmon_setup(). This means
xmon=early drops into xmon a little earlier on 32-bit, but it
seems to work just fine.

Tested on PSERIES and CLASSIC32.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 4 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index cda2dbe70a76..4b2e32eab9dc 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -391,18 +391,14 @@ void __init setup_system(void)
         find_legacy_serial_ports();
 
         /*
-         * Initialize xmon
-         */
-#ifdef CONFIG_XMON_DEFAULT
-        xmon_init(1);
-#endif
-        /*
          * Register early console
          */
         register_early_udbg_console();
 
-        if (do_early_xmon)
-                debugger(NULL);
+        /*
+         * Initialize xmon
+         */
+        xmon_setup();
 
         check_smt_enabled();
         smp_setup_cpu_maps();