From patchwork Fri Feb 26 06:23:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 8431851 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 CAE7AC0554 for ; Fri, 26 Feb 2016 06:26:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C95452039C for ; Fri, 26 Feb 2016 06:26:47 +0000 (UTC) Received: from lists.xen.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 E432020145 for ; Fri, 26 Feb 2016 06:26:46 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aZBpO-0006PV-JW; Fri, 26 Feb 2016 06:24:38 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aZBpM-0006M3-IE for xen-devel@lists.xen.org; Fri, 26 Feb 2016 06:24:36 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id E5/F1-03316-3AFEFC65; Fri, 26 Feb 2016 06:24:35 +0000 X-Env-Sender: zhaoshenglong@huawei.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1456467869!25149113!1 X-Originating-IP: [58.251.152.64] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13332 invoked from network); 26 Feb 2016 06:24:34 -0000 Received: from szxga01-in.huawei.com (HELO szxga01-in.huawei.com) (58.251.152.64) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 26 Feb 2016 06:24:34 -0000 Received: from 172.24.1.47 (EHLO SZXEML429-HUB.china.huawei.com) ([172.24.1.47]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DFG21629; Fri, 26 Feb 2016 14:24:16 +0800 (CST) Received: from HGHY1Z002260041.china.huawei.com (10.177.16.142) by SZXEML429-HUB.china.huawei.com (10.82.67.184) with Microsoft SMTP Server id 14.3.235.1; Fri, 26 Feb 2016 14:24:06 +0800 From: Shannon Zhao To: Date: Fri, 26 Feb 2016 14:23:00 +0800 Message-ID: <1456467780-8476-23-git-send-email-zhaoshenglong@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1456467780-8476-1-git-send-email-zhaoshenglong@huawei.com> References: <1456467780-8476-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.0A020202.56CFEF90.00B6, 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: d1a7c4f0306fb9546c44834c8930d805 Cc: peter.huangpeng@huawei.com, stefano.stabellini@citrix.com, ian.campbell@citrix.com, shannon.zhao@linaro.org Subject: [Xen-devel] [PATCH v5 22/22] arm/acpi: Add acpi parameter to enable/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=-1.9 required=5.0 tests=BAYES_00, 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 Define new command line parameter "acpi" to enable/disable acpi. This implements the following policy to decide whether ACPI should be used to boot the system: - acpi=off: ACPI will not be used to boot the system, even if there is no alternative available (e.g., device tree is empty) - acpi=force: only ACPI will be used to boot the system; if that fails, there will be no fallback to alternative methods (such as device tree) - otherwise, ACPI will be used as a fallback if the device tree turns out to lack a platform description; the heuristic to decide this is whether /chosen is the only node present at depth 1 Signed-off-by: Shannon Zhao Reviewed-by: Stefano Stabellini --- xen/arch/arm/acpi/boot.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/xen/arch/arm/acpi/boot.c b/xen/arch/arm/acpi/boot.c index 066b590..345e568 100644 --- a/xen/arch/arm/acpi/boot.c +++ b/xen/arch/arm/acpi/boot.c @@ -30,9 +30,11 @@ #include #include #include +#include #include #include +#include /* Processors with enabled flag and sane MPIDR */ static unsigned int enabled_cpus; @@ -174,6 +176,36 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) return -EINVAL; } +static bool_t __initdata param_acpi_off; +static bool_t __initdata param_acpi_force; + +static void __init parse_acpi_param(char *arg) +{ + if ( !arg ) + return; + + /* Interpret the parameter for use within Xen. */ + if ( !parse_bool(arg) ) + param_acpi_off = true; + else if ( !strcmp(arg, "force") ) /* force ACPI to be enabled */ + param_acpi_force = true; +} +custom_param("acpi", parse_acpi_param); + +static int __init dt_scan_depth1_nodes(const void *fdt, int node, + const char *uname, int depth, + u32 address_cells, u32 size_cells, + void *data) +{ + /* + * Return 1 as soon as we encounter a node at depth 1 that is + * not the /chosen node. + */ + if (depth == 1 && (strcmp(uname, "chosen") != 0)) + return 1; + return 0; +} + /* * acpi_boot_table_init() called from setup_arch(), always. * 1. find RSDP and get its address, and then find XSDT @@ -190,6 +222,26 @@ int __init acpi_boot_table_init(void) { int error; + /* + * 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) + * and ACPI has not been force enabled (acpi=force) + */ + if ( param_acpi_off || ( !param_acpi_force + && device_tree_for_each_node(device_tree_flattened, + dt_scan_depth1_nodes, NULL))) + { + disable_acpi(); + return 0; + } + + /* + * ACPI is disabled at this point. Enable it in order to parse + * the ACPI tables. + */ + enable_acpi(); + /* Initialize the ACPI boot-time table parser. */ error = acpi_table_init(); if ( error )