From patchwork Sun Nov 22 08:35:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ovidiu Panait X-Patchwork-Id: 1404451 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=JYR/yyi/; 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 4Cf3gz0GwQz9sSf for ; Sun, 22 Nov 2020 19:42:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D95668260D; Sun, 22 Nov 2020 09:38:32 +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="JYR/yyi/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C705B825A6; Sun, 22 Nov 2020 09:37: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=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MSGID_FROM_MTA_HEADER,T_SPF_HELO_TEMPERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (mail-bn3nam04on0603.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe4e::603]) (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 5902B825AC for ; Sun, 22 Nov 2020 09:37:22 +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=LE4utCJQw9ILgrBQkyiRUEUv/tdrAizLhF0UJAgzA0e+E2/9hGlmSmr0JkE+2kXdI0x5c7Ju9x4vn6M32oG+jqK2BmqkCjCO7fm5ivJ7k07b9TzpUvvkv7q+sEe8cgGMGaV2a79tRJ79RqSw43hhR23XFc8x24ZAqJjYQ39x6s9mWQnpgbiDNRjX7dOsVRva/cGztM48kInLjE+9nlhb6xPc+aDk9aBbyl7DPBonORzUDq1ebs1ISfEbUuFGH/uMWIFxcPyTs8BUaMBkH5LI9NRrI41jRYqzGqL7HtEXIF42WrincDsRLk9TYxNiZyofcgnR/oJAE+wR/6vMha+p0w== 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=LP/hYq3KvPlQT4xihM9c2vcOHorf2arRJNiSjtjP+ZY=; b=l2iX08YzyuC4pUxXwpRYDTksl06cyComSfTQg5f605SvaHWNeTOwV2vOcCmizmwkn4/mHlV7xZ3tS4i4jj/oDjaM6NX9eqP01pAvA6Xp1CPzxGs7tz21dp8HugpBR3vbgWbwTrhdgCkxEIyLdaaglolcmeCTwG6YO9QpZ7IkjJErkWWC8XLoDMueNW3dagjBSaU1BBFv/xum6KFZo1JitJxiYbM1cxYnh9Dpizxndi3rH+LpwK9PPigJPuEqFRv77Fc5BxWGRO+VRrpBodaCpGPmPiEGhyywEZV3sKpqNkziYPK8hH8dNc4loazMasfXJUgVxPRaUZSY+TZXqzXjYQ== 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=LP/hYq3KvPlQT4xihM9c2vcOHorf2arRJNiSjtjP+ZY=; b=JYR/yyi/QxHppul7Qbtj/NnRaDggc1DoemGlpWoLq9IS11rITquFhgtajqtCrrEQRtMI7Y99yJKp36w5B2pmuqxCzMqAbTFh753lFtcfSIX+3QbgwhfLdbPZ/QLNi/5ZKyHQ1EEjbaFEokUlIgaGqVcDzgEGbRCQvShHu/bJFFI= 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:10 +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:10 +0000 From: Ovidiu Panait To: u-boot@lists.denx.de Cc: sjg@chromium.org Subject: [PATCH v2 12/18] common: board_r: Drop initr_xen wrapper Date: Sun, 22 Nov 2020 10:35:50 +0200 Message-Id: <20201122083556.6756-13-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:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eeebebd8-6931-483e-df22-08d88ec1cdd0 X-MS-TrafficTypeDiagnostic: MN2PR11MB4223: 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: cZvU/gfxaFOe9sDVjGtpKfETTEtaZRfDmtwlGpH3hPKXYncsNCSTTrHkFu76ERYqhl7zCuhNSPBzmvTyYAdrAcpZc/wb/JLImPQw9+TM7HN8QFIds3uzFq02uDescPcUjxGSy/vLrFfT1odlAB6FfQzLZbkQ7nV2F4cxmJlZN3xaKdl6wPebM2l8+NCkn+FM0IQ5cXmBPu7h1GcoI6fea/FoIuCriGmw6niuV761kHlZjlBAzPpvlZ2IBmB+BWu1eQQhBRl+vkKOdHUcs6fboDBgzAwV/J5+zMneA4roamBVAE87xDFlUFEexsOb8gUSf5669Evr2UK4TyZSwNX+5Q== 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: V+8Y5PeoP0oIjo96lmAIE14Lcx8M/WRT3d1+CG1C176U12PbL/V0OVh7yTWMPn6a+E9rEkvwAL9QmvAM0IeannP2xxDdxJAAVlnEiQeg+VZdQ7uO5vq3iyMBk+wdQFW2ppESRx55tzC2MCDNhzA/hbnetq8J9tBzgn673wP9b15EIRNClPC5XQI49OK1TrsW6opsOEfXwuNfQaNnmqDau0+vjEscvOx7DptFeuCJ5vW06iympdqAoWeZumzN4rdKYCXFvCx8IsKgsnIh3kv8E520Aro4Z59ki8r02caWmqL4Ps9fzQngXMtI9FvgQBS52mcgHKHp5mZLjHgwPHUxwtIKSL7E8sijWikqLiMdeVwN7tpGn06LsjMWPzC/wHKEetC5RQbNyewza182/kEY4QM0+EudVAJCvS4tgetg52oETMwLmETMP2UnG7wIcV6Q/gpP+Y29RB3gziws9BL9MIv3hVV57inJe5zzI07kSsVAGU0IeXB2/ft2H3HfjNfR9iX/OYYBsFK+TPbNBlaWqWeKLJfgNvvENazZkuN5Rh5Gk/rAAhpstVogFsEqhi3iUNhbqxmybT5VgpaYaqxeD4zvhQf+RVwox8tQLUaVa3MkVO8fWy8AWd/e9eVh+1zLoiEP3fvkAn1OYeTsQOr1Bj6PJ1vksntGC1cjfeX34LgdoIgGLsH7PYVBhGnxOT+hRb7yue90CHw/oKJBD0iKv+2eNOk1WCe+W6erE9bKAScPvkh2txTDH8XZMzAzfLse4r6q0o9uFZ3YLS4c9W37x0TZxabsgHkneCDT7t1F/O8Q8nDaKNHDtwtxfz/9+/OLInl+wrBpkc819xVLRzlk9b3rnT2ZOvOOZ+96eiOW738iUgpeCc3m1krtz7Foc7v8pkOQCzp3WoKwijgIYIP4fw== X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: eeebebd8-6931-483e-df22-08d88ec1cdd0 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:10.7934 (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: 4x1I43xQGCeDuK/JcgC0IOQXFFZdRx/NNgbXJA5IKvzgflgwHSyiWCvmwUuUTEtjz0xC3nMHabAbbSgkmmRk7pj6BCir9Ixgzv02wo+KHZM= 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 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 --- 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