From: Shannon Zhao <zhaoshenglong@huawei.com>
To: <linux-arm-kernel@lists.infradead.org>,
<ard.biesheuvel@linaro.org>, <stefano.stabellini@citrix.com>,
<david.vrabel@citrix.com>
Cc: <catalin.marinas@arm.com>, <will.deacon@arm.com>,
<mark.rutland@arm.com>, <julien.grall@citrix.com>,
<xen-devel@lists.xen.org>, <devicetree@vger.kernel.org>,
<linux-efi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<ian.campbell@citrix.com>, <shannon.zhao@linaro.org>,
<peter.huangpeng@huawei.com>, Hanjun Guo <hanjun.guo@linaro.org>
Subject: [PATCH v4 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI
Date: Fri, 5 Feb 2016 11:05:47 +0800 [thread overview]
Message-ID: <1454641552-12576-13-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1454641552-12576-1-git-send-email-zhaoshenglong@huawei.com>
From: Shannon Zhao <shannon.zhao@linaro.org>
When it's a Xen domain0 booting with ACPI, it will supply a /chosen and
a /hypervisor node in DT. So check if it needs to enable ACPI.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Hanjun Guo <hanjun.guo@linaro.org>
---
CC: Hanjun Guo <hanjun.guo@linaro.org>
---
arch/arm64/kernel/acpi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
index d1ce8e2..4e92be0 100644
--- a/arch/arm64/kernel/acpi.c
+++ b/arch/arm64/kernel/acpi.c
@@ -67,10 +67,13 @@ static int __init dt_scan_depth1_nodes(unsigned long node,
{
/*
* Return 1 as soon as we encounter a node at depth 1 that is
- * not the /chosen node.
+ * not the /chosen node, or /hypervisor node when running on Xen.
*/
- if (depth == 1 && (strcmp(uname, "chosen") != 0))
- return 1;
+ if (depth == 1 && (strcmp(uname, "chosen") != 0)) {
+ if (!xen_initial_domain() || (strcmp(uname, "hypervisor") != 0))
+ return 1;
+ }
+
return 0;
}
@@ -184,7 +187,8 @@ void __init acpi_boot_table_init(void)
/*
* Enable ACPI instead of device tree unless
* - ACPI has been disabled explicitly (acpi=off), or
- * - the device tree is not empty (it has more than just a /chosen node)
+ * - the device tree is not empty (it has more than just a /chosen node,
+ * and a /hypervisor node when running on Xen)
* and ACPI has not been force enabled (acpi=force)
*/
if (param_acpi_off ||
--
2.0.4
next prev parent reply other threads:[~2016-02-05 3:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-05 3:05 [PATCH v4 00/17] Add ACPI support for Xen Dom0 on ARM64 Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 01/17] Xen: ACPI: Hide UART used by Xen Shannon Zhao
2016-02-06 10:23 ` Rafael J. Wysocki
2016-02-08 10:57 ` Stefano Stabellini
2016-02-08 22:25 ` Rafael J. Wysocki
2016-02-09 11:19 ` Stefano Stabellini
2016-02-10 22:29 ` Rafael J. Wysocki
2016-02-11 16:04 ` Stefano Stabellini
2016-02-11 22:22 ` Rafael J. Wysocki
2016-02-12 11:50 ` Stefano Stabellini
2016-02-12 12:57 ` Rafael J. Wysocki
2016-02-29 2:02 ` Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 02/17] xen/grant-table: Move xlated_setup_gnttab_pages to common place Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 03/17] Xen: xlate: Use page_to_xen_pfn instead of page_to_pfn Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 04/17] arm/xen: Use xen_xlate_map_ballooned_pages to setup grant table Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 05/17] xen: memory : Add new XENMAPSPACE type XENMAPSPACE_dev_mmio Shannon Zhao
2016-02-08 11:43 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 06/17] Xen: ARM: Add support for mapping platform device mmio Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 07/17] Xen: ARM: Add support for mapping AMBA " Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 08/17] Xen: public/hvm: sync changes of HVM_PARAM_CALLBACK_VIA ABI from Xen Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 09/17] xen/hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 10/17] arm/xen: Get event-channel irq through HVM_PARAM when booting with ACPI Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 11/17] ARM: XEN: Move xen_early_init() before efi_init() Shannon Zhao
2016-02-05 3:05 ` Shannon Zhao [this message]
2016-02-05 3:05 ` [PATCH v4 13/17] ARM: Xen: Document UEFI support on Xen ARM virtual platforms Shannon Zhao
2016-02-08 11:31 ` Stefano Stabellini
2016-02-05 3:05 ` [PATCH v4 14/17] XEN: EFI: Move x86 specific codes to architecture directory Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 15/17] ARM64: XEN: Add a function to initialize Xen specific UEFI runtime services Shannon Zhao
2016-02-05 3:05 ` [PATCH v4 16/17] FDT: Add a helper to get specified name subnode Shannon Zhao
2016-02-05 14:15 ` Stefano Stabellini
2016-02-09 5:04 ` Rob Herring
2016-02-23 11:13 ` Shannon Zhao
2016-02-24 14:53 ` Rob Herring
2016-02-05 3:05 ` [PATCH v4 17/17] Xen: EFI: Parse DT parameters for Xen specific UEFI Shannon Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454641552-12576-13-git-send-email-zhaoshenglong@huawei.com \
--to=zhaoshenglong@huawei.com \
--cc=ard.biesheuvel@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=david.vrabel@citrix.com \
--cc=devicetree@vger.kernel.org \
--cc=hanjun.guo@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=julien.grall@citrix.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=peter.huangpeng@huawei.com \
--cc=shannon.zhao@linaro.org \
--cc=stefano.stabellini@citrix.com \
--cc=will.deacon@arm.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).