From patchwork Thu May 24 08:04:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 919711 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=socionext.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nifty.com header.i=@nifty.com header.b="1BAtDbPo"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40s24k1Y3jz9s0w for ; Thu, 24 May 2018 18:05:42 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C8BD4C21DD9; Thu, 24 May 2018 08:05:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2C7C3C21C2F; Thu, 24 May 2018 08:05:33 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4E6EBC21C2F; Thu, 24 May 2018 08:05:32 +0000 (UTC) Received: from conuserg-10.nifty.com (conuserg-10.nifty.com [210.131.2.77]) by lists.denx.de (Postfix) with ESMTPS id 45CF0C21C29 for ; Thu, 24 May 2018 08:05:31 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id w4O851Vv016588; Thu, 24 May 2018 17:05:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com w4O851Vv016588 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1527149102; bh=ppPPLKK821sjp7XrJfDGwUWxIEevduFTijLcJN2GOs8=; h=From:To:Cc:Subject:Date:From; b=1BAtDbPojuLv/OeBQyKeHN4EYpGjaOvb7mimq1Dan+VQxxYJQciLFhZpBocg/Zh5V 7n/JBC50fWNnfy6PWTIsNxLgEa9zlIhiVOI3PcttnuWrhBWa0YWhZVYwUCGf7DcSib 8RP+RW46o8b60Z+TImwbjxBwqqWL877VpD85gq6/759N5CwsndsPgX+dYtV8F5ETHT rf2lL6Eal0DmxmrrU104LHIEvZC0XzF4ql72ibgqbvXNaQTTRCs440NzU36R4/Ab55 ANFzXtUwaKoKlm4kUrSfuJBMvBjbbPtbGUKDwACvOowpAtlbxYKJ4oBYBmU2Rx8zre SBGpKc6dEOAOQ== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 24 May 2018 17:04:57 +0900 Message-Id: <1527149097-28783-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Tom Rini , Alexander Graf , Masami Hiramatsu Subject: [U-Boot] [PATCH v2] menu: fix timeout duration X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" For distro-boot, the TIMEOUT directive in the boot script specifies how long to pause in units of 1/10 sec. [1] Commit 8594753ba0a7 ("menu: only timeout when menu is displayed") corrected this by simply dividing the timeout value by 10 in menu_interactive_choice(). I see two problems: - For example, "TIMEOUT 5" should wait for 0.5 sec, but the current implementation cannot handle the granularity of 1/10 sec. In fact, it never breaks because "m->timeout / 10" is zero, which means no timeout. - The menu API is used not only by cmd/pxe.c but also by common/autoboot.c . For the latter case, the unit of the timeout value is _second_ because its default is associated with CONFIG_BOOTDELAY. To fix the first issue, use DIV_ROUND_UP() so that the timeout value is rounded up to the closest integer. For the second issue, move the division to the boundary between cmd/pxe.c and common/menu.c . This is a more desirable place because the comment of struct pxe_menu says: * timeout - time in tenths of a second to wait for a user key-press before * booting the default label. Then, the comment of menu_create() says: * timeout - A delay in seconds to wait for user input. If 0, timeout is * disabled, and the default choice will be returned unless prompt is 1. [1] https://www.syslinux.org/wiki/index.php?title=SYSLINUX#TIMEOUT_timeout Signed-off-by: Masahiro Yamada --- Changes in v2: - In v1, I was misunderstanding. I thought the unit of TIMEOUT was second, but it is actually 1/10 second. Use round up to fix the "never timeout" problem. Also, move the division to the correct place to fix CONFIG_MENU_SHOW. cmd/pxe.c | 4 ++-- common/menu.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/pxe.c b/cmd/pxe.c index 7649d92..5609545 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -1453,8 +1453,8 @@ static struct menu *pxe_menu_to_menu(struct pxe_menu *cfg) /* * Create a menu and add items for all the labels. */ - m = menu_create(cfg->title, cfg->timeout, cfg->prompt, label_print, - NULL, NULL); + m = menu_create(cfg->title, DIV_ROUND_UP(cfg->timeout, 10), + cfg->prompt, label_print, NULL, NULL); if (!m) return NULL; diff --git a/common/menu.c b/common/menu.c index bf2b471..0f0a29a 100644 --- a/common/menu.c +++ b/common/menu.c @@ -194,8 +194,7 @@ static inline int menu_interactive_choice(struct menu *m, void **choice) if (!m->item_choice) { readret = cli_readline_into_buffer("Enter choice: ", - cbuf, - m->timeout / 10); + cbuf, m->timeout); if (readret >= 0) { choice_item = menu_item_by_key(m, cbuf);