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 2C2E1C77B7C for ; Fri, 5 May 2023 08:22:14 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC48F84772; Fri, 5 May 2023 10:21:25 +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="Ohr5oTC0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5B93C8475E; Fri, 5 May 2023 10:21:23 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0606.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::606]) (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 0643684761 for ; Fri, 5 May 2023 10:21:17 +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=Os8Y0OCIZxmxu7YssJahsT9GjJDk8JvFqucbUBsh3z0uCM0smCAja4mMk14vmV7R4mhzetEiIT79ZbVSyRGSz0mHwwqf65xZHvt5nrvgd99J/p8lA6vLcf6q3elb1IH+r1pwYiZQRslO4CklW880YRkBPsOaItZ5anb5n1Qiu8dpTc7ySFDBY36Dxr81bbKZTVsX5Bk8sUYHV693Fyzh4g5aW1xi5UdAPe/QRd+QtqThIK1SuPzIYEaN7oaQcOXZ98r5Bgvmu6SVNscO6+/NH6qXJvd0zhsK4q2IXWQ+UTPuUJXWjmxASrCO39OJ0Tcm3n9nF3GuGmZlfgEtxxemZQ== 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=zoyUq+355Tjrm4KKYtWHxIiACx54SmJqxsoSZUqhb38=; b=bEq9kd2FE1k44bTLmTG3YPoVIWc0UH0iuAXowePDsszk7MT58FRtOygHygia9Ieg2KP+TGDx4uTaXFJfW7K15rXm3aqYyVNMkfYh61L7C7FBTBbQ24H9GDkGZuF9N8wQFYGUjUVm08e+m6a7eaG+aavr247gptPhey88xNNrntPTHL1VLecV8Lu/d3GAXZybeP2/ugb5DnCsX1SfxQdNswmLi+Cu3pX5xzixxw9w7o2wVki2CNCqOjiYPOdJ5Ti+NTExdFXUZWDKpGVOlz9U9oohMibdT1a0RrdmN7WJu5MEh6NXIokchGdcFpENISnZmGGHiryADevUJeGTy5RUqA== 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=zoyUq+355Tjrm4KKYtWHxIiACx54SmJqxsoSZUqhb38=; b=Ohr5oTC0oR7TpBgL/+Z2VPjOyyqZFOPNIlz5kIcW9lowLT/HNd0Zh6efOcFYK3owh4idMueytOSDo3acVOGV0SFbSYyGaZHFJw4/hgDtL7hzGaEVxNurmMN3+ku2y98z4pnvSVNIcJ6kq9208ZwJTE28J+SzBpHaaoGtsPKp5oQ= 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 AS8PR04MB7926.eurprd04.prod.outlook.com (2603:10a6:20b:2ab::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6363.27; Fri, 5 May 2023 08:21:16 +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.6363.027; Fri, 5 May 2023 08:21:16 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer , Stefan Roese , Baruch Siach , Heinrich Schuchardt Subject: [[PATCH v2] 4/4] cmd: tlv_eeprom: enable 'dev' subcommand before 'read' Date: Fri, 5 May 2023 11:20:49 +0300 Message-Id: <20230505082049.9768-5-josua@solid-run.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230505082049.9768-1-josua@solid-run.com> References: <20230505082049.9768-1-josua@solid-run.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: VI1PR0401CA0013.eurprd04.prod.outlook.com (2603:10a6:800:4a::23) To AS8PR04MB8963.eurprd04.prod.outlook.com (2603:10a6:20b:42e::18) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8PR04MB8963:EE_|AS8PR04MB7926:EE_ X-MS-Office365-Filtering-Correlation-Id: 5850944e-35dc-4109-7306-08db4d41b21f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Bo4H6wNfEcmSXSk2+n1DV/8G/8umBAIc48vZW2yP87VcFY/lOa0RJy0arNlqx6Xc4s/LBNkDC/1xVI6vH2eNMGpzhOEAdVCfuIT30Nl6DzsPbB9zN5/WFq9vUnYKBDgyMTWGixmyeLx9TRbzAc1SsztpRHIdMoO0skllc6iAxcGtE/oOynD1dN1ISHELpyS1nVHKtuQkAX69nAcZCnPic5zqcXcQEIClXC9oepMmIHDk3JvsztAx57gaHnYPHIvElnkbKyJg/tEqxCefJp9lq+fNMxNTz1jqM6AoBaaCzKZZI4XIFGmplvi1ic20QMuI2W+UJ/DE6azUrAFISbOeWptt9zoNRNxIfJS+vRwLp7x0Q7vHe9i4tOI4KHIuERMpOb7nCX+jJBUtuBtYCPSK34bCQ0V4Z4jqkFFcTtr88MmLtBsiv21lqaA8D1ZK7OoyPZLsJ1anw34qZmeQU/tHyhllfPwl0AlFpe0aoJW5zDr6fCpBfJqhXgy983HMF4+WoSanVPiwrPQEuMydP3vm7vNRBzJFmmebhIycOOiDodeCzwGRCOULCdTzZMfvCn1L 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)(39840400004)(366004)(136003)(396003)(346002)(376002)(451199021)(52116002)(478600001)(6916009)(4326008)(66946007)(66556008)(66476007)(6486002)(316002)(54906003)(6666004)(86362001)(36756003)(83380400001)(2616005)(6506007)(1076003)(6512007)(8936002)(5660300002)(8676002)(41300700001)(2906002)(186003)(38100700002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uPEsNHoqzjoy15hZghA/lkaapkI5omBR2jIE2IWRz5gY813A47qThM+2X+At?= =?us-ascii?Q?MVwKANdrrKhdieHQvHeUutB6Z1WL7Ot2RkUwSVuNpvQUUmKzCYPTpm2X+wuB?= =?us-ascii?Q?wcK6nQxc1HPvIHTFvMdwISc9pwb4tyBx0tCmfFUVZHQcIn/PVVxgPssKlS7j?= =?us-ascii?Q?HuSSJZm97RdJYcs551ZVM1HjIuTzViOGxx6NQU/kJB6WpBL65VEggq/wno7n?= =?us-ascii?Q?uN+5vpEwxvXfBODE2T03vDMGkUpQeMz5dM57BUBWW7JxYnpMNGSJMy4p5ll2?= =?us-ascii?Q?MI2kai1b2mDVipfBNHUOuWKA+N+xSK5pkV/Hrrxd3qd+6SZH+vI0Z2L2xDAl?= =?us-ascii?Q?Jw8Kyaw7j/hLeHCgsevP5x79S7W0ILmqvggS1lNL1ubRgcpOdQ4sJ7MWIk2X?= =?us-ascii?Q?trBIdAzTBiF7hHaRj0i8T3/5htKcdnNv3H3vkviO6WgMgAa6XoKwnQOTBvsl?= =?us-ascii?Q?bXqND/tTtv/QapWmH3uayOTjVLE4na92gGpSCRYLcvDRb2334c/1VrSP3+u7?= =?us-ascii?Q?jcLDyRZ3tb1gKYasAVvlAIB2xQ46luu/KmpdKw2rdaHCeFDzB4uysqYvNEuZ?= =?us-ascii?Q?tpv8KM/oj+MeCxzy2W6DOnu4G5eGgqN3cNvMAeINHOdSQ1G/RtRGy4tPSjYk?= =?us-ascii?Q?Wq9wGPXyVVrN9j6dBFOJ5qwJyKkZNq8LK/9vhihqNReAV2t2MPUwRNPZwRse?= =?us-ascii?Q?V9VdNz+c/tuO3oWJ25iGEhV86lBU7hUkW5bE0LwBZvjAToM+/GE+4CV2LZhJ?= =?us-ascii?Q?xmorGSVvsOVjkBmODe3X5EJMOK6Ly+hxFCtWRmKHd0S/3ARbXBdTsQFtcFs7?= =?us-ascii?Q?ZSOhZgngZojQybgi163H/3WtPAAGsoF6DkyW93CF+mofWjbo7yUNTgOJkNBX?= =?us-ascii?Q?t/KHWf4k+4gyfj2dg+55nsB37D67NGNO8pXhObJTZgxgxOXmT4kp2Cmbm2HN?= =?us-ascii?Q?LnlKq2Tss6dBazr1oU5aXHpEXD9q3M8oN1kautHbCoJD9SuLE14QWbU5iI4C?= =?us-ascii?Q?DrkPZ2ALmMcT3YaDzmHfDM6VumFruDr5dL51MvqBLpVqD7WwY9GqUDKQail3?= =?us-ascii?Q?46TtK4Zgy8kOIkQa5HJ6dDNwITH8S9DN535NPPO3lI3EzlisiixQd4Ihp+Wh?= =?us-ascii?Q?0NCFwzGKaB1Z0bSL89cXY2ceGoD4ySXaxxXEItgg1HQGxmGsp5UMLXBUReSr?= =?us-ascii?Q?cPAEgEiMdbPxuaWsSyxCksTO/SQkkCKCT2DmmtKdvgG5yx3SRpjhceADGLcD?= =?us-ascii?Q?XmPMk/bbUV5U/7FTWJKUNUfEHVJbHMY9hq1MlimFuF9188FN+r6aVMFGNtx7?= =?us-ascii?Q?H4WBbOdvhv4qykWZoApgLV830p7g0eZPch6yLvY4FALcGvtFyyKTUqAQx934?= =?us-ascii?Q?7G5xld0w/o+5lGBCWRkWjACYGD/RVqhWKnzFEC1YCnAX9TD946wvR6jLfJr1?= =?us-ascii?Q?yBmah6tF4VkUGQzM0G5MSVAm8x/+2oUgu7M6DFoTBxMi4iO1MWU3I+AGVuUI?= =?us-ascii?Q?BUqcy6qQKhLakfljzszCTI2CFzUID/ha6Urk8rE7kOSYYPhJrIIM9DjsmYRd?= =?us-ascii?Q?LO36fFrE1JdovLh1Y/gg2x4eiHsnnBbQiLxqDIYpCBqinToKE9GCXm8evVSR?= =?us-ascii?Q?wkK/uDIdF4g2LN05RIqo+3M=3D?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5850944e-35dc-4109-7306-08db4d41b21f X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8963.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 08:21:16.1167 (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: 3RZgPWxhzE4zvDx+5AZCC9XR9slnDVG1FU5Kgpo802IskwSb/z3xh/sPHw6vsWp+siay2CpK8/RFzydac+zo4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7926 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 Reviewed-by: Stefan Roese 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