tree 34490b121e2be5ff1635cdaeaf27f738e7c4bb24
parent 623f41eb923d7f34888cbd9e4f50a7b1a79d0ae5
author David S. Miller <[EMAIL PROTECTED]> Fri, 22 Apr 2005 12:18:03 -0700
committer David S. Miller <[EMAIL PROTECTED]> Fri, 22 Apr 2005 12:18:03 -0700
[SPARC64]: In sunsab driver, make sure to set the uart timeout.
This breaks serial consoles badly. Thanks to Eric Brower
for tracking down the problem.
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
serial/sunsab.c | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
Index: drivers/serial/sunsab.c
===================================================================
--- 261baa54024f334d2a6f888e383e75cc12ffd757/drivers/serial/sunsab.c
(mode:100644 sha1:8caaf2e5e47c01815e5e570b67d1c329a0e91402)
+++ 34490b121e2be5ff1635cdaeaf27f738e7c4bb24/drivers/serial/sunsab.c
(mode:100644 sha1:39b788d95e39d9eb8f11578552f03933ad0b4e52)
@@ -682,7 +682,8 @@ static void calc_ebrg(int baud, int *n_r
/* Internal routine, port->lock is held and local interrupts are disabled. */
static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int
cflag,
- unsigned int iflag, int baud)
+ unsigned int iflag, unsigned int baud,
+ unsigned int quot)
{
unsigned int ebrg;
unsigned char dafo;
@@ -766,6 +767,9 @@ static void sunsab_convert_to_sab(struct
up->port.ignore_status_mask |= (SAB82532_ISR0_RPF |
SAB82532_ISR0_TCD);
+ uart_update_timeout(&up->port, cflag,
+ (up->port.uartclk / (16 * quot)));
+
/* Now bang the new settings into the chip. */
sunsab_cec_wait(up);
sunsab_tec_wait(up);
@@ -784,10 +788,11 @@ static void sunsab_set_termios(struct ua
{
struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
unsigned long flags;
- int baud = uart_get_baud_rate(port, termios, old, 0, 4000000);
+ unsigned int baud = uart_get_baud_rate(port, termios, old, 0, 4000000);
+ unsigned int quot = uart_get_divisor(port, baud);
spin_lock_irqsave(&up->port.lock, flags);
- sunsab_convert_to_sab(up, termios->c_cflag, termios->c_iflag, baud);
+ sunsab_convert_to_sab(up, termios->c_cflag, termios->c_iflag, baud,
quot);
spin_unlock_irqrestore(&up->port.lock, flags);
}
@@ -880,7 +885,7 @@ static int sunsab_console_setup(struct c
{
struct uart_sunsab_port *up = &sunsab_ports[con->index];
unsigned long flags;
- int baud;
+ unsigned int baud, quot;
printk("Console: ttyS%d (SAB82532)\n",
(sunsab_reg.minor - 64) + con->index);
@@ -926,7 +931,8 @@ static int sunsab_console_setup(struct c
SAB82532_IMR1_XPR;
writeb(up->interrupt_mask1, &up->regs->w.imr1);
- sunsab_convert_to_sab(up, con->cflag, 0, baud);
+ quot = uart_get_divisor(&up->port, baud);
+ sunsab_convert_to_sab(up, con->cflag, 0, baud, quot);
sunsab_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
spin_unlock_irqrestore(&up->port.lock, flags);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
