Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755166Ab3FLGUV (ORCPT ); Wed, 12 Jun 2013 02:20:21 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:49300 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750966Ab3FLGUT (ORCPT ); Wed, 12 Jun 2013 02:20:19 -0400 MIME-Version: 1.0 In-Reply-To: References: <20130329032200.GA11990@google.com> <20130401235256.GA31966@google.com> Date: Tue, 11 Jun 2013 23:20:18 -0700 X-Google-Sender-Auth: vB94PaSIazc60QrKhqvSHjjtYZU Message-ID: Subject: Re: [PATCH] PCI: Remove not needed check in disable aspm link From: Yinghai Lu To: Bjorn Helgaas , Jiang Liu Cc: Roman Yepishev , "Rafael J. Wysocki" , "linux-pci@vger.kernel.org" , "linux-acpi@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Taku Izumi , Kenji Kaneshige , Matthew Garrett , "e1000-devel@lists.sourceforge.net" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1972 Lines: 55 On Tue, Apr 2, 2013 at 1:10 PM, Bjorn Helgaas wrote: > On Mon, Apr 1, 2013 at 6:03 PM, Yinghai Lu wrote: >>> commit 96e5d01cd536458435ef0678d9fa3dc542afb41f >>> Author: Bjorn Helgaas >>> Date: Mon Apr 1 15:47:39 2013 -0600 >>> >>> Revert "PCI/ACPI: Request _OSC control before scanning PCI root bus" >>> >>> This reverts commit 8c33f51df406e1a1f7fa4e9b244845b7ebd61fa6. >>> >>> Conflicts: >>> drivers/acpi/pci_root.c >>> >>> Reference: https://bugzilla.kernel.org/show_bug.cgi?id=55211 >>> Signed-off-by: Bjorn Helgaas >> >> Acked-by: Yinghai Lu >> >> stable need this reverting too. > > I updated the changelog and added this to my for-linus branch, headed for v3.9. We may need to revert this reverting for 3.10. Today noticed that acpiphp jump in before pciehp on one setup. current code from acpi_pci_root_add we have 1. pci_acpi_scan_root ==> pci devices enumeration and bus scanning. ==> pci_alloc_child_bus ==> pcibios_add_bus ==> acpi_pci_add_bus ==> acpiphp_enumerate_slots ==> ...==> register_slot ==> device_is_managed_by_native_pciehp ==> check osc_set with OSC_PCI_EXPRESS_NATIVE_HP_CONTROL 2. _OSC set request so we always have acpiphp hotplug slot registered at first. so either we need to A. revert reverting about _OSC B. move pcibios_add_bus down to pci_bus_add_devices() as acpiphp and apci pci slot driver are some kind of drivers for pci_bus C. A+B Thanks Yinghai -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/