From patchwork Sat Jan 16 16:08:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1427521 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=85.214.62.61; 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=k4aPx61z; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4DJ35D21mSz9sVF for ; Sun, 17 Jan 2021 03:13:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 60B818287F; Sat, 16 Jan 2021 17:12:05 +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="k4aPx61z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EF897827F8; Sat, 16 Jan 2021 17:11:26 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on20614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5b::614]) (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 D7F918280F for ; Sat, 16 Jan 2021 17:11:20 +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=ZDtxX7vNJ1sWOwKVBKx6Q8pX/a5nkdEvzkcOqpLHJ7nVLhT0ub0wqKz1uEs0iE7o40Ep4bCsM762+5qTuy1ckYjvRvb9SjqrhJreIIzdnZquCoA3KpjUh0WS5IlOuekZmw/+CxOsxp7mj7VBGzcGJybmSu7EwPQEg+hXd1BGHPG9x2gXkB+7WzCDsLjjfI2VbhM9L2R+8liIeQ2zFINh/dvsIFjkoo1kwTNLBLfTAoi35hfIWgWe1Bu/kig4ehTTLSbcDfJwf4N7LAX6+DX3IxZxyH2ZVGjui5ajNGW54rlgRnqcBOKDg11jSZp4pRZy12riTmjeAzu1MSLnq9tRuw== 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=BRYSMRnPomFXTdK3eZM2Z6TRrjY98WvY2angYFZAYe8=; b=AW9pcL5H6v1sAx0jm6bFbz2MsVwKqnTzS6hx3aNl5eKXLz1XT8FxSFNhkWh3/woryERSS60F4S9uo1lscOO2SQL8Fxi7YRzqLGmZxO8DavU2sAxsszoAEo/fRHKj0KkpgNI/gOu87itpL2Su7qYLqfLGQSTaEEwn5YM2We1gPSsWhPPb7VnFzNI07iGSXWEr70e30Dhrars0TN+kPBdoezI634q/awdRkj1JQ9JfUdDXFoyzNls2OZ4eFEFjqZCgdbVtAFuGgOh3g9lm2QJbr5E33MPkqL1X389z6+5lSvqTgEU/ld49NRL8BEnsBRwq3qQj2uCcYN51fnwwjcjssQ== 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=BRYSMRnPomFXTdK3eZM2Z6TRrjY98WvY2angYFZAYe8=; b=k4aPx61zKPblwijY/w3gT0sYTt2DLz0QDReOrm1WODHSLGmOGOlscl9aACWOQMXigky1gDUALCzpE+d5iYDTrMbJB1XEA+32Ce1bxzLJvD5osRsO+zI7qv1u5FKyNUVtlmd8wGwe96yMBYhsRggmkolRYkFW1/L24aVTC5e3b6E= Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none; chromium.org; dmarc=none action=none header.from=windriver.com; Received: from BL0PR11MB3201.namprd11.prod.outlook.com (2603:10b6:208:6b::21) by MN2PR11MB4445.namprd11.prod.outlook.com (2603:10b6:208:18a::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.13; Sat, 16 Jan 2021 16:11:19 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::85d9:7219:6427:fb43]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::85d9:7219:6427:fb43%5]) with mapi id 15.20.3763.011; Sat, 16 Jan 2021 16:11:19 +0000 From: Ovidiu Panait To: sjg@chromium.org, trini@konsulko.com Cc: u-boot@lists.denx.de, Ovidiu Panait Subject: [RESEND PATCH 13/18] common: board_r: Drop initr_jumptable wrapper Date: Sat, 16 Jan 2021 18:08:49 +0200 Message-Id: <20210116160854.9525-14-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210116160854.9525-1-ovidiu.panait@windriver.com> References: <20210116160854.9525-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1PR09CA0165.eurprd09.prod.outlook.com (2603:10a6:800:120::19) 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 VI1PR09CA0165.eurprd09.prod.outlook.com (2603:10a6:800:120::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10 via Frontend Transport; Sat, 16 Jan 2021 16:11:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e89c489a-22c2-4502-86f8-08d8ba395c03 X-MS-TrafficTypeDiagnostic: MN2PR11MB4445: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2w6JWl2uuKMC2CIR0wzhneLaq+RxwEvQUD/j/45tkZSq74VZgnS8YXa1auTz4LfW4u7tXQh9aTVF58/TQR68hSEiQXbCI5yA1vyqqlXGZgCvzcLF9o0vaqAF2gzYA+COcPhgVULRHXBDHZ1zAKI4AmWb+HpmmTHbuk2H0YhpYfisNAA1+Pjj8vz6zb0J2EdSahbwX1BCmPoRLnacdBlJWzsZzyVEg2oqo8mUgcIgTOzDS0PFTGS7fh0IWV0Mua+fGInqCrWQQYF++yLWnvdUL+9LU4dK8XUhuQjSuZqWWsWMq4sST5BeFFvTNtxWaUGhIC8sEAepRDRbTpKQeo0AsRHRVN5Rn+Ft7qDNJD1a1QmFYm1cAxoIHVANgUHvKp0lQ97A/IT+HIETXbBXp/Tleg== 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)(346002)(396003)(136003)(376002)(39850400004)(366004)(86362001)(83380400001)(66946007)(107886003)(8936002)(4326008)(6506007)(16526019)(186003)(8676002)(6666004)(5660300002)(2906002)(6486002)(66556008)(66476007)(26005)(1076003)(44832011)(956004)(36756003)(52116002)(478600001)(6512007)(316002)(2616005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: ph1afHNmMSLM/sBMd2EqxZhhc6MNlhdBSK67uYkcATG+7jtrBDw6TgTHds5jREjknOnQ2gaqsFuB4uggEJVLZHFPeMq8xjeLdRuotmUVOLzjiPlJWDgn+4bMvssCEOhXnm16nnE7hElfabQjvoPhButrEpEwjzq03YNIM87F1pnZYbsCYIACH5cNI+MgODWA67jnwrG7U2a/4oNK5xNP+XVtxJ2yQf2i7zYTpT1gBCciGa0eGDOOUUJzZMbk5WDEG7MH9XO1Fb0AtCv5kA+Np2kAikm6m1M3DDH+ikp+OiAIsFnh2w/gNiRuETYalCs86Kws59mykvwGZX1hnJuGpg6hD60Jp2VsHAnEiQHxKhOIqu7GDk8pPY4kZSD87o11wP/EO/ZLIqrRjtzVBKS83i/lzwbuhRgatUJXuJfajehy3qlJXyejD1qTix5/dmeLidNf1gq6xii5OyqrHUYwjpYddEFcpNwJaYGfUTNkk7e5bB4B39KMVnQ0YRa9GFRU6eCU412p1h7xyoNQYjHQlvTJd2nsyNycZm0kkQ+PIRKKUzqQlcLJqX0fLJnuTps3roNxL4SGsrYInm5HBcC6tmDAludWyvJD5eQ8g2ipy0yOL3ex5p3zoagpJvWbEwDXe+ILlnnVtgGo2QHFa6M0vePZAW9tbeWoLGBh102L1pVK0/tKKzsHsPwdf/PoqT+KvgsO2cvbPzYQnKVjRARe63rdLubIGOeh1bIe891991JQQHQjpEC77+cBC8w0EoJtRhmIyPftr2rITy8GszajIqt7IW7b2n7DP8s8D3IsUYwoXdva80p9lHbo0WwZYFx8k6383ueJD2c0lde3iyuB+xV3re0RB0DVkpVF9Q4cRuwdiZkefBfOivc16WUFEkHZ4hOfP9pjP44+ZJ0tpaGAmcZfACWYDgdzMgC3E+UT9i4psCVyvBArXr0cS+K8HKlw79CbejwGAt2lgn7iVtkUh7KfH1OpQNwUW8Kaf3/3VXGvOic6qoydBJi7MvaR8mQH X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: e89c489a-22c2-4502-86f8-08d8ba395c03 X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2021 16:11:19.3871 (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: 7H45NumNdUVjhohcvxDjKL9HKJTcy5gaqQ2W13UFbgQwCiQAF00n6r0rDrWvExUTyV5UVMCQ1aQpMHQDhtj/6RsyvUbQb73ldwDbmKOAmkY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR11MB4445 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 jumptable_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 --- common/board_r.c | 8 +------- common/exports.c | 4 +++- include/exports.h | 10 ++++++++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index a5cbbcc343..32ad40d372 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -490,12 +490,6 @@ static int initr_malloc_bootparams(void) } #endif -static int initr_jumptable(void) -{ - jumptable_init(); - return 0; -} - #if defined(CONFIG_API) static int initr_api(void) { @@ -757,7 +751,7 @@ static init_fnc_t init_sequence_r[] = { pci_init, #endif stdio_add_devices, - initr_jumptable, + jumptable_init, #ifdef CONFIG_API initr_api, #endif diff --git a/common/exports.c b/common/exports.c index 6253b55694..4578f07021 100644 --- a/common/exports.c +++ b/common/exports.c @@ -25,8 +25,10 @@ unsigned long get_version(void) # define miiphy_set_current_dev dummy #endif -void jumptable_init(void) +int jumptable_init(void) { gd->jt = malloc(sizeof(struct jt_funcs)); #include <_exports.h> + + return 0; } diff --git a/include/exports.h b/include/exports.h index b300554091..faf0f59244 100644 --- a/include/exports.h +++ b/include/exports.h @@ -15,8 +15,14 @@ struct cmd_tbl; struct spi_slave; -/* Set up the jump table for use by the API */ -void jumptable_init(void); +/** + * jumptable_init() - Set up the jump table for use by the API + * + * It is called during the generic post-relocation init sequence. + * + * Return: 0 if OK + */ +int jumptable_init(void); /* These are declarations of exported functions available in C code */ unsigned long get_version(void);