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 9BE85C433F5 for ; Tue, 22 Mar 2022 21:01:56 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E237283CDF; Tue, 22 Mar 2022 22:01:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.b="y1I1fjqk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BD6C083BC9; Tue, 22 Mar 2022 22:00:33 +0100 (CET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::60b]) (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 CE9DB83BC7 for ; Tue, 22 Mar 2022 22:00:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=reject dis=none) header.from=seco.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sean.anderson@seco.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I+r9Sl+lR1QaLLuDNBre5SsbH43H/6XeCStmy9bTWAOYMQdtD9+GK18T0J9fzKh1TvSVmTH7uBWFioi/r39R3NoPTW0mkGrI8FGcvl72OR4aYohgeGusGONJAfH6o7rEFhRlB1+1hk90bTQbiONWAAfWEhfYQxsbu6zqxtpftZQqhWot8o1+Wknxf0PAOXvxzjo2tRlbFYqv3/SNJe5oYvAuxLEeG+PlNPdVR6nyg/RRu1LsjoZTs9gJigsz6c92YsDl5LTXuAWT/qOw29t01NidYfh72kWsMRwe+nCqh2InrO2KHaTTT5h+hPC73ipKMynI7Lx2UgC3pmoJdK19pw== 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=BEoCaRy1CH+X6R6XU4q/CGUcy/2gvxwxdIUs/OaTMNA=; b=nE7TY+VToaqK7cuzuhm7BaIbBmVwO+amePqU0q0B1Ijb7JbDf6VmTF33tsSOWWEYiQTRosfzXf+0+4+VuS5VLmhRO1CNlSPESC23ihSfjpZw6WzTpeIZ9s0Wq5DrEdzZ8gDH3he240vUhPUQ1JDWua7TUVPWWC1Ap5kUC9GAv6/DgbIrygfzyFSanGMzwwbINphViEhNpJ2xEn0BBLGhxt+pO16kugwmQ9FRZNXZBimznJ1Z8DZtTVH5nngCk/yDjUaGMZ6xM0/DOIrESVUIGs0H7AQCb+o5s6lrD99l1Tnxmf1LmIrRGpItuR/Li9z1TCiy1Vll5OTFA78vIOVroQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=seco.com; dmarc=pass action=none header.from=seco.com; dkim=pass header.d=seco.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=seco.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BEoCaRy1CH+X6R6XU4q/CGUcy/2gvxwxdIUs/OaTMNA=; b=y1I1fjqku+rMlVkPbbg/TW+Nkgb2+QwmtkbHx9XxzEK48qEUySEk2OmO8gZi9g6gYVz5ixu45b/KIdRkqxyKZNbyzh0P2/B3ED23Sj6710wN/86wwSwkQHvAbcjnLnBMeya/AMJEqSvNYRVGzzARhN/0hSa01eaDHm1J+GR818D0T5vdDScQpyO+en9iz/Jjsemd+m4EK50bfi2dCMSDWSg7Rh7003zcRl9PFrJnc27pvfvLOvNUb9JJI1g0BEFjU/zQTEK1OX9z1iB6PpaIplBIWFiIs+i1cZT3UFhbZhb8udv9l3uFxfq+2W14+S/Upn7cBm12j5VRzGC3QWVkog== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) by AM0PR03MB3938.eurprd03.prod.outlook.com (2603:10a6:208:6e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.23; Tue, 22 Mar 2022 21:00:13 +0000 Received: from DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::2414:8ad5:9fd6:3bff]) by DB7PR03MB4972.eurprd03.prod.outlook.com ([fe80::2414:8ad5:9fd6:3bff%5]) with mapi id 15.20.5081.023; Tue, 22 Mar 2022 21:00:13 +0000 From: Sean Anderson To: Tom Rini Cc: Linus Walleij , Liviu Dudau , Andre Przywara , Simon Glass , u-boot@lists.denx.de, Sean Anderson Subject: [PATCH v3 08/29] arm: smh: Return errno on error Date: Tue, 22 Mar 2022 16:59:16 -0400 Message-Id: <20220322205938.1721846-9-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220322205938.1721846-1-sean.anderson@seco.com> References: <20220322205938.1721846-1-sean.anderson@seco.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: MN2PR20CA0012.namprd20.prod.outlook.com (2603:10b6:208:e8::25) To DB7PR03MB4972.eurprd03.prod.outlook.com (2603:10a6:10:7d::22) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5da7d2a-cbc1-4958-991f-08da0c46f5b1 X-MS-TrafficTypeDiagnostic: AM0PR03MB3938:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RWxLtiLkOagRQ1B2tOOyc+/Hfy13/Q9UrqL9t1hNqT1HecQGBx67dHhSoeh2giKZh2qLsl++EhJKNenBmkawc64NCcUxiO9r+Lnw63hHmSD4kxl+I6otpfydogrhrMYaW1VDAr1ZBiDxuDvzf15CNZ0OAgOVhsFQia0RUR0vbl8x+pcPMyG4fZ4JHorFJGX3fndfQ0A/lBc6kBGtFtFQFRQVbjbG5QziOkpkQ54JMl+GzLLbCJq6cAw6ApJf869Y7UqPut41S1D/iBpnNB0Uhhz1eTS25rUBhAXVYdM5GAw8+3smj+aO6P06dNIxo4nanTIDQnXJHGC+RSjXaqFqBfDqW0vnjCOaztoA8Z6hyhU7Q32w0PArp28Th3q6eADR7aEa3OXVeoUagVYF8rejbcYGco3CATeyuyYVbaRQV2jdGqxahZY8vM/Ii4XO43nKKqTLdNr+E4HWG/FeUY7AzrNvI0/6bgD86pJSMAmC5ZgHNKKbf6DzVCBC+hHEGodFTklOfiGmYfP27KbS2esK1zRVWj7d7dXSM7vY9MOecRvOkMWsxI3j3v1MLJ/zD+QDCJ3ZRpxoXnb9DIpxWPKRaIBRfbS7l/9Mlbe2wJ0Q2NJXme7hEIKg3rdPWT6BlXhkUnyeu4Bxp4pdymb3UJ/b2sXHtFGvSaTC8PzDVJYvr6jiss1gIiK9WmgxaJHhXTGVQEr1YQ1c7VDgN/OXVIheLw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4972.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(38100700002)(38350700002)(86362001)(2906002)(508600001)(66946007)(83380400001)(6486002)(8676002)(66556008)(66476007)(107886003)(4326008)(1076003)(5660300002)(2616005)(8936002)(54906003)(186003)(26005)(44832011)(52116002)(6916009)(36756003)(6506007)(6512007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7JaAy3JUWqyH4yPNKc4u/hgGPK9ZTRuKbTBnAWeIGsKVZo+bLoCfuN9mfJP+?= =?us-ascii?Q?A/FnWO1tUkVBlRQNah2YPJnSYiB+oGtVHqOQYD+ltikTG7/nBac0KPTR8rG+?= =?us-ascii?Q?581haVobjrMJxz6jpw1nCMoB6T+H7n/+V1UJR5JE46ReLgOGjvVwdzRz+dBK?= =?us-ascii?Q?WEXfujTGQ42BEDHi8eKdA9fYRJzox+Rwh4Yn99rlXzOXr916RlmAecpP2k3o?= =?us-ascii?Q?e6814Z9eGkOj9udrhC5u4Y9YvuN7DuqmYGQxpmhsucPyNNYHxBzl91dd32CY?= =?us-ascii?Q?Fb1xYU2jOa1yxkU3g9z0TpPlpvrXDZqqSEMnUvWj0mibTnaWkROmXJynZSYq?= =?us-ascii?Q?IUEI27lQAEmVBUUQjZjBLh0b+ISkaM1GmGDF1FjOCSMBc4igVtsofwBgUjhy?= =?us-ascii?Q?zQ+494Sc/W6adorm/fOL1P+N1PE/G+78sem7+u4MzBPQyPaswRg3xPt5SQvT?= =?us-ascii?Q?Se8Qnir4GqkalpdAl9PqO66cZEQfrSuwSNcJyoGezb0xOqv50S6ld/BHwj9Q?= =?us-ascii?Q?nvdUkZblmgAGIdBHsPrsYVYFarmQgGDwFDSQlyRZf2JjssV0VhXl3nFWGJKX?= =?us-ascii?Q?fxprBJcgi3T7cRkOo9NeoMQbN3aAa932wx65LSIWdcfweEHklkQcHyprL+ez?= =?us-ascii?Q?pKXbtge8J+c+56zGbHIpnMFdqXLQxHJr3di4dY+KEb8rib5HM2swQ+5NVyXW?= =?us-ascii?Q?D7Wo1VhvxuZuaDkb/SezpQQ6xsZKsccdjE5ixB7v+eIv5jTHh0oYD4bIFW2Y?= =?us-ascii?Q?OVbfdiK8QpYDmQBOv5XyrLci22BfDFRf7vVJNGfmwG7w+JPtLEYyg9xLvOjE?= =?us-ascii?Q?2WO5TP2s8jUUbpQa0Dfs2OoTXCyKa/nfeZCDB4NJa4JhKKS0/CDZc3NgxmRL?= =?us-ascii?Q?AGe5cn4/boDsX7D/ELYmhkdGgx61hFks+6DaZAO8aaER4Y89w1FdPr3o3Ahv?= =?us-ascii?Q?K/nZYbBXlQimtMcp1W+08Q1BfgDj4OKypg9hY1D7QPvpDYigUSuP+rM9B6CQ?= =?us-ascii?Q?QeNVKa1yfuIEnlVyJhuB9FH2rTyZKDATXw5lOObS45/O3qQs6GIkw6+S16Z5?= =?us-ascii?Q?9UJDTLmaDOxVw+bYHujChQHedzkB54d3din+9XakjI9k2LBat1ACliB0tNDZ?= =?us-ascii?Q?Ej39rZsM1S4IVC06O0V3q+/DROMNO59v90b5OFO7+2bHYENaFdXBQ+P8CGzt?= =?us-ascii?Q?40G2JC5/4ZQuJ1uVP06YRODd2rF0I2VnoMb5O4zxseuQTucyOCAUdeG1gcA1?= =?us-ascii?Q?L74q7EiO3EOoOKZdExdg99QxckfLPBtLCVhnpq4p9XOSib53Rh5C5rR2VyC4?= =?us-ascii?Q?4Ode7Hy2NJnt66by+SCIrhTQLWVzROO+jIh9o8Z9Qp95ihFzKZgvY4dLVy28?= =?us-ascii?Q?PMG8G0XyTb73wzbL7Hbg5LQJUfm5Gt2ce8u7HK+BNXShFzOf3y2gCrc4+ZHM?= =?us-ascii?Q?ztMlp5mQTkD0Fk7/xpHxZMHgJKKHu/dbZnxw3C6akl0bexZWu/sN4w=3D=3D?= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5da7d2a-cbc1-4958-991f-08da0c46f5b1 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2022 21:00:13.7053 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: K64QsVuIOkcVUyIcsXVbeCHj+3oueFg7lChBfnA6t5dnhWSFyXOx7hwFZwqPBfIsiebIveRGXzKfNgRxztaSUw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR03MB3938 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.5 at phobos.denx.de X-Virus-Status: Clean Instead of printing in what are now library functions, try to return a numeric error code. This also adjust some functions (such as read) to behave more similarly to read(2). For example, we now return the number of bytes read instead of failing immediately on a short read. Signed-off-by: Sean Anderson --- (no changes since v1) arch/arm/lib/semihosting.c | 67 ++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/arch/arm/lib/semihosting.c b/arch/arm/lib/semihosting.c index b983cc3935..1686457685 100644 --- a/arch/arm/lib/semihosting.c +++ b/arch/arm/lib/semihosting.c @@ -21,6 +21,7 @@ #define SYSCLOSE 0x02 #define SYSREAD 0x06 #define SYSFLEN 0x0C +#define SYSERRNO 0x13 /* * Call the handler @@ -39,10 +40,24 @@ static noinline long smh_trap(unsigned int sysnum, void *addr) return result; } -/* - * Open a file on the host. Mode is "r" or "rb" currently. Returns a file - * descriptor or -1 on error. +/** + * smh_errno() - Read the host's errno + * + * This gets the value of the host's errno and negates it. The host's errno may + * or may not be set, so only call this function if a previous semihosting call + * has failed. + * + * Return: a negative error value */ +static int smh_errno(void) +{ + long ret = smh_trap(SYSERRNO, NULL); + + if (ret > 0 && ret < INT_MAX) + return -ret; + return -EIO; +} + long smh_open(const char *fname, enum smh_open_mode mode) { long fd; @@ -61,9 +76,7 @@ long smh_open(const char *fname, enum smh_open_mode mode) /* Open the file on the host */ fd = smh_trap(SYSOPEN, &open); if (fd == -1) - printf("%s: ERROR fd %ld for file \'%s\'\n", __func__, fd, - fname); - + return smh_errno(); return fd; } @@ -86,19 +99,9 @@ long smh_read(long fd, void *memp, size_t len) read.len = len; ret = smh_trap(SYSREAD, &read); - if (ret < 0) { - /* - * The ARM handler allows for returning partial lengths, - * but in practice this never happens so rather than create - * hard to maintain partial read loops and such, just fail - * with an error message. - */ - printf("%s: ERROR ret %ld, fd %ld, len %zu memp %p\n", - __func__, ret, fd, len, memp); - return -1; - } - - return 0; + if (ret < 0) + return smh_errno(); + return len - ret; } /* @@ -112,9 +115,8 @@ long smh_close(long fd) ret = smh_trap(SYSCLOSE, &fd); if (ret == -1) - printf("%s: ERROR fd %ld\n", __func__, fd); - - return ret; + return smh_errno(); + return 0; } /* @@ -128,8 +130,7 @@ long smh_flen(long fd) ret = smh_trap(SYSFLEN, &fd); if (ret == -1) - printf("%s: ERROR ret %ld, fd %ld\n", __func__, ret, fd); - + return smh_errno(); return ret; } @@ -141,28 +142,32 @@ static int smh_load_file(const char * const name, ulong load_addr, long ret; fd = smh_open(name, MODE_READ | MODE_BINARY); - if (fd == -1) - return -1; + if (fd < 0) + return fd; len = smh_flen(fd); if (len < 0) { smh_close(fd); - return -1; + return len; } ret = smh_read(fd, (void *)load_addr, len); smh_close(fd); - if (ret == 0) { + if (ret == len) { *end_addr = load_addr + len - 1; printf("loaded file %s from %08lX to %08lX, %08lX bytes\n", name, load_addr, *end_addr, len); - } else { - printf("read failed\n"); - return 0; + } else if (ret >= 0) { + ret = -EAGAIN; + } + + if (ret < 0) { + printf("read failed: %ld\n", ret); + return ret; } return 0; -- 2.25.1