From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754129AbcA0I5y (ORCPT ); Wed, 27 Jan 2016 03:57:54 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:50038 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752234AbcA0I5w (ORCPT ); Wed, 27 Jan 2016 03:57:52 -0500 Message-ID: <56A8866F.5060302@huawei.com> Date: Wed, 27 Jan 2016 16:57:19 +0800 From: Shannon Zhao User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: Hanjun Guo , , , , , CC: , , , , , , , , , Subject: Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI References: <1453519184-11908-1-git-send-email-zhaoshenglong@huawei.com> <1453519184-11908-13-git-send-email-zhaoshenglong@huawei.com> <56A87F77.8070506@linaro.org> In-Reply-To: <56A87F77.8070506@linaro.org> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.16.142] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.56A88682.0056,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: 6b6799ac819b08fec029119430864dd4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016/1/27 16:27, Hanjun Guo wrote: > Hi Shannon, > > On 2016/1/23 11:19, 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 >> --- >> CC: Hanjun Guo >> --- >> 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. > > The comment is bit misleading, we need to specify two mode, running on > Xen or not, if not on xen, then /chosen node is enough. > Ok, will rephrase it. >> */ >> - 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 here too. > > if that is addressed, > > Acked-by: Hanjun Guo Thanks! -- Shannon From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shannon Zhao Subject: Re: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI Date: Wed, 27 Jan 2016 16:57:19 +0800 Message-ID: <56A8866F.5060302@huawei.com> References: <1453519184-11908-1-git-send-email-zhaoshenglong@huawei.com> <1453519184-11908-13-git-send-email-zhaoshenglong@huawei.com> <56A87F77.8070506@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <56A87F77.8070506-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Hanjun Guo , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, stefano.stabellini-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, david.vrabel-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org Cc: catalin.marinas-5wv7dgnIgG8@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, julien.grall-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, xen-devel-GuqFBffKawuEi8DpZVb4nw@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, ian.campbell-Sxgqhf6Nn4DQT0dZR+AlfA@public.gmane.org, shannon.zhao-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, peter.huangpeng-hv44wF8Li93QT0dZR+AlfA@public.gmane.org List-Id: devicetree@vger.kernel.org On 2016/1/27 16:27, Hanjun Guo wrote: > Hi Shannon, > > On 2016/1/23 11:19, 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 >> --- >> CC: Hanjun Guo >> --- >> 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. > > The comment is bit misleading, we need to specify two mode, running on > Xen or not, if not on xen, then /chosen node is enough. > Ok, will rephrase it. >> */ >> - 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 here too. > > if that is addressed, > > Acked-by: Hanjun Guo Thanks! -- Shannon From mboxrd@z Thu Jan 1 00:00:00 1970 From: zhaoshenglong@huawei.com (Shannon Zhao) Date: Wed, 27 Jan 2016 16:57:19 +0800 Subject: [PATCH v3 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI In-Reply-To: <56A87F77.8070506@linaro.org> References: <1453519184-11908-1-git-send-email-zhaoshenglong@huawei.com> <1453519184-11908-13-git-send-email-zhaoshenglong@huawei.com> <56A87F77.8070506@linaro.org> Message-ID: <56A8866F.5060302@huawei.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 2016/1/27 16:27, Hanjun Guo wrote: > Hi Shannon, > > On 2016/1/23 11:19, 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 >> --- >> CC: Hanjun Guo >> --- >> 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. > > The comment is bit misleading, we need to specify two mode, running on > Xen or not, if not on xen, then /chosen node is enough. > Ok, will rephrase it. >> */ >> - 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 here too. > > if that is addressed, > > Acked-by: Hanjun Guo Thanks! -- Shannon