From patchwork Thu Apr 7 12:03:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8772081 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 A20C9C0553 for ; Thu, 7 Apr 2016 12:13:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CB1E520222 for ; Thu, 7 Apr 2016 12:13:17 +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 02443201ED for ; Thu, 7 Apr 2016 12:13:17 +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 1ao8mW-0004eA-9l; Thu, 07 Apr 2016 12:11:28 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ao8mU-0004dQ-Ek for xen-devel@lists.xen.org; Thu, 07 Apr 2016 12:11:26 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id B9/53-07120-D6E46075; Thu, 07 Apr 2016 12:11:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRWlGSWpSXmKPExsVSPpHPSTfXjy3 c4PdqBYslHxezODB6HN39mymAMYo1My8pvyKBNePdpn8sBTt4Kt7OW8jUwNjL1cXIySEkcIZR 4uot8y5GLiB7N6PEhzl/GEESbAK6Eh83TmHvYuTgEBFwkTj22QukhllgG5PE0dZtbCA1wgKRE ku+LmYGsVkEVCT29M5mB7F5BTwlLky8DmZLCGhIrOydwAJicwLF29onskIs9pDY0TKPCaJeUO LkzCdgNcwCEhIHX7xghuhVlGhbf5INwpaUOLjiBgvIERICpxglXj45wwKRMJW42ryLeQKj4Cw ks2YhmbWAkWkVo3pxalFZapGukV5SUWZ6RkluYmaOrqGBmV5uanFxYnpqTmJSsV5yfu4mRmB4 MgDBDsZlf50OMUpyMCmJ8k53ZQsX4kvKT6nMSCzOiC8qzUktPsQow8GhJMHr7AuUEyxKTU+tS MvMAUYKTFqCg0dJhLcEJM1bXJCYW5yZDpE6xajLsWXBjbVMQix5+XmpUuK8HiBFAiBFGaV5cC NgUXuJUVZKmJcR6CghnoLUotzMElT5V4ziHIxKwhCX8GTmlcBtegV0BBPQERf4wY4oSURISTU w8jFHvGMML3sQdcHifYS1x38RVgHHZI2S2rBYj4d5zc3X/HMXa7z+FGwxxdD75KljDe8zzvju u5A4tSj03IaaF6xX9lstv3PpZ1DYNrWk3ANWAYYHb8ft2WT27dJl898SL4Sy91UpfXpjef7te 5ul/y9tKHOeq18jf9X259RnZYEx1cJneSI4lFiKMxINtZiLihMBtmEoFtUCAAA= X-Env-Sender: zhaoshenglong@huawei.com X-Msg-Ref: server-8.tower-21.messagelabs.com!1460031083!8012538!1 X-Originating-IP: [119.145.14.66] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTE5LjE0NS4xNC42NiA9PiA4NTI3\n X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 18727 invoked from network); 7 Apr 2016 12:11:25 -0000 Received: from unknown (HELO szxga03-in.huawei.com) (119.145.14.66) by server-8.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 7 Apr 2016 12:11:25 -0000 Received: from 172.24.1.136 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.136]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BZL25445; Thu, 07 Apr 2016 20:04:23 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Thu, 7 Apr 2016 20:04:16 +0800 From: Shannon Zhao To: , Date: Thu, 7 Apr 2016 20:03:29 +0800 Message-ID: <1460030614-16112-13-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1460030614-16112-1-git-send-email-zhaoshenglong@huawei.com> References: <1460030614-16112-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.0A090202.57064CC8.00BB, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 4e93e60ca0f270d15694212fcd692cae Cc: devicetree@vger.kernel.org, linux-efi@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, linux-kernel@vger.kernel.org, xen-devel@lists.xen.org, julien.grall@arm.com, david.vrabel@citrix.com, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [Xen-devel] [PATCH v11 12/17] ARM64: ACPI: Check if it runs on Xen to enable or disable ACPI 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" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 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 Acked-by: Mark Rutland Acked-by: Catalin Marinas --- 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 ||