[SPARC]: Fix serial console device detection.

The current scheme works on static interpretation of text names, which is wrong. The output-device setting, for example, must be resolved via an alias or similar to a full path name to the console device. Paths also contain an optional set of 'options', which starts with a colon at the end of the path. The option area is used to specify which of two serial ports ('a' or 'b') the path refers to when a device node drives multiple ports. 'a' is assumed if the option specification is missing. This was caught by the UltraSPARC-T1 simulator. The 'output-device' property was set to 'ttya' and we didn't pick upon the fact that this is an OBP alias set to '/virtual-devices/console'. Instead we saw it as the first serial console device, instead of the hypervisor console. The infrastructure is now there to take advantage of this to resolve the console correctly even in multi-head situations in fbcon too. Thanks to Greg Onufer for the bug report. Signed-off-by: David S. Miller <davem@davemloft.net>

[SPARC]: Fix serial console device detection.
The current scheme works on static interpretation of text names, which is wrong. The output-device setting, for example, must be resolved via an alias or similar to a full path name to the console device. Paths also contain an optional set of 'options', which starts with a colon at the end of the path. The option area is used to specify which of two serial ports ('a' or 'b') the path refers to when a device node drives multiple ports. 'a' is assumed if the option specification is missing. This was caught by the UltraSPARC-T1 simulator. The 'output-device' property was set to 'ttya' and we didn't pick upon the fact that this is an OBP alias set to '/virtual-devices/console'. Instead we saw it as the first serial console device, instead of the hypervisor console. The infrastructure is now there to take advantage of this to resolve the console correctly even in multi-head situations in fbcon too. Thanks to Greg Onufer for the bug report. Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller
1 parent ede13d81b4
Showing 26 changed files with 285 additions and 554 deletions Side-by-side Diff
arch/sparc/kernel/process.c
arch/sparc/kernel/prom.c
arch/sparc/kernel/setup.c
arch/sparc/prom/console.c
arch/sparc/prom/misc.c
arch/sparc64/kernel/power.c
arch/sparc64/kernel/process.c
arch/sparc64/kernel/prom.c
arch/sparc64/kernel/setup.c
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/prom/console.c
arch/sparc64/prom/misc.c
arch/sparc64/prom/tree.c
drivers/serial/suncore.c
drivers/serial/suncore.h
drivers/serial/sunhv.c
drivers/serial/sunsab.c
drivers/serial/sunsu.c
drivers/serial/sunzilog.c
drivers/video/aty/atyfb_base.c
@@ -39,6 +39,7 @@
 #include <asm/processor.h>
 #include <asm/psr.h>
 #include <asm/elf.h>
+#include <asm/prom.h>
 #include <asm/unistd.h>
  
 /* 
@@ -150,7 +151,7 @@
 	local_irq_enable();
 	mdelay(8);
 	local_irq_disable();
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette (1);
 	prom_halt();
 	panic("Halt failed!");
@@ -166,7 +167,7 @@
  
 	p = strchr (reboot_command, '\n');
 	if (p) *p = 0;
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette (1);
 	if (cmd)
 		prom_reboot(cmd);
@@ -179,7 +180,8 @@
 void machine_power_off(void)
 {
 #ifdef CONFIG_SUN_AUXIO
-	if (auxio_power_register && (!serial_console || scons_pwroff))
+	if (auxio_power_register &&
+	    (strcmp(of_console_device->type, "serial") || scons_pwroff))
 		*auxio_power_register |= AUXIO_POWER_OFF;
 #endif
 	machine_halt();
@@ -397,6 +397,135 @@
 	return dp;
 }
  
+struct device_node *of_console_device;
+EXPORT_SYMBOL(of_console_device);
+
+char *of_console_path;
+EXPORT_SYMBOL(of_console_path);
+
+char *of_console_options;
+EXPORT_SYMBOL(of_console_options);
+
+extern void restore_current(void);
+
+static void __init of_console_init(void)
+{
+	char *msg = "OF stdout device is: %s\n";
+	struct device_node *dp;
+	unsigned long flags;
+	const char *type;
+	phandle node;
+	int skip, fd;
+
+	of_console_path = prom_early_alloc(256);
+
+	switch (prom_vers) {
+	case PROM_V0:
+	case PROM_SUN4:
+		skip = 0;
+		switch (*romvec->pv_stdout) {
+		case PROMDEV_SCREEN:
+			type = "display";
+			break;
+
+		case PROMDEV_TTYB:
+			skip = 1;
+			/* FALLTHRU */
+
+		case PROMDEV_TTYA:
+			type = "serial";
+			break;
+
+		default:
+			prom_printf("Invalid PROM_V0 stdout value %u\n",
+				    *romvec->pv_stdout);
+			prom_halt();
+		}
+
+		for_each_node_by_type(dp, type) {
+			if (!skip--)
+				break;
+		}
+		if (!dp) {
+			prom_printf("Cannot find PROM_V0 console node.\n");
+			prom_halt();
+		}
+		of_console_device = dp;
+
+		strcpy(of_console_path, dp->full_name);
+		if (!strcmp(type, "serial")) {
+			strcat(of_console_path,
+			       (skip ? ":b" : ":a"));
+		}
+		break;
+
+	default:
+	case PROM_V2:
+	case PROM_V3:
+		fd = *romvec->pv_v2bootargs.fd_stdout;
+
+		spin_lock_irqsave(&prom_lock, flags);
+		node = (*romvec->pv_v2devops.v2_inst2pkg)(fd);
+		restore_current();
+		spin_unlock_irqrestore(&prom_lock, flags);
+
+		if (!node) {
+			prom_printf("Cannot resolve stdout node from "
+				    "instance %08x.\n", fd);
+			prom_halt();
+		}
+		dp = of_find_node_by_phandle(node);
+		type = of_get_property(dp, "device_type", NULL);
+
+		if (!type) {
+			prom_printf("Console stdout lacks "
+				    "device_type property.\n");
+			prom_halt();
+		}
+
+		if (strcmp(type, "display") && strcmp(type, "serial")) {
+			prom_printf("Console device_type is neither display "
+				    "nor serial.\n");
+			prom_halt();
+		}
+
+		of_console_device = dp;
+
+		if (prom_vers == PROM_V2) {
+			strcpy(of_console_path, dp->full_name);
+			switch (*romvec->pv_stdout) {
+			case PROMDEV_TTYA:
+				strcat(of_console_path, ":a");
+				break;
+			case PROMDEV_TTYB:
+				strcat(of_console_path, ":b");
+				break;
+			}
+		} else {
+			const char *path;
+
+			dp = of_find_node_by_path("/");
+			path = of_get_property(dp, "stdout-path", NULL);
+			if (!path) {
+				prom_printf("No stdout-path in root node.\n");
+				prom_halt();
+			}
+			strcpy(of_console_path, path);
+		}
+		break;
+	}
+
+	of_console_options = strrchr(of_console_path, ':');
+	if (of_console_options) {
+		of_console_options++;
+		if (*of_console_options == '\0')
+			of_console_options = NULL;
+	}
+
+	prom_printf(msg, of_console_path);
+	printk(msg, of_console_path);
+}
+
 void __init prom_build_devicetree(void)
 {
 	struct device_node **nextp;
@@ -409,6 +538,8 @@
 	allnodes->child = build_tree(allnodes,
 				     prom_getchild(allnodes->node),
 				     &nextp);
+	of_console_init();
+
 	printk("PROM: Built device tree with %u bytes of memory.\n",
 	       prom_early_allocated);
 }
@@ -146,31 +146,6 @@
 	}
 }
  
-static void __init process_console(char *commands)
-{
-	serial_console = 0;
-	commands += 8;
-	/* Linux-style serial */
-	if (!strncmp(commands, "ttyS", 4))
-		serial_console = simple_strtoul(commands + 4, NULL, 10) + 1;
-	else if (!strncmp(commands, "tty", 3)) {
-		char c = *(commands + 3);
-		/* Solaris-style serial */
-		if (c == 'a' || c == 'b')
-			serial_console = c - 'a' + 1;
-		/* else Linux-style fbcon, not serial */
-	}
-#if defined(CONFIG_PROM_CONSOLE)
-	if (!strncmp(commands, "prom", 4)) {
-		char *p;
-
-		for (p = commands - 8; *p && *p != ' '; p++)
-			*p = ' ';
-		conswitchp = &prom_con;
-	}
-#endif
-}
-
 static void __init boot_flags_init(char *commands)
 {
 	while (*commands) {
@@ -187,9 +162,7 @@
 				process_switch(*commands++);
 			continue;
 		}
-		if (!strncmp(commands, "console=", 8)) {
-			process_console(commands);
-		} else if (!strncmp(commands, "mem=", 4)) {
+		if (!strncmp(commands, "mem=", 4)) {
 			/*
 			 * "mem=XXX[kKmM] overrides the PROM-reported
 			 * memory size.
@@ -341,41 +314,6 @@
 	smp_setup_cpu_possible_map();
 }
  
-static int __init set_preferred_console(void)
-{
-	int idev, odev;
-
-	/* The user has requested a console so this is already set up. */
-	if (serial_console >= 0)
-		return -EBUSY;
-
-	idev = prom_query_input_device();
-	odev = prom_query_output_device();
-	if (idev == PROMDEV_IKBD && odev == PROMDEV_OSCREEN) {
-		serial_console = 0;
-	} else if (idev == PROMDEV_ITTYA && odev == PROMDEV_OTTYA) {
-		serial_console = 1;
-	} else if (idev == PROMDEV_ITTYB && odev == PROMDEV_OTTYB) {
-		serial_console = 2;
-	} else if (idev == PROMDEV_I_UNK && odev == PROMDEV_OTTYA) {
-		prom_printf("MrCoffee ttya\n");
-		serial_console = 1;
-	} else if (idev == PROMDEV_I_UNK && odev == PROMDEV_OSCREEN) {
-		serial_console = 0;
-		prom_printf("MrCoffee keyboard\n");
-	} else {
-		prom_printf("Confusing console (idev %d, odev %d)\n",
-		    idev, odev);
-		serial_console = 1;
-	}
-
-	if (serial_console)
-		return add_preferred_console("ttyS", serial_console - 1, NULL);
-
-	return -ENODEV;
-}
-console_initcall(set_preferred_console);
-
 extern char *sparc_cpu_type;
 extern char *sparc_fpu_type;
  
@@ -461,7 +399,6 @@
 	prom_cmdline();
 }
  
-int serial_console = -1;
 int stop_a_enabled = 1;
  
 static int __init topology_init(void)
@@ -102,120 +102,4 @@
 	while(prom_nbputchar(c) == -1) ;
 	return;
 }
-
-/* Query for input device type */
-enum prom_input_device
-prom_query_input_device(void)
-{
-	unsigned long flags;
-	int st_p;
-	char propb[64];
-	char *p;
-	int propl;
-
-	switch(prom_vers) {
-	case PROM_V0:
-	case PROM_V2:
-	case PROM_SUN4:
-	default:
-		switch(*romvec->pv_stdin) {
-		case PROMDEV_KBD:	return PROMDEV_IKBD;
-		case PROMDEV_TTYA:	return PROMDEV_ITTYA;
-		case PROMDEV_TTYB:	return PROMDEV_ITTYB;
-		default:
-			return PROMDEV_I_UNK;
-		};
-	case PROM_V3:
-		spin_lock_irqsave(&prom_lock, flags);
-		st_p = (*romvec->pv_v2devops.v2_inst2pkg)(*romvec->pv_v2bootargs.fd_stdin);
-		restore_current();
-		spin_unlock_irqrestore(&prom_lock, flags);
-		if(prom_node_has_property(st_p, "keyboard"))
-			return PROMDEV_IKBD;
-		if (prom_getproperty(st_p, "name", propb, sizeof(propb)) != -1) {
-			if(strncmp(propb, "keyboard", sizeof("serial")) == 0)
-				return PROMDEV_IKBD;
-		}
-		if (prom_getproperty(st_p, "device_type", propb, sizeof(propb)) != -1) {
-		if(strncmp(propb, "serial", sizeof("serial")))
-			return PROMDEV_I_UNK;
-		}
-		propl = prom_getproperty(prom_root_node, "stdin-path", propb, sizeof(propb));
-		if(propl > 2) {
-			p = propb;
-			while(*p) p++; p -= 2;
-			if(p[0] == ':') {
-				if(p[1] == 'a')
-					return PROMDEV_ITTYA;
-				else if(p[1] == 'b')
-					return PROMDEV_ITTYB;
-			}
-		}
-		return PROMDEV_I_UNK;
-	}
-}
-
-/* Query for output device type */
-
-enum prom_output_device
-prom_query_output_device(void)
-{
-	unsigned long flags;
-	int st_p;
-	char propb[64];
-	char *p;
-	int propl;
-
-	switch(prom_vers) {
-	case PROM_V0:
-	case PROM_SUN4:
-		switch(*romvec->pv_stdin) {
-		case PROMDEV_SCREEN:	return PROMDEV_OSCREEN;
-		case PROMDEV_TTYA:	return PROMDEV_OTTYA;
-		case PROMDEV_TTYB:	return PROMDEV_OTTYB;
-		};
-		break;
-	case PROM_V2:
-	case PROM_V3:
-		spin_lock_irqsave(&prom_lock, flags);
-		st_p = (*romvec->pv_v2devops.v2_inst2pkg)(*romvec->pv_v2bootargs.fd_stdout);
-		restore_current();
-		spin_unlock_irqrestore(&prom_lock, flags);
-		propl = prom_getproperty(st_p, "device_type", propb, sizeof(propb));
-		if (propl == sizeof("display") &&
-			strncmp("display", propb, sizeof("display")) == 0)
-		{
-			return PROMDEV_OSCREEN;
-		}
-		if(prom_vers == PROM_V3) {
-			if(propl >= 0 &&
-			    strncmp("serial", propb, sizeof("serial")) != 0)
-				return PROMDEV_O_UNK;
-			propl = prom_getproperty(prom_root_node, "stdout-path",
-						 propb, sizeof(propb));
-			if(propl == CON_SIZE_JMC &&
-			    strncmp(propb, con_name_jmc, CON_SIZE_JMC) == 0)
-				return PROMDEV_OTTYA;
-			if(propl > 2) {
-				p = propb;
-				while(*p) p++; p-= 2;
-				if(p[0]==':') {
-					if(p[1] == 'a')
-						return PROMDEV_OTTYA;
-					else if(p[1] == 'b')
-						return PROMDEV_OTTYB;
-				}
-			}
-		} else {
-			switch(*romvec->pv_stdin) {
-			case PROMDEV_TTYA:	return PROMDEV_OTTYA;
-			case PROMDEV_TTYB:	return PROMDEV_OTTYB;
-			};
-		}
-		break;
-	default:
-		;
-	};
-	return PROMDEV_O_UNK;
-}
@@ -58,7 +58,7 @@
 	extern void install_linux_ticker(void);
 	unsigned long flags;
  
-	if(!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette (1);
 	spin_lock_irqsave(&prom_lock, flags);
 	install_obp_ticker();
@@ -69,7 +69,7 @@
 #ifdef CONFIG_SUN_AUXIO
 	set_auxio(AUXIO_LED, 0);
 #endif
-	if(!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette (0);
 }
  
@@ -46,7 +46,7 @@
 void machine_power_off(void)
 {
 	sstate_poweroff();
-	if (!serial_console || scons_pwroff) {
+	if (strcmp(of_console_device->type, "serial") || scons_pwroff) {
 		if (power_reg) {
 			/* Both register bits seem to have the
 			 * same effect, so until I figure out
@@ -119,7 +119,7 @@
 void machine_halt(void)
 {
 	sstate_halt();
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette (1);
 	if (prom_keyboard)
 		prom_keyboard();
@@ -130,7 +130,7 @@
 void machine_alt_power_off(void)
 {
 	sstate_poweroff();
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette(1);
 	if (prom_keyboard)
 		prom_keyboard();
@@ -145,7 +145,7 @@
 	sstate_reboot();
 	p = strchr (reboot_command, '\n');
 	if (p) *p = 0;
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette (1);
 	if (prom_keyboard)
 		prom_keyboard();
@@ -1646,6 +1646,60 @@
 	smp_fill_in_sib_core_maps();
 }
  
+struct device_node *of_console_device;
+EXPORT_SYMBOL(of_console_device);
+
+char *of_console_path;
+EXPORT_SYMBOL(of_console_path);
+
+char *of_console_options;
+EXPORT_SYMBOL(of_console_options);
+
+static void __init of_console_init(void)
+{
+	char *msg = "OF stdout device is: %s\n";
+	struct device_node *dp;
+	const char *type;
+	phandle node;
+
+	of_console_path = prom_early_alloc(256);
+	if (prom_ihandle2path(prom_stdout, of_console_path, 256) < 0) {
+		prom_printf("Cannot obtain path of stdout.\n");
+		prom_halt();
+	}
+	of_console_options = strrchr(of_console_path, ':');
+	if (of_console_options) {
+		of_console_options++;
+		if (*of_console_options == '\0')
+			of_console_options = NULL;
+	}
+
+	node = prom_inst2pkg(prom_stdout);
+	if (!node) {
+		prom_printf("Cannot resolve stdout node from "
+			    "instance %08x.\n", prom_stdout);
+		prom_halt();
+	}
+
+	dp = of_find_node_by_phandle(node);
+	type = of_get_property(dp, "device_type", NULL);
+	if (!type) {
+		prom_printf("Console stdout lacks device_type property.\n");
+		prom_halt();
+	}
+
+	if (strcmp(type, "display") && strcmp(type, "serial")) {
+		prom_printf("Console device_type is neither display "
+			    "nor serial.\n");
+		prom_halt();
+	}
+
+	of_console_device = dp;
+
+	prom_printf(msg, of_console_path);
+	printk(msg, of_console_path);
+}
+
 void __init prom_build_devicetree(void)
 {
 	struct device_node **nextp;
@@ -1658,6 +1712,8 @@
 	allnodes->child = build_tree(allnodes,
 				     prom_getchild(allnodes->node),
 				     &nextp);
+	of_console_init();
+
 	printk("PROM: Built device tree with %u bytes of memory.\n",
 	       prom_early_allocated);
  
@@ -133,33 +133,6 @@
 	}
 }
  
-static void __init process_console(char *commands)
-{
-	serial_console = 0;
-	commands += 8;
-	/* Linux-style serial */
-	if (!strncmp(commands, "ttyS", 4))
-		serial_console = simple_strtoul(commands + 4, NULL, 10) + 1;
-	else if (!strncmp(commands, "tty", 3)) {
-		char c = *(commands + 3);
-		/* Solaris-style serial */
-		if (c == 'a' || c == 'b') {
-			serial_console = c - 'a' + 1;
-			prom_printf ("Using /dev/tty%c as console.\n", c);
-		}
-		/* else Linux-style fbcon, not serial */
-	}
-#if defined(CONFIG_PROM_CONSOLE)
-	if (!strncmp(commands, "prom", 4)) {
-		char *p;
-
-		for (p = commands - 8; *p && *p != ' '; p++)
-			*p = ' ';
-		conswitchp = &prom_con;
-	}
-#endif
-}
-
 static void __init boot_flags_init(char *commands)
 {
 	while (*commands) {
@@ -176,9 +149,7 @@
 				process_switch(*commands++);
 			continue;
 		}
-		if (!strncmp(commands, "console=", 8)) {
-			process_console(commands);
-		} else if (!strncmp(commands, "mem=", 4)) {
+		if (!strncmp(commands, "mem=", 4)) {
 			/*
 			 * "mem=XXX[kKmM]" overrides the PROM-reported
 			 * memory size.
@@ -378,44 +349,6 @@
 	paging_init();
 }
  
-static int __init set_preferred_console(void)
-{
-	int idev, odev;
-
-	/* The user has requested a console so this is already set up. */
-	if (serial_console >= 0)
-		return -EBUSY;
-
-	idev = prom_query_input_device();
-	odev = prom_query_output_device();
-	if (idev == PROMDEV_IKBD && odev == PROMDEV_OSCREEN) {
-		serial_console = 0;
-	} else if (idev == PROMDEV_ITTYA && odev == PROMDEV_OTTYA) {
-		serial_console = 1;
-	} else if (idev == PROMDEV_ITTYB && odev == PROMDEV_OTTYB) {
-		serial_console = 2;
-	} else if (idev == PROMDEV_IRSC && odev == PROMDEV_ORSC) {
-		serial_console = 3;
-	} else if (idev == PROMDEV_IVCONS && odev == PROMDEV_OVCONS) {
-		/* sunhv_console_init() doesn't check the serial_console
-		 * value anyways...
-		 */
-		serial_console = 4;
-		return add_preferred_console("ttyHV", 0, NULL);
-	} else {
-		prom_printf("Inconsistent console: "
-			    "input %d, output %d\n",
-			    idev, odev);
-		prom_halt();
-	}
-
-	if (serial_console)
-		return add_preferred_console("ttyS", serial_console - 1, NULL);
-
-	return -ENODEV;
-}
-console_initcall(set_preferred_console);
-
 /* BUFFER is PAGE_SIZE bytes long. */
  
 extern char *sparc_cpu_type;
@@ -508,6 +441,5 @@
 	prom_cmdline();
 }
  
-int serial_console = -1;
 int stop_a_enabled = 1;
@@ -330,7 +330,6 @@
  
 /* for input/keybdev */
 EXPORT_SYMBOL(sun_do_break);
-EXPORT_SYMBOL(serial_console);
 EXPORT_SYMBOL(stop_a_enabled);
  
 #ifdef CONFIG_DEBUG_BUGVERBOSE
@@ -73,89 +73,4 @@
 			   P1275_INOUT(3,1),
 			   prom_stdout, s, P1275_SIZE(len));
 }
-
-/* Query for input device type */
-enum prom_input_device
-prom_query_input_device(void)
-{
-	int st_p;
-	char propb[64];
-
-	st_p = prom_inst2pkg(prom_stdin);
-	if(prom_node_has_property(st_p, "keyboard"))
-		return PROMDEV_IKBD;
-	prom_getproperty(st_p, "device_type", propb, sizeof(propb));
-	if(strncmp(propb, "serial", 6))
-		return PROMDEV_I_UNK;
-	/* FIXME: Is there any better way how to find out? */	
-	memset(propb, 0, sizeof(propb));
-	st_p = prom_finddevice ("/options");
-	prom_getproperty(st_p, "input-device", propb, sizeof(propb));
-
-	/*
-	 * If we get here with propb == 'keyboard', we are on ttya, as
-	 * the PROM defaulted to this due to 'no input device'.
-	 */
-	if (!strncmp(propb, "keyboard", 8))
-		return PROMDEV_ITTYA;
-
-	if (!strncmp (propb, "rsc", 3))
-		return PROMDEV_IRSC;
-
-	if (!strncmp (propb, "virtual-console", 3))
-		return PROMDEV_IVCONS;
-
-	if (strncmp (propb, "tty", 3) || !propb[3])
-		return PROMDEV_I_UNK;
-
-	switch (propb[3]) {
-		case 'a': return PROMDEV_ITTYA;
-		case 'b': return PROMDEV_ITTYB;
-		default: return PROMDEV_I_UNK;
-	}
-}
-
-/* Query for output device type */
-
-enum prom_output_device
-prom_query_output_device(void)
-{
-	int st_p;
-	char propb[64];
-	int propl;
-
-	st_p = prom_inst2pkg(prom_stdout);
-	propl = prom_getproperty(st_p, "device_type", propb, sizeof(propb));
-	if (propl >= 0 && propl == sizeof("display") &&
-	    strncmp("display", propb, sizeof("display")) == 0)
-		return PROMDEV_OSCREEN;
-	if(strncmp("serial", propb, 6))
-		return PROMDEV_O_UNK;
-	/* FIXME: Is there any better way how to find out? */	
-	memset(propb, 0, sizeof(propb));
-	st_p = prom_finddevice ("/options");
-	prom_getproperty(st_p, "output-device", propb, sizeof(propb));
-
-	/*
-	 * If we get here with propb == 'screen', we are on ttya, as
-	 * the PROM defaulted to this due to 'no input device'.
-	 */
-	if (!strncmp(propb, "screen", 6))
-		return PROMDEV_OTTYA;
-
-	if (!strncmp (propb, "rsc", 3))
-		return PROMDEV_ORSC;
-
-	if (!strncmp (propb, "virtual-console", 3))
-		return PROMDEV_OVCONS;
-
-	if (strncmp (propb, "tty", 3) || !propb[3])
-		return PROMDEV_O_UNK;
-
-	switch (propb[3]) {
-		case 'a': return PROMDEV_OTTYA;
-		case 'b': return PROMDEV_OTTYB;
-		default: return PROMDEV_O_UNK;
-	}
-}
@@ -72,7 +72,7 @@
  
 	local_irq_save(flags);
  
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette(1);
  
 #ifdef CONFIG_SMP
@@ -85,7 +85,7 @@
 	smp_release();
 #endif
  
-	if (!serial_console && prom_palette)
+	if (prom_palette)
 		prom_palette(0);
  
 	local_irq_restore(flags);
@@ -304,4 +304,12 @@
 	if (node == -1) return 0;
 	return node;
 }
+
+int prom_ihandle2path(int handle, char *buffer, int bufsize)
+{
+	return p1275_cmd("instance-to-path",
+			 P1275_ARG(1,P1275_ARG_OUT_BUF)|
+			 P1275_INOUT(3, 1),
+			 handle, buffer, P1275_SIZE(bufsize));
+}
@@ -16,9 +16,10 @@
 #include <linux/tty.h>
 #include <linux/errno.h>
 #include <linux/string.h>
+#include <linux/serial_core.h>
 #include <linux/init.h>
  
-#include <asm/oplib.h>
+#include <asm/prom.h>
  
 #include "suncore.h"
  
  
  
  
  
  
  
  
  
  
  
  
  
@@ -26,92 +27,60 @@
  
 EXPORT_SYMBOL(sunserial_current_minor);
  
-void
-sunserial_console_termios(struct console *con)
+int sunserial_console_match(struct console *con, struct device_node *dp,
+			    struct uart_driver *drv, int line)
 {
-	char mode[16], buf[16], *s;
-	char mode_prop[] = "ttyX-mode";
-	char cd_prop[]   = "ttyX-ignore-cd";
-	char dtr_prop[]  = "ttyX-rts-dtr-off";
-	char *ssp_console_modes_prop = "ssp-console-modes";
-	int baud, bits, stop, cflag;
-	char parity;
-	int carrier = 0;
-	int rtsdtr = 1;
-	int topnd, nd;
+	int off;
  
-	if (!serial_console)
-		return;
+	if (!con || of_console_device != dp)
+		return 0;
  
-	switch (serial_console) {
-	case PROMDEV_OTTYA:
-		mode_prop[3] = 'a';
-		cd_prop[3] = 'a';
-		dtr_prop[3] = 'a';
-		break;
+	off = 0;
+	if (of_console_options &&
+	    *of_console_options == 'b')
+		off = 1;
  
-	case PROMDEV_OTTYB:
-		mode_prop[3] = 'b';
-		cd_prop[3] = 'b';
-		dtr_prop[3] = 'b';
-		break;
+	if ((line & 1) != off)
+		return 0;
  
-	case PROMDEV_ORSC:
+	con->index = line;
+	drv->cons = con;
+	add_preferred_console(con->name, line, NULL);
  
-		nd = prom_pathtoinode("rsc");
-		if (!nd) {
-			strcpy(mode, "115200,8,n,1,-");
-			goto no_options;
-		}
+	return 1;
+}
+EXPORT_SYMBOL(sunserial_console_match);
  
-		if (!prom_node_has_property(nd, ssp_console_modes_prop)) {
-			strcpy(mode, "115200,8,n,1,-");
-			goto no_options;
-		}
+void
+sunserial_console_termios(struct console *con)
+{
+	struct device_node *dp;
+	const char *od, *mode, *s;
+	char mode_prop[] = "ttyX-mode";
+	int baud, bits, stop, cflag;
+	char parity;
  
-		memset(mode, 0, sizeof(mode));
-		prom_getstring(nd, ssp_console_modes_prop, mode, sizeof(mode));
-		goto no_options;
+	dp = of_find_node_by_path("/options");
+	od = of_get_property(dp, "output-device", NULL);
+	if (!strcmp(od, "rsc")) {
+		mode = of_get_property(of_console_device,
+				       "ssp-console-modes", NULL);
+		if (!mode)
+			mode = "115200,8,n,1,-";
+	} else {
+		char c;
  
-	default:
-		strcpy(mode, "9600,8,n,1,-");
-		goto no_options;
-	}
+		c = 'a';
+		if (of_console_options)
+			c = *of_console_options;
  
-	topnd = prom_getchild(prom_root_node);
-	nd = prom_searchsiblings(topnd, "options");
-	if (!nd) {
-		strcpy(mode, "9600,8,n,1,-");
-		goto no_options;
-	}
+		mode_prop[3] = c;
  
-	if (!prom_node_has_property(nd, mode_prop)) {
-		strcpy(mode, "9600,8,n,1,-");
-		goto no_options;
+		mode = of_get_property(dp, mode_prop, NULL);
+		if (!mode)
+			mode = "9600,8,n,1,-";
 	}
  
-	memset(mode, 0, sizeof(mode));
-	prom_getstring(nd, mode_prop, mode, sizeof(mode));
-
-	if (prom_node_has_property(nd, cd_prop)) {
-		memset(buf, 0, sizeof(buf));
-		prom_getstring(nd, cd_prop, buf, sizeof(buf));
-		if (!strcmp(buf, "false"))
-			carrier = 1;
-
-		/* XXX: this is unused below. */
-	}
-
-	if (prom_node_has_property(nd, dtr_prop)) {
-		memset(buf, 0, sizeof(buf));
-		prom_getstring(nd, dtr_prop, buf, sizeof(buf));
-		if (!strcmp(buf, "false"))
-			rtsdtr = 0;
-
-		/* XXX: this is unused below. */
-	}
-
-no_options:
 	cflag = CREAD | HUPCL | CLOCAL;
  
 	s = mode;
@@ -24,6 +24,8 @@
  
 extern int sunserial_current_minor;
  
+extern int sunserial_console_match(struct console *, struct device_node *,
+				   struct uart_driver *, int);
 extern void sunserial_console_termios(struct console *);
  
 #endif /* !(_SERIAL_SUN_H) */
@@ -520,16 +520,6 @@
 	.data	=	&sunhv_reg,
 };
  
-static inline struct console *SUNHV_CONSOLE(void)
-{
-	if (con_is_present())
-		return NULL;
-
-	sunhv_console.index = 0;
-
-	return &sunhv_console;
-}
-
 static int __devinit hv_probe(struct of_device *op, const struct of_device_id *match)
 {
 	struct uart_port *port;
@@ -582,7 +572,8 @@
 	sunhv_reg.tty_driver->name_base = sunhv_reg.minor - 64;
 	sunserial_current_minor += 1;
  
-	sunhv_reg.cons = SUNHV_CONSOLE();
+	sunserial_console_match(&sunhv_console, op->node,
+				&sunhv_reg, port->line);
  
 	err = uart_add_one_port(&sunhv_reg, port);
 	if (err)
@@ -968,22 +968,6 @@
  
 static inline struct console *SUNSAB_CONSOLE(void)
 {
-	int i;
-
-	if (con_is_present())
-		return NULL;
-
-	for (i = 0; i < num_channels; i++) {
-		int this_minor = sunsab_reg.minor + i;
-
-		if ((this_minor - 64) == (serial_console - 1))
-			break;
-	}
-	if (i == num_channels)
-		return NULL;
-
-	sunsab_console.index = i;
-
 	return &sunsab_console;
 }
 #else
  
@@ -1080,7 +1064,12 @@
 		return err;
 	}
  
+	sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+				&sunsab_reg, up[0].port.line);
 	uart_add_one_port(&sunsab_reg, &up[0].port);
+
+	sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+				&sunsab_reg, up[1].port.line);
 	uart_add_one_port(&sunsab_reg, &up[1].port);
  
 	dev_set_drvdata(&op->dev, &up[0]);
@@ -1164,7 +1153,6 @@
 		}
  
 		sunsab_reg.tty_driver->name_base = sunsab_reg.minor - 64;
-		sunsab_reg.cons = SUNSAB_CONSOLE();
 		sunserial_current_minor += num_channels;
 	}
  
@@ -1371,28 +1371,12 @@
  *	Register console.
  */
  
-static inline struct console *SUNSU_CONSOLE(int num_uart)
+static inline struct console *SUNSU_CONSOLE(void)
 {
-	int i;
-
-	if (con_is_present())
-		return NULL;
-
-	for (i = 0; i < num_uart; i++) {
-		int this_minor = sunsu_reg.minor + i;
-
-		if ((this_minor - 64) == (serial_console - 1))
-			break;
-	}
-	if (i == num_uart)
-		return NULL;
-
-	sunsu_console.index = i;
-
 	return &sunsu_console;
 }
 #else
-#define SUNSU_CONSOLE(num_uart)		(NULL)
+#define SUNSU_CONSOLE()			(NULL)
 #define sunsu_serial_console_init()	do { } while (0)
 #endif
  
@@ -1482,6 +1466,8 @@
  
 	up->port.ops = &sunsu_pops;
  
+	sunserial_console_match(SUNSU_CONSOLE(), dp,
+				&sunsu_reg, up->port.line);
 	err = uart_add_one_port(&sunsu_reg, &up->port);
 	if (err)
 		goto out_unmap;
@@ -1572,7 +1558,6 @@
 			return err;
 		sunsu_reg.tty_driver->name_base = sunsu_reg.minor - 64;
 		sunserial_current_minor += num_uart;
-		sunsu_reg.cons = SUNSU_CONSOLE(num_uart);
 	}
  
 	err = of_register_driver(&su_driver, &of_bus_type);
@@ -1226,23 +1226,6 @@
  
 static inline struct console *SUNZILOG_CONSOLE(void)
 {
-	int i;
-
-	if (con_is_present())
-		return NULL;
-
-	for (i = 0; i < NUM_CHANNELS; i++) {
-		int this_minor = sunzilog_reg.minor + i;
-
-		if ((this_minor - 64) == (serial_console - 1))
-			break;
-	}
-	if (i == NUM_CHANNELS)
-		return NULL;
-
-	sunzilog_console_ops.index = i;
-	sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS;
-
 	return &sunzilog_console_ops;
 }
  
  
@@ -1428,12 +1411,18 @@
 	sunzilog_init_hw(&up[1]);
  
 	if (!keyboard_mouse) {
+		if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node,
+					    &sunzilog_reg, up[0].port.line))
+			up->flags |= SUNZILOG_FLAG_IS_CONS;
 		err = uart_add_one_port(&sunzilog_reg, &up[0].port);
 		if (err) {
 			of_iounmap(&op->resource[0],
 				   rp, sizeof(struct zilog_layout));
 			return err;
 		}
+		if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node,
+					    &sunzilog_reg, up[1].port.line))
+			up->flags |= SUNZILOG_FLAG_IS_CONS;
 		err = uart_add_one_port(&sunzilog_reg, &up[1].port);
 		if (err) {
 			uart_remove_one_port(&sunzilog_reg, &up[0].port);
@@ -1531,7 +1520,6 @@
 			goto out_free_tables;
  
 		sunzilog_reg.tty_driver->name_base = sunzilog_reg.minor - 64;
-		sunzilog_reg.cons = SUNZILOG_CONSOLE();
  
 		sunserial_current_minor += uart_count;
 	}
@@ -2913,10 +2913,6 @@
 	int node, len, i, j, ret;
 	u32 mem, chip_id;
  
-	/* Do not attach when we have a serial console. */
-	if (!con_is_present())
-		return -ENXIO;
-
 	/*
 	 * Map memory-mapped registers.
 	 */
@@ -379,10 +379,6 @@
 	if (fb_get_options("igafb", NULL))
 		return -ENODEV;
  
-        /* Do not attach when we have a serial console. */
-        if (!con_is_present())
-                return -ENXIO;
-
         pdev = pci_get_device(PCI_VENDOR_ID_INTERG,
                                PCI_DEVICE_ID_INTERG_1682, 0);
 	if (pdev == NULL) {
@@ -158,32 +158,6 @@
 extern void prom_printf(char *fmt, ...);
 extern void prom_write(const char *buf, unsigned int len);
  
-/* Query for input device type */
-
-enum prom_input_device {
-	PROMDEV_IKBD,			/* input from keyboard */
-	PROMDEV_ITTYA,			/* input from ttya */
-	PROMDEV_ITTYB,			/* input from ttyb */
-	PROMDEV_IRSC,			/* input from rsc */
-	PROMDEV_IVCONS,			/* input from virtual-console */
-	PROMDEV_I_UNK,
-};
-
-extern enum prom_input_device prom_query_input_device(void);
-
-/* Query for output device type */
-
-enum prom_output_device {
-	PROMDEV_OSCREEN,		/* to screen */
-	PROMDEV_OTTYA,			/* to ttya */
-	PROMDEV_OTTYB,			/* to ttyb */
-	PROMDEV_ORSC,			/* to rsc */
-	PROMDEV_OVCONS,			/* to virtual-console */
-	PROMDEV_O_UNK,
-};
-
-extern enum prom_output_device prom_query_output_device(void);
-
 /* Multiprocessor operations... */
  
 /* Start the CPU with the given device tree node, context table, and context
@@ -85,6 +85,10 @@
  */
 #include <linux/of.h>
  
+extern struct device_node *of_console_device;
+extern char *of_console_path;
+extern char *of_console_options;
+
 #endif /* __KERNEL__ */
 #endif /* _SPARC_PROM_H */
@@ -140,32 +140,6 @@
 extern void prom_printf(const char *fmt, ...);
 extern void prom_write(const char *buf, unsigned int len);
  
-/* Query for input device type */
-
-enum prom_input_device {
-	PROMDEV_IKBD,			/* input from keyboard */
-	PROMDEV_ITTYA,			/* input from ttya */
-	PROMDEV_ITTYB,			/* input from ttyb */
-	PROMDEV_IRSC,			/* input from rsc */
-	PROMDEV_IVCONS,			/* input from virtual-console */
-	PROMDEV_I_UNK,
-};
-
-extern enum prom_input_device prom_query_input_device(void);
-
-/* Query for output device type */
-
-enum prom_output_device {
-	PROMDEV_OSCREEN,		/* to screen */
-	PROMDEV_OTTYA,			/* to ttya */
-	PROMDEV_OTTYB,			/* to ttyb */
-	PROMDEV_ORSC,			/* to rsc */
-	PROMDEV_OVCONS,			/* to virtual-console */
-	PROMDEV_O_UNK,
-};
-
-extern enum prom_output_device prom_query_output_device(void);
-
 /* Multiprocessor operations... */
 #ifdef CONFIG_SMP
 /* Start the CPU with the given device tree node at the passed program
@@ -318,6 +292,8 @@
 extern int prom_inst2pkg(int);
 extern int prom_service_exists(const char *service_name);
 extern void prom_sun4v_guest_soft_state(void);
+
+extern int prom_ihandle2path(int handle, char *buffer, int bufsize);
  
 /* Client interface level routines. */
 extern void prom_set_trap_table(unsigned long tba);
@@ -94,6 +94,10 @@
  */
 #include <linux/of.h>
  
+extern struct device_node *of_console_device;
+extern char *of_console_path;
+extern char *of_console_options;
+
 #endif /* __KERNEL__ */
 #endif /* _SPARC64_PROM_H */
@@ -115,13 +115,7 @@
 #ifndef __ASSEMBLY__
  
 extern void sun_do_break(void);
-extern int serial_console;
 extern int stop_a_enabled;
-
-static __inline__ int con_is_present(void)
-{
-	return serial_console ? 0 : 1;
-}
  
 extern void synchronize_user_stack(void);
...	...	@@ -39,6 +39,7 @@
39	39	#include <asm/processor.h>
40	40	#include <asm/psr.h>
41	41	#include <asm/elf.h>
	42	+#include <asm/prom.h>
42	43	#include <asm/unistd.h>
43	44
44	45	/*
...	...	@@ -150,7 +151,7 @@
150	151	local_irq_enable();
151	152	mdelay(8);
152	153	local_irq_disable();
153		- if (!serial_console && prom_palette)
	154	+ if (prom_palette)
154	155	prom_palette (1);
155	156	prom_halt();
156	157	panic("Halt failed!");
...	...	@@ -166,7 +167,7 @@
166	167
167	168	p = strchr (reboot_command, '\n');
168	169	if (p) *p = 0;
169		- if (!serial_console && prom_palette)
	170	+ if (prom_palette)
170	171	prom_palette (1);
171	172	if (cmd)
172	173	prom_reboot(cmd);
...	...	@@ -179,7 +180,8 @@
179	180	void machine_power_off(void)
180	181	{
181	182	#ifdef CONFIG_SUN_AUXIO
182		- if (auxio_power_register && (!serial_console \|\| scons_pwroff))
	183	+ if (auxio_power_register &&
	184	+ (strcmp(of_console_device->type, "serial") \|\| scons_pwroff))
183	185	*auxio_power_register \|= AUXIO_POWER_OFF;
184	186	#endif
185	187	machine_halt();
...	...	@@ -397,6 +397,135 @@
397	397	return dp;
398	398	}
399	399
	400	+struct device_node *of_console_device;
	401	+EXPORT_SYMBOL(of_console_device);
	402	+
	403	+char *of_console_path;
	404	+EXPORT_SYMBOL(of_console_path);
	405	+
	406	+char *of_console_options;
	407	+EXPORT_SYMBOL(of_console_options);
	408	+
	409	+extern void restore_current(void);
	410	+
	411	+static void __init of_console_init(void)
	412	+{
	413	+ char *msg = "OF stdout device is: %s\n";
	414	+ struct device_node *dp;
	415	+ unsigned long flags;
	416	+ const char *type;
	417	+ phandle node;
	418	+ int skip, fd;
	419	+
	420	+ of_console_path = prom_early_alloc(256);
	421	+
	422	+ switch (prom_vers) {
	423	+ case PROM_V0:
	424	+ case PROM_SUN4:
	425	+ skip = 0;
	426	+ switch (*romvec->pv_stdout) {
	427	+ case PROMDEV_SCREEN:
	428	+ type = "display";
	429	+ break;
	430	+
	431	+ case PROMDEV_TTYB:
	432	+ skip = 1;
	433	+ /* FALLTHRU */
	434	+
	435	+ case PROMDEV_TTYA:
	436	+ type = "serial";
	437	+ break;
	438	+
	439	+ default:
	440	+ prom_printf("Invalid PROM_V0 stdout value %u\n",
	441	+ *romvec->pv_stdout);
	442	+ prom_halt();
	443	+ }
	444	+
	445	+ for_each_node_by_type(dp, type) {
	446	+ if (!skip--)
	447	+ break;
	448	+ }
	449	+ if (!dp) {
	450	+ prom_printf("Cannot find PROM_V0 console node.\n");
	451	+ prom_halt();
	452	+ }
	453	+ of_console_device = dp;
	454	+
	455	+ strcpy(of_console_path, dp->full_name);
	456	+ if (!strcmp(type, "serial")) {
	457	+ strcat(of_console_path,
	458	+ (skip ? ":b" : ":a"));
	459	+ }
	460	+ break;
	461	+
	462	+ default:
	463	+ case PROM_V2:
	464	+ case PROM_V3:
	465	+ fd = *romvec->pv_v2bootargs.fd_stdout;
	466	+
	467	+ spin_lock_irqsave(&prom_lock, flags);
	468	+ node = (*romvec->pv_v2devops.v2_inst2pkg)(fd);
	469	+ restore_current();
	470	+ spin_unlock_irqrestore(&prom_lock, flags);
	471	+
	472	+ if (!node) {
	473	+ prom_printf("Cannot resolve stdout node from "
	474	+ "instance %08x.\n", fd);
	475	+ prom_halt();
	476	+ }
	477	+ dp = of_find_node_by_phandle(node);
	478	+ type = of_get_property(dp, "device_type", NULL);
	479	+
	480	+ if (!type) {
	481	+ prom_printf("Console stdout lacks "
	482	+ "device_type property.\n");
	483	+ prom_halt();
	484	+ }
	485	+
	486	+ if (strcmp(type, "display") && strcmp(type, "serial")) {
	487	+ prom_printf("Console device_type is neither display "
	488	+ "nor serial.\n");
	489	+ prom_halt();
	490	+ }
	491	+
	492	+ of_console_device = dp;
	493	+
	494	+ if (prom_vers == PROM_V2) {
	495	+ strcpy(of_console_path, dp->full_name);
	496	+ switch (*romvec->pv_stdout) {
	497	+ case PROMDEV_TTYA:
	498	+ strcat(of_console_path, ":a");
	499	+ break;
	500	+ case PROMDEV_TTYB:
	501	+ strcat(of_console_path, ":b");
	502	+ break;
	503	+ }
	504	+ } else {
	505	+ const char *path;
	506	+
	507	+ dp = of_find_node_by_path("/");
	508	+ path = of_get_property(dp, "stdout-path", NULL);
	509	+ if (!path) {
	510	+ prom_printf("No stdout-path in root node.\n");
	511	+ prom_halt();
	512	+ }
	513	+ strcpy(of_console_path, path);
	514	+ }
	515	+ break;
	516	+ }
	517	+
	518	+ of_console_options = strrchr(of_console_path, ':');
	519	+ if (of_console_options) {
	520	+ of_console_options++;
	521	+ if (*of_console_options == '\0')
	522	+ of_console_options = NULL;
	523	+ }
	524	+
	525	+ prom_printf(msg, of_console_path);
	526	+ printk(msg, of_console_path);
	527	+}
	528	+
400	529	void __init prom_build_devicetree(void)
401	530	{
402	531	struct device_node **nextp;
...	...	@@ -409,6 +538,8 @@
409	538	allnodes->child = build_tree(allnodes,
410	539	prom_getchild(allnodes->node),
411	540	&nextp);
	541	+ of_console_init();
	542	+
412	543	printk("PROM: Built device tree with %u bytes of memory.\n",
413	544	prom_early_allocated);
414	545	}
...	...	@@ -146,31 +146,6 @@
146	146	}
147	147	}
148	148
149		-static void __init process_console(char *commands)
150		-{
151		- serial_console = 0;
152		- commands += 8;
153		- /* Linux-style serial */
154		- if (!strncmp(commands, "ttyS", 4))
155		- serial_console = simple_strtoul(commands + 4, NULL, 10) + 1;
156		- else if (!strncmp(commands, "tty", 3)) {
157		- char c = *(commands + 3);
158		- /* Solaris-style serial */
159		- if (c == 'a' \|\| c == 'b')
160		- serial_console = c - 'a' + 1;
161		- /* else Linux-style fbcon, not serial */
162		- }
163		-#if defined(CONFIG_PROM_CONSOLE)
164		- if (!strncmp(commands, "prom", 4)) {
165		- char *p;
166		-
167		- for (p = commands - 8; p && p != ' '; p++)
168		- *p = ' ';
169		- conswitchp = &prom_con;
170		- }
171		-#endif
172		-}
173		-
174	149	static void __init boot_flags_init(char *commands)
175	150	{
176	151	while (*commands) {
...	...	@@ -187,9 +162,7 @@
187	162	process_switch(*commands++);
188	163	continue;
189	164	}
190		- if (!strncmp(commands, "console=", 8)) {
191		- process_console(commands);
192		- } else if (!strncmp(commands, "mem=", 4)) {
	165	+ if (!strncmp(commands, "mem=", 4)) {
193	166	/*
194	167	* "mem=XXX[kKmM] overrides the PROM-reported
195	168	* memory size.
...	...	@@ -341,41 +314,6 @@
341	314	smp_setup_cpu_possible_map();
342	315	}
343	316
344		-static int __init set_preferred_console(void)
345		-{
346		- int idev, odev;
347		-
348		- /* The user has requested a console so this is already set up. */
349		- if (serial_console >= 0)
350		- return -EBUSY;
351		-
352		- idev = prom_query_input_device();
353		- odev = prom_query_output_device();
354		- if (idev == PROMDEV_IKBD && odev == PROMDEV_OSCREEN) {
355		- serial_console = 0;
356		- } else if (idev == PROMDEV_ITTYA && odev == PROMDEV_OTTYA) {
357		- serial_console = 1;
358		- } else if (idev == PROMDEV_ITTYB && odev == PROMDEV_OTTYB) {
359		- serial_console = 2;
360		- } else if (idev == PROMDEV_I_UNK && odev == PROMDEV_OTTYA) {
361		- prom_printf("MrCoffee ttya\n");
362		- serial_console = 1;
363		- } else if (idev == PROMDEV_I_UNK && odev == PROMDEV_OSCREEN) {
364		- serial_console = 0;
365		- prom_printf("MrCoffee keyboard\n");
366		- } else {
367		- prom_printf("Confusing console (idev %d, odev %d)\n",
368		- idev, odev);
369		- serial_console = 1;
370		- }
371		-
372		- if (serial_console)
373		- return add_preferred_console("ttyS", serial_console - 1, NULL);
374		-
375		- return -ENODEV;
376		-}
377		-console_initcall(set_preferred_console);
378		-
379	317	extern char *sparc_cpu_type;
380	318	extern char *sparc_fpu_type;
381	319
...	...	@@ -461,7 +399,6 @@
461	399	prom_cmdline();
462	400	}
463	401
464		-int serial_console = -1;
465	402	int stop_a_enabled = 1;
466	403
467	404	static int __init topology_init(void)
...	...	@@ -102,120 +102,4 @@
102	102	while(prom_nbputchar(c) == -1) ;
103	103	return;
104	104	}
105		-
106		-/* Query for input device type */
107		-enum prom_input_device
108		-prom_query_input_device(void)
109		-{
110		- unsigned long flags;
111		- int st_p;
112		- char propb[64];
113		- char *p;
114		- int propl;
115		-
116		- switch(prom_vers) {
117		- case PROM_V0:
118		- case PROM_V2:
119		- case PROM_SUN4:
120		- default:
121		- switch(*romvec->pv_stdin) {
122		- case PROMDEV_KBD: return PROMDEV_IKBD;
123		- case PROMDEV_TTYA: return PROMDEV_ITTYA;
124		- case PROMDEV_TTYB: return PROMDEV_ITTYB;
125		- default:
126		- return PROMDEV_I_UNK;
127		- };
128		- case PROM_V3:
129		- spin_lock_irqsave(&prom_lock, flags);
130		- st_p = (romvec->pv_v2devops.v2_inst2pkg)(romvec->pv_v2bootargs.fd_stdin);
131		- restore_current();
132		- spin_unlock_irqrestore(&prom_lock, flags);
133		- if(prom_node_has_property(st_p, "keyboard"))
134		- return PROMDEV_IKBD;
135		- if (prom_getproperty(st_p, "name", propb, sizeof(propb)) != -1) {
136		- if(strncmp(propb, "keyboard", sizeof("serial")) == 0)
137		- return PROMDEV_IKBD;
138		- }
139		- if (prom_getproperty(st_p, "device_type", propb, sizeof(propb)) != -1) {
140		- if(strncmp(propb, "serial", sizeof("serial")))
141		- return PROMDEV_I_UNK;
142		- }
143		- propl = prom_getproperty(prom_root_node, "stdin-path", propb, sizeof(propb));
144		- if(propl > 2) {
145		- p = propb;
146		- while(*p) p++; p -= 2;
147		- if(p[0] == ':') {
148		- if(p[1] == 'a')
149		- return PROMDEV_ITTYA;
150		- else if(p[1] == 'b')
151		- return PROMDEV_ITTYB;
152		- }
153		- }
154		- return PROMDEV_I_UNK;
155		- }
156		-}
157		-
158		-/* Query for output device type */
159		-
160		-enum prom_output_device
161		-prom_query_output_device(void)
162		-{
163		- unsigned long flags;
164		- int st_p;
165		- char propb[64];
166		- char *p;
167		- int propl;
168		-
169		- switch(prom_vers) {
170		- case PROM_V0:
171		- case PROM_SUN4:
172		- switch(*romvec->pv_stdin) {
173		- case PROMDEV_SCREEN: return PROMDEV_OSCREEN;
174		- case PROMDEV_TTYA: return PROMDEV_OTTYA;
175		- case PROMDEV_TTYB: return PROMDEV_OTTYB;
176		- };
177		- break;
178		- case PROM_V2:
179		- case PROM_V3:
180		- spin_lock_irqsave(&prom_lock, flags);
181		- st_p = (romvec->pv_v2devops.v2_inst2pkg)(romvec->pv_v2bootargs.fd_stdout);
182		- restore_current();
183		- spin_unlock_irqrestore(&prom_lock, flags);
184		- propl = prom_getproperty(st_p, "device_type", propb, sizeof(propb));
185		- if (propl == sizeof("display") &&
186		- strncmp("display", propb, sizeof("display")) == 0)
187		- {
188		- return PROMDEV_OSCREEN;
189		- }
190		- if(prom_vers == PROM_V3) {
191		- if(propl >= 0 &&
192		- strncmp("serial", propb, sizeof("serial")) != 0)
193		- return PROMDEV_O_UNK;
194		- propl = prom_getproperty(prom_root_node, "stdout-path",
195		- propb, sizeof(propb));
196		- if(propl == CON_SIZE_JMC &&
197		- strncmp(propb, con_name_jmc, CON_SIZE_JMC) == 0)
198		- return PROMDEV_OTTYA;
199		- if(propl > 2) {
200		- p = propb;
201		- while(*p) p++; p-= 2;
202		- if(p[0]==':') {
203		- if(p[1] == 'a')
204		- return PROMDEV_OTTYA;
205		- else if(p[1] == 'b')
206		- return PROMDEV_OTTYB;
207		- }
208		- }
209		- } else {
210		- switch(*romvec->pv_stdin) {
211		- case PROMDEV_TTYA: return PROMDEV_OTTYA;
212		- case PROMDEV_TTYB: return PROMDEV_OTTYB;
213		- };
214		- }
215		- break;
216		- default:
217		- ;
218		- };
219		- return PROMDEV_O_UNK;
220		-}
...	...	@@ -58,7 +58,7 @@
58	58	extern void install_linux_ticker(void);
59	59	unsigned long flags;
60	60
61		- if(!serial_console && prom_palette)
	61	+ if (prom_palette)
62	62	prom_palette (1);
63	63	spin_lock_irqsave(&prom_lock, flags);
64	64	install_obp_ticker();
...	...	@@ -69,7 +69,7 @@
69	69	#ifdef CONFIG_SUN_AUXIO
70	70	set_auxio(AUXIO_LED, 0);
71	71	#endif
72		- if(!serial_console && prom_palette)
	72	+ if (prom_palette)
73	73	prom_palette (0);
74	74	}
75	75
...	...	@@ -46,7 +46,7 @@
46	46	void machine_power_off(void)
47	47	{
48	48	sstate_poweroff();
49		- if (!serial_console \|\| scons_pwroff) {
	49	+ if (strcmp(of_console_device->type, "serial") \|\| scons_pwroff) {
50	50	if (power_reg) {
51	51	/* Both register bits seem to have the
52	52	* same effect, so until I figure out
...	...	@@ -119,7 +119,7 @@
119	119	void machine_halt(void)
120	120	{
121	121	sstate_halt();
122		- if (!serial_console && prom_palette)
	122	+ if (prom_palette)
123	123	prom_palette (1);
124	124	if (prom_keyboard)
125	125	prom_keyboard();
...	...	@@ -130,7 +130,7 @@
130	130	void machine_alt_power_off(void)
131	131	{
132	132	sstate_poweroff();
133		- if (!serial_console && prom_palette)
	133	+ if (prom_palette)
134	134	prom_palette(1);
135	135	if (prom_keyboard)
136	136	prom_keyboard();
...	...	@@ -145,7 +145,7 @@
145	145	sstate_reboot();
146	146	p = strchr (reboot_command, '\n');
147	147	if (p) *p = 0;
148		- if (!serial_console && prom_palette)
	148	+ if (prom_palette)
149	149	prom_palette (1);
150	150	if (prom_keyboard)
151	151	prom_keyboard();
...	...	@@ -1646,6 +1646,60 @@
1646	1646	smp_fill_in_sib_core_maps();
1647	1647	}
1648	1648
	1649	+struct device_node *of_console_device;
	1650	+EXPORT_SYMBOL(of_console_device);
	1651	+
	1652	+char *of_console_path;
	1653	+EXPORT_SYMBOL(of_console_path);
	1654	+
	1655	+char *of_console_options;
	1656	+EXPORT_SYMBOL(of_console_options);
	1657	+
	1658	+static void __init of_console_init(void)
	1659	+{
	1660	+ char *msg = "OF stdout device is: %s\n";
	1661	+ struct device_node *dp;
	1662	+ const char *type;
	1663	+ phandle node;
	1664	+
	1665	+ of_console_path = prom_early_alloc(256);
	1666	+ if (prom_ihandle2path(prom_stdout, of_console_path, 256) < 0) {
	1667	+ prom_printf("Cannot obtain path of stdout.\n");
	1668	+ prom_halt();
	1669	+ }
	1670	+ of_console_options = strrchr(of_console_path, ':');
	1671	+ if (of_console_options) {
	1672	+ of_console_options++;
	1673	+ if (*of_console_options == '\0')
	1674	+ of_console_options = NULL;
	1675	+ }
	1676	+
	1677	+ node = prom_inst2pkg(prom_stdout);
	1678	+ if (!node) {
	1679	+ prom_printf("Cannot resolve stdout node from "
	1680	+ "instance %08x.\n", prom_stdout);
	1681	+ prom_halt();
	1682	+ }
	1683	+
	1684	+ dp = of_find_node_by_phandle(node);
	1685	+ type = of_get_property(dp, "device_type", NULL);
	1686	+ if (!type) {
	1687	+ prom_printf("Console stdout lacks device_type property.\n");
	1688	+ prom_halt();
	1689	+ }
	1690	+
	1691	+ if (strcmp(type, "display") && strcmp(type, "serial")) {
	1692	+ prom_printf("Console device_type is neither display "
	1693	+ "nor serial.\n");
	1694	+ prom_halt();
	1695	+ }
	1696	+
	1697	+ of_console_device = dp;
	1698	+
	1699	+ prom_printf(msg, of_console_path);
	1700	+ printk(msg, of_console_path);
	1701	+}
	1702	+
1649	1703	void __init prom_build_devicetree(void)
1650	1704	{
1651	1705	struct device_node **nextp;
...	...	@@ -1658,6 +1712,8 @@
1658	1712	allnodes->child = build_tree(allnodes,
1659	1713	prom_getchild(allnodes->node),
1660	1714	&nextp);
	1715	+ of_console_init();
	1716	+
1661	1717	printk("PROM: Built device tree with %u bytes of memory.\n",
1662	1718	prom_early_allocated);
1663	1719
...	...	@@ -133,33 +133,6 @@
133	133	}
134	134	}
135	135
136		-static void __init process_console(char *commands)
137		-{
138		- serial_console = 0;
139		- commands += 8;
140		- /* Linux-style serial */
141		- if (!strncmp(commands, "ttyS", 4))
142		- serial_console = simple_strtoul(commands + 4, NULL, 10) + 1;
143		- else if (!strncmp(commands, "tty", 3)) {
144		- char c = *(commands + 3);
145		- /* Solaris-style serial */
146		- if (c == 'a' \|\| c == 'b') {
147		- serial_console = c - 'a' + 1;
148		- prom_printf ("Using /dev/tty%c as console.\n", c);
149		- }
150		- /* else Linux-style fbcon, not serial */
151		- }
152		-#if defined(CONFIG_PROM_CONSOLE)
153		- if (!strncmp(commands, "prom", 4)) {
154		- char *p;
155		-
156		- for (p = commands - 8; p && p != ' '; p++)
157		- *p = ' ';
158		- conswitchp = &prom_con;
159		- }
160		-#endif
161		-}
162		-
163	136	static void __init boot_flags_init(char *commands)
164	137	{
165	138	while (*commands) {
...	...	@@ -176,9 +149,7 @@
176	149	process_switch(*commands++);
177	150	continue;
178	151	}
179		- if (!strncmp(commands, "console=", 8)) {
180		- process_console(commands);
181		- } else if (!strncmp(commands, "mem=", 4)) {
	152	+ if (!strncmp(commands, "mem=", 4)) {
182	153	/*
183	154	* "mem=XXX[kKmM]" overrides the PROM-reported
184	155	* memory size.
...	...	@@ -378,44 +349,6 @@
378	349	paging_init();
379	350	}
380	351
381		-static int __init set_preferred_console(void)
382		-{
383		- int idev, odev;
384		-
385		- /* The user has requested a console so this is already set up. */
386		- if (serial_console >= 0)
387		- return -EBUSY;
388		-
389		- idev = prom_query_input_device();
390		- odev = prom_query_output_device();
391		- if (idev == PROMDEV_IKBD && odev == PROMDEV_OSCREEN) {
392		- serial_console = 0;
393		- } else if (idev == PROMDEV_ITTYA && odev == PROMDEV_OTTYA) {
394		- serial_console = 1;
395		- } else if (idev == PROMDEV_ITTYB && odev == PROMDEV_OTTYB) {
396		- serial_console = 2;
397		- } else if (idev == PROMDEV_IRSC && odev == PROMDEV_ORSC) {
398		- serial_console = 3;
399		- } else if (idev == PROMDEV_IVCONS && odev == PROMDEV_OVCONS) {
400		- /* sunhv_console_init() doesn't check the serial_console
401		- * value anyways...
402		- */
403		- serial_console = 4;
404		- return add_preferred_console("ttyHV", 0, NULL);
405		- } else {
406		- prom_printf("Inconsistent console: "
407		- "input %d, output %d\n",
408		- idev, odev);
409		- prom_halt();
410		- }
411		-
412		- if (serial_console)
413		- return add_preferred_console("ttyS", serial_console - 1, NULL);
414		-
415		- return -ENODEV;
416		-}
417		-console_initcall(set_preferred_console);
418		-
419	352	/* BUFFER is PAGE_SIZE bytes long. */
420	353
421	354	extern char *sparc_cpu_type;
...	...	@@ -508,6 +441,5 @@
508	441	prom_cmdline();
509	442	}
510	443
511		-int serial_console = -1;
512	444	int stop_a_enabled = 1;
...	...	@@ -330,7 +330,6 @@
330	330
331	331	/* for input/keybdev */
332	332	EXPORT_SYMBOL(sun_do_break);
333		-EXPORT_SYMBOL(serial_console);
334	333	EXPORT_SYMBOL(stop_a_enabled);
335	334
336	335	#ifdef CONFIG_DEBUG_BUGVERBOSE