From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by befuddled.reisers.ca (Postfix, from userid 65534) id 6E3EC1F0C5A; Fri, 12 May 2017 15:44:09 -0400 (EDT) Received: from mail-wm0-x243.google.com (mail-wm0-x243.google.com [IPv6:2a00:1450:400c:c09::243]) by befuddled.reisers.ca (Postfix) with ESMTPS id 1C2FA1F0C52 for ; Fri, 12 May 2017 15:44:07 -0400 (EDT) Received: by mail-wm0-x243.google.com with SMTP id u65so15643388wmu.3 for ; Fri, 12 May 2017 12:44:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :in-reply-to:user-agent; bh=CnvOOPTitgtzMggj/VvfAC65BFfO6YiyFtk7keh2gvI=; b=et9V6zXqPiPb0re5JdpGWgRiyNSuZV0FlNUHnewikQ8b8o939vdfO2caHo+oljH5UC cEmiLrkx/1EMc97LquGSWJ9WuDLF1MvLOp2Djfaq/3P68uWeL7qRT5794QK0ibitwH2b OCjZr6Cs3ANRVLrGKpN+LS5ZiTUEvyACLFmUb0kjZCBpDQuAd0n6yl0kfYa4hNQyXjj2 /7h7sMAKEPRtE7sKutWOyRgF/0dFKY9c+jpVMdkaxzzsnKeDJ9QJH9mquJuwPCXqPjqt 66rnj0+OPnxM355z3YzTTZtNvSVWR9JVOuTxPe8r80cFGOcjJxOTa0iKnOiaABv6lZF3 xCeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:in-reply-to:user-agent; bh=CnvOOPTitgtzMggj/VvfAC65BFfO6YiyFtk7keh2gvI=; b=eB30EEGWDnjRZS4FXO1WX9ZD5Lzz+jBwSAwGlaLDfwJVAaazwnafpqp7kKAr+CdGMd 9hNG267jCZcFAzgxPo9HfjKtVheSr4skXMzi+ReTecXoxOfRtVXF01J9P0H0yuFAZg8O SHLg+lb3D4cxWN0bsebw9TUeYsUJD1JH9HQ5WVjik/fkyp9tof4Yc9tcVaC7qEoiwCjT RsDeKJhCUfnxhVfpH550wno3vNajmVw1+CLtR4qGuwca/gYFhhnR52q8l2mDkIBfP8+R jk8oO/pm1XgZ8anbJT2vqaTvnDghHl5fYuHvJVxrQNsz58KQ4cvdTUp5sLdoLTlvGssv 0O8g== X-Gm-Message-State: AODbwcB7NYcK8zlOAmoxvHg1BEY8gJnlbSokGWST1vH9teM4EL7K822y g2aSz6JF8rULxg== X-Received: by 10.28.172.69 with SMTP id v66mr3681522wme.46.1494618241727; Fri, 12 May 2017 12:44:01 -0700 (PDT) Received: from sanghar (host81-132-222-115.range81-132.btcentralplus.com. [81.132.222.115]) by smtp.gmail.com with ESMTPSA id l29sm4489823wmi.8.2017.05.12.12.44.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 12 May 2017 12:44:01 -0700 (PDT) Date: Fri, 12 May 2017 20:43:58 +0100 From: Okash Khawaja To: Greg Kroah-Hartman , Samuel Thibault , Alan Cox , linux-kernel@vger.kernel.org Cc: William Hubbs , Chris Brannon , Kirk Reiser , speakup@linux-speakup.org, devel@driverdev.osuosl.org, John Covici Subject: [patch v2 1/1] staging: speakup: flush tty buffers and ensure hardware flow control Message-ID: <20170512194358.GA25867@sanghar> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170511143314.590cb399@alans-desktop> User-Agent: Mutt/1.8.2 (2017-04-18) X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 X-BeenThere: speakup@linux-speakup.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Speakup is a screen review system for Linux." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 May 2017 19:44:09 -0000 This patch fixes the issue where TTY-migrated synths would take a while to shut up after hitting numpad enter key. When calling synth_flush, even though XOFF character is sent as high priority, data buffered in TTY layer is still sent to the synth. This patch flushes that buffered data when synth_flush is called. It also tries to ensure that hardware flow control is enabled, by setting CRTSCTS using tty's termios. Reported-by: John Covici Signed-off-by: Okash Khawaja Reviewed-by: Samuel Thibault Index: linux-staging/drivers/staging/speakup/serialio.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/serialio.c +++ linux-staging/drivers/staging/speakup/serialio.c @@ -30,6 +30,7 @@ static void spk_serial_tiocmset(unsigned int set, unsigned int clear); static unsigned char spk_serial_in(void); static unsigned char spk_serial_in_nowait(void); +static void spk_serial_flush_buffer(void); struct spk_io_ops spk_serial_io_ops = { .synth_out = spk_serial_out, @@ -37,6 +38,7 @@ .tiocmset = spk_serial_tiocmset, .synth_in = spk_serial_in, .synth_in_nowait = spk_serial_in_nowait, + .flush_buffer = spk_serial_flush_buffer, }; EXPORT_SYMBOL_GPL(spk_serial_io_ops); @@ -268,6 +270,11 @@ return inb_p(speakup_info.port_tts + UART_RX); } +static void spk_serial_flush_buffer(void) +{ + /* TODO: flush the UART 16550 buffer */ +} + static int spk_serial_out(struct spk_synth *in_synth, const char ch) { if (in_synth->alive && spk_wait_for_xmitr(in_synth)) { Index: linux-staging/drivers/staging/speakup/spk_ttyio.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/spk_ttyio.c +++ linux-staging/drivers/staging/speakup/spk_ttyio.c @@ -85,6 +85,7 @@ static void spk_ttyio_tiocmset(unsigned int set, unsigned int clear); static unsigned char spk_ttyio_in(void); static unsigned char spk_ttyio_in_nowait(void); +static void spk_ttyio_flush_buffer(void); struct spk_io_ops spk_ttyio_ops = { .synth_out = spk_ttyio_out, @@ -92,13 +93,22 @@ .tiocmset = spk_ttyio_tiocmset, .synth_in = spk_ttyio_in, .synth_in_nowait = spk_ttyio_in_nowait, + .flush_buffer = spk_ttyio_flush_buffer, }; EXPORT_SYMBOL_GPL(spk_ttyio_ops); +static inline void get_termios(struct tty_struct *tty, struct ktermios *out_termios) +{ + down_read(&tty->termios_rwsem); + *out_termios = tty->termios; + up_read(&tty->termios_rwsem); +} + static int spk_ttyio_initialise_ldisc(int ser) { int ret = 0; struct tty_struct *tty; + struct ktermios tmp_termios; ret = tty_register_ldisc(N_SPEAKUP, &spk_ttyio_ldisc_ops); if (ret) { @@ -127,6 +137,20 @@ } clear_bit(TTY_HUPPED, &tty->flags); + /* ensure hardware flow control is enabled */ + get_termios(tty, &tmp_termios); + if (!(tmp_termios.c_cflag & CRTSCTS)) { + tmp_termios.c_cflag |= CRTSCTS; + tty_set_termios(tty, &tmp_termios); + /* + * check c_cflag to see if it's updated as tty_set_termios may not return + * error even when no tty bits are changed by the request. + */ + get_termios(tty, &tmp_termios); + if (!(tmp_termios.c_cflag & CRTSCTS)) + pr_warn("speakup: Failed to set hardware flow control\n"); + } + tty_unlock(tty); ret = tty_set_ldisc(tty, N_SPEAKUP); @@ -201,6 +225,11 @@ return (rv == 0xff) ? 0 : rv; } +static void spk_ttyio_flush_buffer(void) +{ + speakup_tty->ops->flush_buffer(speakup_tty); +} + int spk_ttyio_synth_probe(struct spk_synth *synth) { int rv = spk_ttyio_initialise_ldisc(synth->ser); Index: linux-staging/drivers/staging/speakup/spk_types.h =================================================================== --- linux-staging.orig/drivers/staging/speakup/spk_types.h +++ linux-staging/drivers/staging/speakup/spk_types.h @@ -154,6 +154,7 @@ void (*tiocmset)(unsigned int set, unsigned int clear); unsigned char (*synth_in)(void); unsigned char (*synth_in_nowait)(void); + void (*flush_buffer)(void); }; struct spk_synth { Index: linux-staging/drivers/staging/speakup/speakup_audptr.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_audptr.c +++ linux-staging/drivers/staging/speakup/speakup_audptr.c @@ -127,6 +127,7 @@ static void synth_flush(struct spk_synth *synth) { + synth->io_ops->flush_buffer(); synth->io_ops->send_xchar(SYNTH_CLEAR); synth->io_ops->synth_out(synth, PROCSPEECH); } Index: linux-staging/drivers/staging/speakup/speakup_decext.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_decext.c +++ linux-staging/drivers/staging/speakup/speakup_decext.c @@ -221,6 +221,7 @@ static void synth_flush(struct spk_synth *synth) { in_escape = 0; + synth->io_ops->flush_buffer(); synth->synth_immediate(synth, "\033P;10z\033\\"); } Index: linux-staging/drivers/staging/speakup/speakup_dectlk.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_dectlk.c +++ linux-staging/drivers/staging/speakup/speakup_dectlk.c @@ -293,6 +293,7 @@ synth->io_ops->synth_out(synth, ']'); in_escape = 0; is_flushing = 1; + synth->io_ops->flush_buffer(); synth->io_ops->synth_out(synth, SYNTH_CLEAR); } Index: linux-staging/drivers/staging/speakup/speakup_spkout.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/speakup_spkout.c +++ linux-staging/drivers/staging/speakup/speakup_spkout.c @@ -125,6 +125,7 @@ static void synth_flush(struct spk_synth *synth) { + synth->io_ops->flush_buffer(); synth->io_ops->send_xchar(SYNTH_CLEAR); } Index: linux-staging/drivers/staging/speakup/synth.c =================================================================== --- linux-staging.orig/drivers/staging/speakup/synth.c +++ linux-staging/drivers/staging/speakup/synth.c @@ -120,6 +120,7 @@ void spk_synth_flush(struct spk_synth *synth) { + synth->io_ops->flush_buffer(); synth->io_ops->synth_out(synth, synth->clear); } EXPORT_SYMBOL_GPL(spk_synth_flush);