From patchwork Sun Feb 28 11:19:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 63152 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp731336lbc; Sun, 28 Feb 2016 03:25:46 -0800 (PST) X-Received: by 10.140.229.209 with SMTP id z200mr13515569qhb.40.1456658733286; Sun, 28 Feb 2016 03:25:33 -0800 (PST) Return-Path: Received: from lists.xen.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id v82si21627138qkv.63.2016.02.28.03.25.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Feb 2016 03:25:33 -0800 (PST) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aZzSO-0005UC-8Z; Sun, 28 Feb 2016 11:24:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aZzSN-0005Td-0l for xen-devel@lists.xen.org; Sun, 28 Feb 2016 11:24:11 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id 2B/05-03316-AD8D2D65; Sun, 28 Feb 2016 11:24:10 +0000 X-Env-Sender: zhaoshenglong@huawei.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1456658644!25444539!1 X-Originating-IP: [58.251.152.64] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23014 invoked from network); 28 Feb 2016 11:24:09 -0000 Received: from szxga01-in.huawei.com (HELO szxga01-in.huawei.com) (58.251.152.64) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 28 Feb 2016 11:24:09 -0000 Received: from 172.24.1.49 (EHLO szxeml432-hub.china.huawei.com) ([172.24.1.49]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DFJ26962; Sun, 28 Feb 2016 19:20:44 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by szxeml432-hub.china.huawei.com (10.82.67.209) with Microsoft SMTP Server id 14.3.235.1; Sun, 28 Feb 2016 19:20:35 +0800 From: Shannon Zhao To: Date: Sun, 28 Feb 2016 19:19:20 +0800 Message-ID: <1456658360-16080-25-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1456658360-16080-1-git-send-email-zhaoshenglong@huawei.com> References: <1456658360-16080-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.56D2D80C.0127, 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: 2163b3e882f752d9476c657f70c135b8 Cc: peter.huangpeng@huawei.com, zhaoshenglong@huawei.com, stefano.stabellini@citrix.com, ian.campbell@citrix.com, shannon.zhao@linaro.org Subject: [Xen-devel] [PATCH v4 24/24] xen/arm64: Add ACPI support X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" From: Naresh Bhat Add ACPI support on arm64 xen hypervisor. Enable EFI support on ARM. Signed-off-by: Naresh Bhat Signed-off-by: Shannon Zhao --- V4: add comments to explain why efi_enabled = 1 needs --- xen/arch/arm/Kconfig | 1 + xen/common/efi/runtime.c | 8 ++++++-- xen/include/asm-arm/config.h | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index 60e923c..e39b05b 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -14,6 +14,7 @@ config ARM_64 def_bool y depends on 64BIT select HAS_GICV3 + select HAS_ACPI config ARM def_bool y diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index ae87557..26a82a7 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -10,8 +10,12 @@ DEFINE_XEN_GUEST_HANDLE(CHAR16); #ifndef COMPAT -#ifdef CONFIG_ARM /* Disabled until runtime services implemented */ -const bool_t efi_enabled = 0; +#ifdef CONFIG_ARM +/* Currently it doesn't implement runtime services on ARM, but to boot Dom0 with + * ACPI it needs to assign efi_enabled with 1 to get acpi_os_get_root_pointer + * work. + */ +const bool_t efi_enabled = 1; #else # include # include diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h index a26cb1a..98710fe 100644 --- a/xen/include/asm-arm/config.h +++ b/xen/include/asm-arm/config.h @@ -36,6 +36,11 @@ #define CONFIG_ARM_L1_CACHE_SHIFT 7 /* XXX */ +#if defined(CONFIG_ARM_64) +#define CONFIG_ACPI 1 +#define CONFIG_ACPI_BOOT 1 +#endif + #define CONFIG_SMP 1 #define CONFIG_VIDEO 1