From patchwork Mon Oct 13 16:17:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 38679 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9FD5B20973 for ; Mon, 13 Oct 2014 16:19:24 +0000 (UTC) Received: by mail-wg0-f70.google.com with SMTP id a1sf4323636wgh.9 for ; Mon, 13 Oct 2014 09:19:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=EIyM1dpMsq2x0xRVi1GwblPvgtItQfnAsVuRFeGyq68=; b=X0cuqWvElvoRy3SkgHIXijfstCLQOr53VWSrL31Ld5oFZnmdlgcwokKwTtaVIM13k4 sL4RDCWsx4Hbml3weCrylwwsrwOhpTeG8LSVk6dBKzQOxYrl9u6uPwJP4+AzWEZpBFPc cZempZZspRzGTcS4993NSwta1jDi3eNabyhBb7Xu+eMaDOjVxofEd5n3J17TYt/WgHUp qRxvLlYRINys8RcrK26DFjn0G9oRluoKUSflq9L3kZoB2jBcqUNli8if5JXmbwV/eoGx RGZqAriS5y3OgXW5lm42ZfPwJ2UMGBhX34X+CMzHCpEDZLue8/0xBizRiyyDIsU5+VeW yC/w== X-Gm-Message-State: ALoCoQlIWUDyuIxrmYuLpz2IuQJhEwu7ftPbQEfqtt+T3ibhL2zPifMBSZirriyp4n/mLpTfDYpI X-Received: by 10.180.105.74 with SMTP id gk10mr349277wib.0.1413217163656; Mon, 13 Oct 2014 09:19:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.206.72 with SMTP id lm8ls496922lac.9.gmail; Mon, 13 Oct 2014 09:19:23 -0700 (PDT) X-Received: by 10.112.204.197 with SMTP id la5mr24773677lbc.2.1413217163503; Mon, 13 Oct 2014 09:19:23 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id ql10si14184960lbb.25.2014.10.13.09.19.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 13 Oct 2014 09:19:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id s18so7075573lam.9 for ; Mon, 13 Oct 2014 09:19:23 -0700 (PDT) X-Received: by 10.152.7.145 with SMTP id j17mr24763779laa.67.1413217163177; Mon, 13 Oct 2014 09:19:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp244406lbz; Mon, 13 Oct 2014 09:19:22 -0700 (PDT) X-Received: by 10.220.196.207 with SMTP id eh15mr2998832vcb.41.1413217161943; Mon, 13 Oct 2014 09:19:21 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id k4si12077672vdx.8.2014.10.13.09.19.21 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 13 Oct 2014 09:19:21 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XdiJQ-0001Y7-Sq; Mon, 13 Oct 2014 16:17:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XdiJO-0001Xv-S0 for xen-devel@lists.xen.org; Mon, 13 Oct 2014 16:17:31 +0000 Received: from [85.158.137.68:31268] by server-7.bemta-3.messagelabs.com id 5F/53-01084-A1BFB345; Mon, 13 Oct 2014 16:17:30 +0000 X-Env-Sender: Suravee.Suthikulpanit@amd.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1413217048!13237683!1 X-Originating-IP: [65.55.169.102] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5764 invoked from network); 13 Oct 2014 16:17:29 -0000 Received: from mail-bl2on0102.outbound.protection.outlook.com (HELO na01-bl2-obe.outbound.protection.outlook.com) (65.55.169.102) by server-11.tower-31.messagelabs.com with AES256-SHA encrypted SMTP; 13 Oct 2014 16:17:29 -0000 Received: from BN1PR02CA0022.namprd02.prod.outlook.com (10.141.56.22) by CO1PR02MB206.namprd02.prod.outlook.com (10.242.165.144) with Microsoft SMTP Server (TLS) id 15.0.1049.19; Mon, 13 Oct 2014 16:17:26 +0000 Received: from BN1AFFO11FD020.protection.gbl (2a01:111:f400:7c10::131) by BN1PR02CA0022.outlook.office365.com (2a01:111:e400:2a::22) with Microsoft SMTP Server (TLS) id 15.0.1049.19 via Frontend Transport; Mon, 13 Oct 2014 16:17:25 +0000 Received: from atltwp01.amd.com (165.204.84.221) by BN1AFFO11FD020.mail.protection.outlook.com (10.58.52.80) with Microsoft SMTP Server id 15.0.1039.16 via Frontend Transport; Mon, 13 Oct 2014 16:17:25 +0000 X-WSS-ID: 0NDE58Z-07-0FV-02 X-M-MSG: Received: from satlvexedge02.amd.com (satlvexedge02.amd.com [10.177.96.29]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (No client certificate requested) by atltwp01.amd.com (Axway MailGate 5.3.1) with ESMTPS id 2D68A12C000E; Mon, 13 Oct 2014 11:17:23 -0500 (CDT) Received: from SATLEXDAG04.amd.com (10.181.40.9) by SATLVEXEDGE02.amd.com (10.177.96.29) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 13 Oct 2014 11:17:25 -0500 Received: from ssuthiku-fedora-lt.amd.com (10.180.168.240) by satlexdag04.amd.com (10.181.40.9) with Microsoft SMTP Server id 14.3.195.1; Mon, 13 Oct 2014 12:17:23 -0400 From: To: , Date: Mon, 13 Oct 2014 11:17:10 -0500 Message-ID: <1413217030-9170-1-git-send-email-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(428002)(189002)(199003)(21056001)(95666004)(31966008)(102836001)(88136002)(77156001)(105586002)(120916001)(20776003)(229853001)(47776003)(85306004)(92726001)(86152002)(92566001)(36756003)(46102003)(575784001)(93916002)(106466001)(50466002)(86362001)(80022003)(48376002)(85852003)(64706001)(76482002)(77096002)(87286001)(19580395003)(104166001)(97736003)(89996001)(19580405001)(50226001)(62966002)(53416004)(4396001)(84676001)(50986999)(44976005)(33646002)(68736004)(101416001)(87936001); DIR:OUT; SFP:1102; SCL:1; SRVR:CO1PR02MB206; H:atltwp01.amd.com; FPR:; MLV:sfv; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:CO1PR02MB206; X-Exchange-Antispam-Report-Test: UriScan:; X-Forefront-PRVS: 03630A6A4A Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-OriginatorOrg: amd4.onmicrosoft.com Cc: roy.franz@linaro.org, xen-devel@lists.xen.org, ian.campbell@citrix.com, Suravee Suthikulpanit Subject: [Xen-devel] [PATCH FOR-4.5] xen: arm: Do not enable EFI in dom0 since it is not yet supported. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: suravee.suthikulpanit@amd.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: From: Suravee Suthikulpanit Since EFI is not yet supported in dom0, we need to remove the following properties from the chosen node: * linux,uefi-mmap-start * linux,uefi-mmap-size * linux,uefi-mmap-desc-size * linux,uefi-mmap-desc-ver These are added by "arch/arm/efi/efi-boot.h: fdt_add_uefi_nodes()", and used by dom0 kernel to enable EFI. Cc: Julien Grall Cc: Stefano Stabellini Cc: Ian Campbell Cc: Roy Franz Signed-off-by: Suravee Suthikulpanit Reviewed-by: Julien Grall Reviewed-by: Roy Franz Acked-by: Ian Campbell --- xen/arch/arm/domain_build.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 90abc3a..f1d0d20 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -423,12 +423,21 @@ static int write_properties(struct domain *d, struct kernel_info *kinfo, * bootargs (from module #1, above). * * remove bootargs, xen,dom0-bootargs, xen,xen-bootargs, * linux,initrd-start and linux,initrd-end. + * * remove bootargs, linux,uefi-system-table, + * linux,uefi-mmap-start, linux,uefi-mmap-size, + * linux,uefi-mmap-desc-size, and linux,uefi-mmap-desc-ver + * (since EFI boot is not currently supported in dom0). */ if ( dt_node_path_is_equal(node, "/chosen") ) { if ( dt_property_name_is_equal(prop, "xen,xen-bootargs") || dt_property_name_is_equal(prop, "linux,initrd-start") || - dt_property_name_is_equal(prop, "linux,initrd-end") ) + dt_property_name_is_equal(prop, "linux,initrd-end") || + dt_property_name_is_equal(prop, "linux,uefi-system-table") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-start") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-size") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-desc-size") || + dt_property_name_is_equal(prop, "linux,uefi-mmap-desc-ver")) continue; if ( dt_property_name_is_equal(prop, "xen,dom0-bootargs") )