Default to console=ttyS0 on rp34x0 machines

Default again to console=ttyS0 for all machines, including the rp34x0.

The Linux kernel commit bcf3f1752a62 ("parisc: Hide Diva-built-in serial aux
and graphics card") avoids that the Diva AUX port on rp34x0 machines show up as
ttyS0, and as such we now can use ttyS0 as boot console on all machines again.

Signed-off-by: Helge Deller <deller@gmx.de>

1 files changed, 8 insertions, 4 deletions

diff --git a/ipl/ipl.c b/ipl/ipl.c
index 1a6d946..3d03439 100644
--- a/ipl/ipl.c
+++ b/ipl/ipl.c
@@ -441,9 +441,12 @@ interact(int *ok)
 
 /*
  * On some server models the serial port of the GSP/Management card which
- * mirrors the console port shows up as ttyS1 instead of ttyS0.  This is due
- * how the pci code in Linux kernel scans the PCI bus.  Check the relevant
- * models and return ttyS1 for such machines.
+ * mirrors the console port shows up as ttyS1 instead of ttyS0.  This happens
+ * on older Linux kernels which set up a serial port for the Diva AUX port.
+ * The Linux kernel commit bcf3f1752a62 ("parisc: Hide Diva-built-in serial aux
+ * and graphics card") avoids this by hiding the Diva AUX port:
+ * https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bcf3f1752a622f1372d3252d0fea8855d89812e7
+ *
  * Beware: pdc_model_sysmodel() may return a machine name which has trailing
  * spaces.
  */
@@ -462,7 +465,8 @@ get_default_serial_console()
 	   char **check = ttyS1_models;
 	   while (*check) {
 		if (strncmp(*check, sys_model_name, strlen(*check)) == 0)
-			return "ttyS1";
+			printf("WARNING: Found rp34x0 machine. "
+				"Older Linux kernel may need console=ttyS1.\n");
 		check++;
 	   }
 	}