From patchwork Thu Jul 18 05:38:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Gnatenko X-Patchwork-Id: 2829394 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0D95BC0AB2 for ; Thu, 18 Jul 2013 05:39:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F19FE201EF for ; Thu, 18 Jul 2013 05:39:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AEDD201F2 for ; Thu, 18 Jul 2013 05:39:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758161Ab3GRFjB (ORCPT ); Thu, 18 Jul 2013 01:39:01 -0400 Received: from mail-lb0-f176.google.com ([209.85.217.176]:54110 "EHLO mail-lb0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755872Ab3GRFjA (ORCPT ); Thu, 18 Jul 2013 01:39:00 -0400 Received: by mail-lb0-f176.google.com with SMTP id z5so2133223lbh.21 for ; Wed, 17 Jul 2013 22:38:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:mime-version:content-transfer-encoding; bh=ZFRz+k2zGxKV3iA76nDy89/cdbV8Is1M/6odLPyNj1w=; b=SE/8HZMaik4otSbCjhhtSfeuKIBMVPLGNBA/A3kxTafZ6RHQqsnXs9+o20dy8GmnXu CMNuwXAVo/Th+q2ikby/T4Epcg1HtC3hsPMuRysnvySMq8q3pp3gxb8dHL4ZGKheE6BN OtYGE7k5pptlfFhWGNhPJ0EyXv2VMS8by/kiB+peWiNK9yv+xcwoUMurQ03EqSEjVtWM S9/5gpqrZve+239V6G4VqdXe9BmiL5Vl4bLguw77tv93mB87UBCHOWcQJefs16t995mK hJN9C0BK+W2HgaTDqCLB19jbFU5oEflF9DyW0q+4FYPy/50gjshPmA2h+6o2pbbME5Am Vd8g== X-Received: by 10.152.121.106 with SMTP id lj10mr4540820lab.27.1374125938865; Wed, 17 Jul 2013 22:38:58 -0700 (PDT) Received: from [192.168.254.26] ([176.192.161.180]) by mx.google.com with ESMTPSA id u1sm3488086lag.5.2013.07.17.22.38.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Jul 2013 22:38:57 -0700 (PDT) Message-ID: <1374125927.6123.1.camel@ThinkPad-X230.localdomain> Subject: Re: [PATCH 1/3] ACPICA: expose OSI version From: Igor Gnatenko To: "Rafael J. Wysocki" Cc: linux-acpi@vger.kernel.org, Matthew Garrett , seth.forshee@canonical.com, joeyli.kernel@gmail.com, daniel.vetter@ffwll.ch, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, lenb@kernel.org, Aaron Lu , Yves-Alexis Perez , Felipe Contreras , "Lee, Chun-Yi" , Henrique de Moraes Holschuh Date: Thu, 18 Jul 2013 09:38:47 +0400 In-Reply-To: <1577214.QYL5SKYFj8@vostro.rjw.lan> References: <1370818899-8595-1-git-send-email-matthew.garrett@nebula.com> <1448863.3slS729B6b@vostro.rjw.lan> <1577214.QYL5SKYFj8@vostro.rjw.lan> X-Mailer: Evolution 3.8.3 (3.8.3-2.fc19) Mime-Version: 1.0 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Aaron Lu Expose acpi_gbl_osi_data so that code outside of ACPICA can check the value of the last successfull _OSI call. The definitions for OSI versions are moved to actypes.h so that other components can access them too. Based on a patch from Matthew Garrett which in turn was based on an earlier patch from Seth Forshee. [rjw: Changelog] Signed-off-by: Aaron Lu Signed-off-by: Rafael J. Wysocki Tested-by: Igor Gnatenko --- drivers/acpi/acpica/aclocal.h | 13 ------------- include/acpi/acpixf.h | 1 + include/acpi/actypes.h | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h index dfed265..d4a49016 100644 --- a/drivers/acpi/acpica/aclocal.h +++ b/drivers/acpi/acpica/aclocal.h @@ -931,19 +931,6 @@ struct acpi_bit_register_info { /* Structs and definitions for _OSI support and I/O port validation */ -#define ACPI_OSI_WIN_2000 0x01 -#define ACPI_OSI_WIN_XP 0x02 -#define ACPI_OSI_WIN_XP_SP1 0x03 -#define ACPI_OSI_WINSRV_2003 0x04 -#define ACPI_OSI_WIN_XP_SP2 0x05 -#define ACPI_OSI_WINSRV_2003_SP1 0x06 -#define ACPI_OSI_WIN_VISTA 0x07 -#define ACPI_OSI_WINSRV_2008 0x08 -#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 struct acpi_interface_info { diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 1b09300..22d497e 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -62,6 +62,7 @@ extern u32 acpi_current_gpe_count; extern struct acpi_table_fadt acpi_gbl_FADT; extern u8 acpi_gbl_system_awake_and_running; extern u8 acpi_gbl_reduced_hardware; /* ACPI 5.0 */ +extern u8 acpi_gbl_osi_data; /* Runtime configuration of debug print levels */ diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index a64adcc..22b03c9 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -1144,4 +1144,19 @@ struct acpi_memory_list { #endif }; +/* Definitions for _OSI support */ + +#define ACPI_OSI_WIN_2000 0x01 +#define ACPI_OSI_WIN_XP 0x02 +#define ACPI_OSI_WIN_XP_SP1 0x03 +#define ACPI_OSI_WINSRV_2003 0x04 +#define ACPI_OSI_WIN_XP_SP2 0x05 +#define ACPI_OSI_WINSRV_2003_SP1 0x06 +#define ACPI_OSI_WIN_VISTA 0x07 +#define ACPI_OSI_WINSRV_2008 0x08 +#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 + #endif /* __ACTYPES_H__ */