From patchwork Sat Nov 28 08:43:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1407490 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=HFIHiIUT; 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 4CjlW76mlyz9s1l for ; Sat, 28 Nov 2020 19:47:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 884958275D; Sat, 28 Nov 2020 09:46:10 +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="HFIHiIUT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8DD9082724; Sat, 28 Nov 2020 09:44:45 +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 NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e89::609]) (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 DB469826F1 for ; Sat, 28 Nov 2020 09:44:39 +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=iHsRQ2Cd2m3ozRCvPMroYvcYFHmwv6n9Qr7ixvIPMGsN5eOGw6r4mG41ueM7ezNIodFyJ/Nu3co0OVc3UvEG9setxFei3pIYGRCFZ2VaXJTzS7t3oPIacxjjvuXYU81/Qd/XFd5PbaQyCaLRwqUja7Zv31MmEhT8h7KdDO+oPcfGVcDgjCwyDGnIDsnAhAdIC9i/1QioXkLapDkfhjO/4Eyq11j3IOxO2R2j+3syjjXP2JCJHcpZb7AU6UrluuUtz+/29jMGaXeHYMKYDJRIMjZTb/BlUNXy0Uo9Me+ROzUmckMnNk2S80frFeT6I+zO/fBnUfCZuj4waIV460oK2w== 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=0GFPqllZ38+eQMAAu510UciyFfqSh5CEbOfLfGp3k3U=; b=dUHRYtdIl9Qj0S59XEgGu6xETo3VbjWVmZq2niPWX6XieAjV37v4rkl4EykzwJ8OFHhi/ZIfdRJql3QoT0/GhuHIamAJLp/4N1IpcqgqY+UT+w9b1NaznfkejEfR2cvv/euE4BP3i56k6XHqCnn9u/a5EThesDsjV8d5U0j45Iu+z21Hte0hDgn3rzRkNWjfwi8d0fIehKHtGF+kc/0ccpYk23j/85usT3z8U21GE3OunR3vMJIMaO4MLLs6aHeN5o6sdJueKdTN1WRieeRW0jXoeiyrlnfT24VSytM1w83KzcrDHf63pmx5n9cRK6gTjhXmyCefSFTG32yWtz5Mng== 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=0GFPqllZ38+eQMAAu510UciyFfqSh5CEbOfLfGp3k3U=; b=HFIHiIUTrWlYL7Zv2LJwbbwEABJJ3QYxeC812HLgEuBcFqxtctiRwE6kpsbHt/dCU3y/EXrE41UIaOVsrbopeSTlfMBYqBp44ybRnSIKrZz6CmS+495M3t1vh41zuP87r8eQx95EFSZfqdgmkC/XbsuW9OIIwitu0UhbLGUYyJ8= 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 BL0PR11MB3492.namprd11.prod.outlook.com (2603:10b6:208:7c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.23; Sat, 28 Nov 2020 08:44:39 +0000 Received: from BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2]) by BL0PR11MB3201.namprd11.prod.outlook.com ([fe80::54:a24e:6136:45f2%5]) with mapi id 15.20.3611.025; Sat, 28 Nov 2020 08:44:39 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org, daniel.schwierzeck@gmail.com Subject: [PATCH v4 12/18] common: board_r: Drop initr_xen wrapper Date: Sat, 28 Nov 2020 10:43:14 +0200 Message-Id: <20201128084320.10164-13-ovidiu.panait@windriver.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201128084320.10164-1-ovidiu.panait@windriver.com> References: <20201128084320.10164-1-ovidiu.panait@windriver.com> X-Originating-IP: [46.97.150.20] X-ClientProxiedBy: VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) 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 VI1P193CA0018.EURP193.PROD.OUTLOOK.COM (2603:10a6:800:bd::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3611.20 via Frontend Transport; Sat, 28 Nov 2020 08:44:38 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ab7e6ada-4f3b-44ad-0036-08d89379d76d X-MS-TrafficTypeDiagnostic: BL0PR11MB3492: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5c3Hljud//k98krbB9v6odL3ei31d4+by5vXTHeVWwIHBoELsOe0BIsTaKb7oOQCfivX+RrlCcY5KxShuZdlum2vu2WjOpyfUUrQhSRG045dKVpAcx9bYsrY62aqHqKkMedCL0RXwnvBmKTFD+i2j0y8XTMEnLXryJ+mvBqIfwYUAtyLgS3ynr6okTDyPEJChsPETxesHwnJ48OBnf9ZYfWUPm1hEAmPq38R+HsCZ+F5l09P5mfHcC0OWKZYlVrPbDnbE0g3wQ1s+FNqQPqh1tgqCcNEQDOqtpzcP264G0uV+dX8n3W9wJUEUXBweTRoJq5yBt/9ts9nF0PlsjfOGw== 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)(366004)(346002)(396003)(376002)(39840400004)(136003)(8936002)(6666004)(2906002)(86362001)(4326008)(36756003)(478600001)(5660300002)(66476007)(66556008)(66946007)(956004)(6486002)(83380400001)(16526019)(6512007)(2616005)(8676002)(6916009)(44832011)(186003)(1076003)(52116002)(316002)(6506007)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: yuPnaKQ9mxqlG6UeMPdgYoBJ5W3wN3VPdtClt7q+plCZ68qdH2W8VonxdUgWlXS+Ye9IjvRJr6VwmbeLzmzgzfN+e1PXd2kP2pY7byXv71d4zET18NfFYvS2BL5K1KwvHUO/C9Hm5nFKB+4ENjkds1Dx6GNlkjk7xe43gNlptdPxfdE6rq1As814Ru0P0rJIDjx/K8UfGvgx3SyQyPOIvxBmSgz5x6/mntNlfbMzjNB/AMZ2HE4Z3TtQgrHwYGlEei0HLnDvO6/f2gbXlKjhwDv4Ly9UIIHKwabgA5D27ibczikQzDfmzqLNpZTsK0F2lBJ3Iu+ObdsB3pBtOm80U/6Rf1VL0ph+siy4VUB7OwVAcpqpCfIUtbQkPyLESYdzTe1Ay3WYGQ3z+opvttfv1XvtdxViVz1nAoYjc/9EZsGMzEwb487sKcVcM19mKtjlyA6NUZQ3sJB5QRxzamFXb0iDheYE+T9+5XkTTDuRFSioSbPHlr+fQUfvQxc9ORFy1tPoPsyMsh34c9ra8d1PkE+9vB5y4FEGtmCwA2K0fTH1ZBWWrM9vgrr/bw6Jdo1Mby1tgaoGGB40q9BjGobpztS2ShiXZh7L2grYap8Cwm8NkXl/pqxoj3JJ96pS08XkMu+WMN+u3ag7hJasQhl7noJeLjy0RO8BA3NakUx0S5ryVRaRZH01AVrwTSZHX/05BvGnQgdx3Xhen4OCvofK18PHsOQydYnZ0t1/XhrvldSvv4pwM+ekeBjvi1XK92zC6dnCy8VKmSgUn2n8xVLetRVh5aO+Fi4YvBu/o6WK0VyQEin8JvpTRdP2ovqz0io2YhwWDVE3IgYIlNDwJMz74dszJ5i5G9qfeTZXNcNdXp7lKol2sCEYzVhBrMavd7H5SppAUmaipeGPRfyct7BdxcHRsQ8dSj6J1wrk1iXexftX4BhXMoXUEP8cERwibKACfNULjqNBONVKPeivErWxHboIRjuOiIvpoM2MxtYuoL+B4MCqyMYZhayMOnGoWI0N X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab7e6ada-4f3b-44ad-0036-08d89379d76d X-MS-Exchange-CrossTenant-AuthSource: BL0PR11MB3201.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2020 08:44:38.8995 (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: qaax3zxih0TToum2tU4TFRdB1w0+ntWVQd4QYP43Z6mZfIaMalCYQv7fynfSDUrVYPT03kjj28AXrHM8ZuQgJvbiaM/7nIGvmNv1cShyftQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR11MB3492 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 xen_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 --- v4 updates: - none v3 updates: - none v2 updates: - add reviewed-by tag common/board_r.c | 10 +--------- drivers/xen/hypervisor.c | 4 +++- include/xen.h | 2 +- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 48e898b586..a5cbbcc343 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -428,14 +428,6 @@ static int initr_mmc(void) } #endif -#ifdef CONFIG_XEN -static int initr_xen(void) -{ - xen_init(); - return 0; -} -#endif - #ifdef CONFIG_PVBLOCK static int initr_pvblock(void) { @@ -743,7 +735,7 @@ static init_fnc_t init_sequence_r[] = { initr_mmc, #endif #ifdef CONFIG_XEN - initr_xen, + xen_init, #endif #ifdef CONFIG_PVBLOCK initr_pvblock, diff --git a/drivers/xen/hypervisor.c b/drivers/xen/hypervisor.c index 178c206f5b..2560894832 100644 --- a/drivers/xen/hypervisor.c +++ b/drivers/xen/hypervisor.c @@ -232,7 +232,7 @@ void clear_evtchn(uint32_t port) synch_clear_bit(port, &s->evtchn_pending[0]); } -void xen_init(void) +int xen_init(void) { debug("%s\n", __func__); @@ -240,6 +240,8 @@ void xen_init(void) init_events(); init_xenbus(); init_gnttab(); + + return 0; } void xen_fini(void) diff --git a/include/xen.h b/include/xen.h index a952a2c84b..868132156e 100644 --- a/include/xen.h +++ b/include/xen.h @@ -11,7 +11,7 @@ * Map Xen memory pages, initialize event handler and xenbus, * setup the grant table. */ -void xen_init(void); +int xen_init(void); /** * xen_fini() - Board cleanup before Linux kernel start