Changes for v3.11 merge window
Bjorn Helgaas
maintainerBelow are the patches currently in my "next" branch, planned for release in v3.11. If I'm missing something important, let me know.
Alexander Gordeev (2):
PCI: Allocate only as many MSI vectors as requested by driver x86/MSI: Conserve interrupt resources when using multiple-MSIs
Betty Dall (4):
PCI/AER: Move AER severity defines to aer.h
PCI/AER: Remove "extern" from function declarations ACPI / APEI: Force fatal AER severity when component has been reset PCI/AER: Reset link for devices below Root Port or Downstream Port
Bjorn Helgaas (18):
PCI/ACPI: Check acpi_resource_to_address64() return value powerpc/PCI: Use PCI_UNKNOWN for unknown power state sparc/PCI: Use PCI_UNKNOWN for unknown power state PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do it Merge branch 'pci/misc' into next
Merge branch 'pci/kevin-bus-to-resource' into next Merge branch 'pci/misc' into next
Merge branch 'pci/jiang-remove-global-list' into next Merge branch 'pci/shane-amd-ahci-i2c' into next
Merge branch 'pci/alexander-msi' into next
Merge branch 'pci/jiang-iov-fixes' into next
PCI/AER: Don't parse HEST table for non-PCIe devices PCI/AER: Factor out HEST device type matching
PCI/AER: Set dev->__aer_firmware_first only for matching devices Merge branch 'pci/betty-aer-v3' into next
Merge branch 'pci/misc' into next
PCI: Return early on allocation failures to unindent mainline code Merge branch 'pci/jiang-bus-lock-v3' into next
Gu Zheng (2):
PCI: Introduce pci_alloc_dev(struct pci_bus*) to replace alloc_pci_dev()
PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)
Jiang Liu (13):
PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count PCI/ACPI: Combine duplicate adjacent "if" tests
PCI/ACPI: Introduce "handle" local for economy of expression PCI/ACPI: Remove unused global list acpi_pci_roots
PCI/ACPI: Use dev_printk(), acpi_handle_print(), pr_xxx() when possible
PCI: Hide remove and rescan sysfs interfaces for SR-IOV virtual functions ia64/PCI: Clean up pci_scan_root_bus() usage
PCI: Fix refcount issue in pci_create_root_bus() error recovery path
PCI: Rename pci_release_bus_bridge_dev() to pci_release_host_bridge_dev() m68k/PCI: Remove redundant call of pci_bus_add_devices() unicore32/PCI: Remove redundant call of pci_bus_add_devices()
PCI: Drop redundant setting of bus->is_added in virtfn_add_bus()
PCI: Simplify IOV implementation and fix reference count races
Jingoo Han (1):
PCI: Replace strict_strtoul() with kstrtoul()
Jon Mason (1):
PCI: Work around Ivytown NTB BAR size issue
Kevin Hao (3):
PCI: Add 0x prefix to BAR register position in __pci_read_base()
PCI: Consolidate calls to pcibios_bus_to_resource() in __pci_read_base()
PCI: Unset resource if initial BAR value is invalid
Libo Chen (1):
PCI: Convert ioapic.c to module_pci_driver
Rafael J. Wysocki (1):
PCI / ACPI / PM: Use correct power state strings in messages
Sebastian Ott (1):
PCI: Add pcibios_release_device()
Shane Huang (3):
PCI: Put Hudson-2 device IDs together
ahci: Add AMD CZ SATA device ID
i2c-piix4: Add AMD CZ SMBus device ID
Wang Sheng-Hui (1):
PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()
Xudong Hao (1):
PCI: Finish SR-IOV VF setup before adding the device
Yijing Wang (5):
x86/PCI: Increase info->res_num before checking pci_use_crs
PCI: Fix kerneldoc for pci_disable_link_state()
PCI: Replace printks with appropriate pr_*()
PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM
PCI: Fix comment typo for pcie_pme_remove()
Documentation/i2c/busses/i2c-piix4 | 2 +- arch/ia64/sn/kernel/io_init.c | 11 +--- arch/m68k/platform/coldfire/pci.c | 1 - arch/powerpc/kernel/pci_of_scan.c | 5 +- arch/sparc/kernel/pci.c | 5 +- arch/unicore32/kernel/pci.c | 5 -- arch/x86/pci/acpi.c | 7 +-- drivers/acpi/apei/ghes.c | 10 ++++ drivers/acpi/pci_root.c | 101 +++++++++++++------------------- drivers/ata/ahci.c | 1 + drivers/char/agp/alpha-agp.c | 2 +- drivers/char/agp/parisc-agp.c | 2 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-piix4.c | 3 +- drivers/iommu/irq_remapping.c | 12 ++-- drivers/pci/bus.c | 15 +++++ drivers/pci/ioapic.c | 13 +---- drivers/pci/iov.c | 65 +++++++++------------ drivers/pci/msi.c | 10 +++- drivers/pci/pci-acpi.c | 10 ++-- drivers/pci/pci-sysfs.c | 48 ++++++++++++---- drivers/pci/pci.c | 12 +++- drivers/pci/pcie/aer/aerdrv.h | 4 -- drivers/pci/pcie/aer/aerdrv_acpi.c | 47 +++++++-------- drivers/pci/pcie/aer/aerdrv_core.c | 17 +++--- drivers/pci/pcie/aspm.c | 29 +++++++--- drivers/pci/pcie/pme.c | 2 +- drivers/pci/probe.c | 115 +++++++++++++++++++++++-------------- drivers/pci/quirks.c | 27 +++++++++ drivers/scsi/megaraid.c | 2 +- include/acpi/acpi_bus.h | 1 - include/linux/aer.h | 20 ++++--- include/linux/msi.h | 1 + include/linux/pci.h | 6 +- include/linux/pci_ids.h | 4 +- include/uapi/linux/pci_regs.h | 2 +- 36 files changed, 352 insertions(+), 266 deletions(-)
Quoted 2 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.11. If I'm missing something important, let me know.
can you put this one in ?
https://patchwork.kernel.org/patch/2647131/
[v5,1/7] PCI: Don't let mmio fallback to must-only, if ioport fails with must+optional
it will not just help powerpc case.
also found that it is needed for one of 8 socket system that support pciehp but some root bus does not have ioport range allocated.
in that case sriov does not work.
Thanks
Yinghai
Bjorn Helgaas
maintainerQuoted 7 lines · Yinghai Lu
Quoted 2 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.11. If I'm missing something important, let me know.
can you put this one in ?
https://patchwork.kernel.org/patch/2647131/
Quoted 8 lines
[v5,1/7] PCI: Don't let mmio fallback to must-only, if ioport fails with must+optional
it will not just help powerpc case.
also found that it is needed for one of 8 socket system that support pciehp but some root bus does not have ioport range allocated.
in that case sriov does not work.
OK, I'll merge [1/7] if you open a kernel.org bugzilla and attach logs showing the SR-IOV issue you tripped over. Patch [1/7] will immediately fix that bug, of course. If anybody ever reworks our resource assignment code, it will help to have information about the scenarios it has to happen.
Actually, your patch should also have a reference to Ben's problem report. But I can dig that out and add it for you.
Bjorn
Hi Bjorn,
It seems missing the patch in misc, https://patchwork.kernel.org/patch/2739861/
Thanks!
Yijing
Quoted 135 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.11. If I'm missing something important, let me know.
Alexander Gordeev (2):
PCI: Allocate only as many MSI vectors as requested by driver x86/MSI: Conserve interrupt resources when using multiple-MSIsBetty Dall (4):
PCI/AER: Move AER severity defines toaer.h
PCI/AER: Remove "extern" from function declarations ACPI / APEI: Force fatal AER severity when component has been reset PCI/AER: Reset link for devices below Root Port or Downstream PortBjorn Helgaas (18):
PCI/ACPI: Checkacpi_resource_to_address64()return value powerpc/PCI: UsePCI_UNKNOWNfor unknown power state sparc/PCI: UsePCI_UNKNOWNfor unknown power state PCI/ASPM: Warn when driver asks to disable ASPM, but we can't do it Merge branch 'pci/misc' into next
Merge branch 'pci/kevin-bus-to-resource' into next Merge branch 'pci/misc' into next
Merge branch 'pci/jiang-remove-global-list' into next Merge branch 'pci/shane-amd-ahci-i2c' into next
Merge branch 'pci/alexander-msi' into next
Merge branch 'pci/jiang-iov-fixes' into next
PCI/AER: Don't parse HEST table for non-PCIe devices PCI/AER: Factor out HEST device type matching
PCI/AER: Setdev->__aer_firmware_firstonly for matching devices Merge branch 'pci/betty-aer-v3' into next
Merge branch 'pci/misc' into next
PCI: Return early on allocation failures to unindent mainline code Merge branch 'pci/jiang-bus-lock-v3' into nextGu Zheng (2):
PCI: Introducepci_alloc_dev(struct pci_bus*)to replacealloc_pci_dev()
PCI: Convertalloc_pci_dev(void)topci_alloc_dev(bus)Jiang Liu (13):
PCI: Introduce pci_bus_{get|put}() to manage PCI bus reference count PCI/ACPI: Combine duplicate adjacent "if" tests
PCI/ACPI: Introduce "handle" local for economy of expression PCI/ACPI: Remove unused global listacpi_pci_roots
PCI/ACPI: Usedev_printk(),acpi_handle_print(),pr_xxx()when possible
PCI: Hide remove and rescan sysfs interfaces for SR-IOV virtual functions ia64/PCI: Clean uppci_scan_root_bus()usage
PCI: Fix refcount issue inpci_create_root_bus()error recovery path
PCI: Renamepci_release_bus_bridge_dev()topci_release_host_bridge_dev()m68k/PCI: Remove redundant call ofpci_bus_add_devices()unicore32/PCI: Remove redundant call ofpci_bus_add_devices()
PCI: Drop redundant setting ofbus->is_addedinvirtfn_add_bus()
PCI: Simplify IOV implementation and fix reference count racesJingoo Han (1):
PCI: Replacestrict_strtoul()withkstrtoul()Jon Mason (1):
PCI: Work around Ivytown NTB BAR size issueKevin Hao (3):
PCI: Add 0x prefix to BAR register position in__pci_read_base()
PCI: Consolidate calls topcibios_bus_to_resource()in__pci_read_base()
PCI: Unset resource if initial BAR value is invalidLibo Chen (1):
PCI: Convertioapic.ctomodule_pci_driverRafael J. Wysocki (1):
PCI / ACPI / PM: Use correct power state strings in messagesSebastian Ott (1):
PCI: Addpcibios_release_device()Shane Huang (3):
PCI: Put Hudson-2 device IDs together
ahci: Add AMD CZ SATA device ID
i2c-piix4: Add AMD CZ SMBus device IDWang Sheng-Hui (1):
PCI: Fix INTC comment typo forpci_swizzle_interrupt_pin()Xudong Hao (1):
PCI: Finish SR-IOV VF setup before adding the deviceYijing Wang (5):
x86/PCI: Increaseinfo->res_numbefore checkingpci_use_crs
PCI: Fix kerneldoc forpci_disable_link_state()
PCI: Replace printks with appropriate pr_*()
PCI: Fix comment typo forPCI_EXP_LNKCAP_CLKPM
PCI: Fix comment typo forpcie_pme_remove()Documentation/i2c/busses/i2c-piix4 | 2 +- arch/ia64/sn/kernel/io_init.c | 11 +--- arch/m68k/platform/coldfire/pci.c | 1 - arch/powerpc/kernel/pci_of_scan.c | 5 +- arch/sparc/kernel/pci.c | 5 +- arch/unicore32/kernel/pci.c | 5 -- arch/x86/pci/acpi.c | 7 +-- drivers/acpi/apei/ghes.c | 10 ++++ drivers/acpi/pci_root.c | 101 +++++++++++++------------------- drivers/ata/ahci.c | 1 + drivers/char/agp/alpha-agp.c | 2 +- drivers/char/agp/parisc-agp.c | 2 +- drivers/i2c/busses/Kconfig | 1 + drivers/i2c/busses/i2c-piix4.c | 3 +- drivers/iommu/irq_remapping.c | 12 ++-- drivers/pci/bus.c | 15 +++++ drivers/pci/ioapic.c | 13 +---- drivers/pci/iov.c | 65 +++++++++------------ drivers/pci/msi.c | 10 +++- drivers/pci/pci-acpi.c | 10 ++-- drivers/pci/pci-sysfs.c | 48 ++++++++++++---- drivers/pci/pci.c | 12 +++- drivers/pci/pcie/aer/aerdrv.h | 4 -- drivers/pci/pcie/aer/aerdrv_acpi.c | 47 +++++++-------- drivers/pci/pcie/aer/aerdrv_core.c | 17 +++--- drivers/pci/pcie/aspm.c | 29 +++++++--- drivers/pci/pcie/pme.c | 2 +- drivers/pci/probe.c | 115 +++++++++++++++++++++++-------------- drivers/pci/quirks.c | 27 +++++++++ drivers/scsi/megaraid.c | 2 +- include/acpi/acpi_bus.h | 1 - include/linux/aer.h | 20 ++++--- include/linux/msi.h | 1 + include/linux/pci.h | 6 +- include/linux/pci_ids.h | 4 +- include/uapi/linux/pci_regs.h | 2 +- 36 files changed, 352 insertions(+), 266 deletions(-)--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html.
Signature · 2 lines
Thanks! Yijing