* [git pull] PCI changes
@ 2011-05-23 20:43 Jesse Barnes
2011-05-23 21:16 ` David Miller
0 siblings, 1 reply; 21+ messages in thread
From: Jesse Barnes @ 2011-05-23 20:43 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
The following changes since commit
2f666bcf757cb72549f360ef6da02f03620a48b6:
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-04-19 18:32:57 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
Ok, with the recent fixes to the resource code, we ought to be able to
re-enable the code that tries to reallocate bridge resources as
needed. As with last time we tried this, we'll keep the revert trigger
light; if this causes any problems we can't quickly root cause we'll
yank it back out.
Other than that, there are a few enabling features for PCIe 2.1
extensions here, and some support code for KVM, along with the usual
collection of fixes.
Thanks,
Jesse
Alex Williamson (4):
PCI: Enable ASPM state clearing regardless of policy
PCI: Track the size of each saved capability data area
PCI: Add interfaces to store and load the device saved state
KVM: Use pci_store/load_saved_state() around VM device usage
Chen Gong (1):
PCI: remove unused AER functions
Greg Thelen (2):
PCI: check pci_vpd_pci22_wait() return
PCI: handle positive error codes
Hemant Pedanekar (1):
PCI: Add quirk for setting valid class for TI816X Endpoint
Ian Campbell (1):
PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
Jan Beulich (1):
x86/PCI: derive pcibios_last_bus from ACPI MCFG
Jean Delvare (3):
PCI: Fix typo in ich7 quirk comment
PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
PCI: Don't use dmi_name_in_vendors in quirk
Jesse Barnes (3):
PCI: add ID-based ordering enable/disable support
PCI: add OBFF enable/disable support
PCI: add latency tolerance reporting enable/disable support
Jordan_Hargrave@Dell.com (1):
PCI: Set PCIE maxpayload for card during hotplug insertion
Julia Lawall (1):
x86/PCI: Convert release_resource to release_region/release_mem_region
Rafael J. Wysocki (2):
PCI/PM: Add kerneldoc description of pci_pm_reset()
PCI/ACPI: Report _OSC control mask returned on failure to get control
Seth Heasley (1):
x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
Wanlong Gao (1):
PCI: Fix uninitialized variable bug in AER injection code
Yinghai Lu (5):
x86/PCI: Remove dma32_reserve_bootmem
PCI/e1000e: Add and use pci_disable_link_state_locked()
PCI: update bridge resources to get more big ranges when allocating space (again)
PCI: add rescan to /sys/.../pci_bus/.../
PCI/sysfs: move bus cpuaffinity to class dev_attrs
Documentation/ABI/testing/sysfs-bus-pci | 9 +
arch/x86/include/asm/pci.h | 2 -
arch/x86/kernel/pci-dma.c | 64 -----
arch/x86/kernel/setup.c | 1 -
arch/x86/pci/direct.c | 17 +-
arch/x86/pci/irq.c | 4 +-
arch/x86/pci/mmconfig-shared.c | 10 +
drivers/acpi/pci_root.c | 14 +-
drivers/net/e1000e/netdev.c | 2 +-
drivers/pci/access.c | 18 ++-
drivers/pci/bus.c | 6 -
drivers/pci/hotplug/acpiphp_glue.c | 7 +
drivers/pci/hotplug/pcihp_slot.c | 45 ++++
drivers/pci/pci-sysfs.c | 62 +++++
drivers/pci/pci.c | 419 ++++++++++++++++++++++++++++++-
drivers/pci/pci.h | 3 +-
drivers/pci/pcie/aer/aer_inject.c | 2 +-
drivers/pci/pcie/aer/aerdrv.h | 9 -
drivers/pci/pcie/aspm.c | 21 ++-
drivers/pci/probe.c | 43 +---
drivers/pci/quirks.c | 21 ++-
drivers/pci/remove.c | 2 -
drivers/pci/setup-bus.c | 125 +++++++++-
include/linux/kvm_host.h | 1 +
include/linux/pci-aspm.h | 1 +
include/linux/pci.h | 49 ++++-
include/linux/pci_ids.h | 3 +
include/linux/pci_regs.h | 17 ++
virt/kvm/assigned-dev.c | 18 +-
29 files changed, 818 insertions(+), 177 deletions(-)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2011-05-23 20:43 [git pull] PCI changes Jesse Barnes
@ 2011-05-23 21:16 ` David Miller
2011-05-24 0:04 ` Jesse Barnes
0 siblings, 1 reply; 21+ messages in thread
From: David Miller @ 2011-05-23 21:16 UTC (permalink / raw)
To: jbarnes; +Cc: torvalds, linux-pci, linux-kernel
From: Jesse Barnes <jbarnes@virtuousgeek.org>
Date: Mon, 23 May 2011 13:43:39 -0700
> The following changes since commit
> 2f666bcf757cb72549f360ef6da02f03620a48b6:
>
> Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-04-19 18:32:57 -0700)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
>
> Ok, with the recent fixes to the resource code, we ought to be able to
> re-enable the code that tries to reallocate bridge resources as
> needed. As with last time we tried this, we'll keep the revert trigger
> light; if this causes any problems we can't quickly root cause we'll
> yank it back out.
>
> Other than that, there are a few enabling features for PCIe 2.1
> extensions here, and some support code for KVM, along with the usual
> collection of fixes.
Jesse, I submitted a warning fixe a few months ago and they don't
seem to be integrated.
http://marc.info/?l=-pci&m=130146645206948&w=2
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2011-05-23 21:16 ` David Miller
@ 2011-05-24 0:04 ` Jesse Barnes
0 siblings, 0 replies; 21+ messages in thread
From: Jesse Barnes @ 2011-05-24 0:04 UTC (permalink / raw)
To: David Miller; +Cc: torvalds, linux-pci, linux-kernel
On Mon, 23 May 2011 17:16:17 -0400 (EDT)
David Miller <davem@davemloft.net> wrote:
> From: Jesse Barnes <jbarnes@virtuousgeek.org>
> Date: Mon, 23 May 2011 13:43:39 -0700
>
> > The following changes since commit
> > 2f666bcf757cb72549f360ef6da02f03620a48b6:
> >
> > Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2011-04-19 18:32:57 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
> >
> > Ok, with the recent fixes to the resource code, we ought to be able to
> > re-enable the code that tries to reallocate bridge resources as
> > needed. As with last time we tried this, we'll keep the revert trigger
> > light; if this causes any problems we can't quickly root cause we'll
> > yank it back out.
> >
> > Other than that, there are a few enabling features for PCIe 2.1
> > extensions here, and some support code for KVM, along with the usual
> > collection of fixes.
>
> Jesse, I submitted a warning fixe a few months ago and they don't
> seem to be integrated.
>
> http://marc.info/?l=-pci&m=130146645206948&w=2
Arg, sorry Dave. I remember seeing that patch even, but didn't see it
in patchwork when I did my last pass. I'll queue it up for my next
pull. IIRC, ppc64 has a similar issue, and Ben ran into the same
multiple usage issue, but I don't remember how he solved it. At any
rate, this fix looks fine.
Thanks,
Jesse
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2012-01-13 23:14 ` Linus Torvalds
@ 2012-01-13 23:26 ` Matthew Garrett
0 siblings, 0 replies; 21+ messages in thread
From: Matthew Garrett @ 2012-01-13 23:26 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jesse Barnes, linux-pci, linux-kernel
On Fri, Jan 13, 2012 at 03:14:21PM -0800, Linus Torvalds wrote:
> On Fri, Jan 13, 2012 at 1:24 PM, Matthew Garrett <mjg59@srcf.ucam.org> wrote:
> >>
> >> So why is acpi_pci_root_add() special? Cna you explain that part to me?
> >
> > pcie_no_aspm() means "Do not permit ASPM to be enabled" - it doesn't
> > alter the existing state. pcie_clear_aspm() does that.
>
> I *know*.
>
> So look again.
>
> Why is acpi_pci_root_add() special?
>
> Because dammit, it does exactly that pcie_clear_aspm() for the
> ACPI_FADT_NO_ASPM case.
I'm sorry, I thought you were referring to the status quo rather than
the patch - I see what you mean now. The intent here is to clear ASPM
state if the FADT bit has been set *and* we've got _OSC control, whereas
previously we'd clear ASPM state any time the FADT bit was set. There
are some machines which (a) set the FADT bit, (b) hand over _OSC
control, (c) program the device and (d) crash under certain
circumstances if you then try to use it. My assumption here is that the
FADT bit *does* mean "clear ASPM state", but only if we've been granted
_OSC control. That's the behaviour described in the changelog.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2012-01-13 21:24 ` Matthew Garrett
@ 2012-01-13 23:14 ` Linus Torvalds
2012-01-13 23:26 ` Matthew Garrett
0 siblings, 1 reply; 21+ messages in thread
From: Linus Torvalds @ 2012-01-13 23:14 UTC (permalink / raw)
To: Matthew Garrett; +Cc: Jesse Barnes, linux-pci, linux-kernel
On Fri, Jan 13, 2012 at 1:24 PM, Matthew Garrett <mjg59@srcf.ucam.org> wrote:
>>
>> So why is acpi_pci_root_add() special? Cna you explain that part to me?
>
> pcie_no_aspm() means "Do not permit ASPM to be enabled" - it doesn't
> alter the existing state. pcie_clear_aspm() does that.
I *know*.
So look again.
Why is acpi_pci_root_add() special?
Because dammit, it does exactly that pcie_clear_aspm() for the
ACPI_FADT_NO_ASPM case.
That was my question. Why does it do that, when the commit log (and
the other users) say that ACPI_FADT_NO_ASPM means "don't touch".
It touches.
Linus
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2012-01-12 3:38 ` Linus Torvalds
@ 2012-01-13 21:24 ` Matthew Garrett
2012-01-13 23:14 ` Linus Torvalds
0 siblings, 1 reply; 21+ messages in thread
From: Matthew Garrett @ 2012-01-13 21:24 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Jesse Barnes, linux-pci, linux-kernel
On Wed, Jan 11, 2012 at 07:38:25PM -0800, Linus Torvalds wrote:
> On Wed, Jan 11, 2012 at 10:34 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> >
> > Matthew Garrett (1):
> > PCI: Rework ASPM disable code
>
> Yay.
>
> However, looking this through some more, I'm still a bit confused by
> the pcie_clear_aspm() call in acpi_pci_root_add().
>
> It seems to be explicitly against the rules elsewhere - we clear ASPM
> even though ACPI_FADT_NO_ASPM is set - which the changelog (and the
> other parts of that commit) says means "don't touch pre-existing ASPM
> state").
>
> So why is acpi_pci_root_add() special? Cna you explain that part to me?
pcie_no_aspm() means "Do not permit ASPM to be enabled" - it doesn't
alter the existing state. pcie_clear_aspm() does that.
--
Matthew Garrett | mjg59@srcf.ucam.org
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2012-01-11 18:34 Jesse Barnes
2012-01-12 3:38 ` Linus Torvalds
@ 2012-01-12 5:34 ` Yinghai Lu
1 sibling, 0 replies; 21+ messages in thread
From: Yinghai Lu @ 2012-01-12 5:34 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Linus Torvalds, linux-pci, linux-kernel
On Wed, Jan 11, 2012 at 10:34 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> The following changes since commit
> f423fc627b05f47bc9305f9661630fce30f208f9:
>
> Revert "rtc: Expire alarms after the time is set." (2012-01-04 07:57:22 -0800)
>
> are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci linux-next
>
> There's a fix pending for a build problem when CONFIG_AMD_NB=n, but I
> didn't want to delay the pull request any longer; I'll include it in
> the next fixes pull.
>
> This one doesn't include Yinghai's resource management stuff either,
> I'll put that in my -next tree for the next merge window when Yinghai
> has it ready. That might be a good time to revert 12c22d6ef299 (the
> revert of the transparent bridge sizing code we talked about), unless
> you want to try it now.
Can you please push following patch to linus in this merging window?
https://lkml.org/lkml/2011/11/23/2
[PATCH -v4] PCI: Make sriov work with hotplug remove
Thanks
Yinghai
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2012-01-11 18:34 Jesse Barnes
@ 2012-01-12 3:38 ` Linus Torvalds
2012-01-13 21:24 ` Matthew Garrett
2012-01-12 5:34 ` Yinghai Lu
1 sibling, 1 reply; 21+ messages in thread
From: Linus Torvalds @ 2012-01-12 3:38 UTC (permalink / raw)
To: Jesse Barnes, Matthew Garrett; +Cc: linux-pci, linux-kernel
On Wed, Jan 11, 2012 at 10:34 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> Matthew Garrett (1):
> PCI: Rework ASPM disable code
Yay.
However, looking this through some more, I'm still a bit confused by
the pcie_clear_aspm() call in acpi_pci_root_add().
It seems to be explicitly against the rules elsewhere - we clear ASPM
even though ACPI_FADT_NO_ASPM is set - which the changelog (and the
other parts of that commit) says means "don't touch pre-existing ASPM
state").
So why is acpi_pci_root_add() special? Cna you explain that part to me?
Linus
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2012-01-11 18:34 Jesse Barnes
2012-01-12 3:38 ` Linus Torvalds
2012-01-12 5:34 ` Yinghai Lu
0 siblings, 2 replies; 21+ messages in thread
From: Jesse Barnes @ 2012-01-11 18:34 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 12758 bytes --]
The following changes since commit
f423fc627b05f47bc9305f9661630fce30f208f9:
Revert "rtc: Expire alarms after the time is set." (2012-01-04 07:57:22 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci linux-next
There's a fix pending for a build problem when CONFIG_AMD_NB=n, but I
didn't want to delay the pull request any longer; I'll include it in
the next fixes pull.
This one doesn't include Yinghai's resource management stuff either,
I'll put that in my -next tree for the next merge window when Yinghai
has it ready. That might be a good time to revert 12c22d6ef299 (the
revert of the transparent bridge sizing code we talked about), unless
you want to try it now.
It *does* include some nice improvements from Bjorn on how the root bus
and bus resource code is structured, some good boot fixes from Fedora,
and lots of misc fixes elsewhere.
There was definitely more rebasing than I'd like fairly late on, but that
was mainly to merge in fixes to Bjorn's series for various build errors
that got reported, so I don't think it invalidated testing (I generally
don't pull from you and rebase except after you've pulled from me).
Thanks,
Jesse
Alessandro Rubini (1):
PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT)
Alex Williamson (2):
PCI: Fix PRI and PASID consistency
PCI: Fix PCI_EXP_TYPE_RC_EC value
Andreas Herrmann (1):
x86/PCI: amd: Kill misleading message about enablement of IO access to PCI ECS]
Bjorn Helgaas (36):
PCI: add helpers for building PCI bus resource lists
PCI: show host bridges and root bus resources
PCI: add pci_create_root_bus() that accepts resource list
PCI: add pci_scan_root_bus() that accepts resource list
PCI: convert pci_scan_bus() to use pci_create_root_bus()
PCI: convert pci_scan_bus_parented() to use pci_create_root_bus()
PCI: deprecate pci_scan_bus_parented()
alpha/PCI: convert to pci_scan_root_bus() for correct root bus resources
arm/PCI: convert to pci_scan_root_bus() for correct root bus resources
frv/PCI: convert to pci_scan_root_bus() for correct root bus resources
ia64/PCI: use pci_create_bus() instead of pci_scan_bus_parented()
ia64/PCI: convert to pci_create_root_bus() for correct root bus resources
microblaze/PCI: fix pci_bus_for_each_resource() usage
microblaze/PCI: make pcibios_setup_phb_resources() static
microblaze/PCI: convert to pci_create_root_bus() for correct root bus resources
microblaze/PCI: use pci_scan_root_bus()
mips/PCI: convert to pci_scan_root_bus() for correct root bus resources
mn10300/PCI: convert to pci_scan_root_bus() for correct root bus resources
parisc/PCI: dino: use pci_create_bus() instead of pci_scan_bus_parented()
parisc/PCI: dino: convert to pci_create_root_bus() for correct root bus resources
parisc/PCI: lba: deal with LMMIO/PAT overlaps before creating PCI root bus
parisc/PCI: lba: use pci_create_bus() instead of pci_scan_bus_parented()
parisc/PCI: lba: convert to pci_create_root_bus() for correct root bus resources
powerpc/PCI: make pcibios_setup_phb_resources() static
powerpc/PCI: split PHB part out of pcibios_map_io_space()
powerpc/PCI: convert to pci_create_root_bus()
sh/PCI: convert to pci_scan_root_bus() for correct root bus resources
sparc/PCI: convert to pci_create_root_bus()
sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources
x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan
x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus()
xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources
PCI: remove pci_create_bus()
x86/PCI: amd: factor out MMCONFIG discovery
PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB
Dave Jones (3):
PCI: add set_nouse_crs for use by a pci=nocrs blacklist
PCI: Add Dell Studio 1557 to pci=nocrs blacklist
PCI: Add Thinkpad SL510 to pci=nocrs blacklist
David Fries (1):
PCI: pci_has_legacy_pm_support add driver and device to WARN
Eric W. Biederman (1):
PCI: msi: Disable msi interrupts when we initialize a pci device
Gary Hade (1):
x86/PCI: Ignore CPU non-addressable _CRS reserved memory resources
Hao, Xudong (1):
PCI: Enable ATS at the device state restore
Jan Kiszka (3):
PCI: Rework config space blocking services
PCI: Introduce INTx check & mask API
uio: Convert uio_generic_pci to new intx masking API
Kenji Kaneshige (2):
PCI: pciehp: Fix wrong workqueue cleanup
PCI: pciehp: Handle push button event asynchronously
Konrad Rzeszutek Wilk (1):
x86/PCI: Expand the x86_msi_ops to have a restore MSIs.
Matthew Garrett (1):
PCI: Rework ASPM disable code
Myron Stowe (16):
PCI: add declaration for pcibios_set_master() to pci core
PCI: ARM: convert pcibios_set_master() to a non-inlined function
PCI: IA64: convert pcibios_set_master() to a non-inlined function
PCI: MicroBlaze: convert pcibios_set_master() to a non-inlined function
PCI: PowerPC: convert pcibios_set_master() to a non-inlined function
PCI: SPARC: convert pcibios_set_master() to a non-inlined function
PCI: TILE: convert pcibios_set_master() to a non-inlined function
PCI: UniCore: convert pcibios_set_master() to a non-inlined function
PCI: Xtensa: convert pcibios_set_master() to a non-inlined function
PCI: Pull PCI 'latency timer' setup up into the core
PCI: frv: use generic pcibios_set_master()
PCI: MIPS: use generic pcibios_set_master()
PCI: mn10300: use generic pcibios_set_master()
PCI: sh: use generic pcibios_set_master()
PCI: x86: use generic pcibios_set_master()
PCI: latency timer doesn't apply to PCIe
Neil Horman (2):
PCI/sysfs: add per pci device msi[x] irq listing (v5)
PCI: msi: fix imbalanced refcount of msi irq sysfs objects
P. Christeas (1):
PCI: kconfig: English typo in pci/pcie/Kconfig
Rafael J. Wysocki (1):
PCI/ACPI/PM: Avoid resuming devices that don't signal PME
Ram Pai (1):
PCI: delay configuration of SRIOV capability
Vincent Palatin (1):
PCI/PM/Runtime: make PCI traces quieter
Yinghai Lu (3):
PCI: Only call pci_stop_bus_device() one time for child devices at remove
PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES
PCI: Increase resource array mask bit size in pcim_iomap_regions()
Zac Storer (1):
PCI: fix a brace coding style issue in probe.c
Documentation/ABI/testing/sysfs-bus-pci | 18 +++
Documentation/feature-removal-schedule.txt | 12 ++
arch/alpha/kernel/pci.c | 40 ++++----
arch/arm/common/it8152.c | 9 +-
arch/arm/common/via82c505.c | 3 +-
arch/arm/include/asm/mach/pci.h | 2 +-
arch/arm/include/asm/pci.h | 12 --
arch/arm/kernel/bios32.c | 34 +++----
arch/arm/mach-cns3xxx/pcie.c | 8 +-
arch/arm/mach-dove/pcie.c | 9 +-
arch/arm/mach-footbridge/dc21285.c | 8 +-
arch/arm/mach-integrator/pci_v3.c | 19 ++--
arch/arm/mach-iop13xx/pci.c | 17 ++--
arch/arm/mach-ixp2000/enp2611.c | 3 +-
arch/arm/mach-ixp2000/pci.c | 8 +-
arch/arm/mach-ixp23xx/pci.c | 8 +-
arch/arm/mach-ixp4xx/common-pci.c | 8 +-
arch/arm/mach-kirkwood/pcie.c | 8 +-
arch/arm/mach-ks8695/pci.c | 8 +-
arch/arm/mach-mv78xx0/pcie.c | 8 +-
arch/arm/mach-orion5x/pci.c | 16 ++--
arch/arm/mach-sa1100/pci-nanoengine.c | 13 ++-
arch/arm/mach-tegra/pcie.c | 9 +-
arch/arm/mach-versatile/pci.c | 19 ++--
arch/arm/plat-iop/pci.c | 8 +-
arch/blackfin/include/asm/pci.h | 4 -
arch/frv/mb93090-mb00/pci-frv.c | 20 ----
arch/frv/mb93090-mb00/pci-frv.h | 2 -
arch/frv/mb93090-mb00/pci-vdk.c | 11 +-
arch/h8300/include/asm/pci.h | 5 -
arch/ia64/include/asm/pci.h | 6 -
arch/ia64/pci/pci.c | 43 ++++----
arch/microblaze/include/asm/pci-bridge.h | 1 -
arch/microblaze/include/asm/pci.h | 5 -
arch/microblaze/pci/pci-common.c | 43 ++++----
arch/mips/pci/pci.c | 38 ++-----
arch/mn10300/unit-asb2305/pci-asb2305.c | 22 ----
arch/mn10300/unit-asb2305/pci-asb2305.h | 2 -
arch/mn10300/unit-asb2305/pci.c | 12 +-
arch/powerpc/include/asm/pci-bridge.h | 1 -
arch/powerpc/include/asm/pci.h | 5 -
arch/powerpc/kernel/pci-common.c | 30 ++++--
arch/powerpc/kernel/pci_64.c | 40 ++++----
arch/sh/drivers/pci/pci.c | 41 ++------
arch/sparc/include/asm/pci_32.h | 5 -
arch/sparc/include/asm/pci_64.h | 5 -
arch/sparc/kernel/leon_pci.c | 25 ++---
arch/sparc/kernel/pci.c | 22 ++--
arch/tile/include/asm/pci.h | 7 --
arch/tile/kernel/pci.c | 5 +
arch/unicore32/include/asm/pci.h | 5 -
arch/unicore32/kernel/pci.c | 5 +
arch/x86/include/asm/amd_nb.h | 2 +
arch/x86/include/asm/pci.h | 9 ++
arch/x86/include/asm/pci_x86.h | 2 -
arch/x86/include/asm/topology.h | 2 +-
arch/x86/include/asm/x86_init.h | 1 +
arch/x86/kernel/amd_nb.c | 31 ++++++
arch/x86/kernel/x86_init.c | 1 +
arch/x86/pci/acpi.c | 75 ++++++++++---
arch/x86/pci/amd_bus.c | 43 ++------
arch/x86/pci/broadcom_bus.c | 62 +++++++----
arch/x86/pci/bus_numa.c | 31 +++---
arch/x86/pci/common.c | 19 ++--
arch/x86/pci/i386.c | 20 ----
arch/x86/pci/legacy.c | 3 -
arch/x86/pci/numaq_32.c | 2 -
arch/xtensa/include/asm/pci.h | 5 -
arch/xtensa/kernel/pci.c | 90 ++++++++--------
drivers/acpi/pci_irq.c | 10 +-
drivers/acpi/pci_root.c | 7 ++
drivers/parisc/dino.c | 47 ++++----
drivers/parisc/lba_pci.c | 72 +++++++------
drivers/pci/access.c | 76 +++++++++-----
drivers/pci/ats.c | 37 +++++--
drivers/pci/bus.c | 32 +++++-
drivers/pci/hotplug/pciehp.h | 1 -
drivers/pci/hotplug/pciehp_core.c | 11 +--
drivers/pci/hotplug/pciehp_ctrl.c | 4 +-
drivers/pci/hotplug/pciehp_hpc.c | 1 -
drivers/pci/iov.c | 16 ++--
drivers/pci/msi.c | 160 +++++++++++++++++++++++++++-
drivers/pci/pci-acpi.c | 13 ++-
drivers/pci/pci-driver.c | 3 +-
drivers/pci/pci.c | 153 +++++++++++++++++++++++++-
drivers/pci/pci.h | 10 ++
drivers/pci/pcie/Kconfig | 2 +-
drivers/pci/pcie/aspm.c | 58 +++++++----
drivers/pci/probe.c | 68 +++++++++++--
drivers/pci/remove.c | 10 ++-
drivers/pci/setup-res.c | 6 +-
drivers/pnp/quirks.c | 42 +++++++
drivers/scsi/ipr.c | 67 +++++++++++--
drivers/scsi/ipr.h | 1 +
drivers/uio/uio_pci_generic.c | 76 +------------
include/linux/msi.h | 3 +
include/linux/pci-aspm.h | 4 +-
include/linux/pci.h | 51 ++++++----
include/linux/pci_ids.h | 23 ++++
include/linux/pci_regs.h | 6 +-
lib/devres.c | 6 +-
101 files changed, 1334 insertions(+), 857 deletions(-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2011-10-28 23:30 ` Rafael J. Wysocki
@ 2011-10-31 17:18 ` Jesse Barnes
0 siblings, 0 replies; 21+ messages in thread
From: Jesse Barnes @ 2011-10-31 17:18 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linus Torvalds, linux-pci, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 3490 bytes --]
On Sat, 29 Oct 2011 01:30:44 +0200
"Rafael J. Wysocki" <rjw@sisk.pl> wrote:
> Hi,
>
> On Friday, October 28, 2011, Jesse Barnes wrote:
> > Note! There are two branches available, see below.
> >
> > The following changes since commit
> > e9308cfd5ab4ade3d81cf591c7599c3a05a21b04:
> >
> > Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-10-14 17:07:52 +1200)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci next-revert
> >
> > Probably the most exciting bits of this series are the MPS fixes and
> > Joerg's PASID stuff. But I don't think there's anything really risky
> > (i.e. no big resource management changes this time around).
> >
> > We found a problem on PPC with the latency setup changes, so this
> > branch includes reverts for those patches. However, another branch is
> > available with those patches rebased out if you prefer a cleaner
> > changelog. See below for the changelog and diffstat to expect from
> > that branch.
> >
> > Ben Hutchings (2):
> > PCI: Add Solarflare vendor ID and SFC4000 device IDs
> > PCI: Add quirk for known incorrect MPSS
> >
> > Benjamin Herrenschmidt (2):
> > PCI: Make pci_setup_bridge() non-static for use by arch code
> > pci: Clamp pcie_set_readrq() when using "performance" settings
> >
> > Jan Beulich (1):
> > x86: constify PCI raw ops structures
> >
> > Jesse Barnes (7):
> > Revert "PCI: latency timer doesn't apply to PCIe"
> > Revert "PCI: x86: use generic pcibios_set_master()"
> > Revert "PCI: sh: use generic pcibios_set_master()"
> > Revert "PCI: mn10300: use generic pcibios_set_master()"
> > Revert "PCI: mips: use generic pcibios_set_master()"
> > Revert "PCI: frv: use generic pcibios_set_master()"
> > Revert "PCI: Pull PCI 'latency timer' setup up into the core"
> >
> > Joerg Roedel (4):
> > PCI: Move ATS implementation into own file
> > PCI: Export ATS functions to modules
> > PCI: Add implementation for PRI capability
> > PCI: Add support for PASID capability
> >
> > Jon Mason (3):
> > PCI: Workaround for Intel MPS errata
> > PCI: enable MPS "performance" setting to properly handle bridge MPS
> > PCI: Clean-up MPS debug output
> >
> > Josh Boyer (1):
> > PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
> >
> > Myron Stowe (7):
> > PCI: Pull PCI 'latency timer' setup up into the core
> > PCI: frv: use generic pcibios_set_master()
> > PCI: mips: use generic pcibios_set_master()
> > PCI: mn10300: use generic pcibios_set_master()
> > PCI: sh: use generic pcibios_set_master()
> > PCI: x86: use generic pcibios_set_master()
> > PCI: latency timer doesn't apply to PCIe
> >
> > Prarit Bhargava (1):
> > PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
> >
> > Rafael J. Wysocki (2):
> > PCI / PM: Extend PME polling to all PCI devices
> > PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
>
> Any chance to push https://lkml.org/lkml/2011/10/21/192 any time soon?
>
> It pretty much is a necessary fix for a problem with _OSC after some
> recent changes.
Yeah, pushed to my for-linus branch, thanks Rafael.
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2011-10-28 20:29 Jesse Barnes
@ 2011-10-28 23:30 ` Rafael J. Wysocki
2011-10-31 17:18 ` Jesse Barnes
0 siblings, 1 reply; 21+ messages in thread
From: Rafael J. Wysocki @ 2011-10-28 23:30 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Linus Torvalds, linux-pci, linux-kernel
Hi,
On Friday, October 28, 2011, Jesse Barnes wrote:
> Note! There are two branches available, see below.
>
> The following changes since commit
> e9308cfd5ab4ade3d81cf591c7599c3a05a21b04:
>
> Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-10-14 17:07:52 +1200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci next-revert
>
> Probably the most exciting bits of this series are the MPS fixes and
> Joerg's PASID stuff. But I don't think there's anything really risky
> (i.e. no big resource management changes this time around).
>
> We found a problem on PPC with the latency setup changes, so this
> branch includes reverts for those patches. However, another branch is
> available with those patches rebased out if you prefer a cleaner
> changelog. See below for the changelog and diffstat to expect from
> that branch.
>
> Ben Hutchings (2):
> PCI: Add Solarflare vendor ID and SFC4000 device IDs
> PCI: Add quirk for known incorrect MPSS
>
> Benjamin Herrenschmidt (2):
> PCI: Make pci_setup_bridge() non-static for use by arch code
> pci: Clamp pcie_set_readrq() when using "performance" settings
>
> Jan Beulich (1):
> x86: constify PCI raw ops structures
>
> Jesse Barnes (7):
> Revert "PCI: latency timer doesn't apply to PCIe"
> Revert "PCI: x86: use generic pcibios_set_master()"
> Revert "PCI: sh: use generic pcibios_set_master()"
> Revert "PCI: mn10300: use generic pcibios_set_master()"
> Revert "PCI: mips: use generic pcibios_set_master()"
> Revert "PCI: frv: use generic pcibios_set_master()"
> Revert "PCI: Pull PCI 'latency timer' setup up into the core"
>
> Joerg Roedel (4):
> PCI: Move ATS implementation into own file
> PCI: Export ATS functions to modules
> PCI: Add implementation for PRI capability
> PCI: Add support for PASID capability
>
> Jon Mason (3):
> PCI: Workaround for Intel MPS errata
> PCI: enable MPS "performance" setting to properly handle bridge MPS
> PCI: Clean-up MPS debug output
>
> Josh Boyer (1):
> PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
>
> Myron Stowe (7):
> PCI: Pull PCI 'latency timer' setup up into the core
> PCI: frv: use generic pcibios_set_master()
> PCI: mips: use generic pcibios_set_master()
> PCI: mn10300: use generic pcibios_set_master()
> PCI: sh: use generic pcibios_set_master()
> PCI: x86: use generic pcibios_set_master()
> PCI: latency timer doesn't apply to PCIe
>
> Prarit Bhargava (1):
> PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
>
> Rafael J. Wysocki (2):
> PCI / PM: Extend PME polling to all PCI devices
> PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
Any chance to push https://lkml.org/lkml/2011/10/21/192 any time soon?
It pretty much is a necessary fix for a problem with _OSC after some
recent changes.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2011-10-28 20:29 Jesse Barnes
2011-10-28 23:30 ` Rafael J. Wysocki
0 siblings, 1 reply; 21+ messages in thread
From: Jesse Barnes @ 2011-10-28 20:29 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 7436 bytes --]
Note! There are two branches available, see below.
The following changes since commit
e9308cfd5ab4ade3d81cf591c7599c3a05a21b04:
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-10-14 17:07:52 +1200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci next-revert
Probably the most exciting bits of this series are the MPS fixes and
Joerg's PASID stuff. But I don't think there's anything really risky
(i.e. no big resource management changes this time around).
We found a problem on PPC with the latency setup changes, so this
branch includes reverts for those patches. However, another branch is
available with those patches rebased out if you prefer a cleaner
changelog. See below for the changelog and diffstat to expect from
that branch.
Ben Hutchings (2):
PCI: Add Solarflare vendor ID and SFC4000 device IDs
PCI: Add quirk for known incorrect MPSS
Benjamin Herrenschmidt (2):
PCI: Make pci_setup_bridge() non-static for use by arch code
pci: Clamp pcie_set_readrq() when using "performance" settings
Jan Beulich (1):
x86: constify PCI raw ops structures
Jesse Barnes (7):
Revert "PCI: latency timer doesn't apply to PCIe"
Revert "PCI: x86: use generic pcibios_set_master()"
Revert "PCI: sh: use generic pcibios_set_master()"
Revert "PCI: mn10300: use generic pcibios_set_master()"
Revert "PCI: mips: use generic pcibios_set_master()"
Revert "PCI: frv: use generic pcibios_set_master()"
Revert "PCI: Pull PCI 'latency timer' setup up into the core"
Joerg Roedel (4):
PCI: Move ATS implementation into own file
PCI: Export ATS functions to modules
PCI: Add implementation for PRI capability
PCI: Add support for PASID capability
Jon Mason (3):
PCI: Workaround for Intel MPS errata
PCI: enable MPS "performance" setting to properly handle bridge MPS
PCI: Clean-up MPS debug output
Josh Boyer (1):
PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
Myron Stowe (7):
PCI: Pull PCI 'latency timer' setup up into the core
PCI: frv: use generic pcibios_set_master()
PCI: mips: use generic pcibios_set_master()
PCI: mn10300: use generic pcibios_set_master()
PCI: sh: use generic pcibios_set_master()
PCI: x86: use generic pcibios_set_master()
PCI: latency timer doesn't apply to PCIe
Prarit Bhargava (1):
PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
Rafael J. Wysocki (2):
PCI / PM: Extend PME polling to all PCI devices
PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
arch/x86/include/asm/pci_x86.h | 6 +-
arch/x86/pci/ce4100.c | 2 +-
arch/x86/pci/common.c | 4 +-
arch/x86/pci/direct.c | 6 +-
arch/x86/pci/mmconfig_32.c | 2 +-
arch/x86/pci/mmconfig_64.c | 2 +-
arch/x86/pci/numaq_32.c | 2 +-
arch/x86/pci/olpc.c | 2 +-
arch/x86/pci/pcbios.c | 4 +-
drivers/acpi/osl.c | 3 +-
drivers/net/sfc/efx.c | 10 +-
drivers/net/sfc/efx.h | 4 -
drivers/net/sfc/falcon.c | 3 +-
drivers/net/sfc/falcon_boards.c | 3 +-
drivers/pci/Kconfig | 26 +++
drivers/pci/Makefile | 1 +
drivers/pci/ats.c | 438 ++++++++++++++++++++++++++++++++++++
drivers/pci/hotplug/acpiphp_glue.c | 109 ++++++++--
drivers/pci/iov.c | 142 ------------
drivers/pci/pci-acpi.c | 6 +-
drivers/pci/pci.c | 59 +++--
drivers/pci/pcie/pme.c | 9 +
drivers/pci/probe.c | 68 +++---
drivers/pci/quirks.c | 111 ++++++++--
drivers/pci/setup-bus.c | 2 +-
include/acpi/acpiosxf.h | 2 +
include/linux/pci-ats.h | 75 ++++++
include/linux/pci.h | 2 +
include/linux/pci_ids.h | 5 +
include/linux/pci_regs.h | 20 ++
30 files changed, 868 insertions(+), 260 deletions(-)
create mode 100644 drivers/pci/ats.c
--------- rebased tree info below
The following changes since commit e9308cfd5ab4ade3d81cf591c7599c3a05a21b04:
Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6 (2011-10-14 17:07:52 +1200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci next-rebase
Ben Hutchings (2):
PCI: Add Solarflare vendor ID and SFC4000 device IDs
PCI: Add quirk for known incorrect MPSS
Benjamin Herrenschmidt (2):
PCI: Make pci_setup_bridge() non-static for use by arch code
pci: Clamp pcie_set_readrq() when using "performance" settings
Jan Beulich (1):
x86: constify PCI raw ops structures
Joerg Roedel (4):
PCI: Move ATS implementation into own file
PCI: Export ATS functions to modules
PCI: Add implementation for PRI capability
PCI: Add support for PASID capability
Jon Mason (3):
PCI: Workaround for Intel MPS errata
PCI: enable MPS "performance" setting to properly handle bridge MPS
PCI: Clean-up MPS debug output
Josh Boyer (1):
PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
Prarit Bhargava (1):
PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
Rafael J. Wysocki (2):
PCI / PM: Extend PME polling to all PCI devices
PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
arch/x86/include/asm/pci_x86.h | 6 +-
arch/x86/pci/ce4100.c | 2 +-
arch/x86/pci/common.c | 4 +-
arch/x86/pci/direct.c | 6 +-
arch/x86/pci/mmconfig_32.c | 2 +-
arch/x86/pci/mmconfig_64.c | 2 +-
arch/x86/pci/numaq_32.c | 2 +-
arch/x86/pci/olpc.c | 2 +-
arch/x86/pci/pcbios.c | 4 +-
drivers/acpi/osl.c | 3 +-
drivers/net/sfc/efx.c | 10 +-
drivers/net/sfc/efx.h | 4 -
drivers/net/sfc/falcon.c | 3 +-
drivers/net/sfc/falcon_boards.c | 3 +-
drivers/pci/Kconfig | 26 +++
drivers/pci/Makefile | 1 +
drivers/pci/ats.c | 438 ++++++++++++++++++++++++++++++++++++
drivers/pci/hotplug/acpiphp_glue.c | 109 ++++++++--
drivers/pci/iov.c | 142 ------------
drivers/pci/pci-acpi.c | 6 +-
drivers/pci/pci.c | 59 +++--
drivers/pci/pcie/pme.c | 9 +
drivers/pci/probe.c | 68 +++---
drivers/pci/quirks.c | 111 ++++++++--
drivers/pci/setup-bus.c | 2 +-
include/acpi/acpiosxf.h | 2 +
include/linux/pci-ats.h | 75 ++++++
include/linux/pci.h | 2 +
include/linux/pci_ids.h | 5 +
include/linux/pci_regs.h | 20 ++
30 files changed, 868 insertions(+), 260 deletions(-)
create mode 100644 drivers/pci/ats.c
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2011-07-28 23:51 Jesse Barnes
0 siblings, 0 replies; 21+ messages in thread
From: Jesse Barnes @ 2011-07-28 23:51 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
The following changes since commit
a2fa83faf47b514ab947cea916d3691b66525073:
Merge branch 'usb-linus' of
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
(2011-07-05 20:57:45 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
linux-next
Nothing too terribly exciting... my reference tree doesn't include the
realloc patch, so this lists it as one of the changes, but it should be
a dupe of what's already in your tree.
Ram has a couple of more changes coming (that will hide behind
pci=realloc), I'll send those in a later pull request.
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
Bjorn Helgaas (4):
x86/PCI: reduce severity of host bridge window conflict warnings
PCI: treat mem BAR type "11" (reserved) as 32-bit, not 64-bit, BAR
PCI: fold pci_calc_resource_flags() into decode_bar()
PCI: remove printks about disabled bridge windows
Chris Wright (1):
PCI: ARI is a PCIe v2 feature
Huang Ying (1):
PCI: PCIe AER: add aer_recover_queue
Jan Beulich (1):
x86/PCI: config space accessor functions should not ignore the
segment argument
Jon Mason (1):
PCI: correct pcie_set_readrq write size
Kenji Kaneshige (1):
PCI: pciehp: change wait time for valid configuration access
Myron Stowe (1):
PCI: Assign values to 'pci_obff_signal_type' enumeration constants
Narendra_K@Dell.com (1):
x86/PCI: Preserve existing pci=bfsort whitelist for Dell systems
Ralf Baechle (1):
PCI: Make the struct pci_dev * argument of pci_fixup_irqs const.
Ram Pai (1):
PCI: conditional resource-reallocation through kernel parameter
pci=realloc
Sergei Shtylyov (2):
PCI hotplug: cpqphp: use pci_dev->subsystem_{vendor|device}
PCI hotplug: cpqphp: use pci_dev->vendor
Shaohua Li (1):
x86/PCI: select direct access mode for mmconfig option
Thomas Renninger (1):
PCI hotplug: Rename is_ejectable which also exists in dock.c
Tiejun Chen (1):
PCI: enumerate the PCI device only removed out PCI hieratchy of
OS when re-scanning PCI
tip-bot for Sergei Shtylyov (1):
x86/PCI: quirks: Use pci_dev->revision
Documentation/kernel-parameters.txt | 2 +
arch/alpha/kernel/sys_alcor.c | 2 +-
arch/alpha/kernel/sys_cabriolet.c | 6 +-
arch/alpha/kernel/sys_dp264.c | 8 +-
arch/alpha/kernel/sys_eb64p.c | 2 +-
arch/alpha/kernel/sys_eiger.c | 2 +-
arch/alpha/kernel/sys_marvel.c | 2 +-
arch/alpha/kernel/sys_miata.c | 2 +-
arch/alpha/kernel/sys_mikasa.c | 2 +-
arch/alpha/kernel/sys_nautilus.c | 2 +-
arch/alpha/kernel/sys_noritake.c | 2 +-
arch/alpha/kernel/sys_rawhide.c | 2 +-
arch/alpha/kernel/sys_ruffian.c | 2 +-
arch/alpha/kernel/sys_rx164.c | 2 +-
arch/alpha/kernel/sys_sable.c | 4 +-
arch/alpha/kernel/sys_sio.c | 4 +-
arch/alpha/kernel/sys_sx164.c | 2 +-
arch/alpha/kernel/sys_takara.c | 4 +-
arch/alpha/kernel/sys_titan.c | 2 +-
arch/alpha/kernel/sys_wildfire.c | 2 +-
arch/arm/common/it8152.c | 2 +-
arch/arm/include/asm/hardware/it8152.h | 2 +-
arch/arm/include/asm/mach/pci.h | 4 +-
arch/arm/kernel/bios32.c | 2 +-
arch/arm/mach-cns3xxx/pcie.c | 2 +-
arch/arm/mach-dove/pcie.c | 2 +-
arch/arm/mach-footbridge/cats-pci.c | 2 +-
arch/arm/mach-footbridge/ebsa285-pci.c | 2 +-
arch/arm/mach-footbridge/netwinder-pci.c | 2 +-
arch/arm/mach-footbridge/personal-pci.c | 3 +-
arch/arm/mach-integrator/pci.c | 2 +-
arch/arm/mach-iop13xx/iq81340mc.c | 2 +-
arch/arm/mach-iop13xx/pci.c | 2 +-
arch/arm/mach-iop32x/em7210.c | 2 +-
arch/arm/mach-iop32x/glantank.c | 2 +-
arch/arm/mach-iop32x/iq31244.c | 4 +-
arch/arm/mach-iop32x/iq80321.c | 2 +-
arch/arm/mach-iop32x/n2100.c | 2 +-
arch/arm/mach-iop33x/iq80331.c | 2 +-
arch/arm/mach-iop33x/iq80332.c | 2 +-
arch/arm/mach-ixp2000/enp2611.c | 3 +-
arch/arm/mach-ixp2000/ixdp2400.c | 3 +-
arch/arm/mach-ixp2000/ixdp2800.c | 3 +-
arch/arm/mach-ixp2000/ixdp2x01.c | 3 +-
arch/arm/mach-ixp23xx/ixdp2351.c | 2 +-
arch/arm/mach-ixp23xx/roadrunner.c | 3 +-
arch/arm/mach-ixp4xx/avila-pci.c | 2 +-
arch/arm/mach-ixp4xx/coyote-pci.c | 2 +-
arch/arm/mach-ixp4xx/dsmg600-pci.c | 2 +-
arch/arm/mach-ixp4xx/fsg-pci.c | 2 +-
arch/arm/mach-ixp4xx/gateway7001-pci.c | 3 +-
arch/arm/mach-ixp4xx/goramo_mlr.c | 2 +-
arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 +-
arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 +-
arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 +-
arch/arm/mach-ixp4xx/nas100d-pci.c | 2 +-
arch/arm/mach-ixp4xx/nslu2-pci.c | 2 +-
arch/arm/mach-ixp4xx/vulcan-pci.c | 2 +-
arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 +-
arch/arm/mach-kirkwood/pcie.c | 3 +-
arch/arm/mach-ks8695/board-dsm320.c | 2 +-
arch/arm/mach-ks8695/board-micrel.c | 2 +-
arch/arm/mach-ks8695/include/mach/devices.h | 2 +-
arch/arm/mach-mv78xx0/pcie.c | 3 +-
arch/arm/mach-orion5x/common.h | 2 +-
arch/arm/mach-orion5x/db88f5281-setup.c | 3 +-
arch/arm/mach-orion5x/dns323-setup.c | 4 +-
arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +-
arch/arm/mach-orion5x/mss2-setup.c | 2 +-
arch/arm/mach-orion5x/pci.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +-
arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +-
arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +-
arch/arm/mach-orion5x/ts209-setup.c | 3 +-
arch/arm/mach-orion5x/ts409-setup.c | 3 +-
arch/arm/mach-orion5x/wnr854t-setup.c | 3 +-
arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +-
arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +-
arch/arm/mach-sa1100/pci-nanoengine.c | 3 +-
arch/arm/mach-shark/pci.c | 2 +-
arch/arm/mach-tegra/pcie.c | 2 +-
arch/arm/mach-versatile/pci.c | 2 +-
arch/sh/drivers/pci/fixups-cayman.c | 2 +-
arch/sh/drivers/pci/fixups-dreamcast.c | 2 +-
arch/sh/drivers/pci/fixups-landisk.c | 2 +-
arch/sh/drivers/pci/fixups-r7780rp.c | 2 +-
arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +-
arch/sh/drivers/pci/fixups-sdk7780.c | 2 +-
arch/sh/drivers/pci/fixups-se7751.c | 2 +-
arch/sh/drivers/pci/fixups-sh03.c | 2 +-
arch/sh/drivers/pci/fixups-snapgear.c | 2 +-
arch/sh/drivers/pci/fixups-titan.c | 2 +-
arch/sh/drivers/pci/pcie-sh7786.c | 2 +-
arch/sh/include/asm/pci.h | 2 +-
arch/sparc/include/asm/leon_pci.h | 2 +-
arch/sparc/kernel/leon_pci_grpci2.c | 2 +-
arch/tile/kernel/pci.c | 2 +-
arch/unicore32/kernel/pci.c | 2 +-
arch/x86/Kconfig | 2 +-
arch/x86/kernel/quirks.c | 5 +-
arch/x86/pci/acpi.c | 7 +-
arch/x86/pci/ce4100.c | 2 +
arch/x86/pci/common.c | 14 ++--
arch/x86/pci/direct.c | 6 +-
arch/x86/pci/numaq_32.c | 2 +
arch/x86/pci/olpc.c | 4 +
arch/x86/pci/pcbios.c | 2 +
arch/x86/pci/visws.c | 2 +-
drivers/pci/hotplug/acpi_pcihp.c | 6 +-
drivers/pci/hotplug/cpqphp_core.c | 17 ++---
drivers/pci/hotplug/pciehp_ctrl.c | 3 +
drivers/pci/hotplug/pciehp_hpc.c | 11 +---
drivers/pci/pci.c | 13 +++-
drivers/pci/pci.h | 2 +
drivers/pci/pcie/aer/aerdrv_core.c | 76
++++++++++++++++++-- drivers/pci/pcie/aer/aerdrv_errprint.c
| 3 +- drivers/pci/probe.c | 89
+++++++++++-------------
drivers/pci/setup-bus.c | 18 ++++-
drivers/pci/setup-irq.c | 4 +-
drivers/pci/setup-res.c | 3 +-
include/linux/aer.h | 3 +
include/linux/pci.h | 6 +- 123 files
changed, 318 insertions(+), 219 deletions(-)
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2011-03-18 17:30 Jesse Barnes
0 siblings, 0 replies; 21+ messages in thread
From: Jesse Barnes @ 2011-03-18 17:30 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
The following changes since commit
100b33c8bd8a3235fd0b7948338d6cbb3db3c63d:
Linux 2.6.38-rc4 (2011-02-07 16:03:55 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
The only scary thing in here is Ram's patchset to adjust our resource
allocation policy. The old policy was too biased in favor of hotplug;
his patches try to make sure we can allocate space for devices detected
at boot first, only making hotplug windows available if possible
afterwards.
A couple of last minute fixes for the ACPI _DSM patch landed this week
as well, but they're very low risk so I think that's ok.
Ben Hutchings (1):
PCI: sysfs: Fix failure path for addition of "vpd" attribute
Brandeburg, Jesse (1):
PCI: remove quirk for pre-production systems
Jesper Juhl (1):
PCI: Avoid potential NULL pointer dereference in pci_scan_bridge
Jiri Slaby (2):
PCI: add more checking to ICH region quirks
PCI: do not create quirk I/O regions below PCIBIOS_MIN_IO for ICH
Narendra_K@Dell.com (2):
PCI: Export ACPI _DSM provided firmware instance number and string name to sysfs
PCI: label: Fix compilation error when CONFIG_ACPI is unset
Prarit Bhargava (1):
PCI: aer-inject: Override PCIe AER Mask Registers
Ram Pai (4):
PCI: refactor io size calculation code
PCI: data structure agnostic free list function
PCI: introduce reset_resource()
PCI: pre-allocate additional resources to devices only after successful allocation of essential resources.
Randy Dunlap (1):
PCI: fix tlan build when CONFIG_PCI is not enabled
Seth Heasley (1):
PCI/lpc: irq and pci_ids patch for Intel DH89xxCC DeviceIDs
Shyam_Iyer@Dell.com (1):
PCI: label: remove #include of ACPI header to avoid warnings
Stefano Stabellini (1):
PCI hotplug: acpiphp: set current_state to D0 in register_slot
Documentation/ABI/testing/sysfs-bus-pci | 31 +++-
arch/x86/pci/irq.c | 15 +-
drivers/pci/Kconfig | 2 +
drivers/pci/Makefile | 3 +-
drivers/pci/hotplug/acpiphp_glue.c | 1 +
drivers/pci/pci-label.c | 252 +++++++++++++++++++++++-
drivers/pci/pci-sysfs.c | 2 +-
drivers/pci/pci.h | 2 +-
drivers/pci/pcie/aer/aer_inject.c | 31 +++-
drivers/pci/probe.c | 4 +-
drivers/pci/quirks.c | 113 +++++------
drivers/pci/setup-bus.c | 321 +++++++++++++++++++++++--------
include/linux/pci.h | 5 +
include/linux/pci_ids.h | 3 +
14 files changed, 614 insertions(+), 171 deletions(-)
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2011-01-14 17:01 Jesse Barnes
0 siblings, 0 replies; 21+ messages in thread
From: Jesse Barnes @ 2011-01-14 17:01 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
The following changes since commit
e819eb8687767cefca7b6abf5ac6d5efcf581eeb:
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (2010-12-22 19:47:37 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
NOTE! You may notice this has been recently rebased; that's because I
had to drop a patch that didn't get a fix in time. It was an
independent change to our sysfs label code though, so I don't think
dropping it invalidates any testing already done or time in linux-next.
There's nothing in here as exciting as last time (i.e. no real resource
changes), mostly just a collection of fixes and relatively small
changes.
Alex Williamson (1):
PCI: sysfs: Update ROM to include default owner write access
Bjorn Helgaas (2):
x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available
x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTAL
Jon Mason (1):
PCI: make pci_restore_state return void
Matthew Garrett (1):
PCI: Disable ASPM if BIOS asks us to
Narendra_K@Dell.com (1):
PCI: enable pci=bfsort by default on future Dell systems
Rafael J. Wysocki (5):
PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c
PCI/PCIe: Clear Root PME Status bits early during system resume
PCI/ACPI: Request _OSC control once for each root bridge (v3)
PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events
PCI/PM: Report wakeup events before resuming devices
Randy Dunlap (1):
PCI: fix __pci_device_probe kernel-doc warning
Seth Heasley (1):
x86/PCI: irq and pci_ids patch for Intel Patsburg
Sheng Yang (2):
PCI: MSI: Move MSI-X entry definition to pci_regs.h
PCI: Add mask bit definition for MSI-X table
Tejun Heo (1):
PCI: pci-stub: ignore zero-length id parameters
Yinghai Lu (1):
PCI: Skip id checking if no id is passed
arch/x86/Kconfig | 10 ++++++-
arch/x86/pci/broadcom_bus.c | 11 +++++---
arch/x86/pci/common.c | 41 +++++++++++++++++++++++++++++++
arch/x86/pci/irq.c | 3 +-
drivers/acpi/apei/hest.c | 22 +++++++----------
drivers/acpi/pci_root.c | 35 ++++++++++++++++++++++++++
drivers/media/video/cafe_ccic.c | 4 +--
drivers/net/myri10ge/myri10ge.c | 4 +--
drivers/net/sfc/falcon.c | 25 ++++---------------
drivers/net/skge.c | 4 +--
drivers/net/sky2.c | 5 +---
drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +-
drivers/pci/hotplug/pciehp_acpi.c | 3 +-
drivers/pci/msi.c | 5 ++-
drivers/pci/msi.h | 6 ----
drivers/pci/pci-acpi.c | 3 +-
drivers/pci/pci-driver.c | 5 ++-
drivers/pci/pci-stub.c | 7 +++++
drivers/pci/pci-sysfs.c | 2 +-
drivers/pci/pci.c | 25 ++----------------
drivers/pci/pci.h | 14 ++++------
drivers/pci/pcie/aer/aerdrv.c | 1 +
drivers/pci/pcie/aer/aerdrv.h | 3 --
drivers/pci/pcie/aspm.c | 21 +++++++++++++---
drivers/pci/pcie/pme.c | 31 ++++-------------------
drivers/pci/pcie/portdrv.h | 5 +--
drivers/pci/pcie/portdrv_acpi.c | 23 +++--------------
drivers/pci/pcie/portdrv_core.c | 25 ++++++++++--------
drivers/pci/pcie/portdrv_pci.c | 37 +++++++++++++++++++++++++---
drivers/scsi/ipr.c | 8 +-----
drivers/scsi/pmcraid.c | 7 +----
drivers/staging/sm7xx/smtcfb.c | 2 +-
include/acpi/apei.h | 6 ++++
include/linux/pci-acpi.h | 6 ++++
include/linux/pci-aspm.h | 5 +++-
include/linux/pci.h | 20 ++++++++++----
include/linux/pci_ids.h | 3 +-
include/linux/pci_regs.h | 10 +++++++
sound/pci/cs5535audio/cs5535audio_pm.c | 7 +----
39 files changed, 263 insertions(+), 195 deletions(-)
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2010-08-05 19:52 Jesse Barnes
0 siblings, 0 replies; 21+ messages in thread
From: Jesse Barnes @ 2010-08-05 19:52 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
The following changes since commit
a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c:
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (2010-07-29 15:23:28 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 linux-next
Mostly small changes spread out across PCI this time around, with one
significant change to the way we do probing. This pull includes the "disable
while probing" patch we've talked about for awhile, though the new logic
excludes host bridges and has a blacklist infrastructure should we end up
needing it.
There are a few more ACPI related fixes coming from Rafael, but they're not
quite baked yet (lots of review comments and such, which is good).
Thanks,
--
Jesse Barnes, Intel Open Source Technology Center
Alan Stern (1):
PCI: change device runtime PM settings for probe and remove
Alex Williamson (1):
PCI: Allow read/write access to sysfs I/O port resources
Ben Hutchings (2):
PCI: MSI: Remove unsafe and unnecessary hardware access
PCI: MSI: Restore read_msi_msg_desc(); add get_cached_msi_msg_desc()
Bjorn Helgaas (1):
x86/PCI: use host bridge _CRS info on ASRock ALiveSATA2-GLAN
Clemens Ladisch (1):
PCI quirk: AMD 780: work around wrong vendor ID on APC bridge
Dan Carpenter (1):
PCI: hotplug/shpchp_hpc: add parenthesis in SLOT_REG_RSVDZ_MASK
FUJITA Tomonori (1):
PCI: remove unused HAVE_ARCH_PCI_SET_DMA_MAX_SEGMENT_{SIZE|BOUNDARY}
Jacob Pan (1):
PCI: disable mmio during bar sizing
Jiri Slaby (1):
x86/PCI: pci, fix section mismatch
Junchang Wang (1):
PCI: check return value of pci_enable_device() when enabling bridges
Kenji Kaneshige (2):
PCI: fix wrong memory address handling in MSI-X
PCI: kernel oops on access to pci proc file while hot-removal
Kulikov Vasiliy (3):
PCI: pci-sysfs: remove casts from void*
PCI: use for_each_pci_dev()
x86/PCI: use for_each_pci_dev()
Linus Torvalds (1):
PCI aerdrv: fix annoying warnings
Matthew Garrett (3):
PCI: Don't enable aspm before drivers have had a chance to veto it
ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
PCI: Default PCIe ASPM control to on and require !EMBEDDED to disable
Mike Habeck (1):
x86/PCI: Add option to not assign BAR's if not already assigned
Narendra K (2):
PCI: export SMBIOS provided firmware instance and label to sysfs
PCI: Fix warnings when CONFIG_DMI unset
Praveen Kalamegham (2):
PCI hotplug: pciehp: Fixed return value sign for pciehp_unconfigure_device
PCI hotplug: shpchp: Removed check for hotplug of display devices
Rafael J. Wysocki (1):
PCI: Do not run NVidia quirks related to MSI with MSI disabled
Stephen Hemminger (1):
PCI: sparse warning (trivial)
Stephen Rothwell (1):
PCI: update for owner removal from struct device_attribute
Tejun Heo (1):
PCI: disable MSI on VIA K8M800
Yinghai Lu (1):
PCI hotplug: make sure child bridges are enabled at hotplug time
Documentation/ABI/testing/sysfs-bus-pci | 27 ++++++
Documentation/filesystems/sysfs-pci.txt | 7 +-
Documentation/kernel-parameters.txt | 2 +
arch/ia64/kernel/msi_ia64.c | 2 +-
arch/ia64/sn/kernel/msi_sn.c | 2 +-
arch/x86/include/asm/pci_x86.h | 1 +
arch/x86/kernel/apic/io_apic.c | 2 +-
arch/x86/pci/acpi.c | 9 ++
arch/x86/pci/common.c | 20 +++++
arch/x86/pci/irq.c | 6 +-
arch/x86/pci/legacy.c | 2 +-
drivers/acpi/pci_root.c | 9 ++
drivers/firmware/dmi_scan.c | 25 ++++++
drivers/net/e1000e/netdev.c | 16 +---
drivers/net/r8169.c | 16 +---
drivers/pci/Makefile | 3 +
drivers/pci/bus.c | 4 +-
drivers/pci/hotplug/fakephp.c | 2 +-
drivers/pci/hotplug/pciehp_pci.c | 2 +-
drivers/pci/hotplug/shpchp_hpc.c | 2 +-
drivers/pci/hotplug/shpchp_pci.c | 19 +---
drivers/pci/msi.c | 29 ++++++-
drivers/pci/pci-driver.c | 32 ++++++-
drivers/pci/pci-label.c | 143 +++++++++++++++++++++++++++++++
drivers/pci/pci-sysfs.c | 75 ++++++++++++++++-
drivers/pci/pci.c | 4 -
drivers/pci/pci.h | 9 ++
drivers/pci/pcie/Kconfig | 20 +++--
drivers/pci/pcie/aer/aerdrv_core.c | 17 ++--
drivers/pci/pcie/aspm.c | 16 +++-
drivers/pci/probe.c | 10 ++
drivers/pci/proc.c | 6 +-
drivers/pci/quirks.c | 42 ++++++++-
drivers/pci/search.c | 2 +-
drivers/pci/setup-bus.c | 12 ++-
drivers/pci/setup-irq.c | 3 +-
include/linux/dmi.h | 9 ++
include/linux/msi.h | 2 +
include/linux/pci.h | 2 +
39 files changed, 517 insertions(+), 94 deletions(-)
create mode 100644 drivers/pci/pci-label.c
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2010-05-22 3:01 ` Jesse Barnes
@ 2010-05-22 8:17 ` Pekka Enberg
0 siblings, 0 replies; 21+ messages in thread
From: Pekka Enberg @ 2010-05-22 8:17 UTC (permalink / raw)
To: Jesse Barnes; +Cc: Linus Torvalds, linux-pci, linux-kernel
On Sat, May 22, 2010 at 6:01 AM, Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On Fri, 21 May 2010 18:59:58 -0700 (PDT)
> Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
>>
>>
>> On Fri, 21 May 2010, Linus Torvalds wrote:
>> >
>> > 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...
You can use "git request-pull" against master.kernel.org to avoid the
mirroring problem.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2010-05-22 1:59 ` Linus Torvalds
@ 2010-05-22 3:01 ` Jesse Barnes
2010-05-22 8:17 ` Pekka Enberg
0 siblings, 1 reply; 21+ messages in thread
From: Jesse Barnes @ 2010-05-22 3:01 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-pci, linux-kernel
On Fri, 21 May 2010 18:59:58 -0700 (PDT)
Linus Torvalds <torvalds@linux-foundation.org> wrote:
>
>
> On Fri, 21 May 2010, Linus Torvalds wrote:
> >
> > 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...
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2010-05-22 0:12 ` Linus Torvalds
@ 2010-05-22 1:59 ` Linus Torvalds
2010-05-22 3:01 ` Jesse Barnes
0 siblings, 1 reply; 21+ messages in thread
From: Linus Torvalds @ 2010-05-22 1:59 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-pci, linux-kernel
On Fri, 21 May 2010, Linus Torvalds wrote:
>
> 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
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] PCI changes
2010-05-21 21:48 Jesse Barnes
@ 2010-05-22 0:12 ` Linus Torvalds
2010-05-22 1:59 ` Linus Torvalds
0 siblings, 1 reply; 21+ messages in thread
From: Linus Torvalds @ 2010-05-22 0:12 UTC (permalink / raw)
To: Jesse Barnes; +Cc: linux-pci, linux-kernel
On Fri, 21 May 2010, Jesse Barnes wrote:
>
> 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
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] PCI changes
@ 2010-05-21 21:48 Jesse Barnes
2010-05-22 0:12 ` Linus Torvalds
0 siblings, 1 reply; 21+ messages in thread
From: Jesse Barnes @ 2010-05-21 21:48 UTC (permalink / raw)
To: Linus Torvalds, linux-pci, linux-kernel
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
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2012-01-13 23:26 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-23 20:43 [git pull] PCI changes Jesse Barnes
2011-05-23 21:16 ` David Miller
2011-05-24 0:04 ` Jesse Barnes
-- strict thread matches above, loose matches on Subject: below --
2012-01-11 18:34 Jesse Barnes
2012-01-12 3:38 ` Linus Torvalds
2012-01-13 21:24 ` Matthew Garrett
2012-01-13 23:14 ` Linus Torvalds
2012-01-13 23:26 ` Matthew Garrett
2012-01-12 5:34 ` Yinghai Lu
2011-10-28 20:29 Jesse Barnes
2011-10-28 23:30 ` Rafael J. Wysocki
2011-10-31 17:18 ` Jesse Barnes
2011-07-28 23:51 Jesse Barnes
2011-03-18 17:30 Jesse Barnes
2011-01-14 17:01 Jesse Barnes
2010-08-05 19:52 Jesse Barnes
2010-05-21 21:48 Jesse Barnes
2010-05-22 0:12 ` Linus Torvalds
2010-05-22 1:59 ` Linus Torvalds
2010-05-22 3:01 ` Jesse Barnes
2010-05-22 8:17 ` Pekka Enberg
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.