[illumos-gate merge]

commit f81518d2d2ef63a80422631582fa82f0f956a850
    14797 scsi_cname is unsafe
commit a2d4222865d0ef80687403e52976bd691ec2faee
    14557 Attempts to map PCI BARs without MMIO ends in panics
commit aa88555e2aa3d01aff5e421451572bdfcf722282
    14809 eeprom fails with key and key=value argument processing
commit a26f9c149bc8e4c9206303674cdef16edec1ca70
    14755 viona should expose more ring state
    14756 expose viona kernel interface version
    14787 bhyve should block leases on drv purge
commit 81bcd6ad07db9db66927eebc0d558e9a12011226
    14793 dump(1) should be 64bit only
commit d37b9759f3782bad29cf7508d292559b4a8cf1f8
    14792 elfdump(1) should be 64bit only
commit 902bba376031b794865234f1621102c7f4bf9d2b
    14608 ttymon should use tty-mode property

Conflicts:
    manifest
    usr/src/cmd/sgs/elfdump/i386/Makefile

1 files changed, 85 insertions, 3 deletions

diff --git a/usr/src/cmd/ttymon/ttymon.c b/usr/src/cmd/ttymon/ttymon.c
index 03ff520059..0c061a9c8c 100644
--- a/usr/src/cmd/ttymon/ttymon.c
+++ b/usr/src/cmd/ttymon/ttymon.c
@@ -26,6 +26,7 @@
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved	*/
 
+#include <ctype.h>
 #include <stdio_ext.h>
 #include <stdlib.h>
 #include <fcntl.h>
@@ -597,25 +598,106 @@ free_defs(void)
 }
 
 /*
+ * rebuild flags entry using speed from ttymode.
+ */
+static char *
+merge_flags(char *src, char *ttymode)
+{
+	char *data, *ptr, *flags;
+
+	/* copy speed entry */
+	data = strsave(src);
+	flags = strsave(ttymode);
+	ptr = strchr(flags, ',');
+	if (ptr == NULL) {	/* ttymode is corrupted */
+		free(flags);
+		return (data);
+	}
+	*ptr = '\0';
+	ptr = flags;
+	flags = strsave(flags);
+	free(ptr);
+
+	/*
+	 * The flags line is supposed to have stty keywords separated by space.
+	 * We need to split up the keywords, replace the speed and
+	 * reconstruct the flags line.
+	 */
+
+	ptr = strtok(data, " \t");
+	if (ptr == NULL) {
+		free(data);
+		return (flags);
+	}
+
+	do {
+		char *tmp;
+
+		/* skip speed */
+		if (isdigit(*ptr))
+			continue;
+
+		if (asprintf(&tmp, "%s %s", flags, ptr) <= 0) {
+			/* should we complain? */
+			break;
+		}
+		free(flags);
+		flags = tmp;
+	} while ((ptr = strtok(NULL, " \t")) != NULL);
+
+	free(data);
+	return (flags);
+}
+
+/*
  * struct Gdef *get_speed(ttylabel)
  *	- search "/etc/ttydefs" for speed and term. specification
  *	  using "ttylabel". If "ttylabel" is NULL, default
  *	  to DEFAULT
+ *	- for /dev/console, if we are in fact using serial console,
+ *	  use ttyX-mode value to get speed. This allows us to use
+ *	  the value set for serial console either from firmware (or BMC sol),
+ *	  or boot loader default.
  * arg:	  ttylabel - label/id of speed settings.
  */
 
 struct Gdef *
-get_speed(char *ttylabel)
+get_speed(struct pmtab *pmptr)
 {
+	static struct Gdef serial = { 0 };
 	struct Gdef *sp;
+	char *ttylabel = pmptr->p_ttylabel;
 
 	if ((ttylabel != NULL) && (*ttylabel != '\0')) {
 		if ((sp = find_def(ttylabel)) == NULL) {
 			log("unable to find <%s> in \"%s\"", ttylabel, TTYDEFS);
 			sp = &DEFAULT; /* use default */
 		}
-	} else sp = &DEFAULT; /* use default */
-	return (sp);
+	} else {
+		sp = &DEFAULT; /* use default */
+	}
+
+	/*
+	 * if this is not /dev/console or /dev/console is not using serial,
+	 * we are done.
+	 */
+	if (pmptr->p_ttymode == NULL ||
+	    strcmp(pmptr->p_device, "/dev/console") != 0)
+		return (sp);
+
+	/* is entry for serial set up? */
+	if (serial.g_id == NULL) {
+		/*
+		 * Copy data from sp, except we need to update inital and
+		 * final flags.
+		 */
+		serial.g_id = strsave(sp->g_id);
+		serial.g_iflags = merge_flags(sp->g_iflags, pmptr->p_ttymode);
+		serial.g_fflags = merge_flags(sp->g_fflags, pmptr->p_ttymode);
+		serial.g_autobaud = sp->g_autobaud;
+		serial.g_nextid = strsave(sp->g_nextid);
+	}
+	return (&serial);
 }
 
 /*