Message ID | 20210116160854.9525-13-ovidiu.panait@windriver.com |
---|---|
State | Accepted |
Commit | eb2825b79d1e029fa0b9e9ff35fe08c2eca8ca17 |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=<UNKNOWN>) 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=U0iu/rsK; 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 4DJ35075Vkz9sVF for <incoming@patchwork.ozlabs.org>; Sun, 17 Jan 2021 03:13:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC76E82880; Sat, 16 Jan 2021 17:12:00 +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="U0iu/rsK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B455A82838; 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-bn8nam12on2062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5b::62c]) (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 03EFB82824 for <u-boot@lists.denx.de>; Sat, 16 Jan 2021 17:11:19 +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=AHPYiLu3cmkCPkw3XULRkxXkXKACGANYcaoBfhwfgNg2bl4DPvTBr88ex+NWo1UzGF70Tk3dXPzeiGd54JVUYgh06+9HihTGIyXmQrKAdbk4SvYVcYGuilE5e44Xsuc8wUiqpxPfOUDtgACXABKXjWesNCp+qZe/WCxhoq+tzh5uxhSlL8x8I//j5BnrU0z2KnOGouOa44d63uE2jpPdYgEaF22qmu6fT8f2H0l5//0NXcUy4SwT1XO3iMr+4Ho/5heKF1BP4e1/ywCM2uloQ8gSbezIpSLOBuSfow1WWTZ9tA9PLEXLv5hqetGYjA12CGtcK5O9k1HGZTSpgSA+Sw== 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=jBQE8RtowIlt+r5emfoM3WlMEJh6VAzXIjNXrN4Ku8M=; b=BDQHuvYkcgkPc5KcDxr6slKztHaoM1yxqvcPVmof34uAf7NMW6fcevJYFkdc0nN2/bzXoc9EUJyLSo11vObzHeeFdBZ/WSA/ocoi/SAg3fDbif1JJpEVypIMVnQF8LZmFqzbfEOeeYivu2rjh/+X2HwG7SCv/9ZgW/CltertOaJzYJaCEBwL1bAltzxn4BMSoGRg4qOo67J6YXijURefz676ji4fMiTHnumqCqOl+D1zoS+oyViRuWUGgFS8XPKHNKEJRzsyIi0IbsxtQ8vCid4f4zxhCG6j7NwNeY+mXqziLh77mbyfiFWB+NGh8PMwt6s7zsT04BUGLwre6DgRHw== 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=jBQE8RtowIlt+r5emfoM3WlMEJh6VAzXIjNXrN4Ku8M=; b=U0iu/rsKdrPyJZto3SfTKnM0K6tmz7LRVEPk5d96E3FgZ20iOtxTMtl2laFnJKgkJIjXbLeE+m8r3BgO97zGv7D+ujN4ELL8FRmbPeucKq+EW2Iqc0dTfIhzG1SHUJeUmJ5FFBRY4E8y4ChbBBl264/DeDJAyUo6hkIBwvXgcj0= 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:18 +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:18 +0000 From: Ovidiu Panait <ovidiu.panait@windriver.com> To: sjg@chromium.org, trini@konsulko.com Cc: u-boot@lists.denx.de, Ovidiu Panait <ovidiu.panait@windriver.com> Subject: [RESEND PATCH 12/18] common: board_r: Drop initr_xen wrapper Date: Sat, 16 Jan 2021 18:08:48 +0200 Message-Id: <20210116160854.9525-13-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> Content-Type: text/plain 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:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7de0a548-ae0b-46a5-c1f4-08d8ba395b32 X-MS-TrafficTypeDiagnostic: MN2PR11MB4445: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <MN2PR11MB4445A17E9379F0BD9F73CBADFEA60@MN2PR11MB4445.namprd11.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:378; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PnFveG64CbnsEgt7PoCl+nzKVmk7gpeORSJQPl47R9NxghFfZAjIux2n6MEn44SHZvE2UFCneInQxczKy8EXTkIQ/rIiUvvXpuDhMvaPCRMiPV9MGGUk7dezsB2nGhXTizIt0nLQnXMzCtnT9DcNkg4NIZM7QggQmf7N199ZLfZAYVE7nnsIyhE1Fj8Og1VgdXy+2kKwSIa8FlpDdQnz6qObbsi0ISHKTAzt26M9wOReO6yuooZIgqK8VzgkVrRFlApsMfZh7xjprnOXojWJ4ieLXMdg/S2dHzuUST6vEDISB3Lwf4YXbVV1CjOCBcgs21JjuPQTLjSA7hh0Pm3jOetIdylSNr6fZC7xctZQtKE+toQUkFGrlV37JloETXGAaFQnmHNM05jmjfzcpShNCw== 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: UNevEVNUDtSl2bwElU0g0Gfe6cTudPCFBGoIFCFcRS3qbADDeYN715ZXsuRB4USJQA4kwNCKQUI1LEJ/Fac176POmB8WL28iMKGS/+lhMHzMKDLgT5ubBVipL0EpH3xj9YrpFCiKz5K7bA/5pCTB0Ah3QrMeFrWZ0bSeS8JwlViJ3D52fxz9oUjMUyr6LBcQOg/uWssJVp9bDhNlU5axubauti2tqzks68FzxQNHe9nX8+xjSR7hEx+mYd8PjT9FqpDN3n6VA5Hcxxo/s/MdV+l+3Zs8ZntxAEcABKOb3nJndB1qVWQ7fEsw9Qx57YvYgx6brbR1yBTR0izksjZypHT6nfld9FpFs4Nvtj3UrXLA2RtqAT8CH01auLvfIRDOHJwzRIwRDc1zGtZqboNZhbZy09ujq1evYOOJBcv2uHRJ+r/78xrLAdC/s/hywqSb698YoGhnV+zJW9v7OEm2z5Df9AzL0CYz2k7zYnhF20drRiS2bWpxHKJ/9R7IS4NCh7y1NRdMkGojnCr0HP3Bhqiyjy1oKrN7pDND6N62GRvVBwHt3Px06hgka15RPihTtkbFhkKV3cObnFs96PDtXLiL7PHDYZz6o7lquZeDOCrvpkF0pqqjcJ3zxUdjSc0zszGJK+unvQHMVsRk8NHpTkYFCrdOGbGndum0rQArXybHufZqz2WYVctM0mC1SmFGhLVw7itnsUihPMbzLsDIPdsKHJdkk1djYvpooGy/oA0au2Jk1FOYU9TdaIdb6NZUEnnYOl01eVZbBZ63yn+YZJKpqW4YZyHEMXYTOoutPM12KDYv6ZpNf/Vn3f/zLmvgMPx5Va6xrxMWEWjryX35mcqEZJz5QUrvyTcZ7Lo3vmkxLlZb4Bj+2ZNy+oUI1Ewb/wuWHqnyk3nY4aH94Z+ybYaJENlz2F/Sf4jccpHIrwljg+omKYzEdbh0S80eZWx0JYbuWhcebxnuDbOhEZLH1UcWkyG1NCD11kQZZD1XOI6iX0b5dn+KI1fRpr9Sq7+8 X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7de0a548-ae0b-46a5-c1f4-08d8ba395b32 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:18.0029 (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: VFZpGON9Tmb5z3JVK/Dq8EVhWgORqxClsj/rpnPFcoFtk1fEl+2rTMTlCHVh4W+EivC6cO5y73JaurXJHAhLBMSep9eG6pfW4M55CWpKwXA= 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean |
Series |
Minor board_f/board_r cleanups
|
expand
|
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