From patchwork Sat Oct 6 20:09:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 1558971 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id BF8E73FD56 for ; Sat, 6 Oct 2012 20:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752593Ab2JFULj (ORCPT ); Sat, 6 Oct 2012 16:11:39 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:65435 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753530Ab2JFULf (ORCPT ); Sat, 6 Oct 2012 16:11:35 -0400 Received: by mail-qc0-f174.google.com with SMTP id d3so1916086qch.19 for ; Sat, 06 Oct 2012 13:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references:reply-to:organization; bh=N+uilX0x0r2EaSHcn0zHvj/sgjR0fQwX9R+yNgXyQ3o=; b=R3eTf5pe/X9JfmJ34hKMsUHiYazC9oB7f92vd9K21ebQKGMXfcW4DubRs80Bw710G7 AnV+b4XiekCHnUuZTSqBs3IMjm61/Spx4n/om3osURtCRs++7/QweYhxhm07aEjWQ0uh zfybzN4q7XWZ1v0lSe0a8+vWVEzmQVZPkbVZwoBQnw3s+yjuE4CqC+RL3qxngLwtWDMb +gMzjLT2cID5x2X28w0Lo+7u5UUnD+8+xu+S/AwwTLpsoL7ul3kSa8CLtkFLpqZa8mXk 4EcdkNdbGHBOYBROvuddfXNzxVIZQUwf7ATJxUArSQb+skUgi9BVbe5JboiMwlfrgc6M ytfQ== Received: by 10.224.194.69 with SMTP id dx5mr22560147qab.80.1349554295152; Sat, 06 Oct 2012 13:11:35 -0700 (PDT) Received: from x980.localdomain6 (pool-74-104-146-186.bstnma.fios.verizon.net. [74.104.146.186]) by mx.google.com with ESMTPS id x19sm13470740qeq.12.2012.10.06.13.11.20 (version=SSLv3 cipher=OTHER); Sat, 06 Oct 2012 13:11:28 -0700 (PDT) From: Len Brown To: linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Bob Moore , Feng Tang , Len Brown Subject: [PATCH 05/49] ACPICA: Add Windows8/Server2012 string for _OSI method. Date: Sat, 6 Oct 2012 16:09:26 -0400 Message-Id: X-Mailer: git-send-email 1.8.0.rc0.18.gf84667d In-Reply-To: <1349554210-29978-1-git-send-email-lenb@kernel.org> References: <1349554210-29978-1-git-send-email-lenb@kernel.org> In-Reply-To: References: Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Bob Moore This change adds a new _OSI string, "Windows 2012" for both Windows 8 and Windows Server 2012. From Microsoft document "How to Identify the Windows Version in ACPI by Using _OSI", July 13, 2012. Signed-off-by: Bob Moore Signed-off-by: Feng Tang Signed-off-by: Len Brown --- drivers/acpi/acpica/aclocal.h | 1 + drivers/acpi/acpica/utosi.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index cc80fe1..493529a 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -932,6 +932,7 @@ struct acpi_bit_register_info { #define ACPI_OSI_WIN_VISTA_SP1 0x09 #define ACPI_OSI_WIN_VISTA_SP2 0x0A #define ACPI_OSI_WIN_7 0x0B +#define ACPI_OSI_WIN_8 0x0C #define ACPI_ALWAYS_ILLEGAL 0x00 diff --git a/drivers/acpi/acpica/utosi.c b/drivers/acpi/acpica/utosi.c index 34ef0bd..676285d 100644 --- a/drivers/acpi/acpica/utosi.c +++ b/drivers/acpi/acpica/utosi.c @@ -73,6 +73,7 @@ static struct acpi_interface_info acpi_default_supported_interfaces[] = { {"Windows 2006 SP1", NULL, 0, ACPI_OSI_WIN_VISTA_SP1}, /* Windows Vista SP1 - Added 09/2009 */ {"Windows 2006 SP2", NULL, 0, ACPI_OSI_WIN_VISTA_SP2}, /* Windows Vista SP2 - Added 09/2010 */ {"Windows 2009", NULL, 0, ACPI_OSI_WIN_7}, /* Windows 7 and Server 2008 R2 - Added 09/2009 */ + {"Windows 2012", NULL, 0, ACPI_OSI_WIN_8}, /* Windows 8 and Server 2012 - Added 08/2012 */ /* Feature Group Strings */