diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-26 08:48:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-26 08:48:09 +0200 |
| commit | 60f41e8484926c2a82fe6fe0585edfccaf1208f5 (patch) | |
| tree | 67ecce97f39ccbcf5ac3659ef6d925aa1ce86801 /drivers/tty/hvc/hvc_console.h | |
| parent | 45965252a29afc8ef6f58938077fe30f86081bf0 (diff) | |
| download | linux-60f41e8484926c2a82fe6fe0585edfccaf1208f5.tar.gz | |
Revert "tty: hvc: pass DMA capable memory to put_chars()"
This reverts commit 0986d7bc5598f5df30e3db777d00e73890c97627.
It still has some issues and needs to be dropped at this point in time.
Link: https://lore.kernel.org/r/208f7a41-a9fa-630c-cb44-c37c503f3a72@kernel.org
Reported-by: Jiri Slaby <jirislaby@kernel.org>
Cc: Xianting Tian <xianting.tian@linux.alibaba.com>
Cc: Shile Zhang <shile.zhang@linux.alibaba.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/hvc/hvc_console.h')
| -rw-r--r-- | drivers/tty/hvc/hvc_console.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/tty/hvc/hvc_console.h b/drivers/tty/hvc/hvc_console.h index 2c32ab67b68d..18d005814e4b 100644 --- a/drivers/tty/hvc/hvc_console.h +++ b/drivers/tty/hvc/hvc_console.h @@ -32,21 +32,12 @@ */ #define HVC_ALLOC_TTY_ADAPTERS 8 -/* - * These sizes are most efficient for vio, because they are the - * native transfer size. We could make them selectable in the - * future to better deal with backends that want other buffer sizes. - */ -#define N_OUTBUF 16 -#define N_INBUF 16 - -#define __ALIGNED__ __attribute__((__aligned__(L1_CACHE_BYTES))) - struct hvc_struct { struct tty_port port; spinlock_t lock; int index; int do_wakeup; + char *outbuf; int outbuf_size; int n_outbuf; uint32_t vtermno; @@ -57,16 +48,6 @@ struct hvc_struct { struct work_struct tty_resize; struct list_head next; unsigned long flags; - - /* - * the buf and its lock are used in hvc console api for putting chars, - * and also used in hvc_poll_put_char() for putting single char. - */ - spinlock_t cons_outbuf_lock; - char cons_outbuf[N_OUTBUF] __ALIGNED__; - - /* the buf is used for putting chars to tty */ - char outbuf[] __ALIGNED__; }; /* implemented by a low level driver */ |