Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide locking required by the interrupt handlers running at IPL_SERIAL.

Browse Source
This commit is contained in:
pk 2003-01-28 12:35:31 +00:00
parent 96aa0db5b2
commit be1188e00d
18 changed files with 108 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/arch/cesfic/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.5 2003/01/01 01:26:40 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.6 2003/01/28 12:35:31 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -141,6 +141,7 @@ zs_config(zsc, base)
cs->cs_defspeed = 9600;
}
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_defcflag = CREAD | CS8 | HUPCL;

3
sys/arch/mac68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.41 2003/01/06 13:05:02 wiz Exp $ */
/* $NetBSD: zs.c,v 1.42 2003/01/28 12:35:32 pk Exp $ */
/*
* Copyright (c) 1996-1998 Bill Studenmund
@ -284,6 +284,7 @@ zsc_attach(parent, self, aux)
cs = &xcs->xzs_cs;
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/macppc/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.24 2003/01/01 01:47:30 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.25 2003/01/28 12:35:32 pk Exp $ */
/*
* Copyright (c) 1996, 1998 Bill Studenmund
@ -269,6 +269,7 @@ zsc_attach(parent, self, aux)
cs = &xcs->xzs_cs;
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/mipsco/obio/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.15 2003/01/01 01:49:56 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.16 2003/01/28 12:35:32 pk Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@ -232,6 +232,7 @@ zs_attach(parent, self, aux)
ch = &zsc->zsc_cs_store[channel];
cs = zsc->zsc_cs[channel] = (struct zs_chanstate *)ch;
simple_lock_init(&cs->cs_lock);
cs->cs_reg_csr = NULL;
cs->cs_reg_data = NULL;
cs->cs_channel = channel;

3
sys/arch/mvme68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.30 2003/01/01 01:51:24 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.31 2003/01/28 12:35:33 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -151,6 +151,7 @@ zs_config(zsc, zs, vector, pclk)
zsc_args.hwflags = zs_hwflags[zsc_unit][channel];
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
/*
* If we're the console, copy the channel state, and

4
sys/arch/news68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.12 2003/01/11 16:00:48 tsutsui Exp $ */
/* $NetBSD: zs.c,v 1.13 2003/01/28 12:35:33 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -215,6 +215,8 @@ zs_attach(parent, self, aux)
for (channel = 0; channel < 2; channel++) {
zsc_args.channel = channel;
cs = &zsc->zsc_cs_store[channel];
simple_lock_init(&cs->cs_lock);
zsc->zsc_cs[channel] = cs;
zc = (channel == 0) ? &zs->zs_chan_a : &zs->zs_chan_b;

3
sys/arch/newsmips/apbus/zs_ap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_ap.c,v 1.8 2002/10/02 04:27:51 thorpej Exp $ */
/* $NetBSD: zs_ap.c,v 1.9 2003/01/28 12:35:34 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -255,6 +255,7 @@ zs_ap_attach(parent, self, aux)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/newsmips/dev/zs_hb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs_hb.c,v 1.7 2002/10/02 04:27:52 thorpej Exp $ */
/* $NetBSD: zs_hb.c,v 1.8 2003/01/28 12:35:34 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -237,6 +237,7 @@ zs_hb_attach(parent, self, aux)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/next68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.21 2003/01/01 01:57:16 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.22 2003/01/28 12:35:35 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -240,6 +240,7 @@ zs_attach(parent, self, aux)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/sgimips/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.17 2003/01/01 02:10:08 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.18 2003/01/28 12:35:35 pk Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@ -244,6 +244,7 @@ zs_hpc_attach(parent, self, aux)
ch = &zsc->zsc_cs_store[channel];
cs = zsc->zsc_cs[channel] = (struct zs_chanstate *)ch;
simple_lock_init(&cs->cs_lock);
cs->cs_reg_csr = NULL;
cs->cs_reg_data = NULL;
cs->cs_channel = channel;

3
sys/arch/sparc/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.96 2003/01/22 22:00:39 pk Exp $ */
/* $NetBSD: zs.c,v 1.97 2003/01/28 12:35:35 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -445,6 +445,7 @@ zs_attach(zsc, zsd, pri)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/sparc64/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.45 2003/01/01 02:22:56 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.46 2003/01/28 12:35:36 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -292,6 +292,7 @@ zs_attach(zsc, zsd, pri)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/sun2/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.6 2003/01/01 02:23:45 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.7 2003/01/28 12:35:37 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -177,6 +177,7 @@ zs_attach(zsc, zsd, pri)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/sun3/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.70 2003/01/01 02:26:13 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.71 2003/01/28 12:35:37 pk Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -287,6 +287,7 @@ zs_attach(parent, self, aux)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

3
sys/arch/x68k/dev/zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: zs.c,v 1.23 2003/01/01 02:31:14 thorpej Exp $ */
/* $NetBSD: zs.c,v 1.24 2003/01/28 12:35:38 pk Exp $ */
/*-
* Copyright (c) 1998 Minoura Makoto
@ -211,6 +211,7 @@ zs_attach(parent, self, aux)
cs = &zsc->zsc_cs_store[channel];
zsc->zsc_cs[channel] = cs;
simple_lock_init(&cs->cs_lock);
cs->cs_channel = channel;
cs->cs_private = NULL;
cs->cs_ops = &zsops_null;

13
sys/dev/ic/z8530sc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530sc.c,v 1.17 2002/09/24 13:23:31 ad Exp $ */
/* $NetBSD: z8530sc.c,v 1.18 2003/01/28 12:35:39 pk Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.17 2002/09/24 13:23:31 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: z8530sc.c,v 1.18 2003/01/28 12:35:39 pk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -255,6 +255,10 @@ zsc_intr_hard(arg)
/* First look at channel A. */
cs = zsc->zsc_cs[0];
/* Lock both channels */
simple_lock(&cs->cs_lock);
simple_lock(&zsc->zsc_cs[1]->cs_lock);
/* Note: only channel A has an RR3 */
rr3 = zs_read_reg(cs, 3);
@ -276,6 +280,9 @@ zsc_intr_hard(arg)
(*cs->cs_ops->zsop_txint)(cs);
}
/* Done with channel A */
simple_unlock(&cs->cs_lock);
/* Now look at channel B. */
cs = zsc->zsc_cs[1];
if (rr3 & (ZSRR3_IP_B_RX | ZSRR3_IP_B_TX | ZSRR3_IP_B_STAT)) {
@ -288,6 +295,8 @@ zsc_intr_hard(arg)
(*cs->cs_ops->zsop_txint)(cs);
}
simple_unlock(&cs->cs_lock);
/* Note: caller will check cs_x->cs_softreq and DTRT. */
return (rr3);
}

4
sys/dev/ic/z8530sc.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530sc.h,v 1.17 2002/09/24 13:23:31 ad Exp $ */
/* $NetBSD: z8530sc.h,v 1.18 2003/01/28 12:35:39 pk Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -77,6 +77,8 @@ struct zs_chanstate {
void *cs_private; /* sub-driver data pointer */
struct zsops *cs_ops;
struct simplelock cs_lock; /* per channel lock */
int cs_brg_clk; /* BAUD Rate Generator clock
* (usually PCLK / 16) */
int cs_defspeed; /* default baud rate */

98
sys/dev/ic/z8530tty.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530tty.c,v 1.88 2003/01/24 20:46:45 pk Exp $ */
/* $NetBSD: z8530tty.c,v 1.89 2003/01/28 12:35:38 pk Exp $ */
/*-
* Copyright (c) 1993, 1994, 1995, 1996, 1997, 1998, 1999
@ -99,7 +99,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.88 2003/01/24 20:46:45 pk Exp $");
__KERNEL_RCSID(0, "$NetBSD: z8530tty.c,v 1.89 2003/01/28 12:35:38 pk Exp $");
#include "opt_kgdb.h"
@ -292,6 +292,8 @@ zstty_attach(parent, self, aux)
int channel, s, tty_unit;
dev_t dev;
char *i, *o;
int dtr_on;
int resetbit;
callout_init(&zst->zst_diag_ch);
cn_init_magic(&zstty_cnm_state);
@ -377,6 +379,8 @@ zstty_attach(parent, self, aux)
/*
* Hardware init
*/
dtr_on = 0;
resetbit = 0;
if (ISSET(zst->zst_hwflags, ZS_HWFLAG_CONSOLE)) {
/* Call zsparam similar to open. */
struct termios t;
@ -389,8 +393,6 @@ zstty_attach(parent, self, aux)
t.c_ospeed = cs->cs_defspeed;
t.c_cflag = cs->cs_defcflag;
s = splzs();
/*
* Turn on receiver and status interrupts.
* We defer the actual write of the register to zsparam(),
@ -399,33 +401,25 @@ zstty_attach(parent, self, aux)
*/
SET(cs->cs_preg[1], ZSWR1_RIE | ZSWR1_SIE);
splx(s);
/* Make sure zsparam will see changes. */
tp->t_ospeed = 0;
(void) zsparam(tp, &t);
s = splzs();
/* Make sure DTR is on now. */
zs_modem(zst, 1);
dtr_on = 1;
splx(s);
} else if (!ISSET(zst->zst_hwflags, ZS_HWFLAG_NORESET)) {
/* Not the console; may need reset. */
int reset;
reset = (channel == 0) ? ZSWR9_A_RESET : ZSWR9_B_RESET;
s = splzs();
zs_write_reg(cs, 9, reset);
/* Will raise DTR in open. */
zs_modem(zst, 0);
splx(s);
resetbit = (channel == 0) ? ZSWR9_A_RESET : ZSWR9_B_RESET;
}
s = splzs();
simple_lock(&cs->cs_lock);
if (resetbit)
zs_write_reg(cs, 9, resetbit);
zs_modem(zst, dtr_on);
simple_unlock(&cs->cs_lock);
splx(s);
}
@ -451,6 +445,7 @@ zs_shutdown(zst)
int s;
s = splzs();
simple_lock(&cs->cs_lock);
/* If we were asserting flow control, then deassert it. */
SET(zst->zst_rx_flags, RX_IBUF_BLOCKED);
@ -469,20 +464,20 @@ zs_shutdown(zst)
*/
if (ISSET(tp->t_cflag, HUPCL)) {
zs_modem(zst, 0);
simple_unlock(&cs->cs_lock);
splx(s);
/*
* XXX - another process is not prevented from opening
* the device during our sleep.
* XXXSMP - another process isn't prevented from opening
* at even if it was waiting for t_wopen.
*/
(void) tsleep(cs, TTIPRI, ttclos, hz);
s = splzs();
}
/* Re-check state in case we were opened during our sleep */
if (ISSET(tp->t_state, TS_ISOPEN) || tp->t_wopen != 0)
return;
/* Re-check state in case we were opened during our sleep */
if (ISSET(tp->t_state, TS_ISOPEN) || tp->t_wopen != 0)
goto out;
s = splzs();
simple_lock(&cs->cs_lock);
}
/* Turn off interrupts if not the console. */
if (!ISSET(zst->zst_hwflags, ZS_HWFLAG_CONSOLE)) {
@ -500,7 +495,7 @@ zs_shutdown(zst)
(*cs->disable)(zst->zst_cs);
}
out:
simple_unlock(&cs->cs_lock);
splx(s);
}
@ -573,6 +568,7 @@ zsopen(dev, flags, mode, p)
SET(t.c_cflag, MDMBUF);
s2 = splzs();
simple_lock(&cs->cs_lock);
/*
* Turn on receiver and status interrupts.
@ -586,6 +582,7 @@ zsopen(dev, flags, mode, p)
zst->zst_ppsmask = 0;
zst->ppsparam.mode = 0;
simple_unlock(&cs->cs_lock);
splx(s2);
/* Make sure zsparam will see changes. */
@ -610,6 +607,7 @@ zsopen(dev, flags, mode, p)
ttsetwater(tp);
s2 = splzs();
simple_lock(&cs->cs_lock);
/*
* Turn on DTR. We must always do this, even if carrier is not
@ -627,6 +625,7 @@ zsopen(dev, flags, mode, p)
CLR(zst->zst_rx_flags, RX_ANY_BLOCK);
zs_hwiflow(zst);
simple_unlock(&cs->cs_lock);
splx(s2);
}
@ -756,6 +755,7 @@ zsioctl(dev, cmd, data, flag, p)
error = 0;
s = splzs();
simple_lock(&cs->cs_lock);
switch (cmd) {
case TIOCSBRK:
@ -940,6 +940,7 @@ zsioctl(dev, cmd, data, flag, p)
break;
}
simple_unlock(&cs->cs_lock);
splx(s);
return (error);
@ -981,6 +982,7 @@ zsstart(tp)
tbc = ndqb(&tp->t_outq, 0);
(void) splzs();
simple_lock(&cs->cs_lock);
zst->zst_tba = tba;
zst->zst_tbc = tbc;
@ -1002,6 +1004,7 @@ zsstart(tp)
zst->zst_tbc--;
zst->zst_tba++;
}
simple_unlock(&cs->cs_lock);
out:
splx(s);
return;
@ -1096,6 +1099,7 @@ zsparam(tp, t)
*
*/
s = splzs();
simple_lock(&cs->cs_lock);
/*
* Recalculate which status ints to enable.
@ -1191,6 +1195,7 @@ zsparam(tp, t)
*/
zstty_stint(cs, 1);
simple_unlock(&cs->cs_lock);
splx(s);
/*
@ -1240,6 +1245,7 @@ zs_maskintr(zst)
/*
* Raise or lower modem control (DTR/RTS) signals. If a character is
* in transmission, the change is deferred.
* Called at splzs() and with the channel lock held.
*/
static void
zs_modem(zst, onoff)
@ -1268,6 +1274,10 @@ zs_modem(zst, onoff)
}
}
/*
* Set modem bits.
* Called at splzs() and with the channel lock held.
*/
static void
tiocm_to_zs(zst, how, ttybits)
struct zstty_softc *zst;
@ -1310,6 +1320,10 @@ tiocm_to_zs(zst, how, ttybits)
}
}
/*
* Get modem bits.
* Called at splzs() and with the channel lock held.
*/
static int
zs_to_tiocm(zst)
struct zstty_softc *zst;
@ -1354,6 +1368,7 @@ zshwiflow(tp, block)
return (0);
s = splzs();
simple_lock(&cs->cs_lock);
if (block) {
if (!ISSET(zst->zst_rx_flags, RX_TTY_BLOCKED)) {
SET(zst->zst_rx_flags, RX_TTY_BLOCKED);
@ -1370,13 +1385,14 @@ zshwiflow(tp, block)
zs_hwiflow(zst);
}
}
simple_unlock(&cs->cs_lock);
splx(s);
return (1);
}
/*
* Internal version of zshwiflow
* called at splzs
* Called at splzs() and with the channel lock held.
*/
static void
zs_hwiflow(zst)
@ -1411,8 +1427,8 @@ integrate void zstty_stsoft __P((struct zstty_softc *, struct tty *));
static void zstty_diag __P((void *));
/*
* receiver ready interrupt.
* called at splzs
* Receiver Ready interrupt.
* Called at splzs() and with the channel lock held.
*/
static void
zstty_rxint(cs)
@ -1493,7 +1509,8 @@ zstty_rxint(cs)
}
/*
* transmitter ready interrupt. (splzs)
* Transmitter Ready interrupt.
* Called at splzs() and with the channel lock held.
*/
static void
zstty_txint(cs)
@ -1533,7 +1550,8 @@ zstty_txint(cs)
}
/*
* status change interrupt. (splzs)
* Status Change interrupt.
* Called at splzs() and with the channel lock held.
*/
static void
zstty_stint(cs, force)
@ -1724,6 +1742,7 @@ zstty_rxsoft(zst, tp)
if (cc != scc) {
zst->zst_rbget = get;
s = splzs();
simple_lock(&cs->cs_lock);
cc = zst->zst_rbavail += scc - cc;
/* Buffers should be ok again, release possible block. */
if (cc >= zst->zst_r_lowat) {
@ -1738,6 +1757,7 @@ zstty_rxsoft(zst, tp)
zs_hwiflow(zst);
}
}
simple_unlock(&cs->cs_lock);
splx(s);
}
@ -1751,12 +1771,18 @@ zstty_txsoft(zst, tp)
struct zstty_softc *zst;
struct tty *tp;
{
struct zs_chanstate *cs = zst->zst_cs;
int s;
s = splzs();
simple_lock(&cs->cs_lock);
CLR(tp->t_state, TS_BUSY);
if (ISSET(tp->t_state, TS_FLUSH))
CLR(tp->t_state, TS_FLUSH);
else
ndflush(&tp->t_outq, (int)(zst->zst_tba - tp->t_outq.c_cf));
simple_unlock(&cs->cs_lock);
splx(s);
(*tp->t_linesw->l_start)(tp);
}
@ -1770,9 +1796,11 @@ zstty_stsoft(zst, tp)
int s;
s = splzs();
simple_lock(&cs->cs_lock);
rr0 = cs->cs_rr0;
delta = cs->cs_rr0_delta;
cs->cs_rr0_delta = 0;
simple_unlock(&cs->cs_lock);
splx(s);
if (ISSET(delta, cs->cs_rr0_dcd)) {