1. 02 Feb, 2013 4 commits
    • Bjorn Helgaas's avatar
      Merge branch 'pci/misc' into next · f2dfcde4
      Bjorn Helgaas authored
      * pci/misc:
        PCI: pciehp: Drop suspend/resume ENTRY messages
        PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
        PCI: Document hpiosize= and hpmemsize= resource reservation parameters
        PCI: Use PCI Express Capability accessor
        PCI: Introduce accessor to retrieve PCIe Capabilities Register
        PCI: Kill pci_is_reassigndev()
      f2dfcde4
    • Bjorn Helgaas's avatar
      Merge branch 'pci/joe-aspm' into next · ecb87e66
      Bjorn Helgaas authored
      * pci/joe-aspm:
        PCI/ASPM: Don't touch ASPM if forcibly disabled
        PCI/ASPM: Deallocate upstream link state even if device is not PCIe
      ecb87e66
    • Bjorn Helgaas's avatar
      Merge branch 'pci/yinghai-root-bus-hotplug' into next · 8e5de3dc
      Bjorn Helgaas authored
      * pci/yinghai-root-bus-hotplug:
        PCI: acpiphp: Remove dead code for PCI host bridge hotplug
        PCI: acpiphp: Create companion ACPI devices before creating PCI devices
        PCI: Remove unused "rc" in virtfn_add_bus()
      8e5de3dc
    • Jiang Liu's avatar
      PCI: acpiphp: Remove dead code for PCI host bridge hotplug · be6d2867
      Jiang Liu authored
      Commit 668192b6 "PCI: acpiphp: Move host bridge hotplug
      to pci_root.c" has moved PCI host bridge hotplug logic from acpiphp
      to pci_root, but there is still PCI host bridge hotplug related
      dead code left in acpiphp. So remove those dead code.
      
      Now companion ACPI devices are always created before corresponding
      PCI devices. And the ACPI event handle_hotplug_event_bridge() will be
      installed only if it has associated PCI device. So remove dead code to
      handle bridge hot-adding in function handle_hotplug_event_bridge().
      Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      be6d2867
  2. 01 Feb, 2013 5 commits
  3. 31 Jan, 2013 4 commits
  4. 27 Jan, 2013 3 commits
    • Bjorn Helgaas's avatar
      Merge branch 'pci/yinghai-root-bus-hotplug' into next · 939de1d6
      Bjorn Helgaas authored
      * pci/yinghai-root-bus-hotplug:
        PCI: Put pci_dev in device tree as early as possible
        PCI: Skip attaching driver in device_add()
        PCI: acpiphp: Keep driver loaded even if no slots found
        PCI/ACPI: Print info if host bridge notify handler installation fails
        PCI: acpiphp: Move host bridge hotplug to pci_root.c
        PCI/ACPI: acpiphp: Rename alloc_acpiphp_hp_work() to alloc_acpi_hp_work()
        PCI: Make device create/destroy logic symmetric
        PCI: Fix reference count leak in pci_dev_present()
        PCI: Set pci_dev dev_node early so IOAPIC irq_descs are allocated locally
        PCI: Add root bus children dev's res to fail list
        PCI: acpiphp: Add is_hotplug_bridge detection
      
      Conflicts:
      	drivers/pci/pci.h
      939de1d6
    • Bjorn Helgaas's avatar
      Merge branch 'pci/acpi-scan2' into next · fb455792
      Bjorn Helgaas authored
      * pci/acpi-scan2:
        ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead
        ACPI: update ej_event interface to take acpi_device
        ACPI / scan: Add second pass to acpi_bus_trim()
        ACPI / scan: Change the implementation of acpi_bus_trim()
        ACPI / scan: Drop the second argument of acpi_bus_trim()
        ACPI / scan: Drop the second argument of acpi_device_unregister()
        ACPI: Remove the ops field from struct acpi_device
        ACPI: remove unused acpi_op_bind and acpi_op_unbind
        ACPI / scan: Fix check of device_attach() return value.
      fb455792
    • Bjorn Helgaas's avatar
      Merge branch 'pci/yijing-ari' into next · 14b5cb37
      Bjorn Helgaas authored
      * pci/yijing-ari:
        PCI: shpchp: Iterate over all devices in slot, not functions 0-7
        PCI: sgihp: Iterate over all devices in slot, not functions 0-7
        PCI: cpcihp: Iterate over all devices in slot, not functions 0-7
        PCI: pciehp: Iterate over all devices in slot, not functions 0-7
        PCI: Consolidate "next-function" functions
        PCI: Rename pci_enable_ari() to pci_configure_ari()
        PCI: Enable ARI if dev and upstream bridge support it; disable otherwise
      14b5cb37
  5. 25 Jan, 2013 19 commits
  6. 24 Jan, 2013 1 commit
    • Yijing Wang's avatar
      PCI: Enable ARI if dev and upstream bridge support it; disable otherwise · b0cc6020
      Yijing Wang authored
      Currently, we enable ARI in a device's upstream bridge if the bridge and
      the device support it.  But we never disable ARI, even if the device is
      removed and replaced with a device that doesn't support ARI.
      
      This means that if we hot-remove an ARI device and replace it with a
      non-ARI multi-function device, we find only function 0 of the new device
      because the upstream bridge still has ARI enabled, and next_ari_fn()
      only returns function 0 for the new non-ARI device.
      
      This patch disables ARI in the upstream bridge if the device doesn't
      support ARI.  See the PCIe spec, r3.0, sec 6.13.
      
      [bhelgaas: changelog, function comment]
      Signed-off-by: default avatarYijing Wang <wangyijing@huawei.com>
      Signed-off-by: default avatarJiang Liu <jiang.liu@huawei.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      b0cc6020
  7. 19 Jan, 2013 1 commit
    • Rafael J. Wysocki's avatar
      ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead · b8bd759a
      Rafael J. Wysocki authored
      The only difference between acpi_bus_scan() and acpi_bus_add() is the
      invocation of acpi_update_all_gpes() in the latter which in fact is
      unnecessary, because acpi_update_all_gpes() has already been called
      by acpi_scan_init() and the way it is implemented guarantees the next
      invocations of it to do nothing.
      
      For this reason, drop acpi_bus_add() and make all its callers use
      acpi_bus_scan() directly instead of it.  Additionally, rearrange the
      code in acpi_scan_init() slightly to improve the visibility of the
      acpi_update_all_gpes() call in there.
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
      b8bd759a
  8. 17 Jan, 2013 1 commit
  9. 15 Jan, 2013 2 commits