On Fri, Feb 1, 2013 at 4:06 PM, Bjorn Helgaas <bhelg...@google.com> wrote:
> On Wed, Jan 30, 2013 at 9:10 AM, Jiang Liu <liu...@gmail.com> wrote:
>> From: Jiang Liu <jiang....@huawei.com>
>>
>> With commit 4f535093cf8f6da8c "PCI: Put pci_dev in device tree as
>> early as possible", companion ACPI devices should be created before
>> creating correspoding PCI devices, otherwise it will break the ACPI
>> PCI binding logic.
>>
>> Signed-off-by: Jiang Liu <jiang....@huawei.com>
Applied to pci/yinghai-root-bus for v3.9. Thanks!
>> ---
>> Hi Bjorn,
>> This patch set applies to your pci/yinghai-root-bus branch.
>> There are still other potential bugs in the acpiphp driver under
>> investigation. So I will send out these two first to catch up with
>> the 3.9 merging window.
>> Thanks!
>> Gerry
>
> I assume this fixes some sort of user-visible issue with acpiphp.
> What failure does the user see?
>
>> ---
>> drivers/pci/hotplug/acpiphp_glue.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/pci/hotplug/acpiphp_glue.c
>> b/drivers/pci/hotplug/acpiphp_glue.c
>> index bd784ff..acb7af2 100644
>> --- a/drivers/pci/hotplug/acpiphp_glue.c
>> +++ b/drivers/pci/hotplug/acpiphp_glue.c
>> @@ -839,6 +839,9 @@ static int __ref enable_device(struct acpiphp_slot *slot)
>> if (slot->flags & SLOT_ENABLED)
>> goto err_exit;
>>
>> + list_for_each_entry(func, &slot->funcs, sibling)
>> + acpiphp_bus_add(func);
>> +
>> num = pci_scan_slot(bus, PCI_DEVFN(slot->device, 0));
>> if (num == 0) {
>> /* Maybe only part of funcs are added. */
>> @@ -862,9 +865,6 @@ static int __ref enable_device(struct acpiphp_slot *slot)
>> }
>> }
>>
>> - list_for_each_entry(func, &slot->funcs, sibling)
>> - acpiphp_bus_add(func);
>> -
>> pci_bus_assign_resources(bus);
>> acpiphp_sanitize_bus(bus);
>> acpiphp_set_hpp_values(bus);
>> --
>> 1.7.9.5
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
