| Message ID | 20220517175507.1581310-1-sean.anderson@seco.com |
|---|---|
| State | Accepted |
| Commit | fb84517d52aa24b5b8bad6abc228459a146b6ba5 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | serial: smh: Fake tstc | expand |
On Tue, May 17, 2022 at 01:55:07PM -0400, Sean Anderson wrote: > ARM semihosting provides no provisions for determining if there is > pending input. The only way to determine if there is console input is to > do a read (and block until the user types something). For this reason, > we always return true for tstc (since you will always get input if you > try). However, this behavior can cause problems for code which expects > tstc to eventually be empty. In query_console_serial, there is the > following construct: > > /* empty input buffer */ > while (tstc()) > getchar(); > > with the current implementation, this effectively turns into an infinite > loop. To avoid this, fake tstc by returning false half of the time. This > is generally OK because the other common construct looks like > > do { > if (tstc()) > process(getchar()); > } while (!timeout()); > > so it's fine if we only read a new character every other loop. This will > break things like CYGACC_COMM_IF_GETC_TIMEOUT, but that could be > reworked to test on the timeout instead of calling tstc again (and > ymodem over semihosted serial is not that useful in the first place). > > Signed-off-by: Sean Anderson <sean.anderson@seco.com> Applied to u-boot/next, thanks!
diff --git a/drivers/serial/serial_semihosting.c b/drivers/serial/serial_semihosting.c index 2561414e40..cfa1ec3148 100644 --- a/drivers/serial/serial_semihosting.c +++ b/drivers/serial/serial_semihosting.c @@ -13,10 +13,12 @@ * struct smh_serial_priv - Semihosting serial private data * @infd: stdin file descriptor (or error) * @outfd: stdout file descriptor (or error) + * @counter: Counter used to fake pending every other call */ struct smh_serial_priv { int infd; int outfd; + unsigned counter; }; #if CONFIG_IS_ENABLED(DM_SERIAL) @@ -68,10 +70,20 @@ static ssize_t smh_serial_puts(struct udevice *dev, const char *s, size_t len) return ret; } +static int smh_serial_pending(struct udevice *dev, bool input) +{ + struct smh_serial_priv *priv = dev_get_priv(dev); + + if (input) + return priv->counter++ & 1; + return false; +} + static const struct dm_serial_ops smh_serial_ops = { .putc = smh_serial_putc, .puts = smh_serial_puts, .getc = smh_serial_getc, + .pending = smh_serial_pending, }; static int smh_serial_bind(struct udevice *dev) @@ -106,6 +118,7 @@ U_BOOT_DRVINFO(smh_serial) = { #else /* DM_SERIAL */ static int infd = -ENODEV; static int outfd = -ENODEV; +static unsigned counter = 1; static int smh_serial_start(void) { @@ -138,7 +151,7 @@ static int smh_serial_getc(void) static int smh_serial_tstc(void) { - return 1; + return counter++ & 1; } static void smh_serial_puts(const char *s)
ARM semihosting provides no provisions for determining if there is pending input. The only way to determine if there is console input is to do a read (and block until the user types something). For this reason, we always return true for tstc (since you will always get input if you try). However, this behavior can cause problems for code which expects tstc to eventually be empty. In query_console_serial, there is the following construct: /* empty input buffer */ while (tstc()) getchar(); with the current implementation, this effectively turns into an infinite loop. To avoid this, fake tstc by returning false half of the time. This is generally OK because the other common construct looks like do { if (tstc()) process(getchar()); } while (!timeout()); so it's fine if we only read a new character every other loop. This will break things like CYGACC_COMM_IF_GETC_TIMEOUT, but that could be reworked to test on the timeout instead of calling tstc again (and ymodem over semihosted serial is not that useful in the first place). Signed-off-by: Sean Anderson <sean.anderson@seco.com> --- drivers/serial/serial_semihosting.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-)