Merge tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH: "Here is the big tty and serial driver update for 4.4-rc1. Lots of serial driver updates and a few small tty core changes. Full details in the shortlog. All of these have been in linux-next for a while" * tag 'tty-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (148 commits) tty: Use unbound workqueue for all input workers tty: Abstract tty buffer work tty: Prevent tty teardown during tty_write_message() tty: core: Use correct spinlock flavor in tiocspgrp() tty: Combine SIGTTOU/SIGTTIN handling serial: amba-pl011: fix incorrect integer size in pl011_fifo_to_tty() ttyFDC: Fix build problems due to use of module_{init,exit} tty: remove unneeded return statement serial: 8250_mid: add support for DMA engine handling from UART MMIO dmaengine: hsu: remove platform data dmaengine: hsu: introduce stubs for the exported functions dmaengine: hsu: make the UART driver in control of selecting this driver serial: fix mctrl helper functions serial: 8250_pci: Intel MID UART support to its own driver serial: fsl_lpuart: add earlycon support tty: disable unbind for old 74xx based serial/mpsc console port serial: pl011: Spelling s/clocks-names/clock-names/ n_tty: Remove reader wakeups for TTY_BREAK/TTY_PARITY chars tty: synclink, fix indentation serial: at91, fix rs485 properties ...
This commit is contained in:
@@ -81,7 +81,7 @@ config HVC_UDBG
|
||||
|
||||
config HVC_DCC
|
||||
bool "ARM JTAG DCC console"
|
||||
depends on ARM
|
||||
depends on ARM || ARM64
|
||||
select HVC_DRIVER
|
||||
help
|
||||
This console uses the JTAG DCC on ARM to create a console under the HVC
|
||||
|
@@ -29,7 +29,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/kthread.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/major.h>
|
||||
#include <linux/atomic.h>
|
||||
#include <linux/sysrq.h>
|
||||
@@ -418,7 +418,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
|
||||
* there is no buffered data otherwise sleeps on a wait queue
|
||||
* waking periodically to check chars_in_buffer().
|
||||
*/
|
||||
tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
|
||||
tty_wait_until_sent(tty, HVC_CLOSE_WAIT);
|
||||
} else {
|
||||
if (hp->port.count < 0)
|
||||
printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
|
||||
@@ -1005,19 +1005,3 @@ put_tty:
|
||||
out:
|
||||
return err;
|
||||
}
|
||||
|
||||
/* This isn't particularly necessary due to this being a console driver
|
||||
* but it is nice to be thorough.
|
||||
*/
|
||||
static void __exit hvc_exit(void)
|
||||
{
|
||||
if (hvc_driver) {
|
||||
kthread_stop(hvc_task);
|
||||
|
||||
tty_unregister_driver(hvc_driver);
|
||||
/* return tty_struct instances allocated in hvc_init(). */
|
||||
put_tty_driver(hvc_driver);
|
||||
unregister_console(&hvc_console);
|
||||
}
|
||||
}
|
||||
module_exit(hvc_exit);
|
||||
|
@@ -70,20 +70,27 @@ static const struct hv_ops hvc_dcc_get_put_ops = {
|
||||
|
||||
static int __init hvc_dcc_console_init(void)
|
||||
{
|
||||
int ret;
|
||||
|
||||
if (!hvc_dcc_check())
|
||||
return -ENODEV;
|
||||
|
||||
hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
|
||||
return 0;
|
||||
/* Returns -1 if error */
|
||||
ret = hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
|
||||
|
||||
return ret < 0 ? -ENODEV : 0;
|
||||
}
|
||||
console_initcall(hvc_dcc_console_init);
|
||||
|
||||
static int __init hvc_dcc_init(void)
|
||||
{
|
||||
struct hvc_struct *p;
|
||||
|
||||
if (!hvc_dcc_check())
|
||||
return -ENODEV;
|
||||
|
||||
hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
|
||||
return 0;
|
||||
p = hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
|
||||
|
||||
return PTR_ERR_OR_ZERO(p);
|
||||
}
|
||||
device_initcall(hvc_dcc_init);
|
||||
|
@@ -1230,7 +1230,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
|
||||
irq = hvcsd->vdev->irq;
|
||||
spin_unlock_irqrestore(&hvcsd->lock, flags);
|
||||
|
||||
tty_wait_until_sent_from_close(tty, HVCS_CLOSE_WAIT);
|
||||
tty_wait_until_sent(tty, HVCS_CLOSE_WAIT);
|
||||
|
||||
/*
|
||||
* This line is important because it tells hvcs_open that this
|
||||
|
Reference in New Issue
Block a user