From patchwork Tue Aug 3 21:02:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 116867 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 o73L2Br0012215 for ; Tue, 3 Aug 2010 21:03:40 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756725Ab0HCVDk (ORCPT ); Tue, 3 Aug 2010 17:03:40 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:33774 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755699Ab0HCVDj (ORCPT ); Tue, 3 Aug 2010 17:03:39 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id E122A18F339; Tue, 3 Aug 2010 22:57:26 +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 10169-01; Tue, 3 Aug 2010 22:57:18 +0200 (CEST) Received: from ferrari.localnet (220-bem-13.acn.waw.pl [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 273EF18C936; Tue, 3 Aug 2010 22:57:18 +0200 (CEST) From: "Rafael J. Wysocki" To: linux-pm@lists.linux-foundation.org Subject: Re: [linux-pm] [PATCH 7/8] ACPI / PCI: Do not preserve _OSC control bits returned by a query (v2) Date: Tue, 3 Aug 2010 23:02:33 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rjw+; KDE/4.4.4; x86_64; ; ) Cc: Hidetoshi Seto , linux-pci@vger.kernel.org, Jesse Barnes , ACPI Devel Maling List , Kenji Kaneshige References: <201008022351.31406.rjw@sisk.pl> <4C57C182.7060407@jp.fujitsu.com> <201008031133.37471.rjw@sisk.pl> In-Reply-To: <201008031133.37471.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201008032302.33778.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]); Tue, 03 Aug 2010 21:03:40 +0000 (UTC) Index: linux-2.6/drivers/pci/pcie/portdrv_acpi.c =================================================================== --- linux-2.6.orig/drivers/pci/pcie/portdrv_acpi.c +++ linux-2.6/drivers/pci/pcie/portdrv_acpi.c @@ -35,7 +35,7 @@ int pcie_port_acpi_setup(struct pci_dev { acpi_status status; acpi_handle handle; - u32 flags; + u32 flags, prev_flags = 0; if (acpi_pci_disabled) return 0; @@ -55,11 +55,14 @@ int pcie_port_acpi_setup(struct pci_dev flags |= OSC_PCI_EXPRESS_AER_CONTROL; } - status = acpi_pci_osc_control_query(handle, &flags); - if (ACPI_FAILURE(status)) { - dev_dbg(&port->dev, "ACPI _OSC query failed (code %d)\n", - status); - return -ENODEV; + while (flags != prev_flags) { + prev_flags = flags; + status = acpi_pci_osc_control_query(handle, &flags); + if (ACPI_FAILURE(status)) { + dev_dbg(&port->dev, + "ACPI _OSC query failed (code %d)\n", status); + return -ENODEV; + } } if (!(flags & OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL)) {