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 AA3A2C77B75 for ; Fri, 5 May 2023 08:22:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 680948475E; Fri, 5 May 2023 10:21:24 +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="LJxUkMNh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 22B738473F; Fri, 5 May 2023 10:21:21 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::61c]) (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 32E1584730 for ; Fri, 5 May 2023 10:21:15 +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=Is10p0VEhC+B0C3A1wrb0wYWSf2gvna36IU9wLRSn4iLeeSMpB9ensCm+baVm6DeorXcl3xwiiM0AHhrKoMQ473eABqgXVKFf/JIl+FKvyLIR+R2kbeP+Jxl7lLLzkBzPAdv0ve4oldOwJhWSeJLOg+jAXhQGe6RXmuYLVtkBr68qKIMirF6eBTO5pFOshoMmJxGwGh8c2O5cfNEqRjeMyZKWVBOnXxUoOjWIqA9pE3FEwgDJshif1/KqxgqR3SaVjTUyfRApRGJlckyxHG2THUUOGQEzgo2twF9dOEAC3qdhxu8CIeDz8X4roZNj2jZzcOww5vbG55XDSLzqTL5aQ== 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=XJ1r4qAgpCb0BCg1EHi7X+Aooey4IEKiUjfk7j7VHAg=; b=ocsoJsyH2HCxOD01uko79GP0TcnwPve0c40UXotF4CVhBYn6p5er5NavOwTW2HoXam953aWCswxs4hV3YVq5gK8ox2CSWG+UdAYZxee/MUMPQa8PJYtNZ0lSX7ICLbzqQn/peGv4tmd0tL1U5gHfdmkeEL8Z7x7m2jFQ27xORriSXiHqL8YzzGow+g4kkKUqRavi7nrXMJsbxJkpyEdvxip0VIR9Hay3ZOr3lsL9qYqSYmcwyTSsWwdmjJVrMqjSxb0dtaGea1f4eoL4aq0+gBDt3C8KguCxDKNoCrVKuuAuVSZERHXnrVZ9bc2oXHTrhh/yMsSQYcA/617eHPI9eQ== 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=XJ1r4qAgpCb0BCg1EHi7X+Aooey4IEKiUjfk7j7VHAg=; b=LJxUkMNhc5C2ONzE9iUENAdT7nCSPjBqjbiUnSeKdf1eTccXMHTlmJ7JFD+HJ1sKKEIOqTjncvdFKCSxmb/VS9Y/r23sacrcJe8cQtJUIwp4RT8SEK1wUcAsjlb6Pn7ixJWY8Wa7bl81KoOkBJ//U5lDArbb4zxVtreWNkB/OIA= 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:14 +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:14 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer , Stefan Roese , Baruch Siach , Heinrich Schuchardt Subject: [[PATCH v2] 2/4] cmd: tlv_eeprom: remove use of global variable has_been_read Date: Fri, 5 May 2023 11:20:47 +0300 Message-Id: <20230505082049.9768-3-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: 73c50a44-80b8-44fb-03da-08db4d41b0ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7zzKfYuKodLbeF82nQ6dQENsLubpz7VZWWTqDYT4Cc7d/fqCr1HUh1zNccQQobNOzFNmEG1Z7mRiEiISge8V++M44C76+dHZk9OSnfC00Awg4lH4YIqq2UEv2pbSZGh5IJOPVpiOqXrKwQFGGYhLKxci+svs+b4S3RT35gek3ipywUacr6hmSP0bSb2dcM/J6vdWiAt3JasG1biRdBM81sZzTsr7N3JE2apUZxUJ/gvCatQr73KSVUCNE6MjR05xHg04ZOr1wWRMT6iqSeETnSNFwTFPz5Vj2Q6UrajEu/ux6PED0NkLn3Jy6M1kCYDAYL0mop1FNul5zjwi/5yhYjUPfzr907WbGtqlgVy0eszsrQDRcoeVJEuzY5aHpmRCB3uvWk1rN4KE7SU69itQ4IQOZIoteJzbxuqtoKvcyItlgU1JX8+4YaJ+LKvuiDFEWmzAIve/T2gGf1hBAAHGlx/lzCHYN5tTQRwt7XEuiAfodWWCckqo/2HIzjBTpidaa8lU+R2Jqi5r39eHC0tdWRQ8t2TfiJSfGF2LzRoBDBOeW6FndIdMXkyPtT+1sWJp 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?d/JE+FZDaKM5RsTQoCVhYB9vL5WjILM0G6IXqSZLH3mfyubJHYGSLLy0B374?= =?us-ascii?Q?1k+XEx63bp5yB51ZhIqljdcjJTy6CpAfmbcekWMKkXWgE322iZ2oymJNTEd4?= =?us-ascii?Q?z+0sd1LDT5KrxpF7VqqSofj+gVdtmhGYd3jYXf1ljsXYgFcvGT3Bo0DfbqiE?= =?us-ascii?Q?11+Sf6ipM5gnPoer/9Pngxwhr6Iy1QtAuTLhTInnuvnCYCwy/+SS79AzJ2wc?= =?us-ascii?Q?I3+5vKVpHh3kU5TGpZEp26WiUOgiQmz77PqZ059UxNCAfBBASZ8H3NRTZYpm?= =?us-ascii?Q?FkQ1/xV5ohHdsl/bzQJWtxU9+1jghEG3kSN0SdIZA748XM4yyR5ayBsxb/jE?= =?us-ascii?Q?tVQjjFZLbNKF7IEufQAfRFZF1OpAlaHLN95p0jj1IbjcdSPdVOpGPYyIIQEa?= =?us-ascii?Q?WWT0keOrUeDJZUgkgZ4NxuCuC8Vw15+xPWoqc174xYe/FMVAKTUICISmu8s7?= =?us-ascii?Q?FbYQmw0ZO22XbFnHNlHgxTzQDT25pqUjXraiAEkqgJL53Dq8Gcs9O4v6G4MK?= =?us-ascii?Q?rH7+Fqmhg+UMrdpbaNQdJ5MdMMGIMOs8m1sjqMg38+DDkbgitql2pJsuo63A?= =?us-ascii?Q?GQJGSFGdhAL2BWSB0bXYLVf35uQlHHRBXc+MwyA87EzbQZ+JhlwbE21yiixw?= =?us-ascii?Q?omObfLoP5/NtjfgOWtXld6fENkSxVkO+AyY+TuQBm9Z1EY/HA/iNXnOo1Wrv?= =?us-ascii?Q?YLiUbYVxq+bQnQFosDTfkeSBIoETrsgyOLtzhAficcMKbkfgsG3qsSInWphY?= =?us-ascii?Q?cO9k0/2x4xNnLhY8xf1Zg2w+/5dLxTLcAZ2y8MPgxgtFGIuYRArSA+Hm8BaP?= =?us-ascii?Q?OL6yJ9S7TmtewCZcYtPPw3rlidoIuGYiVtwS5KKtg1Ux4mIu10lOlWFSMANw?= =?us-ascii?Q?S7te1rpzwLCntEzbbz5dkH3dW9IsNrDB7DzUFBiFM//aoOsGAiNy5OVC3R3q?= =?us-ascii?Q?VASrv8aDfag28+8blMJ9gzBlhTB6u5WwZW/k3qepoll5MGfPM7+IC+YcLSLp?= =?us-ascii?Q?6b9Y7WZP73F7FRGs2UzZ5swrjrtn8lU5yDBwYJ0sAtN+olfFrq4ytTCLNGsl?= =?us-ascii?Q?/51KDoFSyIUTwga0IYbr8iTQ2iWqMGn1ejQ6PZgJusr29VThRpL42yMl68gT?= =?us-ascii?Q?qKzR3OXQjM6BpbAMi5twvKKYo+0t9vbk3hE7rmZEZCjOG5qzQtmAE9ms5Inb?= =?us-ascii?Q?psZ3Jh3F0X6LV0dii17eVyGkHqzPmA4g7jRlC6HaaQzKJNR0O+500fJz8T97?= =?us-ascii?Q?GL8If0+5n6mw9cuazK7io8L4b2PGfTUZycFbcoKhYi+E/Zmy86UW3KRhzLUW?= =?us-ascii?Q?mQ1l9OkdrSnfIc1NfKeQ/SDzkzidCXm2NbaDDVqg5I+ALy1ZHEOCw6SOAKk+?= =?us-ascii?Q?PElFx3kxGZE1cqfRBlC1dIVK+71wWOvl3LnNFUWFBHmtZ2TNVguarBOQ6yV1?= =?us-ascii?Q?qROawkrcYUAyKdrm8NOdZcku3E1h1GpXQ36HxpL5QHiVM34qH/HoxVaD/P8k?= =?us-ascii?Q?fWJ5kj8px0R1HO4p1RwEK0Q1808IBYFEMKCdb2/jTs/wW50qMDLNnvMHdGkp?= =?us-ascii?Q?Zn2GKRrlXVpBoBZet575jte120VqRz/kjJUDdjohlLe1KhgKAWIcL8TLtSj4?= =?us-ascii?Q?SbMmUrO4IBgA1GeA7MOm2Ys=3D?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 73c50a44-80b8-44fb-03da-08db4d41b0ff 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:14.2176 (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: cTfNRkUlv1i9dtAoGcArTOwBMI1rngFS728RkOHzj4pIdClohGC9XfYsU89F0KN3zLPBRC7rKC9AQ8+OHy27KQ== 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 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 Reviewed-by: Stefan Roese 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