From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2C57DC77B60 for ; Sat, 29 Apr 2023 09:15:58 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 16A2A8609B; Sat, 29 Apr 2023 11:15:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=solidrn.onmicrosoft.com header.i=@solidrn.onmicrosoft.com header.b="CF1mjbRB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E0B83860BB; Sat, 29 Apr 2023 11:15:30 +0200 (CEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2061f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe12::61f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 18C228609C for ; Sat, 29 Apr 2023 11:15:27 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=solid-run.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=josua@solid-run.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jkGmblCeyPLVbI/mu/URs7dDoJwd3MRpZF76zTAYpI3hMlpTtcc4UvvAqUuAUWiMixqEShvgp/OZKl7AjDWgYSi9t73m5MF0ntikXmh8BIi6ckr+P5gWHNQyZ41Fh13T30t6xXyMeGZ1OMW2vQyEbZikWPcMktSHE9jq8eJXR0neSzpQtp/BOnoAyMEPB2Js0EBQ6XsXT/ardPRFsm8kEh5lAtw7rLCvwIQhp4ocMtGHBRmFfwEsLSdw6WN3jo+qcp7qc6tAz6LNtZqIuDx6L0lJYw+GmTnRDf1gCiI/F5eTbk+x6NF+BnpoCACODvnPXT+FIREQVUFL2RmjObM/MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CYkSKahWQYkE7uJxBGUdpigkMGVsAxqbXk9wmOl7AzA=; b=jd3WHoG9t2nOr+RX2VR8a0ca9meTaKZ0XR1QUZB/99BTwRZ6RMh9oFLK4uw6D0J8eG+H1+PnipJ0IVTIXmBwfUGAQCbDaPbh1V09meBhv6rnjXlGYUn18LPOaDDoXtphrhqnYXV72JufuXOSk5uvvncb+ss1JbIgtONtdSGgKRV0qrK8Z2zX7PRlyVQnoaXKRmU+KcKPWNmvn1CKEGfFHip8VPKleLV1SaiPv0YdWbvY86AKCHHaXkDzhU3L6gFeW+cMNf6/mkHBWE1DMei5aUPBphE11dyOOk7uiHdPPc9/MRm1uxdTO1kI6jrak1YtbQw141KwjayelGpG0rUrUg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=solid-run.com; dmarc=pass action=none header.from=solid-run.com; dkim=pass header.d=solid-run.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=solidrn.onmicrosoft.com; s=selector1-solidrn-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CYkSKahWQYkE7uJxBGUdpigkMGVsAxqbXk9wmOl7AzA=; b=CF1mjbRBUroUvX1cZh3RjQYRn+4nNDocF/8HdFQF0MDn7s2orSLY2qYLbS+HBe0d9AcJ9easXazacinoJnVtnfAP64yfItsocEehNpF+wMV3D7RmyiDx62aHIpryAubvnHke9Ne9s9IiZs02HOS4XhBZqdO5cv0y7oFc+OHmtw8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=solid-run.com; Received: from AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) by PR3PR04MB7371.eurprd04.prod.outlook.com (2603:10a6:102:87::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.26; Sat, 29 Apr 2023 09:15:26 +0000 Received: from AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::9e27:8c41:a8d:938e]) by AS8PR04MB8963.eurprd04.prod.outlook.com ([fe80::9e27:8c41:a8d:938e%3]) with mapi id 15.20.6340.026; Sat, 29 Apr 2023 09:15:26 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer , Stefan Roese , Baruch Siach , Heinrich Schuchardt Subject: [PATCH 3/3] cmd: tlv_eeprom: enable 'dev' subcommand before 'read' Date: Sat, 29 Apr 2023 12:15:13 +0300 Message-Id: <20230429091513.8299-4-josua@solid-run.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230429091513.8299-1-josua@solid-run.com> References: <20230429091513.8299-1-josua@solid-run.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: FR3P281CA0088.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1f::16) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|PR3PR04MB7371:EE_ X-MS-Office365-Filtering-Correlation-Id: ec09e81a-7360-4917-f2a9-08db489244b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Lzdvq1l/NFMjmtVUbn6vHOmWWjdIEo1eqoD4KFlq/J9mZAsr4nQyhUJl5H1asAaCoibpO3bRUi0ckqV0x3d5eWBlf85vCyPQ5HP9vZcU/CXrdyD8ONwlo6dplVJoYL1LIYYuLT0MwAl9ZAsPyjUdSAe6Lftma3eB4MPttnjysLkb7Gr3hlROdeyp23CKNbRjKat8WUT/3Zt5oSGJ2q8WqSvgnLvN3F5x3+lZdEUDejIqrpJ5TQxYGKSfBnsd7qt1MA3XqSGA2Budy1XCXtJbjfpAgFu+9FwLV9D8r7Z2TbeCaiUdcvIH9VegvJr7VDjEAzs1JBkCZf7iCTGHiOWUs7+zGS/9G+5YKpDxg4WaGNfx/5dEq6YcSmyHkTDLeTSYvjqZ7CH3K2R24ldOrQWp3R2e8R6gxeGznA8Qb6Mh5zFPducAi0F8bwCp67YyRh2kYNgtPFxrxHS5oYTJyYQz0FWEykcwB4eFG5uMvuu/RhqK2sPFyMOpZDhJ6yK126RfYyropYLMBVWDnqWuYS4dsLdtlRjdhNnm7zUyChN5iy4QPXueeqv/oDq34BLHdXYN X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB8963.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(346002)(136003)(366004)(396003)(39830400003)(376002)(451199021)(316002)(2616005)(6512007)(6506007)(4326008)(8936002)(8676002)(86362001)(5660300002)(66946007)(478600001)(54906003)(186003)(83380400001)(1076003)(41300700001)(2906002)(38100700002)(36756003)(6916009)(52116002)(66476007)(66556008)(6486002)(6666004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LNREy7br0USPAjPH5vN1NbV4KpuHU+jkoRylBbnZmvHfCe3XbSZi/3K+XsCv?= =?us-ascii?Q?0Or+eSGbWxfOSZS06eUHLH6QuTdXbYtMg1ucXVTcFjLCR7TS5DGiWnSULXoR?= =?us-ascii?Q?RQkJ2jFACiw+MWFtZvrQOcILi3EE+6R2lVlo3KQJS2tHdf7FMEvEIUX7bl9m?= =?us-ascii?Q?+uUYgQyYLKb4Cq/mHkVkHAKMxxymz6CiYTxh1PVGuJrc0ZpOHmSdxxKwsEDV?= =?us-ascii?Q?1vGwHZ3u+r68tlGZqePgkqxqIng5Nog0wHK3CByPdK8aAaLvwCSNc6JAfVLR?= =?us-ascii?Q?yCxix3PI+5FK8xnaFGob6BaKT3T5XcReVmF1UKgIJtptQ9OWLCbUAe3s7P1T?= =?us-ascii?Q?ZjsqrQYVQtAP6d5QhBnMHmJpYLv0qXQk6BrBrUZzkbYRCZfGUWBbiYA7g1D8?= =?us-ascii?Q?q21fYbVQY0g5s3j2S9ZUmFREjTBf3Dl4teqHyFI0t7tBJ3x3ZdHLj9f25Jpd?= =?us-ascii?Q?xAoywGd/zuCwP+UjF6yppouYWEcjxzMy8JXVmQVYp6+Znfbsbm6+Gyg32ORK?= =?us-ascii?Q?N8FH2DyDA4U7a1+Q5KuiLOCtHKQq9SUrFmeFp3k4dbJJ4YMOqYcWS/12jBrE?= =?us-ascii?Q?54+HfIUaNUxqBq/Ihmra81maV6yjkxluVxMBzxrdqsCNE9MYl8jcY5gY9jiJ?= =?us-ascii?Q?lxgfFj34wqO2/zYZ/AWPqEKVgnlWPbib+M/hQ7i1N/k70UwX0jBO0ky2rM98?= =?us-ascii?Q?PnKJ+cGHt94cabbwq2fcWhKgX2AECPQGiWUc/YbME76Iml58cszn0bVtyevF?= =?us-ascii?Q?PscgPI23y3emwN3YHfb7a5KeXcN4hva+P/HZUC53ORaRw92Gb6MJAu2swxWD?= =?us-ascii?Q?kpUBftVKpJQdXQ2ChzOZz6EoB2aIC+47hdfcHYsTRk+ajR183mlrltgDywmT?= =?us-ascii?Q?OYt7H8bov2W/E9/S1cryOP7cZVxu7ZIBv4oTqpgvVN30J5ZiA6BUAW7z2IWs?= =?us-ascii?Q?g/G7qR0LBH71eU2zb22R7IGfpms61X4V75x8+W9mf+ix3QCYTSiYm4q56JDl?= =?us-ascii?Q?75Jki6EnTFsVG8Wd0QPDjiZZrdOHUWMSMb2VB55cFsCMTdVi9RNhTvBZYFHl?= =?us-ascii?Q?5TxlClDFuWPk8soXwjf2Ck25tu1w11X+AyYQjtfqFJDdFxDXelGUCDQyXrGG?= =?us-ascii?Q?VjeQmb8owGt9exREhCqAUWC5q1udWnRMbkpUAqqMJ+1V2c/2zVPGRJtCIsJ8?= =?us-ascii?Q?j7tO7D7d7iOHhQIFI+m9D9q/Kq02/KQxa5FWJF4ibgx177xnC3H8jVNSqZ6Z?= =?us-ascii?Q?evXSm62W1VXzk463uL3V9H5Y5VVOT9tpdzDx1ovKbzdo/qrogN6uPHTUEgzV?= =?us-ascii?Q?PiMMBjHBIlF029wTtLnSR8pA24H+W+T9DXMaglmyuyMPJkkS03Myz5DSQR/r?= =?us-ascii?Q?JwcNqb8cOz6MyW0Awl+mt7hIDf/c+46/lK9WUV27W7UKQIdowiKtaPZGqzBb?= =?us-ascii?Q?9ljKdMmTe2vVvxGsG9lprLpp0LKMXOHbjqDNV5Y1OlYrmWVbHAfzoKoEXWBM?= =?us-ascii?Q?hGoQxtFOwirHpPOi2UbGGO4f5BuDXLgoJZQ9diSh3UaXC9I8kFXPEgfTEzN9?= =?us-ascii?Q?90OOmwTl501I2ZcOc44d54+MLFyojIvUfMk1kSY3IIR7/YhMKdYtBMEy57d7?= =?us-ascii?Q?DyYfRtew2lrZXIpPLndB3jI=3D?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec09e81a-7360-4917-f2a9-08db489244b7 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2023 09:15:26.0144 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a4a8aaf3-fd27-4e27-add2-604707ce5b82 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: RrbS+tb7fCqJ23xxmC+oy/O/nqnKJBUfxKybThaC3uBN+dwMhJ6s+rqvmIdSnHTdI+j31ap8EVnyPFDqeg/Ekg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7371 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Move the handler for "tlv_eeprom dev X" command to the beginning of do_tlv_eeprom, to allow using it before issuing a "read" command for currently selected eeprom. Also remove the check if eeprom exists, since that can only work after the first execution of read_eeprom triggered device lookup. Instead accept values up to the defined array size (MAX_TLV_DEVICES). Signed-off-by: Josua Mayer Cc: Stefan Roese Cc: Baruch Siach Cc: Heinrich Schuchardt --- cmd/tlv_eeprom.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c index 636c1fe32ef..79796394c5c 100644 --- a/cmd/tlv_eeprom.c +++ b/cmd/tlv_eeprom.c @@ -450,6 +450,22 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) // "reset" will both be treated as "read". cmd = argv[1][0]; + // select device + if (cmd == 'd') { + /* 'dev' command */ + unsigned int devnum; + + devnum = simple_strtoul(argv[2], NULL, 0); + if (devnum >= MAX_TLV_DEVICES) { + printf("Invalid device number\n"); + return 0; + } + current_dev = devnum; + has_been_read = 0; + + return 0; + } + // Read the EEPROM contents if (cmd == 'r') { has_been_read = 0; @@ -508,16 +524,6 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) tlvinfo_delete_tlv(eeprom, tcode); if (argc == 4) tlvinfo_add_tlv(eeprom, tcode, argv[3]); - } else if (cmd == 'd') { /* 'dev' command */ - unsigned int devnum; - - devnum = simple_strtoul(argv[2], NULL, 0); - if (devnum > MAX_TLV_DEVICES || !tlv_devices[devnum]) { - printf("Invalid device number\n"); - return 0; - } - current_dev = devnum; - has_been_read = 0; } else { return CMD_RET_USAGE; } -- 2.35.3