From patchwork Fri Jan 15 06:55:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8038881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E12799F1C0 for ; Fri, 15 Jan 2016 07:06:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 15F23204FC for ; Fri, 15 Jan 2016 07:06:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 463E5204FB for ; Fri, 15 Jan 2016 07:06:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJyQk-0005rs-Lu; Fri, 15 Jan 2016 07:04:18 +0000 Received: from szxga01-in.huawei.com ([58.251.152.64]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJyNP-0002nG-E1 for linux-arm-kernel@lists.infradead.org; Fri, 15 Jan 2016 07:00:58 +0000 Received: from 172.24.1.51 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.1.51]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DDB64111; Fri, 15 Jan 2016 14:56:32 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML429-HUB.china.huawei.com (10.82.67.184) with Microsoft SMTP Server id 14.3.235.1; Fri, 15 Jan 2016 14:56:25 +0800 From: Shannon Zhao To: , , , Subject: [PATCH v2 13/16] ARM: XEN: Set EFI_PARAVIRT if Xen supports EFI Date: Fri, 15 Jan 2016 14:55:26 +0800 Message-ID: <1452840929-19612-14-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1452840929-19612-1-git-send-email-zhaoshenglong@huawei.com> References: <1452840929-19612-1-git-send-email-zhaoshenglong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.56989822.0064, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 7c499ce6c54741980060851c00398894 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160114_230052_358255_6A97144D X-CRM114-Status: GOOD ( 12.48 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, xen-devel@lists.xen.org, julien.grall@citrix.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Shannon Zhao Check if there is "uefi" node in the DT. If so, set EFI_PARAVIRT flag. Signed-off-by: Shannon Zhao --- arch/arm/xen/enlighten.c | 23 +++++++++++++++++++++++ arch/arm64/kernel/efi.c | 5 +++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 5d0fe68..485e117 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -248,6 +249,19 @@ static int __init fdt_find_xen_node(unsigned long node, const char *uname, return 0; } +static int __init fdt_find_uefi_node(unsigned long node, const char *uname, + int depth, void *data) +{ + bool *found = data; + + if (depth != 2 || strcmp(uname, "uefi") != 0) + return 0; + + *found = true; + + return 1; +} + /* * see Documentation/devicetree/bindings/arm/xen.txt for the * documentation of the Xen Device Tree format. @@ -255,6 +269,8 @@ static int __init fdt_find_xen_node(unsigned long node, const char *uname, #define GRANT_TABLE_PHYSADDR 0 void __init xen_early_init(void) { + bool uefi_found = false; + of_scan_flat_dt(fdt_find_xen_node, NULL); if (!xen_node.found) { pr_debug("No Xen support\n"); @@ -279,6 +295,13 @@ void __init xen_early_init(void) if (!console_set_on_cmdline && !xen_initial_domain()) add_preferred_console("hvc", 0, NULL); + + if (IS_ENABLED(CONFIG_XEN_EFI)) { + /* Check if Xen support UEFI */ + of_scan_flat_dt(fdt_find_uefi_node, &uefi_found); + if (uefi_found) + set_bit(EFI_PARAVIRT, &efi.flags); + } } static int __init xen_guest_init(void) diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 4eeb171..16c6b72 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -288,6 +288,11 @@ static int __init arm64_enable_runtime_services(void) return 0; } + if (efi_enabled(EFI_PARAVIRT)) { + pr_info("EFI runtime services access via paravirt.\n"); + return -1; + } + pr_info("Remapping and enabling EFI services.\n"); mapsize = memmap.map_end - memmap.map;