From patchwork Wed Feb 4 00:21: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: 44320 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6F89D21513 for ; Wed, 4 Feb 2015 00:22:16 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id n3sf174516wiv.0 for ; Tue, 03 Feb 2015 16:22:15 -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=d9MpJWARvHVLfFr51KskeaL3cCwhcrBCjQ1CHldRVEI=; b=U7Y40cTYuU2rtUHp1Z0WBJ0KOGzBg43/weFWxMJvS83kYCm876mEiqV/4AW4tXflU7 AUR4MDQs/SPVi22JXd/LecpaxUw+dMw9Me5shNbQNNJQa/itIRtqmzIIlGnuJ/2SunZm QenEQdWzb7P04MHwV7j0ehuIUwwjAw+i789f//Jc6M5UzyjJETBb9Jz9UtQqQsP8/nl/ gkZb5ltyz97YcQf8gI5DofZaz9l8b6si1MmrF1kuOEcsYHijK29ucdR3CfPxG+iG2x3H VjCZwLTwFGjerChgQGvSYumpbrfn4vC/ptQnPXzZaRK+R2vw6vNFtWT5nlmDMfmoGJUW enww== X-Gm-Message-State: ALoCoQksbdMyfPAr/KnsW4UarypPydeVEnMneCO/Y63DxO+/5iwfukOV2WPWaHy10ZyYTxCEG19N X-Received: by 10.180.12.146 with SMTP id y18mr1132631wib.6.1423009335776; Tue, 03 Feb 2015 16:22:15 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.18.225 with SMTP id z1ls820210lad.109.gmail; Tue, 03 Feb 2015 16:22:15 -0800 (PST) X-Received: by 10.112.199.39 with SMTP id jh7mr27914724lbc.46.1423009335488; Tue, 03 Feb 2015 16:22:15 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id dw2si64880lbc.62.2015.02.03.16.22.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 03 Feb 2015 16:22:15 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ge10so55493533lab.10 for ; Tue, 03 Feb 2015 16:22:15 -0800 (PST) X-Received: by 10.152.116.43 with SMTP id jt11mr27980612lab.69.1423009335373; Tue, 03 Feb 2015 16:22:15 -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 h5csp166759lbj; Tue, 3 Feb 2015 16:22:14 -0800 (PST) X-Received: by 10.43.55.84 with SMTP id vx20mr26340462icb.62.1423009328385; Tue, 03 Feb 2015 16:22:08 -0800 (PST) Received: from mail-ig0-f179.google.com (mail-ig0-f179.google.com. [209.85.213.179]) by mx.google.com with ESMTPS id y197si97149iod.25.2015.02.03.16.22.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Feb 2015 16:22:08 -0800 (PST) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.213.179 as permitted sender) client-ip=209.85.213.179; Received: by mail-ig0-f179.google.com with SMTP id l13so419434iga.0 for ; Tue, 03 Feb 2015 16:22:07 -0800 (PST) X-Received: by 10.43.64.146 with SMTP id xi18mr6819403icb.65.1423009327669; Tue, 03 Feb 2015 16:22:07 -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 d39sm73966ioj.26.2015.02.03.16.22.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Feb 2015 16:22:06 -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 v2 5/5] ACPI: arm64: use "Linux" as ACPI_OS_NAME for _OS on arm64 Date: Tue, 3 Feb 2015 17:21:44 -0700 Message-Id: <1423009304-5007-6-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1423009304-5007-1-git-send-email-al.stone@linaro.org> References: <1423009304-5007-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.51 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 d01d3f7..9a13d28 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -88,6 +88,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