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 B7B6EC77B7E for ; Sat, 29 Apr 2023 09:15:45 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F33786024; Sat, 29 Apr 2023 11:15:34 +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="CBgO+122"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E6E85860BB; Sat, 29 Apr 2023 11:15:29 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::627]) (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 7B08E86058 for ; Sat, 29 Apr 2023 11:15: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=josua@solid-run.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WtNaL948L4DMuZtTUWolgaQpVMBodPB04vMwJIEVX73YDor8djy4XsfQZL6aQw1zn3ZYx60lRz65Xwy80q0J2u63j5fY3TV9XH/rmepVxC+Npr2nqVfElPCKMCWssD9BmSIFViNwaLo8I6Ov/TQmZeRsKznUYYlRzRiziUD/pMx9P/wwAZyCenWBAugY5WhwqXZfo1xbiHrK2rrJLLESLuUNMI4JeXg+e2aNNqo5ewof/0VD+SFF/oTulIyArY7gXDSsYiVumNzVl8Mb50ITVzG97wycw/lEEkaSTWmFu3h/t1oykDWd5NR2OVaHaKJnKKsgKcOTCpZTbQ+93ClLDg== 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=g+LeXEqTkc+/46pwh22PUdinsjgVvSLblejmj2tT0as=; b=jNPfKpmKqpYOM96aRI7q2jlzxIxzlA8/FA/QCRyMguoThnw8A8Sz9U/wKLt+yzWFjODGE77zJ0YUjnURuX4ZEEZ5AaRJtWPAgD7DmIC7NuHB4wLlpRm2l37Bmh4eFKhaS3hsnXadPT6zq7KW5NyQI9B3yxtbNcboo+1egJRMcOVzKF9dyLELXCK7vJzjfOeCHCXjG81zOrerxtGU5u82BuQijc0NRkWtOiDR2pDC+iRoRflAeoC+2KQoT3KDRgipNfcGL+1YCaTpsCFwhXoiT63zuqqiLfQn0wCyZVbx0RrVqMergPZisco5Ky6CNOPgVO044tEfK8JszA36cN7J1w== 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=g+LeXEqTkc+/46pwh22PUdinsjgVvSLblejmj2tT0as=; b=CBgO+122blwxooiM/JXwJa33JYidspFZYS+6qHifrXAr8WHTr1EobuAYFv0HsX40S6ccfBDoY1p2gJ2+4x/OIltE0mzpswU/RPsC/iCw+QbQGV4vYUAHUJ5WAhBk2eerVzy0Ggfz+evqJzHDbAMjp1JYDLhKOnA5sN9d2e4rj+Q= 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:24 +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:24 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer , Stefan Roese , Baruch Siach , Heinrich Schuchardt Subject: [PATCH 1/3] cmd: tlv_eeprom: remove use of global variable has_been_read Date: Sat, 29 Apr 2023 12:15:11 +0300 Message-Id: <20230429091513.8299-2-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: 0f203486-418b-4cbb-325b-08db489243a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C6HcnuMATTyumzAF5vuAreYcFDVVcQzSF7/frsHH2qb0NxU3lhTd9nPDlSxnWenJhRG5EOufrnyiljCfgKjUA4WY3ovRlmawA0gTrKFvOCjcr89ZSK9UKbfbcNaYIIPcNzU6uxW+CQY4GX/1w7kMEHfl1s7uuUqIT3y7uiIsgq03fRRmWlVB1SooJPx8zB71BvviuBkhrRzwwJacGn1FcevNXeS7KfcKiy/5BP1W22oEJTLPZjSY0oHKDB6UgZ36Ji7t5WZw1IMfBb47kQGcfttJ9jG04bhCqNWkY4iBSkizNF+WzTDmRNzCrPr0GDgPfLWdTA0ko0kAM01Y/bUQ1FuYj/Tr3kQxP8BQFLlbjzHTRtJ2Q86BckyWG9lqQKFS2djfjR3ET5nwrMBq4gxdBbzIjy5V0C/iU8vf2MwgxR3feEbYqoDGzNhgtvIv73XqVycoRraiO5zvKLdQNfVl000LaD22NzARE0B64OBlF5wIKDS6o6sV35tcnSMklfD3hkw1KM3eTavZq7xlhTZKBqBIpVLe+9femuSHXsxLAjmPBUXHUgXw/YbxkYmqTUqM 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?kfoIUlsafoM9G8ZRh1WOP36XZ1uSF9UYnjD5qq2KZBg02YGO/GWuRph7Sx+U?= =?us-ascii?Q?IlEeCCzcIzlpzzRxucGB3JWwwVxFoxs1JB76Qoye9eshmsh3E5TUsAAMqIeb?= =?us-ascii?Q?XyQeB4PBNO82/Gg0G97W6BnpWEap8U4NsKLScKA5EimfY8ubvLFcA8BLYTAf?= =?us-ascii?Q?rqvUwrYscN6apUy52gSpJvtMv2+ohpwZIL3gs3RZOEze454ndoZLTRkjLqwk?= =?us-ascii?Q?POejyAs8pYeobnf9imcABn0vPim3uJefG4Etl32zRR2E6vli9cEoj/z93AQm?= =?us-ascii?Q?dqXljUDnN5uTbz9jfx+l3rnHoBGjH65EPAFhVat4yQDolt279slSyqK9wcul?= =?us-ascii?Q?0o1C/m8maJJ1jSveB9AfnbcpnZCqGiqwQimRWrVuTv0L+DQMXciLMtqpC9R9?= =?us-ascii?Q?ZVLqGYkWbkbv81P9jNheQtm61ej3YYnD6SUj3RLQFP2po+49Yg4+fEYvZPMN?= =?us-ascii?Q?z/MKS8yODvnMbAG0CmjjCerWqBI9mnwzZylSGpsa367CZnDDkSDjSokG26HT?= =?us-ascii?Q?J6Y5c8gtvZl5qCKHvbjuUVuD15z2PvK5bC5YnPrQNIIxf7FrpdKaciBUJVju?= =?us-ascii?Q?IvEpcO+QXLgSzR952SL8bST1KlMyQIXwxwEymUsLH2N9io5Z4MOfk5eW5/Mm?= =?us-ascii?Q?Ih6XYqc7RAPOLERxK7bJaP0j9+54QK3OxDuFkuET2qcrWmhX8fqay3gy/Ha9?= =?us-ascii?Q?2M/OWJUE2nBjDGqrU5TcNqoADPn993PElFZmWBGsaNVIDTmUA6oi41CSDPZm?= =?us-ascii?Q?oTuk70paKmnn7eJa3mZP9PUa4o2cXvoEHxp8UbuGI0/Ff/7enAi/TJuYUItA?= =?us-ascii?Q?d/PDzwjWaOUgOiTi2lT5R7weHs5Fs0J4f+hm9fOrGAis/Bb6JzXN17kY05Jf?= =?us-ascii?Q?uuzMXeEQCHo39O37U5ub0ZZsX+cam0IrzUcJQRwHa7RbGxiBJ+hTBT4Na8ef?= =?us-ascii?Q?pSYuB8ZCQE/7+nS6qk4plEM7RvBcgzphOf0uHyXpwtg5r6fd0fQEkJgAHDDi?= =?us-ascii?Q?gm/2WYY31YEHwMcEJRaJD2Z7YPIFpl6FHEBYaYvFGZL8yKuSLVviSnbdH+zl?= =?us-ascii?Q?uq/h7pgBV1Ee/VEW6WIxaaPc/XxIq8gHHJOlYWtNACTxPBYrwxKGPGzzhg77?= =?us-ascii?Q?0p1z7DevKI61LGUnUFGkRTgVrlRfP5cPZnRR2mHNt2twvQ1WFzpUSx3ydkfP?= =?us-ascii?Q?6fhbpiQbLKkl6LeQJfFJS76efGXSYG9vWDXJSGp+IIUDm9Pmzg/cP8b0+aaI?= =?us-ascii?Q?UcWE82Fc7vG6a4W82lfEckhl6IE8+nXNOq1Fw0/ceZFKL3fDll2puG2Qu0dq?= =?us-ascii?Q?v13Dx+ATPsQtaPtvy6EndkFm0cTDQpzQTOw1S4cwWx47v0dBZB/XgmU2cWKr?= =?us-ascii?Q?xoM//pN5jRFb/Hs/A1BGOH3aIG00X74oV4nwpSpL2wLzMBQvb4xHd4NEvuzp?= =?us-ascii?Q?sjaaHeB+fOY7XfkrG5ZGhkYJ0Rvpa7UCGJ/I24iYjocHfCMrx5qscYKZ7QVu?= =?us-ascii?Q?JR/r1hi+yBI7/oNR8+ZuWI+XJKoNNInOkaIAuPu2sBOsFKzjQsNQjgRFdiJD?= =?us-ascii?Q?U+r8ZSLFPaXG5wheDQd6WF58EXEdbUtAPK9dKFdRGO+iAzerKjni0Bz5wyEX?= =?us-ascii?Q?SNj6Dm36YzGTHIzsCCbLXas=3D?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f203486-418b-4cbb-325b-08db489243a8 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:24.2311 (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: ca50o78tcCW1CnDD7AZt3/k9jnr1utHPqukuXERvPWaXZF2WWt6mxfzl7V8590U9fyYmk2flAPkrfi6Wnu0VaA== 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 has_been_read is only used as an optimization for do_tlv_eeprom. Explicitly use and set inside this function, thus making read_eeprom stateless. Signed-off-by: Josua Mayer Cc: Stefan Roese Cc: Baruch Siach Cc: Heinrich Schuchardt --- cmd/tlv_eeprom.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c index 8049bf9843c..d36401e9138 100644 --- a/cmd/tlv_eeprom.c +++ b/cmd/tlv_eeprom.c @@ -42,8 +42,6 @@ static int set_date(char *buf, const char *string); static int set_bytes(char *buf, const char *string, int *converted_accum); static void show_tlv_devices(int current_dev); -/* Set to 1 if we've read EEPROM into memory */ -static int has_been_read; /* The EERPOM contents after being read into memory */ static u8 eeprom[TLV_INFO_MAX_LEN]; @@ -130,9 +128,6 @@ static int read_eeprom(int devnum, u8 *eeprom) struct tlvinfo_header *eeprom_hdr = to_header(eeprom); struct tlvinfo_tlv *eeprom_tlv = to_entry(&eeprom[HDR_SIZE]); - if (has_been_read) - return 0; - /* Read the header */ ret = read_tlv_eeprom((void *)eeprom_hdr, 0, HDR_SIZE, devnum); /* If the header was successfully read, read the TLVs */ @@ -149,10 +144,8 @@ static int read_eeprom(int devnum, u8 *eeprom) update_crc(eeprom); } - has_been_read = 1; - #ifdef DEBUG - show_eeprom(eeprom); + show_eeprom(devnum, eeprom); #endif return ret; @@ -432,10 +425,16 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) char cmd; struct tlvinfo_header *eeprom_hdr = to_header(eeprom); static unsigned int current_dev; + /* Set to 1 if we've read EEPROM into memory */ + static int has_been_read; + int ret; // If no arguments, read the EERPOM and display its contents if (argc == 1) { - read_eeprom(current_dev, eeprom); + if (!has_been_read) { + if (read_eeprom(current_dev, eeprom) == 0) + has_been_read = 1; + } show_eeprom(current_dev, eeprom); return 0; } @@ -447,8 +446,10 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) // Read the EEPROM contents if (cmd == 'r') { has_been_read = 0; - if (!read_eeprom(current_dev, eeprom)) + if (read_eeprom(current_dev, eeprom) == 0) { printf("EEPROM data loaded from device to memory.\n"); + has_been_read = 1; + } return 0; } -- 2.35.3