From f30f0f2b4792e63ffa8d07e2e791122bfb20fdbf Mon Sep 17 00:00:00 2001
From: Matt Macy <mmacy@FreeBSD.org>
Date: Sun, 22 Jul 2018 23:32:21 +0000
Subject: [PATCH] Add busy detect quirk to list of console options

This change allows one to set the busy_detect flag
required by the synopsys UART at the loader prompt.
This is needed by the EPYC 3000 SoC.

This will give users a working console up to the point where getty is required:
hw.uart.console="mm:0xfedc9000,rs:2,bd:1"

Reviewed by:	imp
MFC after:	4 weeks
Differential Revision:	https://reviews.freebsd.org/D16399
---
 sys/dev/uart/uart.h            | 1 +
 sys/dev/uart/uart_dev_ns8250.c | 1 +
 sys/dev/uart/uart_subr.c       | 9 +++++++++
 3 files changed, 11 insertions(+)

diff --git a/sys/dev/uart/uart.h b/sys/dev/uart/uart.h
index 73109173bd4..4ef6af3d901 100644
--- a/sys/dev/uart/uart.h
+++ b/sys/dev/uart/uart.h
@@ -44,6 +44,7 @@ struct uart_bas {
 	u_int	rclk;
 	u_int	regshft;
 	u_int	regiowidth;
+	u_int	busy_detect;
 };
 
 #define	uart_regofs(bas, reg)		((reg) << (bas)->regshft)
diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c
index 266530db060..03792f8f659 100644
--- a/sys/dev/uart/uart_dev_ns8250.c
+++ b/sys/dev/uart/uart_dev_ns8250.c
@@ -469,6 +469,7 @@ ns8250_bus_attach(struct uart_softc *sc)
 
 	bas = &sc->sc_bas;
 
+	ns8250->busy_detect = bas->busy_detect;
 	ns8250->mcr = uart_getreg(bas, REG_MCR);
 	ns8250->fcr = FCR_ENABLE;
 #ifdef CPU_XBURST
diff --git a/sys/dev/uart/uart_subr.c b/sys/dev/uart/uart_subr.c
index dcdaf9f1929..2dd10d9f4a2 100644
--- a/sys/dev/uart/uart_subr.c
+++ b/sys/dev/uart/uart_subr.c
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 #define	UART_TAG_RS	7
 #define	UART_TAG_SB	8
 #define	UART_TAG_XO	9
+#define	UART_TAG_BD	10
 
 static struct uart_class *uart_classes[] = {
 	&uart_ns8250_class,
@@ -124,6 +125,10 @@ uart_parse_tag(const char **p)
 {
 	int tag;
 
+	if ((*p)[0] == 'b' && (*p)[1] == 'd') {
+		tag = UART_TAG_BD;
+		goto out;
+	}
 	if ((*p)[0] == 'b' && (*p)[1] == 'r') {
 		tag = UART_TAG_BR;
 		goto out;
@@ -179,6 +184,7 @@ out:
  * separated by commas. Each attribute is a tag-value pair with the tag and
  * value separated by a colon. Supported tags are:
  *
+ *	bd = Busy Detect
  *	br = Baudrate
  *	ch = Channel
  *	db = Data bits
@@ -242,6 +248,9 @@ uart_getenv(int devtype, struct uart_devinfo *di, struct uart_class *class)
 	spec = cp;
 	for (;;) {
 		switch (uart_parse_tag(&spec)) {
+		case UART_TAG_BD:
+			di->bas.busy_detect = uart_parse_long(&spec);
+			break;
 		case UART_TAG_BR:
 			di->baudrate = uart_parse_long(&spec);
 			break;