iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio_console: Initialize guest_connected=true for rproc_serial

Browse Source 
When rproc_serial is initialized, guest_connected should be set
to true. We can then revert the extra checks introduced in
commit: "virtio_console: Let unconnected rproc device receive data."

Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Sjur Brændeland
2013-02-13 20:57:21 +10:30
committed by Rusty Russell
parent b2a17029c2
commit 8078db789a
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/virtio_console.c
View File

@ -1436,7 +1436,7 @@ static int add_port(struct ports_device *portdev, u32 id)
* rproc_serial does not want the console port, only * rproc_serial does not want the console port, only
* the generic port implementation. * the generic port implementation.
*/ */
port->host_connected = true; port->host_connected = port->guest_connected = true;
else if (!use_multiport(port->portdev)) { else if (!use_multiport(port->portdev)) {
/* /*
* If we're not using multiport support, * If we're not using multiport support,
@ -1757,11 +1757,8 @@ static void in_intr(struct virtqueue *vq)
* tty is spawned) and the host sends out data to console * tty is spawned) and the host sends out data to console
* ports. For generic serial ports, the host won't * ports. For generic serial ports, the host won't
* (shouldn't) send data till the guest is connected. * (shouldn't) send data till the guest is connected.
* However a remote device might send data before the port is
* connected. So don't remove data from a rproc_serial device.
*/ */
if (!port->guest_connected)
if (!port->guest_connected && !is_rproc_serial(port->portdev->vdev))
discard_port_data(port); discard_port_data(port);
spin_unlock_irqrestore(&port->inbuf_lock, flags); spin_unlock_irqrestore(&port->inbuf_lock, flags);