Commit 5e152b4c 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-2.6 

* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (27 commits)
  PCI: Don't use dmi_name_in_vendors in quirk
  PCI: remove unused AER functions
  PCI/sysfs: move bus cpuaffinity to class dev_attrs
  PCI: add rescan to /sys/.../pci_bus/.../
  PCI: update bridge resources to get more big ranges when allocating space (again)
  KVM: Use pci_store/load_saved_state() around VM device usage
  PCI: Add interfaces to store and load the device saved state
  PCI: Track the size of each saved capability data area
  PCI/e1000e: Add and use pci_disable_link_state_locked()
  x86/PCI: derive pcibios_last_bus from ACPI MCFG
  PCI: add latency tolerance reporting enable/disable support
  PCI: add OBFF enable/disable support
  PCI: add ID-based ordering enable/disable support
  PCI hotplug: acpiphp: assume device is in state D0 after powering on a slot.
  PCI: Set PCIE maxpayload for card during hotplug insertion
  PCI/ACPI: Report _OSC control mask returned on failure to get control
  x86/PCI: irq and pci_ids patch for Intel Panther Point DeviceIDs
  PCI: handle positive error codes
  PCI: check pci_vpd_pci22_wait() return
  PCI: Use ICH6_GPIO_EN in ich6_lpc_acpi_gpio
  ...

Fix up trivial conflicts in include/linux/pci_ids.h: commit a6e5e2be
moved the intel SMBUS ID definitons to the i2c-i801.c driver.
parents a77febbe 9251bac9

Documentation/ABI/testing/sysfs-bus-pci

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ Description: 
		hot-remove the PCI device and any of its children.

		Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../pci_bus/.../rescan

Date:		May 2011

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

Description:

		Writing a non-zero value to this attribute will

		force a rescan of the bus and all child buses,

		and re-discover devices removed earlier from this

		part of the device tree.  Depends on CONFIG_HOTPLUG.



What:		/sys/bus/pci/devices/.../rescan

Date:		January 2009

Contact:	Linux PCI developers <linux-pci@vger.kernel.org>

arch/x86/include/asm/pci.h

+0 −2
Original line number Diff line number Diff line
@@ -135,8 +135,6 @@ void default_teardown_msi_irqs(struct pci_dev *dev); 
#include "pci_64.h"

#endif



void dma32_reserve_bootmem(void);



/* implement the pci_ DMA API in terms of the generic device dma_ one */

#include <asm-generic/pci-dma-compat.h>

arch/x86/kernel/pci-dma.c

+0 −64
Original line number Diff line number Diff line
@@ -68,74 +68,10 @@ int dma_set_mask(struct device *dev, u64 mask) 
}

EXPORT_SYMBOL(dma_set_mask);



#if defined(CONFIG_X86_64) && !defined(CONFIG_NUMA)

static __initdata void *dma32_bootmem_ptr;

static unsigned long dma32_bootmem_size __initdata = (128ULL<<20);



static int __init parse_dma32_size_opt(char *p)

{

	if (!p)

		return -EINVAL;

	dma32_bootmem_size = memparse(p, &p);

	return 0;

}

early_param("dma32_size", parse_dma32_size_opt);



void __init dma32_reserve_bootmem(void)

{

	unsigned long size, align;

	if (max_pfn <= MAX_DMA32_PFN)

		return;



	/*

	 * check aperture_64.c allocate_aperture() for reason about

	 * using 512M as goal

	 */

	align = 64ULL<<20;

	size = roundup(dma32_bootmem_size, align);

	dma32_bootmem_ptr = __alloc_bootmem_nopanic(size, align,

				 512ULL<<20);

	/*

	 * Kmemleak should not scan this block as it may not be mapped via the

	 * kernel direct mapping.

	 */

	kmemleak_ignore(dma32_bootmem_ptr);

	if (dma32_bootmem_ptr)

		dma32_bootmem_size = size;

	else

		dma32_bootmem_size = 0;

}

static void __init dma32_free_bootmem(void)

{



	if (max_pfn <= MAX_DMA32_PFN)

		return;



	if (!dma32_bootmem_ptr)

		return;



	free_bootmem(__pa(dma32_bootmem_ptr), dma32_bootmem_size);



	dma32_bootmem_ptr = NULL;

	dma32_bootmem_size = 0;

}

#else

void __init dma32_reserve_bootmem(void)

{

}

static void __init dma32_free_bootmem(void)

{

}



#endif



void __init pci_iommu_alloc(void)

{

	struct iommu_table_entry *p;



	/* free the range so iommu could get some range less than 4G */

	dma32_free_bootmem();



	sort_iommu_table(__iommu_table, __iommu_table_end);

	check_iommu_entries(__iommu_table, __iommu_table_end);

arch/x86/kernel/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -964,7 +964,6 @@ void __init setup_arch(char **cmdline_p) 


	initmem_init();

	memblock_find_dma_reserve();

	dma32_reserve_bootmem();



#ifdef CONFIG_KVM_CLOCK

	kvmclock_init();

arch/x86/pci/direct.c

+6 −11
Original line number Diff line number Diff line
@@ -280,12 +280,9 @@ void __init pci_direct_init(int type) 


int __init pci_direct_probe(void)

{

	struct resource *region, *region2;



	if ((pci_probe & PCI_PROBE_CONF1) == 0)

		goto type2;

	region = request_region(0xCF8, 8, "PCI conf1");

	if (!region)

	if (!request_region(0xCF8, 8, "PCI conf1"))

		goto type2;



	if (pci_check_type1()) {
@@ -293,16 +290,14 @@ int __init pci_direct_probe(void) 
		port_cf9_safe = true;

		return 1;

	}

	release_resource(region);

	release_region(0xCF8, 8);



 type2:

	if ((pci_probe & PCI_PROBE_CONF2) == 0)

		return 0;

	region = request_region(0xCF8, 4, "PCI conf2");

	if (!region)

	if (!request_region(0xCF8, 4, "PCI conf2"))

		return 0;

	region2 = request_region(0xC000, 0x1000, "PCI conf2");

	if (!region2)

	if (!request_region(0xC000, 0x1000, "PCI conf2"))

		goto fail2;



	if (pci_check_type2()) {
@@ -311,8 +306,8 @@ int __init pci_direct_probe(void) 
		return 2;

	}



	release_resource(region2);

	release_region(0xC000, 0x1000);

 fail2:

	release_resource(region);

	release_region(0xCF8, 4);

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE