From patchwork Fri Jan 23 00:44:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 43562 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 20A9E218DB for ; Fri, 23 Jan 2015 00:45:27 +0000 (UTC) Received: by mail-we0-f199.google.com with SMTP id u56sf616681wes.2 for ; Thu, 22 Jan 2015 16:45:26 -0800 (PST) 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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=ZtZJNuiM76WjxZLF6vm3s+5yLEZ8tAUZOFb6YNc7LDo=; b=QnYOvTWMnNhaOaYN0CkLAAlY2GN67xGJ4F8bCmfja6WWbHKWcyi7lr5LZcwNdE2al/ 1RfHqr0sA2FMbOPVkunyys+Z25ZmjYiyJapfqN4cfH21fGz6lPz37YDt2B31jNetOCfP x7d+HnP8M91SAVbpbvejFVIvdHBbuqgh7sEaj91vbsujDqgeu5Sdbg1VkjtfSrmeJZ8b ZjjPoyMd1zqv7xy2P4GaqkaS8k0q7HvB3/E6zJuAoG+W6ehOCU4U/XjTVdeT45yEKVnj wGRCVdmSb/qx0fmg36CQyAfk44Z3LNw7N5rk3FjFXF6QRBLjc4MUThLU5R2FAf2qJwII xYag== X-Gm-Message-State: ALoCoQkgzdt57aYiYFDh7eIcinCdfHn8UJivM+CXrQc172jUEjANqphmrSIINcIEXzlzsoKzoDFO X-Received: by 10.112.148.198 with SMTP id tu6mr598743lbb.3.1421973926330; Thu, 22 Jan 2015 16:45:26 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.130 with SMTP id m2ls179589laf.87.gmail; Thu, 22 Jan 2015 16:45:26 -0800 (PST) X-Received: by 10.152.28.194 with SMTP id d2mr4553735lah.85.1421973926119; Thu, 22 Jan 2015 16:45:26 -0800 (PST) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id c6si5023034lab.135.2015.01.22.16.45.26 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 16:45:26 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by mail-la0-f54.google.com with SMTP id hv19so4703738lab.13 for ; Thu, 22 Jan 2015 16:45:26 -0800 (PST) X-Received: by 10.112.180.135 with SMTP id do7mr4527918lbc.23.1421973925896; Thu, 22 Jan 2015 16:45:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.9.200 with SMTP id c8csp71081lbb; Thu, 22 Jan 2015 16:45:25 -0800 (PST) X-Received: by 10.107.168.214 with SMTP id e83mr1107039ioj.37.1421973911562; Thu, 22 Jan 2015 16:45:11 -0800 (PST) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com. [209.85.223.180]) by mx.google.com with ESMTPS id l62si429184ioe.66.2015.01.22.16.45.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 16:45:11 -0800 (PST) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.223.180 as permitted sender) client-ip=209.85.223.180; Received: by mail-ie0-f180.google.com with SMTP id rl12so4616835iec.11 for ; Thu, 22 Jan 2015 16:45:10 -0800 (PST) X-Received: by 10.107.11.104 with SMTP id v101mr1089434ioi.70.1421973910853; Thu, 22 Jan 2015 16:45:10 -0800 (PST) Received: from fidelio.ahs3.com (c-50-134-239-249.hsd1.co.comcast.net. [50.134.239.249]) by mx.google.com with ESMTPSA id k18sm4026037igt.5.2015.01.22.16.45.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 16:45:09 -0800 (PST) From: al.stone@linaro.org To: tony.luck@intel.com, fenghua.yu@intel.com, rjw@rjwysocki.net, catalin.marinas@arm.com, will.deacon@arm.com, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, lenb@kernel.org, robert.moore@intel.com Cc: linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devel@acpica.org, linaro-acpi@lists.linaro.org, linaro-kernel@lists.linaro.org, patches@linaro.org Subject: [PATCH 7/7] ACPI: use Linux as ACPI_OS_NAME for _OS on ARM64 Date: Thu, 22 Jan 2015 17:44:44 -0700 Message-Id: <1421973884-13029-8-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1421973884-13029-1-git-send-email-al.stone@linaro.org> References: <1421973884-13029-1-git-send-email-al.stone@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: al.stone@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.215.54 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Hanjun Guo ACPI_OS_NAME is globally defined as "Microsoft Windows NT" for now. That doesn't make much sense in the ARM context, so set it to "Linux" when CONFIG_ARM64. If it is necessary to change the return value from \_OS_ (that is, return some value other than the default in ACPI_OS_NAME), use the kernel parameter "acpi_os_name=". Signed-off-by: Hanjun Guo --- arch/arm64/Kconfig | 1 + drivers/acpi/Kconfig | 8 ++++++++ include/acpi/acconfig.h | 2 ++ include/acpi/platform/aclinux.h | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 915aa16..20677d1 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1,5 +1,6 @@ config ARM64 def_bool y + select ACPI_OS_NAME_LINUX if ACPI select ACPI_REDUCED_HARDWARE_ONLY if ACPI select ARCH_BINFMT_ELF_RANDOMIZE_PIE select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 3e3bd35..024c5f0 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -369,6 +369,14 @@ config ACPI_REDUCED_HARDWARE_ONLY If you are unsure what to do, do not enable this option. +config ACPI_OS_NAME_LINUX + bool "Using Linux for _OS method" if EXPERT + def_bool n + When used, this option makes sure the _OS method returns + the value "Linux". + + If you are unsure what to do, do not enable this option. + source "drivers/acpi/apei/Kconfig" config ACPI_EXTLOG diff --git a/include/acpi/acconfig.h b/include/acpi/acconfig.h index 5a0a3e5..1980bf4 100644 --- a/include/acpi/acconfig.h +++ b/include/acpi/acconfig.h @@ -69,7 +69,9 @@ * code that will not execute the _OSI method unless _OS matches the string * below. Therefore, change this string at your own risk. */ +#ifndef ACPI_OS_NAME #define ACPI_OS_NAME "Microsoft Windows NT" +#endif /* Maximum objects in the various object caches */ diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 1ba7c19..a8a7ee3 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -69,6 +69,10 @@ #define ACPI_REDUCED_HARDWARE 1 #endif +#ifdef CONFIG_ACPI_OS_NAME_LINUX +#define ACPI_OS_NAME "Linux" +#endif + #include #include #include