From patchwork Wed Feb 25 00:36:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 45007 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EF83B2029F for ; Wed, 25 Feb 2015 00:37:11 +0000 (UTC) Received: by wghl18 with SMTP id l18sf346213wgh.3 for ; Tue, 24 Feb 2015 16:37:11 -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=aIq74k638WhvKSXOjmnTToHfriLfCSg1XvVS0gsdnrs=; b=INKRwW84Fo0a0kfOlJCO9ZiNPL0f86qcXDNugmk1o++ZKLNQgCBNaO5N2tqnm2tJf0 9wFTsVCbTduz1aE3uR4yMQLfHrFYDCytq1fyi46a4kbMmD00a+lvXgE61zjtlONHgVNg JVZErdfci6p2CyocmXdt8/1L3FUGdBuhh61iqvZsMpzsDiEjS1QtpCGiJN8KGArG0nSN ZDkW/D+GMcGl/Fm4eYPm/d/I4WIqZMK0gbufvEO9yOutXGM2iRjyEV5fg0UgPbYY5tbw 0n4BYmPSTDC2E+yBRlk81PMAkSNhUS/msuffma2FHrTGUohJMQqv/PgsPSSY1VaP9eJ2 9B3w== X-Gm-Message-State: ALoCoQnEHqtURg00iVQ7suNOUekgHuQwORR7w1UoHNkMRI3OffDq1i7ATiMl4C+snd0kBOI45jez X-Received: by 10.180.72.44 with SMTP id a12mr111006wiv.0.1424824631263; Tue, 24 Feb 2015 16:37:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.5.33 with SMTP id cj1ls815150lad.53.gmail; Tue, 24 Feb 2015 16:37:10 -0800 (PST) X-Received: by 10.152.7.132 with SMTP id j4mr472549laa.100.1424824630967; Tue, 24 Feb 2015 16:37:10 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id lk3si4650767lac.103.2015.02.24.16.37.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 16:37:10 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lams18 with SMTP id s18so468548lam.13 for ; Tue, 24 Feb 2015 16:37:10 -0800 (PST) X-Received: by 10.112.14.196 with SMTP id r4mr483423lbc.86.1424824630891; Tue, 24 Feb 2015 16:37:10 -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.35.133 with SMTP id h5csp2269237lbj; Tue, 24 Feb 2015 16:37:10 -0800 (PST) X-Received: by 10.50.43.162 with SMTP id x2mr23840476igl.46.1424824619913; Tue, 24 Feb 2015 16:36:59 -0800 (PST) Received: from mail-ie0-f181.google.com (mail-ie0-f181.google.com. [209.85.223.181]) by mx.google.com with ESMTPS id a15si11241174igh.50.2015.02.24.16.36.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 16:36:59 -0800 (PST) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.223.181 as permitted sender) client-ip=209.85.223.181; Received: by iecvy18 with SMTP id vy18so689452iec.13 for ; Tue, 24 Feb 2015 16:36:59 -0800 (PST) X-Received: by 10.50.142.38 with SMTP id rt6mr23625288igb.17.1424824619187; Tue, 24 Feb 2015 16:36:59 -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 d6sm21312437iod.11.2015.02.24.16.36.57 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Feb 2015 16:36:57 -0800 (PST) From: al.stone@linaro.org To: rjw@rjwysocki.net, lenb@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, robert.moore@intel.com, tony.luck@intel.com, fenghua.yu@intel.com Cc: linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, devel@acpica.org, linux-arm-kernel@lists.infradead.org, linaro-acpi@lists.linaro.org, linaro-kernel@lists.linaro.org, patches@linaro.org Subject: [PATCH v3 9/9] ACPI: arm64: use "Linux" as ACPI_OS_NAME for _OS on arm64 Date: Tue, 24 Feb 2015 17:36:25 -0700 Message-Id: <1424824585-6405-10-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424824585-6405-1-git-send-email-al.stone@linaro.org> References: <1424824585-6405-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.53 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: Al Stone 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=". Many thanks to Rafael Wysocki for this greatly simplified form of the patch. Signed-off-by: Hanjun Guo Signed-off-by: Al Stone --- arch/arm64/Kconfig | 5 +++++ include/acpi/acconfig.h | 2 ++ include/acpi/platform/aclinux.h | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index e441d28..d812113 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -87,6 +87,11 @@ config ARM64 config 64BIT def_bool y +config ACPI_OS_NAME + string + default "Linux" + depends on ACPI + config ARCH_PHYS_ADDR_T_64BIT def_bool y 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..a871cdd 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 +#define ACPI_OS_NAME CONFIG_ACPI_OS_NAME +#endif + #include #include #include