From patchwork Fri Jan 15 06:55:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 59833 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp356747lbb; Thu, 14 Jan 2016 22:56:55 -0800 (PST) X-Received: by 10.98.87.204 with SMTP id i73mr12491511pfj.63.1452841015655; Thu, 14 Jan 2016 22:56:55 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m68si14541332pfj.133.2016.01.14.22.56.55; Thu, 14 Jan 2016 22:56:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754534AbcAOG4q (ORCPT + 6 others); Fri, 15 Jan 2016 01:56:46 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:13265 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754451AbcAOG4l (ORCPT ); Fri, 15 Jan 2016 01:56:41 -0500 Received: from 172.24.1.50 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.1.50]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DDB64123; Fri, 15 Jan 2016 14:56:37 +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:29 +0800 From: Shannon Zhao To: , , , CC: , , , , , , , , , Subject: [PATCH v2 16/16] ARM64: XEN: Initialize Xen specific UEFI runtime services Date: Fri, 15 Jan 2016 14:55:29 +0800 Message-ID: <1452840929-19612-17-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.0A020205.56989825.0120, 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: 6f7c59d3a99a6646ca210cddbecfdbcb Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Shannon Zhao When running on Xen hypervisor, runtime services are supported through hypercall. So call Xen specific function to initialize runtime services. Signed-off-by: Shannon Zhao --- arch/arm/xen/enlighten.c | 5 +++++ arch/arm64/xen/Makefile | 1 + arch/arm64/xen/efi.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/xen/Kconfig | 2 +- include/xen/xen-ops.h | 1 + 5 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/xen/efi.c -- 2.0.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/xen/enlighten.c b/arch/arm/xen/enlighten.c index 485e117..84f27ec 100644 --- a/arch/arm/xen/enlighten.c +++ b/arch/arm/xen/enlighten.c @@ -414,6 +414,11 @@ static int __init xen_guest_init(void) if (xen_initial_domain()) pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier); + if (IS_ENABLED(CONFIG_XEN_EFI)) { + if (efi_enabled(EFI_PARAVIRT)) + xen_efi_runtime_setup(); + } + return 0; } early_initcall(xen_guest_init); diff --git a/arch/arm64/xen/Makefile b/arch/arm64/xen/Makefile index 74a8d87..62e6fe2 100644 --- a/arch/arm64/xen/Makefile +++ b/arch/arm64/xen/Makefile @@ -1,2 +1,3 @@ xen-arm-y += $(addprefix ../../arm/xen/, enlighten.o grant-table.o p2m.o mm.o) obj-y := xen-arm.o hypercall.o +obj-$(CONFIG_XEN_EFI) += efi.o diff --git a/arch/arm64/xen/efi.c b/arch/arm64/xen/efi.c new file mode 100644 index 0000000..33046b0 --- /dev/null +++ b/arch/arm64/xen/efi.c @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2015, Linaro Limited, Shannon Zhao + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program. If not, see . + */ + +#include +#include + +void __init xen_efi_runtime_setup(void) +{ + efi.get_time = xen_efi_get_time; + efi.set_time = xen_efi_set_time; + efi.get_wakeup_time = xen_efi_get_wakeup_time; + efi.set_wakeup_time = xen_efi_set_wakeup_time; + efi.get_variable = xen_efi_get_variable; + efi.get_next_variable = xen_efi_get_next_variable; + efi.set_variable = xen_efi_set_variable; + efi.query_variable_info = xen_efi_query_variable_info; + efi.update_capsule = xen_efi_update_capsule; + efi.query_capsule_caps = xen_efi_query_capsule_caps; + efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count; + efi.reset_system = NULL; +} +EXPORT_SYMBOL_GPL(xen_efi_runtime_setup); diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig index 73708ac..27d216a 100644 --- a/drivers/xen/Kconfig +++ b/drivers/xen/Kconfig @@ -268,7 +268,7 @@ config XEN_HAVE_PVMMU config XEN_EFI def_bool y - depends on X86_64 && EFI + depends on (ARM64 || X86_64) && EFI config XEN_AUTO_XLATE def_bool y diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index c83a338..36ff8e4 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -107,6 +107,7 @@ efi_status_t xen_efi_update_capsule(efi_capsule_header_t **capsules, efi_status_t xen_efi_query_capsule_caps(efi_capsule_header_t **capsules, unsigned long count, u64 *max_size, int *reset_type); +void xen_efi_runtime_setup(void); #ifdef CONFIG_PREEMPT