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

Commit 3fb8e492 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: only save/restore existent registers in the PCIe capability
  x86/PCI: don't bother with root quirks if _CRS is used
  docbooks: add/fix PCI kernel-doc
  PCI: cleanup debug output resources
  x86/PCI: set_pci_bus_resources_arch_default cleanups
  x86/PCI: Move set_pci_bus_resources_arch_default into arch/x86
  x86/PCI: don't call e820_all_mapped with -1 in the mmconfig case
  PCI quirk: disable MSI on VIA VT3364 chipsets
parents 4ebf6623 1b6b8ce2

Documentation/DocBook/kernel-api.tmpl

+5 −1
Original line number Diff line number Diff line
@@ -190,16 +190,20 @@ X!Ekernel/module.c 
!Edrivers/pci/pci.c

!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

!Edrivers/pci/access.c

!Edrivers/pci/irq.c

!Edrivers/pci/htirq.c

<!-- FIXME: Removed for now since no structured comments in source

X!Edrivers/pci/hotplug.c

-->

!Edrivers/pci/probe.c

!Edrivers/pci/slot.c

!Edrivers/pci/rom.c

!Edrivers/pci/iov.c

!Idrivers/pci/pci-sysfs.c

     </sect1>

     <sect1><title>PCI Hotplug Support Library</title>

!Edrivers/pci/hotplug/pci_hotplug_core.c

arch/x86/include/asm/topology.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) 
}



struct pci_bus;

void set_pci_bus_resources_arch_default(struct pci_bus *b);

void x86_pci_root_bus_res_quirks(struct pci_bus *b);



#ifdef CONFIG_SMP

#define mc_capable()	(cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)

arch/x86/pci/amd_bus.c

+5 −1
Original line number Diff line number Diff line
@@ -94,12 +94,16 @@ struct pci_root_info { 
static int pci_root_num;

static struct pci_root_info pci_root_info[PCI_ROOT_NR];



void set_pci_bus_resources_arch_default(struct pci_bus *b)

void x86_pci_root_bus_res_quirks(struct pci_bus *b)

{

	int i;

	int j;

	struct pci_root_info *info;



	/* don't go for it if _CRS is used */

	if (pci_probe & PCI_USE__CRS)

		return;



	/* if only one root bus, don't need to anything */

	if (pci_root_num < 2)

		return;

arch/x86/pci/common.c

+4 −1
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *b) 
{

	struct pci_dev *dev;



	/* root bus? */

	if (!b->parent)

		x86_pci_root_bus_res_quirks(b);

	pci_read_bridge_bases(b);

	list_for_each_entry(dev, &b->devices, bus_list)

		pcibios_fixup_device_resources(dev);

arch/x86/pci/i386.c

+4 −0
Original line number Diff line number Diff line
@@ -238,6 +238,10 @@ void __init pcibios_resource_survey(void) 
 */

fs_initcall(pcibios_assign_resources);



void __weak x86_pci_root_bus_res_quirks(struct pci_bus *b)

{

}



/*

 *  If we set up a device for bus mastering, we need to check the latency

 *  timer as certain crappy BIOSes forget to set it properly.