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 94CD4C77B7E for ; Sat, 29 Apr 2023 09:16:11 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 71F8F860D9; Sat, 29 Apr 2023 11:15:38 +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="Nok2NgmT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 149BC8607F; Sat, 29 Apr 2023 11:15:32 +0200 (CEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::61a]) (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 1582D86074 for ; Sat, 29 Apr 2023 11:15:26 +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=AwG5cggLeqq48SmEWngDBm7DpWgArvjE8+0ao8NEinf/Y3IY8KFwVCLEthrikaffftyvgJwSg9+ZdS3ElQ4ALshGX7T9uOh9FYjp/UG8OILYT1AkoTXO9B0xIGlvUFijtBRBSlwo1JXZ4f88GwamQvA/d43/OF2/68zi2VMWxDHD72igD9P+B6aLO4n2FddVsLMmhkWKb6PJj+iYRfRMVMTq27kt97cmsw/jAzmrfzNViFog7xlf5Y8UHhzeAGWUG0vPcboHpWH4+THjtu/RKDbF24HxSaZH3xqd0997ITCkTnl4PsIBB1dhGYjsVPdZTaV/FLAiX0LMzNAuQIyEiQ== 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=/OJ413PvaUQQQXjPz6t3jFwas23qMV8YKKm7qStx59A=; b=mIhD6ejEi6nlGxLeGMcTHjdYSERPbPBZTxZPJJ0yJ1clsh1Zi8c1K6UiE/z3yD3ifwXkB6wSZAH1OjU1EvwPrZGG7o+upMAtEd/jV/ou3Yyw4p8J08qVEJ+qF1ssQFvD2/YVPhrx6EBa9tOpqyEHjxiVBWIeEyl1uipqT4TdNq8GHKdMT9CbeJz2JmN0vaGR9BbeeiChAS6PcOHWvdYCeG5h5ENCxd1PmVhtl+w4P7PLG29uMK2BJ/PkbRtk4Z0EkZ2fx3G866pmFChjVPbtJShARCCRHEa1PcGFu436qxYM8/C1eLWl7Ou3hnGBVyekMUyMiQrcz/FlV105ivRzcQ== 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=/OJ413PvaUQQQXjPz6t3jFwas23qMV8YKKm7qStx59A=; b=Nok2NgmT+oUmehjXvSs4TMewvaxHE6kir3THg1m82Rhmvex3l6oBh2zhq07I+sqfV1zDoPrMw79qH4g+1jNGLQsagjZAM71hKcHPBCYpoUMP95DnTPHeIriinTKL+qHM+J9T4V9R33h444wt5Q50hyJ8ISQMIW1pLXjlM0lJWo0= 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:25 +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:25 +0000 From: Josua Mayer To: u-boot@lists.denx.de Cc: Josua Mayer , Stefan Roese , Baruch Siach , Heinrich Schuchardt Subject: [PATCH 2/3] cmd: tlv_eeprom: handle -ENODEV error from read_eeprom function Date: Sat, 29 Apr 2023 12:15:12 +0300 Message-Id: <20230429091513.8299-3-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: 8efb5345-7d97-4c43-1242-08db48924430 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GVawNIBidMM+PeMnSA2teXlBdANkdz+fj7MOvtWdgJ9eUgT/wYIQCqfXuZPF2YDAKZVVIFv1uBdlD1NMKLlz51JIcwZgFnuMfcFBTeFaOsQWyahhFIyLyv6hVbxMbYMKDPhi1VO6EflBFGunggZo1HNpqtGAPPCETbg5xHl2PCP2hoVDNOjozccDqcRRnb59BDO0hugVEM1ArGfhY5x7ZXC/B2zs2lqKdFcHkfbF5/wwv96uaxdpLck5GsFHg9NdJUsG6i+otZ03LRpvjf/27VXHHjKMYJIJ2T9fmeMYGFw6Hvt9B7FYBsVnHRwfgsR6u34E8FFYJdWhG5ghWOmQ4cEoTefnXc6MXPfpGmWaEYWeJozWV1KSg7yYSYIqkZYiWpXAQmwuTgIus4fmnHXM8/yA7I/e/5rjLJd4gs7hqy15m89Ga+wcQm3A8nglsJvmxGVZxlB5HDscw502WjyIEdf7ORuy8Do1HWlLkxOxYH4USLEGn8v+tFjU08NYQh0BE8A0na1mTtG0SbDSe++D6TtkQl/CgRSfCfrcX1eeJunyslq8n4qhvSaSzEZ04WvF 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?eawv1Gwd7n6FxsUi35DzxOu/TUPk8wiQ0rS4wnJBtKK9mlrfuJkcwI5Dmp9n?= =?us-ascii?Q?iX9wB6pOUhyUpM02Qg9U22yknIU8RBAhPl7Cl92qE4ypdd8pkwKgXGPTaqg0?= =?us-ascii?Q?KcvLXgEQxgSL2niQ1HquUACUzofj1dhCzgYHu+JkvlhZwDrqAhI9ADhobKAy?= =?us-ascii?Q?hdwbGtwsEqjjnlLeZkRl+bX8hW5qPLPs5AuN51jdtGmqXOM88NzpIDK6UR39?= =?us-ascii?Q?Lw5mu9JIfgofW0nRJDX3D4BCIcn3x798+N/gY064lOFOVb6mPXiwHxKLfMZ+?= =?us-ascii?Q?llZj+kwpQupeO344i/Opz0FS/SyuVzm7dnJgaW1EBtKgwRO8tEyY4OU2HEn7?= =?us-ascii?Q?s6FVkSFXJJ2QCYSkHY09Zy+eB3nsLX2YNnBX6qfMEVfHeJlArujGheq8T5KZ?= =?us-ascii?Q?7vKKqnBspYvftLoqX9mn/6+87MYs6ntLgBX4Ie/DaOs/JmXp5Ywqsk/paVwG?= =?us-ascii?Q?Hq1DrZIl3O25almq1WfdXXoNxNyTRG1tRaLmzxMFNEDsYC9Vz/Aq0eltIuyS?= =?us-ascii?Q?J6xXVn/Ccw1yh1LgydswWg57DiHpTO5dWgxce302crWIJXPK0Q0MrafFhtO+?= =?us-ascii?Q?iXNfcS+JKNHKH8v4IVmNzTbep4iD27+QIEuKiJFQo1OxMqoEUz1FQvD3GJrg?= =?us-ascii?Q?g9yyIuTDFLJvtq/39Rnp7bzbOs+wgf43DNaw3prgFVvR0kkGxO+IAOljhC0b?= =?us-ascii?Q?yZxl19KJ9yKPA8cfrLSS0StUF0kTCKSxhwEfAeV7r7mFeHz5Wn+HMUEP9X/y?= =?us-ascii?Q?NohrVoyUNKTulr7Nd6m7IaisxQAVn0L72bxPNs+e8dJoMdAWsg0h4lsB6hoX?= =?us-ascii?Q?a4qg2Ppft1/qwDfHjRdvA34our2+pzWIFuFAJOpuMi5sLV2fYN5dfWDQ3Tt8?= =?us-ascii?Q?ZVqFjUH6NyyMAFISfZd45SIOgJmnwB+9ZxZd5RrNOuWy/+iNEkqJvVz7r93b?= =?us-ascii?Q?4ydSsr666MWvaphoukpxtSk0oiDw+ZvAGXIo3Eh4PE428zMOgxTNNtG/JhNx?= =?us-ascii?Q?5ZbZ7LhfZPukM943XndQKwjapvycEL1mLFs4mfne+M/qa72BT9O1xqfVty6/?= =?us-ascii?Q?gU6HdXIR9Mc4ARlLV7eKzRTNIH5Lb/uaqVqzUn1RST4l5jCNWlxY4eP1Y2T/?= =?us-ascii?Q?nVNSDvwX1ZFUgMIZFJ8CM/Od079hFWzA33xVPIujLUiwWR2+hhfatKn1LpS/?= =?us-ascii?Q?z9ad0JpVgTgphqi/sREZO6MMIHPGuPHxNUKVqKz92rDKWz60mcemHHKMpHKs?= =?us-ascii?Q?+gZLqBak1y2BysLM7Vzt0j3rJkytmCdhpNE+sKKArpOg6qEDp/BxSiDvNQz1?= =?us-ascii?Q?LJxp/DTj/MiqB+98BR9kr1GIRhXebyVUPQUahkS2AuSJUmqEUh3XBtIqrIUN?= =?us-ascii?Q?HDNXn6FQWA4KzveIQ1dK89UL8ZWpVMct5S5+DRDB0072utuHiy0tb2peNUyX?= =?us-ascii?Q?8difTXebffO4SYlPHCJUKuEYOVj4I+XXbYCCgCPnnEnOhGNufQo+R/Ya6qtD?= =?us-ascii?Q?felnMOISy4xKB1+Z4bK9Mi2Xv90HcDKDqdN1IjtkK8nTnMiLPyl3V3ynGGCL?= =?us-ascii?Q?BtFdc3XKMSW2URHElTR4ejIBD7YA6clvkp5hrywajZ+O3gL8TqYbqKJEOnhA?= =?us-ascii?Q?HEzR0gpvqldrHRgqVBwhgjU=3D?= X-OriginatorOrg: solid-run.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8efb5345-7d97-4c43-1242-08db48924430 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:25.1232 (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: UpxEgyy1y354aa11cRbzT2r7vaH4fo65ASvuHjkQ5oCZgna8j/XRroJxoOMJWGLPJ9z3KtCGJKmFfqAHgC8ANw== 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 When tlv eeprom does not exist, return error code instead of quietly making up tlv structure in memory. Signed-off-by: Josua Mayer Cc: Stefan Roese Cc: Baruch Siach Cc: Heinrich Schuchardt --- cmd/tlv_eeprom.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/cmd/tlv_eeprom.c b/cmd/tlv_eeprom.c index d36401e9138..636c1fe32ef 100644 --- a/cmd/tlv_eeprom.c +++ b/cmd/tlv_eeprom.c @@ -134,6 +134,8 @@ static int read_eeprom(int devnum, u8 *eeprom) if (ret == 0 && is_valid_tlvinfo_header(eeprom_hdr)) ret = read_tlv_eeprom((void *)eeprom_tlv, HDR_SIZE, be16_to_cpu(eeprom_hdr->totallen), devnum); + else if (ret == -ENODEV) + return ret; // If the contents are invalid, start over with default contents if (!is_valid_tlvinfo_header(eeprom_hdr) || @@ -432,8 +434,13 @@ int do_tlv_eeprom(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) // If no arguments, read the EERPOM and display its contents if (argc == 1) { if (!has_been_read) { - if (read_eeprom(current_dev, eeprom) == 0) - has_been_read = 1; + ret = read_eeprom(current_dev, eeprom); + if (ret) { + printf("Failed to read EEPROM data from device.\n"); + return 0; + } + + has_been_read = 1; } show_eeprom(current_dev, eeprom); return 0; @@ -446,11 +453,14 @@ 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) == 0) { - printf("EEPROM data loaded from device to memory.\n"); - has_been_read = 1; + ret = read_eeprom(current_dev, eeprom); + if (ret) { + printf("Failed to read EEPROM data from device.\n"); + return 0; } - return 0; + + printf("EEPROM data loaded from device to memory.\n"); + has_been_read = 1; } // Subsequent commands require that the EEPROM has already been read. -- 2.35.3