Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753748AbcD0Jpb (ORCPT ); Wed, 27 Apr 2016 05:45:31 -0400 Received: from mga11.intel.com ([192.55.52.93]:30268 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753688AbcD0Jp1 convert rfc822-to-8bit (ORCPT ); Wed, 27 Apr 2016 05:45:27 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,540,1455004800"; d="scan'208";a="941182555" From: "Chen, Yu C" To: "Zheng, Lv" CC: Lv Zheng , "linux-kernel@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "Wysocki, Rafael J" , "Rafael J. Wysocki" , "Brown, Len" Subject: RE: [PATCH v2 4/6] ACPI / osi: Fix default _OSI(Darwin) support Thread-Topic: [PATCH v2 4/6] ACPI / osi: Fix default _OSI(Darwin) support Thread-Index: AQHRoGJ/QFM3eHmXeEy1u00Qs4rUZZ+dkT9g Date: Wed, 27 Apr 2016 09:45:21 +0000 Message-ID: <36DF59CE26D8EE47B0655C516E9CE64028748233@shsmsx102.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzNlZWEzZjQtY2YwZS00ZDdiLThlYWItODg4Y2JhZDVmMTNhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IlpzR2ZjdWJwMVB1bzdyN0FDaUNjeW5hXC9DeitpR0lwRUN2OHQ3SlRjNDRvPSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2602 Lines: 79 Hi Lv, > -----Original Message----- > From: Zheng, Lv > Sent: Wednesday, April 27, 2016 4:55 PM > To: Wysocki, Rafael J; Rafael J. Wysocki; Brown, Len > Cc: Zheng, Lv; Lv Zheng; linux-kernel@vger.kernel.org; linux- > acpi@vger.kernel.org; Chen, Yu C > Subject: [PATCH v2 4/6] ACPI / osi: Fix default _OSI(Darwin) support > > From: Chen Yu > > The following commit always reports positive value when Apple hardware > queries _OSI("Darwin"): > Commit: 7bc5a2bad0b8d9d1ac9f7b8b33150e4ddf197334 > Subject: ACPI: Support _OSI("Darwin") correctly However since this > implementation places the judgement in runtime, it breaks acpi_osi=!Darwin > and cannot return unsupported for _OSI("WinXXX") invoked before invoking > _OSI("Darwin"). > > This patch fixes the issues by reverting the wrong support and implementing > the default behavior of _OSI("Darwin")/_OSI("WinXXX") on Apple hardware via > DMI matching. > > Fixes: 7bc5a2bad0b8 ("ACPI: Support _OSI("Darwin") correctly") > Cc: # 3.18+ > Link: https://bugzilla.kernel.org/show_bug.cgi?id=92111 > Reported-by: Lukas Wunner > Signed-off-by: Chen Yu > Signed-off-by: Lv Zheng > --- > drivers/acpi/blacklist.c | 23 ++++++++++++++++++ > drivers/acpi/osl.c | 58 ++++++++++++++++++++++++++++++++++++++++--- > --- > include/linux/acpi.h | 1 + > 3 files changed, 75 insertions(+), 7 deletions(-) > > diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index > 96809cd..e947d3e 100644 > --- a/drivers/acpi/blacklist.c > +++ b/drivers/acpi/blacklist.c > @@ -133,6 +133,11 @@ int __init acpi_blacklisted(void) > return blacklisted; > } > #ifdef CONFIG_DMI > +static int __init dmi_enable_osi_darwin(const struct dmi_system_id *d) > +{ > + acpi_dmi_osi_darwin(1, d); /* enable */ > + return 0; > +} > static int __init dmi_enable_osi_linux(const struct dmi_system_id *d) { > acpi_dmi_osi_linux(1, d); /* enable */ > @@ -331,6 +336,24 @@ static struct dmi_system_id acpi_osi_dmi_table[] > __initdata = { > }, > }, > > + /* > + * Enable _OSI("Darwin") for all apple platforms. > + */ > + { > + .callback = dmi_enable_osi_darwin, > + .ident = "Apple hardware", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Apple INC."), > + }, > + }, > + { > + .callback = dmi_enable_osi_darwin, > + .ident = "Apple hardware", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Apple Computer, INC."), > + }, > + }, > + The vendor id should be 'Apple Inc.' and 'Apple Computer, Inc.' instead. thanks, yu