From patchwork Thu Jul 24 13:00:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 34203 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 46CC420C7F for ; Thu, 24 Jul 2014 13:01:16 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rp18sf17591002iec.4 for ; Thu, 24 Jul 2014 06:01:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=8LgRtnKKydLBLwmea38JboXbQGqpidAxBR63TiGfrq8=; b=JtWwvanV8eCWwvDe0vJf03HHCMTxvO7ShAfp60jpokMWhBlUDfV+CR8QRWXvuAZZse 2N/Q1s5VZytvJSJAYF3b7WyEcd7wTnOZR7Si7cJLaWVS0yITCykB4BJ6gVz4qrZfAiHM 9mjh+PHKeOFnTGzBui/YRum/dd2uvG+I3CridAypcsjeYiSUbZCm9ITvHbLmMbp28O5y dg+Qu1/ApEeJYEm7cygRoIU+LcM6Z8Vdys7LBimqyV4PWK71N6Rva5TxFPa8lOhQEMfS iB0GZIakC5E8gr3BVF74nAq4Gln5rigUKlT1Ytslby/pN9230Igs4MpCEu6LMXGYZrXI ZWGg== X-Gm-Message-State: ALoCoQnONCHtz+VIeTGeKvwj/B2eico3eL5SlxAcyDP7dUoeXy0F1h6Navw+0p7znMdw5hBad3Uh X-Received: by 10.182.34.130 with SMTP id z2mr4448719obi.3.1406206875686; Thu, 24 Jul 2014 06:01:15 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.98.11 with SMTP id n11ls736299qge.11.gmail; Thu, 24 Jul 2014 06:01:15 -0700 (PDT) X-Received: by 10.220.116.196 with SMTP id n4mr9081946vcq.6.1406206875538; Thu, 24 Jul 2014 06:01:15 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id q2si4883516vcz.47.2014.07.24.06.01.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:01:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so4756097vcb.23 for ; Thu, 24 Jul 2014 06:01:15 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr12160805vcb.16.1406206875456; Thu, 24 Jul 2014 06:01:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp362783vcb; Thu, 24 Jul 2014 06:01:14 -0700 (PDT) X-Received: by 10.70.102.169 with SMTP id fp9mr10087230pdb.118.1406206871026; Thu, 24 Jul 2014 06:01:11 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id yq9si5937699pab.119.2014.07.24.06.01.10 for ; Thu, 24 Jul 2014 06:01:11 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759016AbaGXNBH (ORCPT + 13 others); Thu, 24 Jul 2014 09:01:07 -0400 Received: from mail-pd0-f171.google.com ([209.85.192.171]:51382 "EHLO mail-pd0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758995AbaGXNBE (ORCPT ); Thu, 24 Jul 2014 09:01:04 -0400 Received: by mail-pd0-f171.google.com with SMTP id z10so3647683pdj.2 for ; Thu, 24 Jul 2014 06:01:04 -0700 (PDT) X-Received: by 10.68.135.42 with SMTP id pp10mr10124178pbb.58.1406206864096; Thu, 24 Jul 2014 06:01:04 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id fb7sm7356165pdb.68.2014.07.24.06.00.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:01:03 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Cc: Graeme Gregory , Arnd Bergmann , Grant Likely , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi-private@linaro.org, Al Stone , Hanjun Guo Subject: [PATCH 02/19] ARM64 / ACPI: Introduce early_param for "acpi" Date: Thu, 24 Jul 2014 21:00:08 +0800 Message-Id: <1406206825-15590-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> References: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Al Stone Introduce two early parameters for "acpi", one is the parameter to disable ACPI on ARM64 and another one is acpi=strict to disable out-of-spec workarounds. Reviewed-by: Grant Likely Signed-off-by: Al Stone Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo --- Documentation/kernel-parameters.txt | 3 ++- arch/arm64/kernel/acpi.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b7fa2f5..d130bd5 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -165,7 +165,7 @@ multipliers 'Kilo', 'Mega', and 'Giga', equalling 2^10, 2^20, and 2^30 bytes respectively. Such letter suffixes can also be entirely omitted. - acpi= [HW,ACPI,X86] + acpi= [HW,ACPI,X86,ARM] Advanced Configuration and Power Interface Format: { force | off | strict | noirq | rsdt } force -- enable ACPI if default was off @@ -175,6 +175,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. strictly ACPI specification compliant. rsdt -- prefer RSDT over (default) XSDT copy_dsdt -- copy DSDT to memory + For ARM64, ONLY "off" and "strict" are available. See also Documentation/power/runtime_pm.txt, pci=noacpi diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index c62fce6..ac78e4e 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -74,3 +74,24 @@ void __init acpi_boot_table_init(void) return; } } + +static int __init parse_acpi(char *arg) +{ + if (!arg) + return -EINVAL; + + /* "acpi=off" disables both ACPI table parsing and interpreter */ + if (strcmp(arg, "off") == 0) { + disable_acpi(); + } + /* acpi=strict disables out-of-spec workarounds */ + else if (strcmp(arg, "strict") == 0) { + acpi_strict = 1; + } else { + /* Core will printk when we return error */ + return -EINVAL; + } + + return 0; +} +early_param("acpi", parse_acpi);