From patchwork Fri Mar 25 13:48:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8671801 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 91FD3C0553 for ; Fri, 25 Mar 2016 13:52:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C0B8120379 for ; Fri, 25 Mar 2016 13:52:31 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3CD9320351 for ; Fri, 25 Mar 2016 13:52:30 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajS8d-0002aL-64; Fri, 25 Mar 2016 13:50:55 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajS8b-0002YV-PC for xen-devel@lists.xen.org; Fri, 25 Mar 2016 13:50:53 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 6C/4B-29237-D3245F65; Fri, 25 Mar 2016 13:50:53 +0000 X-Env-Sender: shannon.zhao@linaro.org X-Msg-Ref: server-5.tower-21.messagelabs.com!1458913851!5906994!1 X-Originating-IP: [209.85.220.46] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64178 invoked from network); 25 Mar 2016 13:50:52 -0000 Received: from mail-pa0-f46.google.com (HELO mail-pa0-f46.google.com) (209.85.220.46) by server-5.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 25 Mar 2016 13:50:52 -0000 Received: by mail-pa0-f46.google.com with SMTP id fl4so46887229pad.0 for ; Fri, 25 Mar 2016 06:50:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=svhVubqUvy6k9h2VhS6u7DRUb0mGjJlmCE57vyU6+fg=; b=C6p9+o8PUBbF+aOHMD2qgg8RwK7AIvwzTgbFDPA1l/apa/FqOvp92h7wR8z2qDExPA rWYR9ePs01iXrbrnGbXS5lu2e29oXMaI2mPhPdFffpq8IHUULgGuEOCZ0JKzmpjiuDhI 4coZaGbSov8rbJvItjp3YpjMaXP6C4i7YMWRY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=svhVubqUvy6k9h2VhS6u7DRUb0mGjJlmCE57vyU6+fg=; b=i3jeUbh7eIfG8rPeA3ngBL/ZshgkAkBXoQMkffyZuU0jeDmEd0/c29XPZJgHJ+K0tp OuDh1azvlmapy0N6v9NgOkcvKr453+v9K7jeGRiUt3ZVSCt1Cw6/ocvpwXHqK6/Omezz mnNqj5+vpxTEaiUCBawGnNi/ipywnHLfLVJWfPtsJkRNgSfhZvc0hxmvQShowGqZndQW lVcFG/kJbwu8jMuuHrpNNKbBQ7MGR2cI/ew1SSY74fq/C+4l8Noygzsl8zN5vCHBtjNN 9M+qS+JmJCeRYeV6rWuTzlLXK++9DM3z5az1yI9F1RM1Oc8Fe/T21fZecxk92qA7rvCM nAWg== X-Gm-Message-State: AD7BkJKnF5xlwDX7bshRhpbj/oU3/z9UIwZ+2HXGqNBBIZFRT7TjNC2qSw5e7OJhCfRge0dC X-Received: by 10.66.193.202 with SMTP id hq10mr20767929pac.6.1458913850870; Fri, 25 Mar 2016 06:50:50 -0700 (PDT) Received: from localhost.localdomain ([45.56.152.2]) by smtp.gmail.com with ESMTPSA id w20sm16744178pfi.31.2016.03.25.06.50.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Mar 2016 06:50:49 -0700 (PDT) From: Shannon Zhao To: xen-devel@lists.xen.org Date: Fri, 25 Mar 2016 21:48:55 +0800 Message-Id: <1458913735-2678-23-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458913735-2678-1-git-send-email-shannon.zhao@linaro.org> References: <1458913735-2678-1-git-send-email-shannon.zhao@linaro.org> Cc: peter.huangpeng@huawei.com, julien.grall@arm.com, stefano.stabellini@citrix.com, shannon.zhao@linaro.org, Jan Beulich , zhaoshenglong@huawei.com Subject: [Xen-devel] [PATCH v7 22/22] 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 Add ACPI support on arm64 xen hypervisor. Enable EFI support on ARM. Cc: Jan Beulich Signed-off-by: Shannon Zhao Acked-by: Jan Beulich Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- v7: Drop CONFIG_ACPI_BOOT --- xen/arch/arm/Kconfig | 9 +++++++++ xen/common/efi/runtime.c | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index cb99df5..6231cd5 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -33,6 +33,15 @@ menu "Architecture Features" source "arch/Kconfig" +config ACPI + bool + prompt "ACPI (Advanced Configuration and Power Interface) Support" if EXPERT = "y" + depends on ARM_64 + ---help--- + + Advanced Configuration and Power Interface (ACPI) support for Xen is + an alternative to device tree on ARM64. + # Select HAS_GICV3 if GICv3 is supported config HAS_GICV3 bool diff --git a/xen/common/efi/runtime.c b/xen/common/efi/runtime.c index ae87557..c256814 100644 --- a/xen/common/efi/runtime.c +++ b/xen/common/efi/runtime.c @@ -10,14 +10,16 @@ DEFINE_XEN_GUEST_HANDLE(CHAR16); #ifndef COMPAT -#ifdef CONFIG_ARM /* Disabled until runtime services implemented */ -const bool_t efi_enabled = 0; -#else +/* + * Currently runtime services are not implemented on ARM. To boot Xen with ACPI, + * set efi_enabled to 1, so that Xen can get the ACPI root pointer from EFI. + */ +const bool_t efi_enabled = 1; + +#ifndef CONFIG_ARM # include # include # include - -const bool_t efi_enabled = 1; #endif unsigned int __read_mostly efi_num_ct;