Skip to contentSkip to conversation

PCI changes

GIT PULL Jesse Barnes 3 participants 5 messages May 21, 2010 – May 22, 2010

lore
Share & tools
lore
#0 lore raw

The following changes since commit fc2a093e7ad23e935aa29e349bc27173c92f1a95: Linus Torvalds (1):
Merge branch 'drm-linus' of
git://git.kernel.org/.../airlied/drm-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED..

Sorry about the "not verified" bit, I just rebased the top 3 patches & pushed an update to drop one Bjorn was a little nervous about. The rest have been soaking for some time.

There's nothing too exciting in here compared to last time, it's a small set of changes, but there are a few good bits: Alan's basic resource exclusion mechanism, a few good quirks for various chipsets and machines, and other misc. fixes and improvements.

Thanks,
Jesse

Alan Cox (1):
resource: shared I/O region support

Alan Stern (1):
PCI: clearing wakeup flags not needed

Alex Chiang (1):
PCI: create function symlinks in /sys/bus/pci/slots/N/

Alex Deucher (1):
PCI quirks: disable msi on AMD rs4xx internal gfx bridges

Ben Hutchings (1):
PCI: Disable MSI for MCP55 on P5N32-E SLI

Felix Radensky (1):
PCI: Allow manual resource allocation for PCI hotplug bridges

Feng Tang (1):
x86/PCI: make ACPI MCFG reserved error messages ACPI specific

Hidetoshi Seto (18):
PCI: aerdrv, doc: update example output in pcieaer-howto.txt
PCI: aerdrv: RsvdP of PCI_ERR_ROOT_COMMAND
PCI: aerdrv: cleanup inconsistent functions
PCI: aerdrv: make aer_{en,dis}able_rootport static
PCI: aerdrv: rework find_source_device
PCI: aerdrv: introduce is_error_source
PCI: aerdrv: remove compare_device_id
PCI: aerdrv: rework add_error_device
PCI: aerdrv: rework aer_isr_one_error()
PCI: aerdrv: rework get_e_source()
PCI: aerdrv: rework do_recovery
PCI: aerdrv: redefine PCI_ERR_ROOT_*_SRC
PCI: aerdrv: remove magical ROOT_ERR_STATUS_MASKS
PCI: aerdrv: remove is_downstream
PCI: aerdrv: rework find_aer_service
PCI: aerdrv: introduce default_downstream_reset_link
PCI: aerdrv: trivial cleanup for aerdrv.c
PCI: aerdrv: trivial cleanup for aerdrv_core.c

Ira W. Snyder (1):
PCI: read memory ranges out of Broadcom CNB20LE host bridge

Jesse Barnes (1):
PCI: change PCI_MSI help text to recommend enabling

Julia Lawall (1):
PCI hotplug: Use kmemdup

Michal Schmidt (1):
PCI: return correct value when writing to the "reset" attribute

Prarit Bhargava (1):
PCI: output FW warning in pci_read/write_vpd

Praveen Kalamegham (1):
PCI: hotplug: pciehp: Removed check for hotplug of display devices

Rafael J. Wysocki (1):
PM/PCI: Update PCI power management documentation

Roman Fietze (1):
PCI: fix typos pci_device_dis/enable to pci_dis/enable_device in comments

Seth Heasley (1):
x86/PCI: irq and pci_ids patch for additional Intel Cougar Point DeviceIDs

Thomas Gleixner (2):
PCI: Convert pci_lock to raw_spinlock x86/PCI: Convert pci_config_lock to raw_spinlock

 Documentation/ABI/testing/sysfs-bus-pci |   40 +
 Documentation/PCI/pcieaer-howto.txt     |   29 +-
 Documentation/power/pci.txt             | 1258 ++++++++++++++++++++++++-------
 arch/x86/Kconfig                        |    8 +
 arch/x86/include/asm/pci_x86.h          |    2 +-
 arch/x86/pci/Makefile                   |    2 +
 arch/x86/pci/broadcom_bus.c             |  101 +++
 arch/x86/pci/common.c                   |    2 +-
 arch/x86/pci/direct.c                   |   16 +-
 arch/x86/pci/irq.c                      |    9 +-
 arch/x86/pci/mmconfig-shared.c          |   17 +-
 arch/x86/pci/mmconfig_32.c              |    8 +-
 arch/x86/pci/numaq_32.c                 |    8 +-
 arch/x86/pci/pcbios.c                   |    8 +-
 drivers/edac/amd76x_edac.c              |    2 +-
 drivers/edac/i82443bxgx_edac.c          |    2 +-
 drivers/edac/r82600_edac.c              |    2 +-
 drivers/pci/Kconfig                     |    2 +-
 drivers/pci/access.c                    |   41 +-
 drivers/pci/hotplug/cpqphp_core.c       |    3 +-
 drivers/pci/hotplug/pciehp_pci.c        |   17 +-
 drivers/pci/pci-sysfs.c                 |   44 ++-
 drivers/pci/pci.c                       |    4 +-
 drivers/pci/pcie/aer/aer_inject.c       |    2 +-
 drivers/pci/pcie/aer/aerdrv.c           |  179 ++++--
 drivers/pci/pcie/aer/aerdrv.h           |    6 +-
 drivers/pci/pcie/aer/aerdrv_core.c      |  558 ++++++--------
 drivers/pci/quirks.c                    |   21 +-
 drivers/pci/slot.c                      |   48 ++
 include/linux/ioport.h                  |    4 +-
 include/linux/pci_ids.h                 |    4 +-
 include/linux/pci_regs.h                |    3 +-
 kernel/resource.c                       |   16 +-
 33 files changed, 1726 insertions(+), 740 deletions(-)
 create mode 100644 arch/x86/pci/broadcom_bus.c
#1 lore raw
Quoted 8 lines · Jesse Barnes

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ..BRANCH.NOT.VERIFIED..

Sorry about the "not verified" bit, I just rebased the top 3 patches & pushed an update to drop one Bjorn was a little nervous about. The rest have been soaking for some time.

I think the "not verified" is also because you actually didn't push it out..

I'm getting "Already up-to-date".

Or is it in some magic branch that you didn't actually mention at all?

Linus

#2 lore raw
Quoted 7 lines · Linus Torvalds

I think the "not verified" is also because you actually didn't push it out..

I'm getting "Already up-to-date".

Or is it in some magic branch that you didn't actually mention at all?

Ahh. It's in "linux-next". Not "for-linus" or "master".

Linus

#3 lore raw
Quoted 4 lines · On Fri, 21 May 2010 18:59:58 -0700 (PDT) Linus Torvalds…
Quoted 1 line · Linus Torvalds
Quoted 8 lines
Quoted 6 lines

I think the "not verified" is also because you actually didn't push it out..

I'm getting "Already up-to-date".

Or is it in some magic branch that you didn't actually mention at all?

Ahh. It's in "linux-next". Not "for-linus" or "master".

Yeah sorry, I had pushed but it hadn't mirrored yet...

Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center
#4 lore raw
Quoted 10 lines · Jesse Barnes
Quoted 7 lines · On Fri, 21 May 2010 18:59:58 -0700 (PDT) Linus Torvalds…
Quoted 4 lines · Linus Torvalds

I think the "not verified" is also because you actually didn't push it out..

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

I'm getting "Already up-to-date".

Or is it in some magic branch that you didn't actually mention at all?

Ahh. It's in "linux-next". Not "for-linus" or "master".

Yeah sorry, I had pushed but it hadn't mirrored yet...

You can use "git request-pull" against master.kernel.org to avoid the mirroring problem.