Author: ian
Date: Sat Aug 8 20:11:47 2015
New Revision: 286469
URL: https://svnweb.freebsd.org/changeset/base/286469
Log:
Provide the tty-layer mutex when initializing the pps api. This allows
time_pps_fetch() to be used in blocking mode.
Also, don't init the pps api for system devices (consoles) that provide a
custom attach routine. The device may actually be a keyboard or other non-
tty device. If it wants to do pps processing (unlikely) it must handle
everything for itself. (In reality, only a sun keyboard uses a custom
attach routine, and it doesn't make a good pps device.)
Modified:
head/sys/dev/uart/uart_bus.h
head/sys/dev/uart/uart_core.c
head/sys/dev/uart/uart_tty.c
Modified: head/sys/dev/uart/uart_bus.h
==============================================================================
--- head/sys/dev/uart/uart_bus.h Sat Aug 8 20:08:09 2015
(r286468)
+++ head/sys/dev/uart/uart_bus.h Sat Aug 8 20:11:47 2015
(r286469)
@@ -150,6 +150,7 @@ void uart_sched_softih(struct uart_softc
int uart_tty_attach(struct uart_softc *);
int uart_tty_detach(struct uart_softc *);
+struct mtx *uart_tty_getlock(struct uart_softc *);
void uart_tty_intr(void *arg);
/*
Modified: head/sys/dev/uart/uart_core.c
==============================================================================
--- head/sys/dev/uart/uart_core.c Sat Aug 8 20:08:09 2015
(r286468)
+++ head/sys/dev/uart/uart_core.c Sat Aug 8 20:11:47 2015
(r286469)
@@ -511,9 +511,6 @@ uart_bus_attach(device_t dev)
sc->sc_sysdev->stopbits);
}
- sc->sc_pps.ppscap = PPS_CAPTUREBOTH;
- pps_init(&sc->sc_pps);
-
sc->sc_leaving = 0;
sc->sc_testintr = 1;
filt = uart_intr(sc);
@@ -568,10 +565,17 @@ uart_bus_attach(device_t dev)
printf("\n");
}
- error = (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL)
- ? (*sc->sc_sysdev->attach)(sc) : uart_tty_attach(sc);
- if (error)
- goto fail;
+ if (sc->sc_sysdev != NULL && sc->sc_sysdev->attach != NULL) {
+ if ((error = sc->sc_sysdev->attach(sc)) != 0)
+ goto fail;
+ } else {
+ if ((error = uart_tty_attach(sc)) != 0)
+ goto fail;
+ sc->sc_pps.ppscap = PPS_CAPTUREBOTH;
+ sc->sc_pps.driver_mtx = uart_tty_getlock(sc);
+ sc->sc_pps.driver_abi = PPS_ABI_VERSION;
+ pps_init_abi(&sc->sc_pps);
+ }
if (sc->sc_sysdev != NULL)
sc->sc_sysdev->hwmtx = sc->sc_hwmtx;
Modified: head/sys/dev/uart/uart_tty.c
==============================================================================
--- head/sys/dev/uart/uart_tty.c Sat Aug 8 20:08:09 2015
(r286468)
+++ head/sys/dev/uart/uart_tty.c Sat Aug 8 20:11:47 2015
(r286469)
@@ -404,3 +404,13 @@ uart_tty_detach(struct uart_softc *sc)
return (0);
}
+
+struct mtx *
+uart_tty_getlock(struct uart_softc *sc)
+{
+
+ if (sc->sc_u.u_tty.tp != NULL)
+ return (tty_getlock(sc->sc_u.u_tty.tp));
+ else
+ return (NULL);
+}
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
