From patchwork Thu Mar 3 20:43:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1600605 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=seco.com header.i=@seco.com header.a=rsa-sha256 header.s=selector1 header.b=wZtru4HF; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4K8jgD2Y1Kz9sG1 for ; Fri, 4 Mar 2022 07:45:44 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A267D83CBF; Thu, 3 Mar 2022 21:44:45 +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="wZtru4HF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8D8F883D14; Thu, 3 Mar 2022 21:44:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::604]) (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 48D0783CA0 for ; Thu, 3 Mar 2022 21:44:27 +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=GT4tltBIUi8LmRfHdRwl2Pu7jzsz6+SgenuhWUsAc6w7seim/nnPb+qjDZM82XwLWeMiUYurgDxHE1rHLKiFlbSIPjDwd0GpvcxVmHw13q0JSfwxKQmFbOOHTbyPhWV2wOeiUzrwc4FhPHtqNeuckeRMkFlaqtzfmryNroboTUp9dqQDMQtgTQ+oPlPmpr9oEelGIJpDrnFWiJKoS+vunLLO9jz0u90NMRgwUw9E1o4V5km0J08g8nGjT6+sEYtaVm0yNWq+zeTAQ4AbJkclMcF3GXrUWmcXl7HkjSlxNZOPmr7f9rGfJahXVC8dLx4jhYOqcPXcu8K8YDyoxv658w== 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=5HmgAC6aKFBuE3M0b0oc33rdL8JhYDCXNuvAY/tp7y8=; b=f+icYRIK83LMZQ690UECxnk+NKc8RfrqQAtkmlyZaGf6ynaxd5a3pseSVxMg/tXMFWKYqPFF9KiqWcC5NxxHQzJSb4u96vEzKgKxBWoSVfU07YXhJcgN46vn+el0lseR8nvAJtdZ6biqzJu+JtaynVxm3hDQ0l9E82KbpbXPTGQ8KsIWj6X+d/lHCoIiylqEXMBd1RIZrIa8xIEGUaAc4Fvq6u3y2wqykHybKynxB6KXJO2JbY6+Ld96V6YaNiSjsAaDVEg+W5EEr9HEWrJqmSz1GqO7mnH5CqeY3Fbf3xOeXbQiR5HlTcCL7j47p+s792YFKEvFxNnBNcc9ENPMEw== 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=5HmgAC6aKFBuE3M0b0oc33rdL8JhYDCXNuvAY/tp7y8=; b=wZtru4HF3wEXN+udetaKpJSlVLsvnCIICjA6/nU0gP6k8ff2oyAiB6Cu6ZEmEOuJ9DKuu4fNsP9hEQx5LC+dCsyCjTNqwq8q54zpfbPB6gvJIxqQWDqmF+4d1o5vM6oO8R8C7KCt+zhA73qniNy3iuMG9S1yYoUsmVnvFcEQQdMEsgX813MvXUMlaQPLuBkqxLVFlahjZwqRBbflvvYE0uc0JYxMiIE1ZV8WXrVxIdbwcmK+2jqKzl2ss3TVEicQmNcrrd5agJX9tcAv65UPzOfrhC/wFY5B4l/jt5yUCJ5a2AA8DEe8D7rqDteBkEZv47UpI9VhUhuguU0z6K6ykw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=seco.com; Received: from DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) by AM6PR03MB3573.eurprd03.prod.outlook.com (2603:10a6:209:2f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5017.26; Thu, 3 Mar 2022 20:44:26 +0000 Received: from DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9130:93ae:6e27:e9a]) by DB7PR03MB4523.eurprd03.prod.outlook.com ([fe80::9130:93ae:6e27:e9a%4]) with mapi id 15.20.5038.014; Thu, 3 Mar 2022 20:44:26 +0000 From: Sean Anderson To: Simon Glass Cc: Linus Walleij , Tom Rini , u-boot@lists.denx.de, Sean Anderson Subject: [PATCH 07/17] arm: smh: Return errno on error Date: Thu, 3 Mar 2022 15:43:50 -0500 Message-Id: <20220303204400.2787389-8-sean.anderson@seco.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220303204400.2787389-1-sean.anderson@seco.com> References: <20220303204400.2787389-1-sean.anderson@seco.com> X-ClientProxiedBy: MN2PR16CA0013.namprd16.prod.outlook.com (2603:10b6:208:134::26) To DB7PR03MB4523.eurprd03.prod.outlook.com (2603:10a6:10:19::27) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 677446d4-9e02-4036-6de2-08d9fd569b28 X-MS-TrafficTypeDiagnostic: AM6PR03MB3573: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: 81X6VSzTxtgxgMQDNWjk7weTgyhoGwFnu0OAlajqg9Nx8f5bKM/rtUxteGYM8En4/qq/HknKbARew4EJ+N7igLF6xsJNnr/g3hUUbMBDYaPDyiGxwQ4FwgCwCOBk05LYKwGR/yWG46YR1EQWUq6S6r/AgRG8B3VigyVjo8V6jvhUZop2I6sUw8dd+5JoHKDoYsXxe10YM7xD+6o2BEFNgfAAmRwXqztE66e2Ga3sQlltAww9QCw6Hx/38r+4jmYeXRd8XVUOftH8eWi4sy4AQac1w1ppRkNBCbvt58Q/sFVyG9e0Ym/9O0Vr+Zu8m8H6j3ul9JQy6b0yvla91eLqWr4+i0wLHsvPVWOxvHpb36SLVdW0SHbXYJOorwTafvDZtF7063xxHckFfYrGYhNrVAyu91QQ/NpN8KgHHKqdUQzqdEBxVGiSeWi07k1YYoaGZZlCy7GZzXcnnGCzoWXXaXXLjwfdM19soqOc2z9J0v6KFJCrv9UqkvhUYnGGuAdRWnDOFJqKVJawcdx2FpWMx03AxyiL6wmCQUPvr3NlVL0EPslfAo/fR4TUwaD12BK3tF56j+1F1qcO+WRtS0TegmTkHpUM65wle7coMr27AvEQc5+AeHhRdVYVbs+4shWiD67YqCp5oV6yjzuG9r08z0lmiDq/aji0h2NimYvcC+wjD6pUo9ptBw9WumtJoLVX6B0h44GFLh1RxwjvpJfTeA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR03MB4523.eurprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6916009)(36756003)(54906003)(1076003)(2616005)(83380400001)(316002)(38100700002)(38350700002)(186003)(26005)(107886003)(4326008)(6506007)(6666004)(508600001)(6512007)(2906002)(52116002)(86362001)(5660300002)(6486002)(8676002)(44832011)(66476007)(66946007)(66556008)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UT2E3tioc8ltXJ5zzLts4t7v2zXB0AlBB7ipAKCmq9bVZSRyEyl6dIJZp4rrboBwVk1/n58ADzFjwViXlvKwnime6mzqw3/spA85wZoZhdllb5UhSmBdwTm4Vh7thOtALOR8BPj6LMSlSb/jUdftDLtDoeAHlB6WVf+3RbWo7jBbrUJtcM+Wgi85teaoDES2bt9nGyjO5eZYYTUcOsSEe0xlnGT6LFA81G3DKwNmtGrbBPJ6CiC+Rh4T2lohynH8ZfqvtRV+mbwRQgEDvjhrw1YK2yutJdefmy0KkWGcsOxH5aXQibtOvtoOu8yNeT7qITYBuUsbNUmyKPDL/eNSBnspjuKTaOQ2gYe9vrYHzSDFhsEpgmT/ZRM7mJhaaNfV4yXQzzTjbdTayR1LxrXgah7WbU9ctk1WbpbsrpMXNtd3aWji3Yrt0LkPsKEyAZqm8WEUyqJkCFQpM8o1535O46Te6Zr7G4YMv0tgilTeSaI3uFdXDxjXTnsQOfnLmfB0xifcZE/Kfcq3UJpNWu05etcGFNbAXcgKZ7UZBZNVammrTuEC8TpZn+jQprDb/p2bYc9Xxx7a0GWO4GSD5HrN4g7jVjCZ6eV6kAz37Ozjw+lhsrtlVQCcP2CZ62yPB7AKj/XtMSQJvNPdJuyFzZz7KE1g1PccUsXmJDIV6KB8Fy0aBcv01PVuV25byFhSfpWD4ybX+Klhl2kEdYNvVmSy5qK3HieqcLjPfEt4W88sTlUfSedp6wzpebQKs//FUbHTwSglsuO+KSGIy9tScVBLHz4ZWyh7jaAWMp6NkptY5wrl4BpRVmueluBzLxluTScrOw4oL0pSsbjYsmMaOX+1pWITZflRPUgrChUP0t1Lg57Yv9JpNpFjnaPB6rnra00EkOLmUmyvu42Vxe0OVOBcDO5cEigmYXm0R3f0YKJg/e4mRRbCVxdhZXgv4TjilvX9b2k2oFOSBSzHFIIKIT7wd9Ahvp40o8iaDHrxEkDGxJ4GfBw9j+17cJgpYHgsNUb2B9J9EfD9ydVhj22I+4lqyuroo7isR/LXukQ2jL3GK93t1CCYz46hXerxv1/zBrrv/81d1gOjPq4hyZRmmo/x6F9U/oC5ckXYSreGvqX56/WXlvCBHBbjcXQcTynNGUdPKqIB/nWApaN5vSXNPou7MqZFzY+PbdDi9ZU6ElKYRORFFgJgkcjR4Wbpg4rHyr2QHYy3kmW9HROdNrB+QCf7MpMY5L2KxQdeSsMFPNsnymMMhLGYrMdiJqZUXNCGV5YnIWowBPbpy8WeYUz2TIrRcif22DwubXrVd6PBZzhocNSmFGZ8K0mIG4MycjQYTd158YA9ye930XLFYCsIueWSVjBL0rfIj4P33z0WCSs5EASTcto3fQc7DEjRBBDC0fQrxgwSfECcl752wD+VvfNxEGfFRbqMBEIRgmUbc3XZivjIQDVH0jEk1QkRxyDuJGr1rvUdi1MZVv9mO2vxPyQ/D08jTiAZq+7fSL64OUa4uf3vCQAd2oCLJJDCKZvHQG6GDjQN8sfG11p8+Jhe46BcADdQ4ZvHOsNEUUqeuhvdunefWj/VYPUkF1JYzFepOutrxFVJOsEDPevSLgAQEKa3qlbtCXYhUaBTdp9UUDTpoBs= X-OriginatorOrg: seco.com X-MS-Exchange-CrossTenant-Network-Message-Id: 677446d4-9e02-4036-6de2-08d9fd569b28 X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4523.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2022 20:44:26.2862 (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: maO95DxqylRNjeKD9n3TKFNBCrYDEAv3gYjwoPPZC91gXOX/6rEOpDEq2RUPSPOe1LpyybGux8386APC5Io55A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB3573 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 --- 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;