From patchwork Fri Jul 30 22:36:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 116134 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6UMebre011152 for ; Fri, 30 Jul 2010 22:40:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755600Ab0G3Wkg (ORCPT ); Fri, 30 Jul 2010 18:40:36 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:49412 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755622Ab0G3Wkb (ORCPT ); Fri, 30 Jul 2010 18:40:31 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id C9F7A18CFEE; Sat, 31 Jul 2010 00:35:09 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 30420-05; Sat, 31 Jul 2010 00:34:52 +0200 (CEST) Received: from ferrari.localnet (unknown [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 1DA4018D8D2; Sat, 31 Jul 2010 00:34:38 +0200 (CEST) From: "Rafael J. Wysocki" To: Jesse Barnes Subject: [PATCH 6/7] ACPI / PCI: Do not preserve _OSC control bits returned by a query Date: Sat, 31 Jul 2010 00:36:46 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rc6-rjw+; KDE/4.4.4; x86_64; ; ) Cc: Kenji Kaneshige , Hidetoshi Seto , Matthew Garrett , linux-pci@vger.kernel.org, linux-pm@lists.linux-foundation.org, ACPI Devel Maling List , Len Brown References: <201007310020.56546.rjw@sisk.pl> In-Reply-To: <201007310020.56546.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007310036.46769.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 30 Jul 2010 22:40:38 +0000 (UTC) Index: linux-2.6/drivers/acpi/pci_root.c =================================================================== --- linux-2.6.orig/drivers/acpi/pci_root.c +++ linux-2.6/drivers/acpi/pci_root.c @@ -247,10 +247,8 @@ static acpi_status acpi_pci_query_osc(st status = acpi_pci_run_osc(root->device->handle, capbuf); if (ACPI_SUCCESS(status)) { root->osc_support_set = support; - root->osc_control_qry = capbuf[OSC_CONTROL_TYPE]; if (control) *control = capbuf[OSC_CONTROL_TYPE]; - root->osc_queried = 1; } return status; } @@ -433,19 +431,6 @@ acpi_status acpi_pci_osc_control_set(acp if ((root->osc_control_set & control_req) == control_req) goto out; - /* Need to query controls first before requesting them */ - if (!root->osc_queried) { - status = acpi_pci_query_osc(root, root->osc_support_set, NULL); - if (ACPI_FAILURE(status)) - goto out; - } - if ((root->osc_control_qry & control_req) != control_req) { - printk(KERN_DEBUG - "Firmware did not grant requested _OSC control\n"); - status = AE_SUPPORT; - goto out; - } - capbuf[OSC_QUERY_TYPE] = 0; capbuf[OSC_SUPPORT_TYPE] = root->osc_support_set; capbuf[OSC_CONTROL_TYPE] = root->osc_control_set | control_req; Index: linux-2.6/include/acpi/acpi_bus.h =================================================================== --- linux-2.6.orig/include/acpi/acpi_bus.h +++ linux-2.6/include/acpi/acpi_bus.h @@ -377,9 +377,6 @@ struct acpi_pci_root { u32 osc_support_set; /* _OSC state of support bits */ u32 osc_control_set; /* _OSC state of control bits */ - u32 osc_control_qry; /* the latest _OSC query result */ - - u32 osc_queried:1; /* has _OSC control been queried? */ }; /* helper */