1 files changed, 61 insertions, 4 deletions

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 59306261f5b2..116babbaaf81 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -115,7 +115,7 @@ void chrp_show_cpuinfo(struct seq_file *m)
         seq_printf(m, "machine\t\t: CHRP %s\n", model);
 
         /* longtrail (goldengate) stuff */
-        if (!strncmp(model, "IBM,LongTrail", 13)) {
+        if (model && !strncmp(model, "IBM,LongTrail", 13)) {
                 /* VLSI VAS96011/12 `Golden Gate 2' */
                 /* Memory banks */
                 sdramen = (in_le32(gg2_pci_config_base + GG2_PCI_DRAM_CTRL)
@@ -203,15 +203,20 @@ static void __init sio_fixup_irq(const char *name, u8 device, u8 level,
 static void __init sio_init(void)
 {
         struct device_node *root;
+        const char *model;
 
-        if ((root = of_find_node_by_path("/")) &&
-            !strncmp(of_get_property(root, "model", NULL),
-                        "IBM,LongTrail", 13)) {
+        root = of_find_node_by_path("/");
+        if (!root)
+                return;
+
+        model = of_get_property(root, "model", NULL);
+        if (model && !strncmp(model, "IBM,LongTrail", 13)) {
                 /* logical device 0 (KBC/Keyboard) */
                 sio_fixup_irq("keyboard", 0, 1, 2);
                 /* select logical device 1 (KBC/Mouse) */
                 sio_fixup_irq("mouse", 1, 12, 2);
         }
+
         of_node_put(root);
 }
 
@@ -251,6 +256,57 @@ static void briq_restart(char *cmd)
         for(;;);
 }
 
+/*
+ * Per default, input/output-device points to the keyboard/screen
+ * If no card is installed, the built-in serial port is used as a fallback.
+ * But unfortunately, the firmware does not connect /chosen/{stdin,stdout}
+ * the the built-in serial node. Instead, a /failsafe node is created.
+ */
+static void chrp_init_early(void)
+{
+        struct device_node *node;
+        const char *property;
+
+        if (strstr(cmd_line, "console="))
+                return;
+        /* find the boot console from /chosen/stdout */
+        if (!of_chosen)
+                return;
+        node = of_find_node_by_path("/");
+        if (!node)
+                return;
+        property = of_get_property(node, "model", NULL);
+        if (!property)
+                goto out_put;
+        if (strcmp(property, "Pegasos2"))
+                goto out_put;
+        /* this is a Pegasos2 */
+        property = of_get_property(of_chosen, "linux,stdout-path", NULL);
+        if (!property)
+                goto out_put;
+        of_node_put(node);
+        node = of_find_node_by_path(property);
+        if (!node)
+                return;
+        property = of_get_property(node, "device_type", NULL);
+        if (!property)
+                goto out_put;
+        if (strcmp(property, "serial"))
+                goto out_put;
+        /*
+         * The 9pin connector is either /failsafe
+         * or /pci@80000000/isa@C/serial@i2F8
+         * The optional graphics card has also type 'serial' in VGA mode.
+         */
+        property = of_get_property(node, "name", NULL);
+        if (!property)
+                goto out_put;
+        if (!strcmp(property, "failsafe") || !strcmp(property, "serial"))
+                add_preferred_console("ttyS", 0, NULL);
+out_put:
+        of_node_put(node);
+}
+
 void __init chrp_setup_arch(void)
 {
         struct device_node *root = of_find_node_by_path("/");
@@ -594,6 +650,7 @@ define_machine(chrp) {
         .probe                  = chrp_probe,
         .setup_arch             = chrp_setup_arch,
         .init                   = chrp_init2,
+        .init_early             = chrp_init_early,
         .show_cpuinfo           = chrp_show_cpuinfo,
         .init_IRQ               = chrp_init_IRQ,
         .restart                = rtas_restart,