Commit 8c2381af authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Benjamin Herrenschmidt

hvc_console: Improve tty/console put_chars handling

Currently, the hvc_console_print() function drops console output if the
hvc backend's put_chars() returns 0.  This patch changes this behavior
to allow a retry through returning -EAGAIN.

This change also affects the hvc_push() function.  Both functions are
changed to handle -EAGAIN and to retry the put_chars() operation.

If a hvc backend returns -EAGAIN, the retry handling differs:

  - hvc_console_print() spins to write the complete console output.
  - hvc_push() behaves the same way as for returning 0.

Now hvc backends can indirectly control the way how console output is
handled through the hvc console layer.
Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Acked-by: default avatarAnton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 63f21a56
...@@ -163,8 +163,10 @@ static void hvc_console_print(struct console *co, const char *b, ...@@ -163,8 +163,10 @@ static void hvc_console_print(struct console *co, const char *b,
} else { } else {
r = cons_ops[index]->put_chars(vtermnos[index], c, i); r = cons_ops[index]->put_chars(vtermnos[index], c, i);
if (r <= 0) { if (r <= 0) {
/* throw away chars on error */ /* throw away characters on error
i = 0; * but spin in case of -EAGAIN */
if (r != -EAGAIN)
i = 0;
} else if (r > 0) { } else if (r > 0) {
i -= r; i -= r;
if (i > 0) if (i > 0)
...@@ -448,7 +450,7 @@ static int hvc_push(struct hvc_struct *hp) ...@@ -448,7 +450,7 @@ static int hvc_push(struct hvc_struct *hp)
n = hp->ops->put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf); n = hp->ops->put_chars(hp->vtermno, hp->outbuf, hp->n_outbuf);
if (n <= 0) { if (n <= 0) {
if (n == 0) { if (n == 0 || n == -EAGAIN) {
hp->do_wakeup = 1; hp->do_wakeup = 1;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment