Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933182AbcDTJfK (ORCPT ); Wed, 20 Apr 2016 05:35:10 -0400 Received: from mail.kernel.org ([198.145.29.136]:45638 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932159AbcDTJfH (ORCPT ); Wed, 20 Apr 2016 05:35:07 -0400 Date: Wed, 20 Apr 2016 10:34:41 +0100 (BST) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-X260 To: mark.rutland@arm.com cc: linux-arm-kernel@lists.infradead.org, sstabellini@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, julien.grall@arm.com, david.vrabel@citrix.com, xen-devel@lists.xen.org, devicetree@vger.kernel.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, shannon.zhao@linaro.org, peter.huangpeng@huawei.com Subject: Re: [PATCH v11 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI In-Reply-To: <1460030614-16112-13-git-send-email-zhaoshenglong@huawei.com> Message-ID: References: <1460030614-16112-1-git-send-email-zhaoshenglong@huawei.com> <1460030614-16112-13-git-send-email-zhaoshenglong@huawei.com> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1894 Lines: 59 Hello Mark, do you think that this patch addresses your previous comments (http://marc.info/?l=devicetree&m=145926913008544&w=2) appropriately? Thanks, Stefano On Thu, 7 Apr 2016, Shannon Zhao wrote: > From: Shannon Zhao > > 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 > Reviewed-by: Stefano Stabellini > Acked-by: Hanjun Guo > --- > arch/arm64/kernel/acpi.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c > index d1ce8e2..57ee317 100644 > --- a/arch/arm64/kernel/acpi.c > +++ b/arch/arm64/kernel/acpi.c > @@ -67,10 +67,15 @@ 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 with compatible > + * string "xen,xen". > */ > - if (depth == 1 && (strcmp(uname, "chosen") != 0)) > - return 1; > + if (depth == 1 && (strcmp(uname, "chosen") != 0)) { > + if (strcmp(uname, "hypervisor") != 0 || > + !of_flat_dt_is_compatible(node, "xen,xen")) > + return 1; > + } > + > return 0; > } > > @@ -184,7 +189,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 > >