Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55069592 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v3.19-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fixes from Bjorn Helgaas:
 "These are fixes for:

   - a resource management problem that causes a Radeon "Fatal error
     during GPU init" on machines where the BIOS programmed an invalid
     Root Port window.  This was a regression in v3.16.

   - an Atheros AR93xx device that doesn't handle PCI bus resets
     correctly.  This was a regression in v3.14.

   - an out-of-date email address"

* tag 'pci-v3.19-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  MAINTAINERS: Update Richard Zhu's email address
  sparc/PCI: Clip bridge windows to fit in upstream windows
  powerpc/PCI: Clip bridge windows to fit in upstream windows
  parisc/PCI: Clip bridge windows to fit in upstream windows
  mn10300/PCI: Clip bridge windows to fit in upstream windows
  microblaze/PCI: Clip bridge windows to fit in upstream windows
  ia64/PCI: Clip bridge windows to fit in upstream windows
  frv/PCI: Clip bridge windows to fit in upstream windows
  alpha/PCI: Clip bridge windows to fit in upstream windows
  x86/PCI: Clip bridge windows to fit in upstream windows
  PCI: Add pci_claim_bridge_resource() to clip window if necessary
  PCI: Add pci_bus_clip_resource() to clip to fit upstream window
  PCI: Pass bridge device, not bus, when updating bridge windows
  PCI: Mark Atheros AR93xx to avoid bus reset
  PCI: Add flag for devices where we can't use bus reset
parents b8de08da f175aa2c

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -7274,7 +7274,7 @@ S: Maintained 
F:	drivers/pci/host/*layerscape*



PCI DRIVER FOR IMX6

M:	Richard Zhu <r65037@freescale.com>

M:	Richard Zhu <Richard.Zhu@freescale.com>

M:	Lucas Stach <l.stach@pengutronix.de>

L:	linux-pci@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/alpha/kernel/pci.c

+6 −2
Original line number Diff line number Diff line
@@ -285,8 +285,12 @@ pcibios_claim_one_bus(struct pci_bus *b) 
			if (r->parent || !r->start || !r->flags)

				continue;

			if (pci_has_flag(PCI_PROBE_ONLY) ||

			    (r->flags & IORESOURCE_PCI_FIXED))

				pci_claim_resource(dev, i);

			    (r->flags & IORESOURCE_PCI_FIXED)) {

				if (pci_claim_resource(dev, i) == 0)

					continue;



				pci_claim_bridge_resource(dev, i);

			}

		}

	}

arch/frv/mb93090-mb00/pci-frv.c

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) 
				r = &dev->resource[idx];

				if (!r->start)

					continue;

				pci_claim_resource(dev, idx);

				pci_claim_bridge_resource(dev, idx);

			}

		}

		pcibios_allocate_bus_resources(&bus->children);

arch/ia64/pci/pci.c

+21 −27
Original line number Diff line number Diff line
@@ -487,45 +487,39 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) 
	return 0;

}



static int is_valid_resource(struct pci_dev *dev, int idx)

void pcibios_fixup_device_resources(struct pci_dev *dev)

{

	unsigned int i, type_mask = IORESOURCE_IO | IORESOURCE_MEM;

	struct resource *devr = &dev->resource[idx], *busr;

	int idx;



	if (!dev->bus)

		return 0;

		return;



	pci_bus_for_each_resource(dev->bus, busr, i) {

		if (!busr || ((busr->flags ^ devr->flags) & type_mask))

	for (idx = 0; idx < PCI_BRIDGE_RESOURCES; idx++) {

		struct resource *r = &dev->resource[idx];



		if (!r->flags || r->parent || !r->start)

			continue;

		if ((devr->start) && (devr->start >= busr->start) &&

				(devr->end <= busr->end))

			return 1;



		pci_claim_resource(dev, idx);

	}

	return 0;

}

EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);



static void pcibios_fixup_resources(struct pci_dev *dev, int start, int limit)

static void pcibios_fixup_bridge_resources(struct pci_dev *dev)

{

	int i;

	int idx;



	for (i = start; i < limit; i++) {

		if (!dev->resource[i].flags)

	if (!dev->bus)

		return;



	for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) {

		struct resource *r = &dev->resource[idx];



		if (!r->flags || r->parent || !r->start)

			continue;

		if ((is_valid_resource(dev, i)))

			pci_claim_resource(dev, i);

	}

}



void pcibios_fixup_device_resources(struct pci_dev *dev)

{

	pcibios_fixup_resources(dev, 0, PCI_BRIDGE_RESOURCES);

		pci_claim_bridge_resource(dev, idx);

	}

EXPORT_SYMBOL_GPL(pcibios_fixup_device_resources);



static void pcibios_fixup_bridge_resources(struct pci_dev *dev)

{

	pcibios_fixup_resources(dev, PCI_BRIDGE_RESOURCES, PCI_NUM_RESOURCES);

}



/*

arch/microblaze/pci/pci-common.c

+12 −1
Original line number Diff line number Diff line
@@ -1026,6 +1026,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus) 
			 pr, (pr && pr->name) ? pr->name : "nil");



		if (pr && !(pr->flags & IORESOURCE_UNSET)) {

			struct pci_dev *dev = bus->self;



			if (request_resource(pr, res) == 0)

				continue;

			/*
@@ -1035,6 +1037,12 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus) 
			 */

			if (reparent_resources(pr, res) == 0)

				continue;



			if (dev && i < PCI_BRIDGE_RESOURCE_NUM &&

			    pci_claim_bridge_resource(dev,

						 i + PCI_BRIDGE_RESOURCES) == 0)

				continue;



		}

		pr_warn("PCI: Cannot allocate resource region ");

		pr_cont("%d of PCI bridge %d, will remap\n", i, bus->number);
@@ -1227,7 +1235,10 @@ void pcibios_claim_one_bus(struct pci_bus *bus) 
				 (unsigned long long)r->end,

				 (unsigned int)r->flags);



			pci_claim_resource(dev, i);

			if (pci_claim_resource(dev, i) == 0)

				continue;



			pci_claim_bridge_resource(dev, i);

		}

	}