Changes for v3.10 merge window
Bjorn Helgaas
maintainerBelow are the patches currently in my "next" branch, planned for release in v3.10. If I'm missing something important, let me know.
Andy Shevchenko (1):
PCI: Fix missing prototype for pcie_port_acpi_setup()
Bjorn Helgaas (20):
Merge branch 'pci/shuah-defines' into next
PCI: Remove __weak annotation from pcibios_get_phb_of_node decl
PCI: Make local functions/structs static
PCI: Move cpci_hotplug_init() proto to header file
PCI: Remove unused variables
PCI: Fix __must_check annotation on pci_create_sysfs_dev_files()
PCI: Remove __must_check from definitions
PCI: Warn about failures instead of "must_check" functions
PCI: Remove "extern" from function declarations
Merge branch 'pci/gabor-get-of-node' into next
PCI: Remove unnecessary dependencies between PME and ACPI
PCI: Use PCI_EXP_SLTCAP_PSN mask when extracting slot number
EISA: Use dev_printk() when possible
EISA: Mark vendor ID resource as I/O port space
EISA: Initialize device before its resources
EISA: Log device resources in dmesg
Merge branch 'pci/bjorn-eisa' into next
Merge branch 'pci/misc' into next
Merge branch 'pci/jiang-subdrivers' into next
Merge branch 'pci/cleanup' into next
Gabor Juhos (1):
MIPS/PCI: Implement pcibios_get_phb_of_node
Jiang Liu (12):
PCI: When removing bus, always remove legacy files & unregister
PCI: Clean up usages of pci_bus->is_added
PCI: acpiphp: Remove all functions even if function 0 doesn't exist
PCI: acpiphp: Replace local macros with standard ACPI macros
PCI: Add pcibios hooks for adding and removing PCI buses PCI/ACPI: Prepare stub functions to handle ACPI PCI (hotplug) slots ia64/PCI: Implement pcibios_{add|remove}_bus() hooks x86/PCI: Implement pcibios_{add|remove}_bus() hooks PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses
PCI: acpiphp: Convert acpiphp to be builtin only, not modular
PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
PCI: acpiphp: Protect acpiphp data structures from concurrent updates
Libin (1):
PCI: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT
Myron Stowe (4):
ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
[SCSI] mvsas: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
[SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b
PCI/ACPI: Remove support of ACPI PCI subdriversPrarit Bhargava (1):
PCI: aer_inject: Fix return values when device not found
Shuah Khan (4):
PCI: Add PCI_BUS_NUM() and PCI_DEVID() interfaces
PCI/AER: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI iommu/amd: Remove local PCI_BUS() define and use PCI_BUS_NUM() from PCI iommu/amd: Remove calc_devid() and use PCI_DEVID() from PCI
Xiangliang Yu (1):
PCI: Define macro for Marvell vendor ID
Xiong Huang (1):
PCI: Add MSI INTX_DISABLE quirks for AR8161/AR8162/AR8171/AR8172/E210X
Yijing Wang (2):
PCI: acpiphp: Use list_for_each_entry_safe() in acpiphp_sanitize_bus()
PCI: acpiphp: Use normal list to simplify implementation
Yinghai Lu (1):
PCI: Clean up quirk_io_region
arch/ia64/pci/pci.c | 11 + arch/mips/pci/pci.c | 8 +- arch/x86/pci/common.c | 11 + drivers/acpi/pci_root.c | 48 +--- drivers/acpi/pci_slot.c | 170 ++------------ drivers/acpi/scan.c | 1 - drivers/ata/ahci.c | 10 +- drivers/eisa/eisa-bus.c | 82 +++---- drivers/eisa/pci_eisa.c | 5 +- drivers/iommu/amd_iommu.c | 14 +- drivers/iommu/amd_iommu_init.c | 40 ++-- drivers/iommu/amd_iommu_types.h | 11 +- drivers/pci/bus.c | 18 +- drivers/pci/hotplug/Kconfig | 7 +- drivers/pci/hotplug/acpiphp.h | 35 ++- drivers/pci/hotplug/acpiphp_core.c | 30 +-- drivers/pci/hotplug/acpiphp_glue.c | 415 ++++++++++++--------------------- drivers/pci/hotplug/cpci_hotplug.h | 44 ++-- drivers/pci/hotplug/cpqphp.h | 70 +++--- drivers/pci/hotplug/cpqphp_nvram.h | 12 +- drivers/pci/hotplug/ibmphp.h | 66 +++--- drivers/pci/hotplug/pci_hotplug_core.c | 15 +- drivers/pci/hotplug/pciehp.h | 22 +- drivers/pci/hotplug/pciehp_acpi.c | 2 +- drivers/pci/hotplug/rpadlpar.h | 8 +- drivers/pci/hotplug/rpaphp.h | 16 +- drivers/pci/hotplug/shpchp.h | 26 +-- drivers/pci/hotplug/shpchp_sysfs.c | 2 +- drivers/pci/msi.c | 4 +- drivers/pci/pci-acpi.c | 30 +++ drivers/pci/pci-sysfs.c | 4 +- drivers/pci/pci.c | 8 +- drivers/pci/pci.h | 89 ++++--- drivers/pci/pcie/Kconfig | 2 +- drivers/pci/pcie/aer/aer_inject.c | 10 +- drivers/pci/pcie/aer/aerdrv.h | 14 +- drivers/pci/pcie/aer/aerdrv_core.c | 4 +- drivers/pci/pcie/pme.c | 2 - drivers/pci/pcie/portdrv.h | 18 +- drivers/pci/pcie/portdrv_acpi.c | 1 + drivers/pci/pcie/portdrv_pci.c | 17 +- drivers/pci/probe.c | 15 +- drivers/pci/quirks.c | 148 +++++------- drivers/pci/remove.c | 4 +- drivers/pci/setup-bus.c | 4 +- drivers/pci/setup-res.c | 2 - drivers/pci/slot.c | 7 +- drivers/scsi/mvsas/mv_init.c | 6 +- drivers/scsi/mvumi.c | 4 +- drivers/scsi/mvumi.h | 1 - include/linux/acpi.h | 9 - include/linux/pci-acpi.h | 29 +++ include/linux/pci-aspm.h | 20 +- include/linux/pci-ats.h | 26 +-- include/linux/pci.h | 112 +++++---- include/linux/pci_hotplug.h | 12 +- include/linux/pci_ids.h | 1 + include/linux/pcieport_if.h | 4 +- 58 files changed, 764 insertions(+), 1042 deletions(-)
Quoted 4 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.10. If I'm missing something important, let me know.
PCI: Fix
__must_checkannotation onpci_create_sysfs_dev_files()
You need to drop this one.
it cause kernel crash:
[ 1.266127] pci 0000:00:00.0: Error adding device (-13) [ 1.268006] pci 0000:00:01.0: Error adding device (-13) [ 1.269404] pci 0000:00:01.1: Error adding device (-13) [ 1.270652] pci 0000:00:01.3: Error adding device (-13) [ 1.272004] pci 0000:00:02.0: Error adding device (-13) [ 1.273345] pci 0000:00:03.0: Error adding device (-13) [ 1.274472] ------------[ cut here ]------------ [ 1.275707] kernel BUG at drivers/pci/bus.c:213! [ 1.276000] invalid opcode: 0000 [#1] SMP [ 1.276000] Modules linked in: [ 1.276000] CPU 0 [ 1.276000] Pid: 1, comm: swapper/0 Not tainted 3.9.0-rc7-yh-01505-gcf7dc22 #1474 Bochs Bochs [ 1.276000] RIP: 0010:[<ffffffff8151edd9>] [<ffffffff8151edd9>] pci_bus_add_devices+0x79/0xb0 [ 1.276000] RSP: 0000:ffff880119e85be8 EFLAGS: 00010246 [ 1.276000] RAX: 000000000000002b RBX: ffff88019c7ba000 RCX: 0000000000000006 [ 1.276000] RDX: 0000000000000000 RSI: ffff880119e988e8 RDI: ffff880119e98000 [ 1.276000] RBP: ffff880119e85c08 R08: 0000000000000001 R09: 0000000000000000 [ 1.276000] R10: 0000000000000000 R11: 0000000000000001 R12: ffff880119927028 [ 1.276000] R13: ffff880119927000 R14: ffff88019c795080 R15: ffff88019c60e1e0 [ 1.276000] FS: 0000000000000000(0000) GS:ffff88011ba00000(0000) knlGS:0000000000000000 [ 1.276000] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 1.276000] CR2: ffff88019ffff000 CR3: 0000000002a14000 CR4: 00000000000006f0 [ 1.276000] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1.276000] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 1.276000] Process swapper/0 (pid: 1, threadinfo ffff880119e84000, task ffff880119e98000) [ 1.276000] Stack: [ 1.276000] ffff88019c795000 ffff880119bb4b00 ffff88019c795000 ffff880119bb4b28 [ 1.276000] ffff880119e85c58 ffffffff81581756 ffff880119e85c58 000000088157b6bf [ 1.276000] 0000000000000000 ffffffff8157d720 ffff88011b404f00 ffff88019c795000 [ 1.276000] Call Trace: [ 1.276000] [<ffffffff81581756>] acpi_pci_root_add+0x376/0x3dc [ 1.276000] [<ffffffff8157d720>] ? acpi_scan_match_handler+0x2f/0x71 [ 1.276000] [<ffffffff8157d7d3>] acpi_bus_device_attach+0x71/0xc8 [ 1.276000] [<ffffffff815a7d1a>] acpi_ns_walk_namespace+0x11a/0x254 [ 1.276000] [<ffffffff8157d762>] ? acpi_scan_match_handler+0x71/0x71 [ 1.276000] [<ffffffff8157d762>] ? acpi_scan_match_handler+0x71/0x71 [ 1.276000] [<ffffffff815a831a>] acpi_walk_namespace+0xee/0x137 [ 1.276000] [<ffffffff8157e5df>] acpi_bus_scan+0x8b/0x9f [ 1.276000] [<ffffffff82dc0d42>] ? acpi_sleep_proc_init+0x2a/0x2a [ 1.276000] [<ffffffff82dc0d42>] ? acpi_sleep_proc_init+0x2a/0x2a [ 1.276000] [<ffffffff82dc116a>] acpi_scan_init+0x63/0x157 [ 1.276000] [<ffffffff82dc0d42>] ? acpi_sleep_proc_init+0x2a/0x2a [ 1.276000] [<ffffffff82dc0f8b>] acpi_init+0x249/0x28b [ 1.276000] [<ffffffff81000254>] do_one_initcall+0x64/0x160 [ 1.276000] [<ffffffff82d90fc6>] kernel_init_freeable+0x15d/0x1ef [ 1.276000] [<ffffffff82d90790>] ? loglevel+0x31/0x31 [ 1.276000] [<ffffffff8206cb30>] ? rest_init+0xc0/0xc0 [ 1.276000] [<ffffffff8206cb3e>] kernel_init+0xe/0xf0 [ 1.276000] [<ffffffff820a445c>] ret_from_fork+0x7c/0xb0 [ 1.276000] [<ffffffff8206cb30>] ? rest_init+0xc0/0xc0 [ 1.276000] Code: c0 e8 dc 58 24 00 0f 1f 40 00 48 8b 1b 4c 39 e3 75 c8 49 8b 5d 28 4c 39 e3 74 2d 0f 1f 80 00 00 00 00 f6 83 c9 08 00 00 04 75 07 <0f> 0b 0f 1f 44 00 00 48 8b 7b 18 48 85 ff 74 05 e8 72 ff ff ff [ 1.276000] RIP [<ffffffff8151edd9>] pci_bus_add_devices+0x79/0xb0 [ 1.276000] RSP <ffff880119e85be8> [ 1.280022] ---[ end trace eb3321925da6d1db ]--- [ 1.284018] Kernel panic - not syncing: Attempted to kill init!
exitcode=0x0000000b
Quoted 2 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.10. If I'm missing something important, let me know.
Well, you said you took the "PCI / PM: Make pci_pme_active() ignore devices without PME support" patch for v3.10, but it is not listed below.
Thanks,
Rafael
Quoted 136 lines
Andy Shevchenko (1):
PCI: Fix missing prototype forpcie_port_acpi_setup()Bjorn Helgaas (20):
Merge branch 'pci/shuah-defines' into next
PCI: Remove__weakannotation frompcibios_get_phb_of_nodedecl
PCI: Make local functions/structs static
PCI: Movecpci_hotplug_init()proto to header file
PCI: Remove unused variables
PCI: Fix__must_checkannotation onpci_create_sysfs_dev_files()
PCI: Remove__must_checkfrom definitions
PCI: Warn about failures instead of "must_check" functions
PCI: Remove "extern" from function declarations
Merge branch 'pci/gabor-get-of-node' into next
PCI: Remove unnecessary dependencies between PME and ACPI
PCI: UsePCI_EXP_SLTCAP_PSNmask when extracting slot number
EISA: Usedev_printk()when possible
EISA: Mark vendor ID resource as I/O port space
EISA: Initialize device before its resources
EISA: Log device resources in dmesg
Merge branch 'pci/bjorn-eisa' into next
Merge branch 'pci/misc' into next
Merge branch 'pci/jiang-subdrivers' into next
Merge branch 'pci/cleanup' into nextGabor Juhos (1):
MIPS/PCI: Implementpcibios_get_phb_of_nodeJiang Liu (12):
PCI: When removing bus, always remove legacy files & unregister
PCI: Clean up usages ofpci_bus->is_added
PCI: acpiphp: Remove all functions even if function 0 doesn't exist
PCI: acpiphp: Replace local macros with standard ACPI macros
PCI: Add pcibios hooks for adding and removing PCI buses PCI/ACPI: Prepare stub functions to handle ACPI PCI (hotplug) slots ia64/PCI: Implement pcibios_{add|remove}_bus() hooks x86/PCI: Implement pcibios_{add|remove}_bus() hooks PCI/ACPI: Handle PCI slot devices when creating/destroying PCI buses
PCI: acpiphp: Convert acpiphp to be builtin only, not modular
PCI: acpiphp: Do not use ACPI PCI subdriver mechanism
PCI: acpiphp: Protect acpiphp data structures from concurrent updatesLibin (1):
PCI: Usevma_pages()to replace (vm_end-vm_start) >>PAGE_SHIFTMyron Stowe (4):
ahci: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b [SCSI] mvsas: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b [SCSI] mvumi: Use PCI_VENDOR_ID_MARVELL_EXT for 0x1b4b PCI/ACPI: Remove support of ACPI PCI subdriversPrarit Bhargava (1):
PCI:aer_inject: Fix return values when device not foundShuah Khan (4):
PCI: AddPCI_BUS_NUM()andPCI_DEVID()interfaces
PCI/AER: Remove localPCI_BUS()define and usePCI_BUS_NUM()from PCI iommu/amd: Remove localPCI_BUS()define and usePCI_BUS_NUM()from PCI iommu/amd: Removecalc_devid()and usePCI_DEVID()from PCIXiangliang Yu (1):
PCI: Define macro for Marvell vendor IDXiong Huang (1):
PCI: Add MSI INTX_DISABLE quirks for AR8161/AR8162/AR8171/AR8172/E210XYijing Wang (2):
PCI: acpiphp: Uselist_for_each_entry_safe()inacpiphp_sanitize_bus()
PCI: acpiphp: Use normal list to simplify implementationYinghai Lu (1):
PCI: Clean upquirk_io_regionarch/ia64/pci/pci.c | 11 + arch/mips/pci/pci.c | 8 +- arch/x86/pci/common.c | 11 + drivers/acpi/pci_root.c | 48 +--- drivers/acpi/pci_slot.c | 170 ++------------ drivers/acpi/scan.c | 1 - drivers/ata/ahci.c | 10 +- drivers/eisa/eisa-bus.c | 82 +++---- drivers/eisa/pci_eisa.c | 5 +- drivers/iommu/amd_iommu.c | 14 +- drivers/iommu/amd_iommu_init.c | 40 ++-- drivers/iommu/amd_iommu_types.h | 11 +- drivers/pci/bus.c | 18 +- drivers/pci/hotplug/Kconfig | 7 +- drivers/pci/hotplug/acpiphp.h | 35 ++- drivers/pci/hotplug/acpiphp_core.c | 30 +-- drivers/pci/hotplug/acpiphp_glue.c | 415 ++++++++++++--------------------- drivers/pci/hotplug/cpci_hotplug.h | 44 ++-- drivers/pci/hotplug/cpqphp.h | 70 +++--- drivers/pci/hotplug/cpqphp_nvram.h | 12 +- drivers/pci/hotplug/ibmphp.h | 66 +++--- drivers/pci/hotplug/pci_hotplug_core.c | 15 +- drivers/pci/hotplug/pciehp.h | 22 +- drivers/pci/hotplug/pciehp_acpi.c | 2 +- drivers/pci/hotplug/rpadlpar.h | 8 +- drivers/pci/hotplug/rpaphp.h | 16 +- drivers/pci/hotplug/shpchp.h | 26 +-- drivers/pci/hotplug/shpchp_sysfs.c | 2 +- drivers/pci/msi.c | 4 +- drivers/pci/pci-acpi.c | 30 +++ drivers/pci/pci-sysfs.c | 4 +- drivers/pci/pci.c | 8 +- drivers/pci/pci.h | 89 ++++--- drivers/pci/pcie/Kconfig | 2 +- drivers/pci/pcie/aer/aer_inject.c | 10 +- drivers/pci/pcie/aer/aerdrv.h | 14 +- drivers/pci/pcie/aer/aerdrv_core.c | 4 +- drivers/pci/pcie/pme.c | 2 - drivers/pci/pcie/portdrv.h | 18 +- drivers/pci/pcie/portdrv_acpi.c | 1 + drivers/pci/pcie/portdrv_pci.c | 17 +- drivers/pci/probe.c | 15 +- drivers/pci/quirks.c | 148 +++++------- drivers/pci/remove.c | 4 +- drivers/pci/setup-bus.c | 4 +- drivers/pci/setup-res.c | 2 - drivers/pci/slot.c | 7 +- drivers/scsi/mvsas/mv_init.c | 6 +- drivers/scsi/mvumi.c | 4 +- drivers/scsi/mvumi.h | 1 - include/linux/acpi.h | 9 - include/linux/pci-acpi.h | 29 +++ include/linux/pci-aspm.h | 20 +- include/linux/pci-ats.h | 26 +-- include/linux/pci.h | 112 +++++---- include/linux/pci_hotplug.h | 12 +- include/linux/pci_ids.h | 1 + include/linux/pcieport_if.h | 4 +- 58 files changed, 764 insertions(+), 1042 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
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
Bjorn Helgaas
maintainerQuoted 6 lines · Rafael J. Wysocki
Quoted 2 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.10. If I'm missing something important, let me know.
Well, you said you took the "PCI / PM: Make
pci_pme_active()ignore devices without PME support" patch for v3.10, but it is not listed below.
Yep, I just merged it 30 seconds ago :) I was waiting to make sure you didn't want the "Fix fallback to PCI_D0" patch in v3.9. Thanks for the reminder.
Bjorn
Quoted 11 lines · Bjorn Helgaas
Quoted 6 lines · Rafael J. Wysocki
Quoted 2 lines · Bjorn Helgaas
Below are the patches currently in my "next" branch, planned for release in v3.10. If I'm missing something important, let me know.
Well, you said you took the "PCI / PM: Make
pci_pme_active()ignore devices without PME support" patch for v3.10, but it is not listed below.Yep, I just merged it 30 seconds ago :) I was waiting to make sure you didn't want the "Fix fallback to
PCI_D0" patch in v3.9. Thanks for the reminder.
No problem and thanks!
Rafael
Signature · 2 lines
I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.