d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a problem where we would recursively try to get the com lock within

Browse Source 
comparam when calling siosetwater().

Noticed by:	bp
This commit is contained in:
jhb 2000-09-08 00:35:46 +00:00
parent 20521b65fe
commit ef00a47c1c
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/sio/sio.c
View File

@ -303,7 +303,7 @@ static swihand_t siopoll;
static int sioprobe __P((device_t dev, int xrid));
static int sio_isa_probe __P((device_t dev));
static void siosettimeout __P((void));
static int siosetwater __P((struct com_s *com, speed_t speed));
static int siosetwater __P((struct com_s *com, speed_t speed, int locked));
static void comstart __P((struct tty *tp));
static void comstop __P((struct tty *tp, int rw));
static timeout_t comwakeup;
@ -1181,7 +1181,7 @@ sioattach(dev, xrid)
com->it_in.c_ispeed = com->it_in.c_ospeed = comdefaultrate;
} else
com->it_in.c_ispeed = com->it_in.c_ospeed = TTYDEF_SPEED;
if (siosetwater(com, com->it_in.c_ispeed) != 0) {
if (siosetwater(com, com->it_in.c_ispeed, 0) != 0) {
/*
* Leave i/o resources allocated if this is a `cn'-level
* console, so that other devices can't snarf them.
@ -2417,7 +2417,7 @@ comparam(tp, t)
disable_intr();
COM_LOCK();
(void) siosetwater(com, t->c_ispeed);
(void) siosetwater(com, t->c_ispeed, 1);
if (divisor != 0) {
sio_setreg(com, com_cfcr, cfcr | CFCR_DLAB);
@ -2516,9 +2516,10 @@ comparam(tp, t)
}
static int
siosetwater(com, speed)
siosetwater(com, speed, locked)
struct com_s *com;
speed_t speed;
int locked;
{
int cp4ticks;
u_char *ibuf;
@ -2562,6 +2563,7 @@ siosetwater(com, speed)
*/
intrsave = save_intr();
disable_intr();
if (!locked)
COM_LOCK();
if (com->iptr != com->ibuf)
sioinput(com);
@ -2581,6 +2583,7 @@ siosetwater(com, speed)
com->ibufend = ibuf + ibufsize;
com->ierroff = ibufsize;
com->ihighwater = ibuf + 3 * ibufsize / 4;
if (!locked)
COM_UNLOCK();
restore_intr(intrsave);
return (0);

11
sys/isa/sio.c
View File

@ -303,7 +303,7 @@ static swihand_t siopoll;
static int sioprobe __P((device_t dev, int xrid));
static int sio_isa_probe __P((device_t dev));
static void siosettimeout __P((void));
static int siosetwater __P((struct com_s *com, speed_t speed));
static int siosetwater __P((struct com_s *com, speed_t speed, int locked));
static void comstart __P((struct tty *tp));
static void comstop __P((struct tty *tp, int rw));
static timeout_t comwakeup;
@ -1181,7 +1181,7 @@ sioattach(dev, xrid)
com->it_in.c_ispeed = com->it_in.c_ospeed = comdefaultrate;
} else
com->it_in.c_ispeed = com->it_in.c_ospeed = TTYDEF_SPEED;
if (siosetwater(com, com->it_in.c_ispeed) != 0) {
if (siosetwater(com, com->it_in.c_ispeed, 0) != 0) {
/*
* Leave i/o resources allocated if this is a `cn'-level
* console, so that other devices can't snarf them.
@ -2417,7 +2417,7 @@ comparam(tp, t)
disable_intr();
COM_LOCK();
(void) siosetwater(com, t->c_ispeed);
(void) siosetwater(com, t->c_ispeed, 1);
if (divisor != 0) {
sio_setreg(com, com_cfcr, cfcr | CFCR_DLAB);
@ -2516,9 +2516,10 @@ comparam(tp, t)
}
static int
siosetwater(com, speed)
siosetwater(com, speed, locked)
struct com_s *com;
speed_t speed;
int locked;
{
int cp4ticks;
u_char *ibuf;
@ -2562,6 +2563,7 @@ siosetwater(com, speed)
*/
intrsave = save_intr();
disable_intr();
if (!locked)
COM_LOCK();
if (com->iptr != com->ibuf)
sioinput(com);
@ -2581,6 +2583,7 @@ siosetwater(com, speed)
com->ibufend = ibuf + ibufsize;
com->ierroff = ibufsize;
com->ihighwater = ibuf + 3 * ibufsize / 4;
if (!locked)
COM_UNLOCK();
restore_intr(intrsave);
return (0);