Module Name: src Committed By: tnn Date: Sat Nov 2 17:13:20 UTC 2019
Modified Files: src/sys/dev/ic: ssdfb.c src/sys/dev/spi: ssdfb_spi.c Log Message: fix hang when SSDFB_ATTACH_FLAG_CONSOLE used with spi To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/ssdfb.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/spi/ssdfb_spi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ic/ssdfb.c diff -u src/sys/dev/ic/ssdfb.c:1.9 src/sys/dev/ic/ssdfb.c:1.10 --- src/sys/dev/ic/ssdfb.c:1.9 Sat Nov 2 14:18:36 2019 +++ src/sys/dev/ic/ssdfb.c Sat Nov 2 17:13:20 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ssdfb.c,v 1.9 2019/11/02 14:18:36 tnn Exp $ */ +/* $NetBSD: ssdfb.c,v 1.10 2019/11/02 17:13:20 tnn Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.9 2019/11/02 14:18:36 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ssdfb.c,v 1.10 2019/11/02 17:13:20 tnn Exp $"); #include "opt_ddb.h" @@ -331,7 +331,8 @@ ssdfb_attach(struct ssdfb_softc *sc, int if (sc->sc_is_console) ssdfb_set_usepoll(sc, true); - mutex_init(&sc->sc_cond_mtx, MUTEX_DEFAULT, IPL_SCHED); + mutex_init(&sc->sc_cond_mtx, MUTEX_DEFAULT, + ISSET(flags, SSDFB_ATTACH_FLAG_MPSAFE) ? IPL_SCHED : IPL_BIO); cv_init(&sc->sc_cond, "ssdfb"); kt_flags = KTHREAD_MUSTJOIN; /* XXX spi(4) is not MPSAFE yet. */ Index: src/sys/dev/spi/ssdfb_spi.c diff -u src/sys/dev/spi/ssdfb_spi.c:1.1 src/sys/dev/spi/ssdfb_spi.c:1.2 --- src/sys/dev/spi/ssdfb_spi.c:1.1 Sat Nov 2 14:33:27 2019 +++ src/sys/dev/spi/ssdfb_spi.c Sat Nov 2 17:13:20 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ssdfb_spi.c,v 1.1 2019/11/02 14:33:27 tnn Exp $ */ +/* $NetBSD: ssdfb_spi.c,v 1.2 2019/11/02 17:13:20 tnn Exp $ */ /* * Copyright (c) 2019 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.1 2019/11/02 14:33:27 tnn Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ssdfb_spi.c,v 1.2 2019/11/02 17:13:20 tnn Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -170,7 +170,7 @@ ssdfb_spi_xfer_rect_3wire_ssd1322(void * /* * Unlike iic(4), there is no way to force spi(4) to use polling. */ - if (usepoll || cold) + if (usepoll && !cold) return 0; ssdfb_bitstream_init(&s, bitstream); @@ -294,7 +294,7 @@ ssdfb_spi_xfer_rect_4wire_ssd1322(void * /* * Unlike iic(4), there is no way to force spi(4) to use polling. */ - if (usepoll || cold) + if (usepoll && !cold) return 0; ssdfb_spi_4wire_set_dc(sc, 0);