6426010 Need ability to direct console to USB serial device

1 files changed, 23 insertions, 0 deletions

diff --git a/usr/src/uts/common/krtld/kobj.c b/usr/src/uts/common/krtld/kobj.c
index 1cdf93e98f..01032117ec 100644
--- a/usr/src/uts/common/krtld/kobj.c
+++ b/usr/src/uts/common/krtld/kobj.c
@@ -1204,12 +1204,35 @@ load_primary(struct module *mp, int lmid)
 }
 
 static int
+console_is_usb_serial(void)
+{
+	char *console;
+	int len, ret;
+
+	if ((len = BOP_GETPROPLEN(ops, "console")) == -1)
+		return (0);
+
+	console = kobj_zalloc(len, KM_WAIT|KM_TMP);
+	(void) BOP_GETPROP(ops, "console", console);
+	ret = (strcmp(console, "usb-serial") == 0);
+	kobj_free(console, len);
+
+	return (ret);
+}
+
+static int
 load_kmdb(val_t *bootaux)
 {
 	struct modctl *mctl;
 	struct module *mp;
 	Sym *sym;
 
+	if (console_is_usb_serial()) {
+		_kobj_printf(ops, "kmdb not loaded "
+		    "(unsupported on usb serial console)\n");
+		return (0);
+	}
+
 	_kobj_printf(ops, "Loading kmdb...\n");
 
 	if ((mctl = add_primary("misc/kmdbmod", KOBJ_LM_DEBUGGER)) == NULL)