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

Commit 475c77ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 

Pull PCI changes (including maintainer change) from Jesse Barnes:
 "This pull has some good cleanups from Bjorn and Yinghai, as well as
  some more code from Yinghai to better handle resource re-allocation
  when enabled.

  There's also a new initcall_debug feature from Arjan which will print
  out quirk timing information to help identify slow quirks for fixing
  or refinement (Yinghai sent in a few patches to do just that once the
  new debug code landed).

  Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
  He's been a core PCI and Linux contributor for some time now, and has
  kindly volunteered to take over.  I just don't feel I have the time
  for PCI review and work that it deserves lately (I've taken on some
  other projects), and haven't been as responsive lately as I'd like, so
  I approached Bjorn asking if he'd like to manage things.  He's going
  to give it a try, and I'm confident he'll do at least as well as I
  have in keeping the tree managed, patches flowing, and keeping things
  stable."

Fix up some fairly trivial conflicts due to other cleanups (mips device
resource fixup cleanups clashing with list handling cleanup, ppc iseries
removal clashing with pci_probe_only cleanup etc)

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
  PCI: Bjorn gets PCI hotplug too
  PCI: hand PCI maintenance over to Bjorn Helgaas
  unicore32/PCI: move <asm-generic/pci-bridge.h> include to asm/pci.h
  sparc/PCI: convert devtree and arch-probed bus addresses to resource
  powerpc/PCI: allow reallocation on PA Semi
  powerpc/PCI: convert devtree bus addresses to resource
  powerpc/PCI: compute I/O space bus-to-resource offset consistently
  arm/PCI: don't export pci_flags
  PCI: fix bridge I/O window bus-to-resource conversion
  x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
  PCI / PCIe: Introduce command line option to disable ARI
  PCI: make acpihp use __pci_remove_bus_device instead
  PCI: export __pci_remove_bus_device
  PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
  PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
  PCI: print out PCI device info along with duration
  PCI: Move "pci reassigndev resource alignment" out of quirks.c
  PCI: Use class for quirk for usb host controller fixup
  PCI: Use class for quirk for ti816x class fixup
  PCI: Use class for quirk for intel e100 interrupt fixup
  ...
parents 934e18b5 1488d515

Documentation/kernel-parameters.txt

+12 −2
Original line number Diff line number Diff line
@@ -2147,8 +2147,14 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
				the default.

				off: Turn ECRC off

				on: Turn ECRC on.

		realloc		reallocate PCI resources if allocations done by BIOS

				are erroneous.

		realloc=	Enable/disable reallocating PCI bridge resources

				if allocations done by BIOS are too small to

				accommodate resources required by all child

				devices.

				off: Turn realloc off

				on: Turn realloc on

		realloc		same as realloc=on

		noari		do not use PCIe ARI.



	pcie_aspm=	[PCIE] Forcibly enable or disable PCIe Active State Power

			Management.
@@ -2156,6 +2162,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		force	Enable ASPM even on devices that claim not to support it.

			WARNING: Forcing ASPM on may cause system lockups.



	pcie_hp=	[PCIE] PCI Express Hotplug driver options:

		nomsi	Do not use MSI for PCI Express Native Hotplug (this

			makes all PCIe ports use INTx for hotplug services).



	pcie_ports=	[PCIE] PCIe ports handling:

		auto	Ask the BIOS whether or not to use native PCIe services

			associated with PCIe ports (PME, hot-plug, AER).  Use

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -5120,7 +5120,7 @@ F: Documentation/PCI/pci-error-recovery.txt 
F:	Documentation/powerpc/eeh-pci-error-recovery.txt



PCI SUBSYSTEM

M:	Jesse Barnes <jbarnes@virtuousgeek.org>

M:	Bjorn Helgaas <bhelgaas@google.com>

L:	linux-pci@vger.kernel.org

Q:	http://patchwork.kernel.org/project/linux-pci/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
@@ -5130,7 +5130,7 @@ F: drivers/pci/ 
F:	include/linux/pci*



PCI HOTPLUG

M:	Jesse Barnes <jbarnes@virtuousgeek.org>

M:	Bjorn Helgaas <bhelgaas@google.com>

L:	linux-pci@vger.kernel.org

S:	Supported

F:	drivers/pci/hotplug

arch/alpha/include/asm/pci.h

+1 −6
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/dma-mapping.h>

#include <asm/scatterlist.h>

#include <asm/machvec.h>

#include <asm-generic/pci-bridge.h>



/*

 * The following structure is used to manage multiple PCI busses.
@@ -99,12 +100,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) 
	return channel ? 15 : 14;

}



extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *,

				    struct resource *);



extern void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

				    struct pci_bus_region *region);



#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index



static inline int pci_proc_domain(struct pci_bus *bus)

arch/alpha/kernel/pci.c

+11 −75
Original line number Diff line number Diff line
@@ -43,12 +43,10 @@ const char *const pci_mem_names[] = { 


const char pci_hae0_name[] = "HAE0";



/* Indicate whether we respect the PCI setup left by console. */

/*

 * Make this long-lived  so that we know when shutting down

 * whether we probed only or not.

 * If PCI_PROBE_ONLY in pci_flags is set, we don't change any PCI resource

 * assignments.

 */

int pci_probe_only;



/*

 * The PCI controller list.
@@ -215,7 +213,7 @@ pdev_save_srm_config(struct pci_dev *dev) 
	struct pdev_srm_saved_conf *tmp;

	static int printed = 0;



	if (!alpha_using_srm || pci_probe_only)

	if (!alpha_using_srm || pci_has_flag(PCI_PROBE_ONLY))

		return;



	if (!printed) {
@@ -242,7 +240,7 @@ pci_restore_srm_config(void) 
	struct pdev_srm_saved_conf *tmp;



	/* No need to restore if probed only. */

	if (pci_probe_only)

	if (pci_has_flag(PCI_PROBE_ONLY))

		return;



	/* Restore SRM config. */
@@ -252,47 +250,18 @@ pci_restore_srm_config(void) 
}

#endif



void __devinit

pcibios_fixup_resource(struct resource *res, struct resource *root)

{

	res->start += root->start;

	res->end += root->start;

}



void __devinit

pcibios_fixup_device_resources(struct pci_dev *dev, struct pci_bus *bus)

{

	/* Update device resources.  */

	struct pci_controller *hose = (struct pci_controller *)bus->sysdata;

	int i;



	for (i = 0; i < PCI_NUM_RESOURCES; i++) {

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

			continue;

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

			pcibios_fixup_resource(&dev->resource[i],

					       hose->io_space);

		else if (dev->resource[i].flags & IORESOURCE_MEM)

			pcibios_fixup_resource(&dev->resource[i],

					       hose->mem_space);

	}

}



void __devinit

pcibios_fixup_bus(struct pci_bus *bus)

{

	struct pci_dev *dev = bus->self;



	if (pci_probe_only && dev &&

	if (pci_has_flag(PCI_PROBE_ONLY) && dev &&

 		   (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {

 		pci_read_bridge_bases(bus);

 		pcibios_fixup_device_resources(dev, bus);

	} 



	list_for_each_entry(dev, &bus->devices, bus_list) {

		pdev_save_srm_config(dev);

		if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)

			pcibios_fixup_device_resources(dev, bus);

	}

}
@@ -302,42 +271,6 @@ pcibios_update_irq(struct pci_dev *dev, int irq) 
	pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);

}



void

pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			 struct resource *res)

{

	struct pci_controller *hose = (struct pci_controller *)dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_space->start;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_space->start;



	region->start = res->start - offset;

	region->end = res->end - offset;

}



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	struct pci_controller *hose = (struct pci_controller *)dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_space->start;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_space->start;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif



int

pcibios_enable_device(struct pci_dev *dev, int mask)

{
@@ -374,7 +307,8 @@ pcibios_claim_one_bus(struct pci_bus *b) 


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

				continue;

			if (pci_probe_only || (r->flags & IORESOURCE_PCI_FIXED))

			if (pci_has_flag(PCI_PROBE_ONLY) ||

			    (r->flags & IORESOURCE_PCI_FIXED))

				pci_claim_resource(dev, i);

		}

	}
@@ -416,8 +350,10 @@ common_init_pci(void) 
			hose->mem_space->end = end;



		INIT_LIST_HEAD(&resources);

		pci_add_resource(&resources, hose->io_space);

		pci_add_resource(&resources, hose->mem_space);

		pci_add_resource_offset(&resources, hose->io_space,

					hose->io_space->start);

		pci_add_resource_offset(&resources, hose->mem_space,

					hose->mem_space->start);



		bus = pci_scan_root_bus(NULL, next_busno, alpha_mv.pci_ops,

					hose, &resources);

arch/alpha/kernel/pci_impl.h

+0 −3
Original line number Diff line number Diff line
@@ -173,9 +173,6 @@ extern void pci_restore_srm_config(void); 
extern struct pci_controller *hose_head, **hose_tail;

extern struct pci_controller *pci_isa_hose;



/* Indicate that we trust the console to configure things properly.  */

extern int pci_probe_only;



extern unsigned long alpha_agpgart_size;



extern void common_init_pci(void);