[git pull] PCI fix

[git pull] PCI fix

[Jesse Barnes]

Just one revert for something Yinghai is already working on fixing up.

The following changes since commit 964fe080d94db82a3268443e9b9ece4c60246414:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../rusty/linux-2.6-for-linus

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Jesse Barnes (1):
      Revert "PCI: get larger bridge ranges when space is available"

 drivers/pci/setup-bus.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

[git pull] PCI fix

[Jesse Barnes]

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 for-linus

Just one fix we discussed to get us back to old allocation behavior.
The new code is pretty close (we've only had a couple of reports of
problems) but not quite there yet.

Ram Pai (1):
      PCI: conditional resource-reallocation through kernel parameter pci=realloc

 Documentation/kernel-parameters.txt |    2 ++
 drivers/pci/pci.c                   |    2 ++
 drivers/pci/pci.h                   |    2 ++
 drivers/pci/setup-bus.c             |   15 +++++++++++++++
 4 files changed, 21 insertions(+), 0 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit
bb3c90f0de7b34995b5e35cf5dc97a3d428b3761:

  Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 (2011-04-08 07:36:14 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one rather low priority fix for one of the patches that went in
this cycle.

Randy Dunlap (1):
      PCI: pci-label: Fix build failure when CONFIG_NLS is set to 'm' by allmodconfig

 drivers/pci/Kconfig  |    4 +++-
 drivers/pci/Makefile |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

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 for-linus

Just one fix from Rafael for a problem introduce this cycle.

Rafael J. Wysocki (1):
      PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c

 drivers/pci/hotplug/pciehp_acpi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit
d56557af19867edb8c0e96f8e26399698a08857f:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (2010-09-07 16:00:17 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one small fix so that pci_resource_alignment does the right thing
regardless of the underlying resource size length.

Cam Macdonell (1):
      PCI: fix pci_resource_alignment prototype

 drivers/pci/iov.c |    2 +-
 drivers/pci/pci.h |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit
f469461df6ff822f71b8737bda86eea20f16ff93:

  Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2010-07-16 11:26:33 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

This one hasn't gone through linux-next yet, but it has been tested by the
reporter and seems reasonably safe.  As always, the pull decision is yours; I
don't think this will make anything worse though...

Thanks,
Jesse

Bjorn Helgaas (1):
      PCI: fall back to original BIOS BAR addresses

 arch/x86/pci/i386.c     |    1 +
 drivers/pci/setup-res.c |   32 ++++++++++++++++++++++++++++++++
 include/linux/pci.h     |    1 +
 3 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 6fdb3ec..5525309 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -184,6 +184,7 @@ static void __init pcibios_allocate_resources(int pass)
 					idx, r, disabled, pass);
 				if (pci_claim_resource(dev, idx) < 0) {
 					/* We'll assign a new address later */
+					dev->fw_addr[idx] = r->start;
 					r->end -= r->start;
 					r->start = 0;
 				}
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c
index 92379e2..2aaa131 100644
--- a/drivers/pci/setup-res.c
+++ b/drivers/pci/setup-res.c
@@ -156,6 +156,38 @@ static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,
 					     pcibios_align_resource, dev);
 	}
 
+	if (ret < 0 && dev->fw_addr[resno]) {
+		struct resource *root, *conflict;
+		resource_size_t start, end;
+
+		/*
+		 * If we failed to assign anything, let's try the address
+		 * where firmware left it.  That at least has a chance of
+		 * working, which is better than just leaving it disabled.
+		 */
+
+		if (res->flags & IORESOURCE_IO)
+			root = &ioport_resource;
+		else
+			root = &iomem_resource;
+
+		start = res->start;
+		end = res->end;
+		res->start = dev->fw_addr[resno];
+		res->end = res->start + size - 1;
+		dev_info(&dev->dev, "BAR %d: trying firmware assignment %pR\n",
+			 resno, res);
+		conflict = request_resource_conflict(root, res);
+		if (conflict) {
+			dev_info(&dev->dev,
+				 "BAR %d: %pR conflicts with %s %pR\n", resno,
+				 res, conflict->name, conflict);
+			res->start = start;
+			res->end = end;
+		} else
+			ret = 0;
+	}
+
 	if (!ret) {
 		res->flags &= ~IORESOURCE_STARTALIGN;
 		dev_info(&dev->dev, "BAR %d: assigned %pR\n", resno, res);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 7cb0084..f26fda7 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -288,6 +288,7 @@ struct pci_dev {
 	 */
 	unsigned int	irq;
 	struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
+	resource_size_t	fw_addr[DEVICE_COUNT_RESOURCE]; /* FW-assigned addr */
 
 	/* These fields are used by common fixups */
 	unsigned int	transparent:1;	/* Transparent PCI bridge */

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit
7e27d6e778cd87b6f2415515d7127eba53fe5d02: Linus Torvalds (1):
        Linux 2.6.35-rc3

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one regression fix from Rafael right now.  I hope to get one or
two more regression fixes in before the final release too.

Rafael J. Wysocki (1):
      PCI/PM: Do not use native PCIe PME by default

 Documentation/kernel-parameters.txt |    4 +++-
 drivers/pci/pcie/pme/pcie_pme.c     |   19 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit 64096c17417380d8a472d096645f4cbc9406c987:
  Linus Torvalds (1):
        Merge branch 'slab-for-linus' of git://git.kernel.org/.../penberg/slab-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one fix from Rafael for the new runtime PM stuff.  A few other
fixes are trickling in now, and I expect more once people start testing
-rc1.

Thanks,
Jesse

Rafael J. Wysocki (1):
      PCI/PM Runtime: Make runtime PM of PCI devices inactive by default

 drivers/pci/pci.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit adda766193ea1cf3137484a9521972d080d0b7af:
  Linus Torvalds (1):
        Merge branch 'release' of git://git.kernel.org/.../lenb/linux-acpi-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

One more last minute fix from Chris.  Without this, devices supporting SR-IOV
have much inflated (and unnecessary) alignment requirements, which can lead to
resource allocation failures.

Chris Wright (1):
      PCI SR-IOV: correct broken resource alignment calculations

 drivers/pci/iov.c       |   23 +++++++++++++++++++++++
 drivers/pci/pci.h       |   13 +++++++++++++
 drivers/pci/setup-bus.c |    4 ++--
 drivers/pci/setup-res.c |    8 ++++----
 4 files changed, 42 insertions(+), 6 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

Re: [git pull] PCI fix

[Linus Torvalds]

On Sat, 22 Aug 2009, Jesse Barnes wrote:
>
> Just one fix here that turns out to fix a suspend/resume regression.  It is a
> core change though, and I'm a little nervous about pushing it at this point.
> So feel free to ignore it if you think it's too risky; we can always land it
> in 2.6.31.1 during the merge window instead (to get it a little more coverage
> first).

The patch looks so trivially correct that I have no qualms about taking 
it.

Not that "trivially correct" code hasn't triggered latent bugs before, but 
if it's known to fix a regressio I think this is a no-brainer. So pulled,

		Linus

[git pull] PCI fix

[Jesse Barnes]

The following changes since commit 6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f:
Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../ryusuke/nilfs2

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Just one fix here that turns out to fix a suspend/resume regression.  It is a
core change though, and I'm a little nervous about pushing it at this point.
So feel free to ignore it if you think it's too risky; we can always land it
in 2.6.31.1 during the merge window instead (to get it a little more coverage
first).

Alek Du (1):
      PCI: check saved state before restore

 drivers/pci/pci-driver.c |    2 +-
 drivers/pci/pci.c        |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

Thanks,
-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

Just one small fix from Yinghai in this pull.  I expect a couple of
more from Alex in the next one, but I'd like to get them through
linux-next first.

The following changes since commit c2cc49a2f8a479dde96a599646d30b6cc9dbed78:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../sfrench/cifs-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Yinghai Lu (1):
      x86/pci: insert ioapic resource before assigning unassigned resources

 arch/x86/include/asm/io_apic.h |    2 ++
 arch/x86/kernel/apic/io_apic.c |   14 +++-----------
 arch/x86/pci/i386.c            |    7 +++++++
 3 files changed, 12 insertions(+), 11 deletions(-)


-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

Please consider pulling the PCI fixes from
git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Includes an oops fix for the acpiphp module when both physical and
logical hotplug are used.  There should be another one on its way from
Len via the ACPI tree.

Thanks,
Jesse

Alex Chiang (1):
      PCI Hotplug: acpiphp: don't store a pci_dev in acpiphp_func

 drivers/pci/hotplug/acpiphp.h      |    1 -
 drivers/pci/hotplug/acpiphp_glue.c |   63 +++++++++++++++---------------------
 2 files changed, 26 insertions(+), 38 deletions(-)

[git pull] PCI fix

[Jesse Barnes]

One more last minute fix from Rafael for a somewhat obscure (kexec)
related bug.

The following changes since commit
279e677faa775ad16e75c32e1bf4a37f8158bc61: Linus Torvalds (1):
        Merge branch 'fixes-for-linus' of
git://git.monstr.eu/linux-2.6-microblaze

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 for-linus

Rafael J. Wysocki (1):
      PCI PM: Fix initialization and kexec breakage for some devices

 drivers/pci/pci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

-- 
Jesse Barnes, Intel Open Source Technology Center

[git pull] PCI fix

[Jesse Barnes]

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

Another small fix for 2.6.28.  If not fixed, this bug could end up causing
IRQ 0 to get disabled when a PCI function is reset before init.

Thanks,
Jesse

Sheng Yang (1):
      PCI: Fix disable IRQ 0 in pci_reset_function()


 drivers/pci/pci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)