microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

TTY/Serial driver fix for 4.0-rc5 

Here's a single 8250 serial driver that fixes a reported deadlock with
 the serial console and the tty driver.
 
 It's been in linux-next for a while now.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iEYEABECAAYFAlUOmYYACgkQMUfUDdst+yn46gCgrU/ZfjUXJRm/VXJ/TQfWyQSL
 2kIAoJ033kZ0RqWNDkGjK9H1kLSHdVn1
 =ApFj
 -----END PGP SIGNATURE-----

Merge tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial driver fix from Greg KH:
 "Here's a single 8250 serial driver that fixes a reported deadlock with
  the serial console and the tty driver.

  It's been in linux-next for a while now"

* tag 'tty-4.0-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  serial: 8250_dw: Fix deadlock in LCR workaround
This commit is contained in:
Linus Torvalds 2015-03-22 11:54:29 -07:00
Родитель cedd5f659e 7fd6f640f2
Коммит b2f45eeff2
1 изменённых файлов: 12 добавлений и 3 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
drivers/tty/serial/8250/8250_dw.c
Просмотреть файл

@ -119,7 +119,10 @@ static void dw8250_serial_out(struct uart_port *p, int offset, int value)
dw8250_force_idle(p); dw8250_force_idle(p);
writeb(value, p->membase + (UART_LCR << p->regshift)); writeb(value, p->membase + (UART_LCR << p->regshift));
} }
dev_err(p->dev, "Couldn't set LCR to %d\n", value); /*
* FIXME: this deadlocks if port->lock is already held
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
*/
} }
} }
@ -163,7 +166,10 @@ static void dw8250_serial_outq(struct uart_port *p, int offset, int value)
__raw_writeq(value & 0xff, __raw_writeq(value & 0xff,
p->membase + (UART_LCR << p->regshift)); p->membase + (UART_LCR << p->regshift));
} }
dev_err(p->dev, "Couldn't set LCR to %d\n", value); /*
* FIXME: this deadlocks if port->lock is already held
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
*/
} }
} }
#endif /* CONFIG_64BIT */ #endif /* CONFIG_64BIT */
@ -187,7 +193,10 @@ static void dw8250_serial_out32(struct uart_port *p, int offset, int value)
dw8250_force_idle(p); dw8250_force_idle(p);
writel(value, p->membase + (UART_LCR << p->regshift)); writel(value, p->membase + (UART_LCR << p->regshift));
} }
dev_err(p->dev, "Couldn't set LCR to %d\n", value); /*
* FIXME: this deadlocks if port->lock is already held
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
*/
} }
} }