From patchwork Sun Nov 22 08:35:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404458 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-windriversystems-onmicrosoft-com header.b=kkHkN47A; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 ozlabs.org (Postfix) with ESMTPS id 4Cf3kH41zgz9sSs for ; Sun, 22 Nov 2020 19:44:39 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A0B8D8262A; Sun, 22 Nov 2020 09:39:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.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=windriversystems.onmicrosoft.com header.i=@windriversystems.onmicrosoft.com header.b="kkHkN47A"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B34F825D0; Sun, 22 Nov 2020 09:38:00 +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=-0.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FORGED_SPF_HELO,KHOP_HELO_FCRDNS,MSGID_FROM_MTA_HEADER, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on20612.outbound.protection.outlook.com [IPv6:2a01:111:f400:7eab::612]) (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 3A135825D0 for ; Sun, 22 Nov 2020 09:37:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=windriver.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Ovidiu.Panait@windriver.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gDC4YzpGWyuHQmCWDS4I+vsyovHSwmbYjdzwyUD2o/9mM0hgPL4voZ9Of/CGDzvmVVIFXfZ4yNvWxfyHnjKtq8liWzJxB3mnOLN4PYYl8vGaKOBCBlabMLu2ef5rkgPA3MVDX5xFvDIq1zyvy/96xMwDeb5iHw5GNgZ/Yy04MADTNHw3kcfdFe0sH61E/LMAl7wXYE0/wNtJ3hrfKy3K+FCWaiPX5KbUaNpI87Po9RwxEe50rBAf02fQdN4gxPqDv80IQmJDYK9Y3mqhy8IW5oOLwipaA6edNydVF3x1Lw+zCtzJtnqMN2wwGXp8QzM2eGMCWCEJrX/XbQdi370fUA== 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-SenderADCheck; bh=ubSJmeIA920J5QwkRPHzVYPJt3m7aLn6Z9tlgqwvYO0=; b=aNohQndznJRZlprgKrZ/uY/AwVH2KaFTsWyBze26bDzHJC+qGCtWsyzRtWMghzxOV/wFNt5Dkrdqdxq4TXWKsPgL2GdGbinPpOSFp62AGUeriH5errYDgB2/FfeGipuy0Zhvba2Oh3IWCwRm+4St5S2zL0uWsUjRfNY3s+xKKoBNeQVs3NTiBVuFt2Om4s+eXmUIhBWsMwt6WqnqrtkKX8YKRo1wn+OnlHgr4Yh9RVDfLd13ezXZyTQxYiNm2FhBmm+kC8s3sz1xVHoefICkeQlJrffj8jcjF4AIHlD5iflEN1Gm4t5e7q50avv0pMqN1Q3vzG5h+mPh6JZGpqzJpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriversystems.onmicrosoft.com; s=selector2-windriversystems-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ubSJmeIA920J5QwkRPHzVYPJt3m7aLn6Z9tlgqwvYO0=; b=kkHkN47AOwcIepcxDjpoaEJYI8UtkvKCLYX0MKZsd34E1H28oM8tBxVkevt995dM29Plf44vAXFJcpF3IT/LK0HbkrbpAHa2f9DL40vw7tO9DqMn/dQXZmn+oimQkWthracG6xaDmYYEtKEZeBumzAF4ZdO3PiXrItuOHulocaw= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4223.namprd11.prod.outlook.com (2603:10b6:208:18a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.22; Sun, 22 Nov 2020 08:37:12 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::650a:e5b9:d7:6cc0%5]) with mapi id 15.20.3589.025; Sun, 22 Nov 2020 08:37:12 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 14/18] common: board_r: Drop initr_api wrapper Date: Sun, 22 Nov 2020 10:35:52 +0200 Message-Id: <20201122083556.6756-15-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201122083556.6756-1-ovidiu.panait@windriver.com> References: <20201122083556.6756-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) To BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from otp-linux01.wrs.com (46.97.150.20) by VI1PR07CA0165.eurprd07.prod.outlook.com (2603:10a6:802:3e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.11 via Frontend Transport; Sun, 22 Nov 2020 08:37:12 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa7f0414-01d5-4acd-e1de-08d88ec1cf08 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OJEGU3gm1cvdkbgEgjXln+ZO2ryLJKt6YaiBgfFDNKFuEQ/iLUBQS+scu2qah2LNZVSGqoyD0HMcI+qy4ixsy94JS2aU4wjslw25SA+YCqKK0wtDFlfC9hygi9a0LMnyVzHp62JrgKFLVysZCNn2XZiFqdYiUxTKjCdnsScBEup9RajUukkOWBRv4ACz1a8/b+6JOVxfv1OIcbQqy36HPD7KdMxRh1S8gZGqctfpL35cXnxXMdoIjrMZBnK8urAt3/0n7UPhY4SnsURX2QUpesLhQ9PXV7M38dkRsT3GaafpOMgHsJE3oHW7XntNxaEnR3fipUKajeY8t18X1rv73g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BL0PR11MB3201.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(39840400004)(136003)(366004)(376002)(346002)(36756003)(186003)(16526019)(316002)(26005)(4326008)(2616005)(6916009)(83380400001)(6512007)(478600001)(8676002)(2906002)(6486002)(8936002)(52116002)(44832011)(956004)(66946007)(6506007)(86362001)(6666004)(66556008)(1076003)(66476007)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ZE/dTRwh3kf5THEqTyyTDC/l7IWg9QzpoRp0ydHSRlD0Fs0vgT/eO8370O0iTdalvIeG9MdInPXzHC/kaCsC78GalriNQ+42h1Z59Cps/zjMntWtlLbbdU++/O3/fJ62G+DwVD7daUEgXF9Wzrvb63Eo42dIk50PsgheflVqU+irmrSvQR0p/+BwClcv3AA4umyp+uhnx1co4ebNeIkTRoxMHC7T+eRq9Z4jjgzf66/r8cR61EFvER5TYReQO+RaKOjG/lfR1HjhmJrOI+hN5zihFt4Hylgjjc/QeYnbXo71LoslZqyR2CrGWPkH6O7Uy4HVd0Hgj3RcHAtSxcEW9/0pc+HXb4d6iyyt+iFmuqjMU84D1iaQYnf+E1ss5/LKs8v/PpsP/5muhLvEqY67Bmq6DZ2XcuXaGsfYbsqyOK8JqlRrG6lRXei71hWM8kiZFB/8oWG5E3FalKzWjlCqvdTfwS7zdA03meCkpkExUHbo8B6jBA3hESDRbRY95A70gHhrCxu6w4VyiHatseMq9x9S6cxywkPdmB3v6sE8Pe41R4hsYBnyclByI6VpzJXkgk44A7ItFeiQ3zSdu/tK0kkzlkUg7q4E3GqSnzfTcQggM6WCvoex20Eia93PVcqrAXxP7w9/Bh2I5Ocs2XsIf/CTbysaF2K5tDM0/ypynZvb4sSQvx8qpBCeHXhxiBpq8bienROZZ4dBYsHexu/Jg/AH/3sHPf4wc83KTlj9WNsqsq/W2wrfO8TkKZ4Li3AGd2QPC6+bopm6A8fVWssTS594OuxlLrqTBR7cuCJwNzOHLB19JCDvfrwEYsiCpft/2OLkXAXappAIObZY/+y1MR8MT4+rxPXmb5NaigA6cGgDFZCHMyWRctVMhG6f9B/QbCaNY/ujtBFyZv2qJRWswA== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa7f0414-01d5-4acd-e1de-08d88ec1cf08 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Nov 2020 08:37:12.7842 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: eVuHClVFSsk4mb+rXbse26GokUFHBiebfSnNyIFOG6Zb1pnHROdGx4TuN8kp17zKDq3GnEq49a9BFJU5qGxuLdgfFYjjuJ7EyRFquz8rT18= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4223 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.102.3 at phobos.denx.de X-Virus-Status: Clean Add a return value to api_init and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Signed-off-by: Ovidiu Panait Reviewed-by: Simon Glass --- v2 updates: - add function comment api/api.c | 6 ++++-- api/api_private.h | 2 +- common/board_r.c | 11 +---------- include/api.h | 10 +++++++++- 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/api/api.c b/api/api.c index 493b77f809..89003c161c 100644 --- a/api/api.c +++ b/api/api.c @@ -642,7 +642,7 @@ int syscall(int call, int *retval, ...) return 1; } -void api_init(void) +int api_init(void) { struct api_signature *sig; @@ -679,7 +679,7 @@ void api_init(void) sig = malloc(sizeof(struct api_signature)); if (sig == NULL) { printf("API: could not allocate memory for the signature!\n"); - return; + return -ENOMEM; } env_set_hex("api_address", (unsigned long)sig); @@ -691,6 +691,8 @@ void api_init(void) sig->checksum = crc32(0, (unsigned char *)sig, sizeof(struct api_signature)); debugf("syscall entry: 0x%lX\n", (unsigned long)sig->syscall); + + return 0; } void platform_set_mr(struct sys_info *si, unsigned long start, unsigned long size, diff --git a/api/api_private.h b/api/api_private.h index 07fd50ad3a..bb23821c2c 100644 --- a/api/api_private.h +++ b/api/api_private.h @@ -8,7 +8,7 @@ #ifndef _API_PRIVATE_H_ #define _API_PRIVATE_H_ -void api_init(void); +int api_init(void); void platform_set_mr(struct sys_info *, unsigned long, unsigned long, int); int platform_sys_info(struct sys_info *); diff --git a/common/board_r.c b/common/board_r.c index 32ad40d372..500457b080 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -490,15 +490,6 @@ static int initr_malloc_bootparams(void) } #endif -#if defined(CONFIG_API) -static int initr_api(void) -{ - /* Initialize API */ - api_init(); - return 0; -} -#endif - #ifdef CONFIG_CMD_NET static int initr_ethaddr(void) { @@ -753,7 +744,7 @@ static init_fnc_t init_sequence_r[] = { stdio_add_devices, jumptable_init, #ifdef CONFIG_API - initr_api, + api_init, #endif console_init_r, /* fully init console as a device */ #ifdef CONFIG_DISPLAY_BOARDINFO_LATE diff --git a/include/api.h b/include/api.h index 84d81dc817..83412a7c87 100644 --- a/include/api.h +++ b/include/api.h @@ -7,6 +7,14 @@ #ifndef __API_H #define __API_H -void api_init(void); +/** + * api_init() - Initialize API for external applications + * + * Initialize API for external (standalone) applications running on top of + * U-Boot. It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int api_init(void); #endif