Skip to contentSkip to conversation

PCI code for 2.6.27-rc1

GIT PULL Jesse Barnes 2 participants 3 messages Jul 29, 2008

lore
Share & tools
lore
#0 lore raw

Please pull my for-linus branch:
git pull git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git for-linus

It contains quite a few fixes and changes I'd like to get into 2.6.27-rc1, including several changes from the x86 forest. See below for the shortlog & diffstat.

Thanks,
Jesse

Alan Cox (1):
PCI: add D3 power state avoidance quirk

Bjorn Helgaas (1):
x86/PCI: use dev_printk when possible

Dmitry Baryshkov (7):
generic: per-device coherent dma allocator
x86: use generic per-device dma coherent allocator Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE
ARM: support generic per-device coherent dma mem
Sh: use generic per-device coherent dma allocator
Cris: convert to using generic dma-coherent mem allocator
dma-coherent: add documentation to new interfaces

Ingo Molnar (2):
Merge branch 'linus' into core/generic-dma-coherent Merge branch 'linus' into core/generic-dma-coherent

Jesse Barnes (4):
PCI hotplug: fix typo in pcie hotplug output
PCI: document pci_target_state
Merge branch 'x86/iommu' of git://git.kernel.org/.../tip/linux-2.6-tip into for-linus Merge branch 'core/generic-dma-coherent' of git://git.kernel.org/.../tip/linux-2.6-tip into for-linus

Joerg Roedel (3):
iommu: add iommu_num_pages helper function
x86, AMD IOMMU: replace to_pages macro with iommu_num_pages x86 gart: replace to_pages macro with iommu_num_pages

Matthew Wilcox (4):
PCI: rewrite PCI BAR reading code
PCI: handle 64-bit resources better on 32-bit machines
PCI MSI: Don't disable MSIs if the mask bit isn't supported
PCI: fix bogus "'device' may be used uninitialized" warning in pci_slot

Shaohua Li (3):
PCI: disable ASPM per ACPI FADT setting
PCI: disable ASPM on pre-1.1 PCIe devices
PCI: add an option to allow ASPM enabled forcibly

 arch/arm/Kconfig                     |    1 +
 arch/arm/mm/consistent.c             |    8 +
 arch/cris/arch-v32/drivers/Kconfig   |    1 +
 arch/cris/arch-v32/drivers/pci/dma.c |  106 +--------------
 arch/sh/Kconfig                      |    1 +
 arch/sh/mm/consistent.c              |   98 +-------------
 arch/x86/Kconfig                     |    1 +
 arch/x86/kernel/amd_iommu.c          |   13 +-
 arch/x86/kernel/pci-dma.c            |  122 +-----------------
 arch/x86/kernel/pci-gart_64.c        |   11 +-
 arch/x86/pci/fixup.c                 |    3 +-
 arch/x86/pci/i386.c                  |   26 ++--
 arch/x86/pci/irq.c                   |  106 +++++++--------
 arch/x86/pci/numaq_32.c              |    5 +-
 drivers/acpi/pci_slot.c              |   18 +--
 drivers/pci/hotplug/pciehp_hpc.c     |    2 +-
 drivers/pci/msi.c                    |   15 ++-
 drivers/pci/pci-acpi.c               |    7 +
 drivers/pci/pci.c                    |   10 ++
 drivers/pci/pcie/aspm.c              |   32 ++++-
 drivers/pci/probe.c                  |  245 +++++++++++++++++-----------------
 drivers/pci/quirks.c                 |   13 ++
 include/acpi/actbl.h                 |    1 +
 include/asm-arm/dma-mapping.h        |    2 +
 include/asm-cris/dma-mapping.h       |    2 +
 include/asm-generic/dma-coherent.h   |   32 +++++
 include/asm-sh/dma-mapping.h         |    1 +
 include/asm-x86/dma-mapping.h        |   22 +---
 include/linux/iommu-helper.h         |    1 +
 include/linux/pci-aspm.h             |    5 +
 include/linux/pci.h                  |    2 +
 include/linux/pci_regs.h             |    1 +
 init/Kconfig                         |    4 +
 kernel/Makefile                      |    1 +
 kernel/dma-coherent.c                |  154 +++++++++++++++++++++
 lib/iommu-helper.c                   |    8 +
 36 files changed, 512 insertions(+), 568 deletions(-)
 create mode 100644 include/asm-generic/dma-coherent.h
 create mode 100644 kernel/dma-coherent.c
#1 lore raw
Quoted 8 lines · Jesse Barnes

Dmitry Baryshkov (7):
generic: per-device coherent dma allocator
x86: use generic per-device dma coherent allocator Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE
ARM: support generic per-device coherent dma mem
Sh: use generic per-device coherent dma allocator
Cris: convert to using generic dma-coherent mem allocator
dma-coherent: add documentation to new interfaces

Were these patches posted to linux-pci? I don't think I ever saw them.

Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."
#2 lore raw
Quoted 11 lines · Matthew Wilcox
Quoted 8 lines · Jesse Barnes

Dmitry Baryshkov (7):
generic: per-device coherent dma allocator
x86: use generic per-device dma coherent allocator Generic dma-coherent: fix DMA_MEMORY_EXCLUSIVE
ARM: support generic per-device coherent dma mem
Sh: use generic per-device coherent dma allocator
Cris: convert to using generic dma-coherent mem allocator
dma-coherent: add documentation to new interfaces

Were these patches posted to linux-pci? I don't think I ever saw them.

No, but they're not really PCI specific patches. They did go to lkml several times and have been sitting in one of Ingo's test trees for awhile. There are no outstanding complaints that I'm aware of.

Jesse