From patchwork Tue Feb 2 01:41:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Yu X-Patchwork-Id: 8185441 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A7319F1C0 for ; Tue, 2 Feb 2016 01:35:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A08020268 for ; Tue, 2 Feb 2016 01:35:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1367202BE for ; Tue, 2 Feb 2016 01:35:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751938AbcBBBfj (ORCPT ); Mon, 1 Feb 2016 20:35:39 -0500 Received: from mga04.intel.com ([192.55.52.120]:27500 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751783AbcBBBfj (ORCPT ); Mon, 1 Feb 2016 20:35:39 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP; 01 Feb 2016 17:35:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,382,1449561600"; d="scan'208";a="906335850" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.160.87]) by fmsmga002.fm.intel.com with ESMTP; 01 Feb 2016 17:35:37 -0800 From: Chen Yu To: linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, rjw@rjwysocki.net, lenb@kernel.org, matthew.garrett@nebula.com, andy.shevchenko@gmail.com, Chen Yu Subject: [PATCH][v3] ACPI: Do not report _OSI("Darwin") when acpi_osi=!Darwin provided Date: Tue, 2 Feb 2016 09:41:18 +0800 Message-Id: <1454377278-3398-1-git-send-email-yu.c.chen@intel.com> X-Mailer: git-send-email 1.8.4.2 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Commit 7bc5a2bad0b8 ("ACPI: Support _OSI("Darwin") correctly") always reports positive value when Apple hardware queries _OSI("Darwin"). But sometimes the users might want to tell the hardware they don't need the Darwin feature, for example, users may leverage the hardware to power off the Thunderbolt, by appending acpi_osi=!Darwin in command line, thus Apple hardware regards it as an incompatible OS X system, hence turns off the Thunderbolt. Link: https://bugzilla.kernel.org/show_bug.cgi?id=92111 Signed-off-by: Chen Yu --- v3: - Simplify acpi_osi_setup_disabled suggested by Andy Shevchenko. v2: - Convert osi_setup_entries to non-initdata variable, to eliminate the warning from 0-DAY test infrastructure. --- drivers/acpi/osl.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 67da6fb..8bb3a93 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -97,6 +97,7 @@ static LIST_HEAD(acpi_ioremaps); static DEFINE_MUTEX(acpi_ioremap_lock); static void __init acpi_osi_setup_late(void); +static bool acpi_osi_setup_disabled(char *str); /* * The story of _OSI(Linux) @@ -149,11 +150,13 @@ static u32 acpi_osi_handler(acpi_string interface, u32 supported) osi_linux.dmi ? " via DMI" : ""); } - if (!strcmp("Darwin", interface)) { + if (!strcmp("Darwin", interface) && + !acpi_osi_setup_disabled(interface)) { /* * Apple firmware will behave poorly if it receives positive * answers to "Darwin" and any other OS. Respond positively - * to Darwin and then disable all other vendor strings. + * to Darwin and then disable all other vendor strings if + * acpi_osi="!Darwin" is not appended in cmdline. */ acpi_update_interfaces(ACPI_DISABLE_ALL_VENDOR_STRINGS); supported = ACPI_UINT32_MAX; @@ -1688,13 +1691,30 @@ struct osi_setup_entry { }; static struct osi_setup_entry - osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = { + osi_setup_entries[OSI_STRING_ENTRIES_MAX] = { {"Module Device", true}, {"Processor Device", true}, {"3.0 _SCP Extensions", true}, {"Processor Aggregator Device", true}, }; +static bool acpi_osi_setup_disabled(char *str) +{ + int i; + struct osi_setup_entry *osi; + + if (str == NULL || *str == '\0') + return false; + + for (i = 0; i < OSI_STRING_ENTRIES_MAX; i++) { + osi = &osi_setup_entries[i]; + if (!strcmp(osi->string, str)) + return !osi->enable; + } + + return false; +} + void __init acpi_osi_setup(char *str) { struct osi_setup_entry *osi;