| Message ID | 20240323180711.5498-17-kabel@kernel.org |
|---|---|
| State | Superseded |
| Delegated to: | Stefan Roese |
| Headers | show |
| Series | Turris Omnia - New board revision support | expand |
Am 23. März 2024 19:07:09 MEZ schrieb "Marek Behún" <kabel@kernel.org>: >In the rng command, print > Abort >instead of > Reading RNG failed >if the error number is -EINTR. It is unclear what would be the user benefit. 'Abort' relates to a user pressing CTRL-C? Best regards Heinrich > >Signed-off-by: Marek Behún <kabel@kernel.org> >--- > cmd/rng.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > >diff --git a/cmd/rng.c b/cmd/rng.c >index 52f722c7af..48ba67061b 100644 >--- a/cmd/rng.c >+++ b/cmd/rng.c >@@ -17,7 +17,7 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > u8 buf[64]; > int devnum; > struct udevice *dev; >- int ret = CMD_RET_SUCCESS; >+ int ret = CMD_RET_SUCCESS, err; > > switch (argc) { > case 1: >@@ -46,8 +46,9 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) > > n = min(n, sizeof(buf)); > >- if (dm_rng_read(dev, buf, n)) { >- printf("Reading RNG failed\n"); >+ err = dm_rng_read(dev, buf, n); >+ if (err) { >+ puts(err == -EINTR ? "Abort\n" : "Reading RNG failed\n"); > ret = CMD_RET_FAILURE; > } else { > print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, n);
On Sat, 23 Mar 2024 19:30:20 +0100 Heinrich Schuchardt <xypron.glpk@gmx.de> wrote: > Am 23. März 2024 19:07:09 MEZ schrieb "Marek Behún" <kabel@kernel.org>: > >In the rng command, print > > Abort > >instead of > > Reading RNG failed > >if the error number is -EINTR. > > > It is unclear what would be the user benefit. > > 'Abort' relates to a user pressing CTRL-C? > Precisely. The next patch of this series adds a rng driver that handles ctrlc() events. Marek
diff --git a/cmd/rng.c b/cmd/rng.c index 52f722c7af..48ba67061b 100644 --- a/cmd/rng.c +++ b/cmd/rng.c @@ -17,7 +17,7 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) u8 buf[64]; int devnum; struct udevice *dev; - int ret = CMD_RET_SUCCESS; + int ret = CMD_RET_SUCCESS, err; switch (argc) { case 1: @@ -46,8 +46,9 @@ static int do_rng(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) n = min(n, sizeof(buf)); - if (dm_rng_read(dev, buf, n)) { - printf("Reading RNG failed\n"); + err = dm_rng_read(dev, buf, n); + if (err) { + puts(err == -EINTR ? "Abort\n" : "Reading RNG failed\n"); ret = CMD_RET_FAILURE; } else { print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, n);
In the rng command, print Abort instead of Reading RNG failed if the error number is -EINTR. Signed-off-by: Marek Behún <kabel@kernel.org> --- cmd/rng.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)