Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 (108c1961) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/kernel-parameters.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -1522,6 +1522,8 @@ and is between 256 and 4096 characters. It is defined in the file
		This is normally done in pci_enable_device(),
		so this option is a temporary workaround
		for broken drivers that don't call it.
		skip_isa_align [X86] do not align io start addr, so can
		handle more pci cards
		firmware [ARM] Do not re-enumerate the bus but instead
		just use the configuration from the
		bootloader. This is currently used on

arch/x86/pci/acpi.c

+0 −41

Original line number	Diff line number	Diff line
		@@ -6,45 +6,6 @@
		#include <asm/numa.h>
		#include "pci.h"

		static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
		{
		pci_probe \|= PCI_CAN_SKIP_ISA_ALIGN;
		printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident);
		return 0;
		}

		static struct dmi_system_id acpi_pciprobe_dmi_table[] __devinitdata = {
		/*
		* Systems where PCI IO resource ISA alignment can be skipped
		* when the ISA enable bit in the bridge control is not set
		*/
		{
		.callback = can_skip_ioresource_align,
		.ident = "IBM System x3800",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
		DMI_MATCH(DMI_PRODUCT_NAME, "x3800"),
		},
		},
		{
		.callback = can_skip_ioresource_align,
		.ident = "IBM System x3850",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
		DMI_MATCH(DMI_PRODUCT_NAME, "x3850"),
		},
		},
		{
		.callback = can_skip_ioresource_align,
		.ident = "IBM System x3950",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
		DMI_MATCH(DMI_PRODUCT_NAME, "x3950"),
		},
		},
		{}
		};

		struct pci_root_info {
		char *name;
		unsigned int res_num;
		@@ -196,8 +157,6 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
		int pxm;
		#endif

		dmi_check_system(acpi_pciprobe_dmi_table);

		if (domain && !pci_domains_supported) {
		printk(KERN_WARNING "PCI: Multiple domains not supported "
		"(dom %d, bus %d)\n", domain, busnum);

arch/x86/pci/common.c

+54 −4

Original line number	Diff line number	Diff line
		@@ -90,6 +90,50 @@ static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
		rom_r->start = rom_r->end = rom_r->flags = 0;
		}

		static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
		{
		pci_probe \|= PCI_CAN_SKIP_ISA_ALIGN;
		printk(KERN_INFO "PCI: %s detected, can skip ISA alignment\n", d->ident);
		return 0;
		}

		static struct dmi_system_id can_skip_pciprobe_dmi_table[] __devinitdata = {
		/*
		* Systems where PCI IO resource ISA alignment can be skipped
		* when the ISA enable bit in the bridge control is not set
		*/
		{
		.callback = can_skip_ioresource_align,
		.ident = "IBM System x3800",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
		DMI_MATCH(DMI_PRODUCT_NAME, "x3800"),
		},
		},
		{
		.callback = can_skip_ioresource_align,
		.ident = "IBM System x3850",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
		DMI_MATCH(DMI_PRODUCT_NAME, "x3850"),
		},
		},
		{
		.callback = can_skip_ioresource_align,
		.ident = "IBM System x3950",
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "IBM"),
		DMI_MATCH(DMI_PRODUCT_NAME, "x3950"),
		},
		},
		{}
		};

		void __init dmi_check_skip_isa_align(void)
		{
		dmi_check_system(can_skip_pciprobe_dmi_table);
		}

		/*
		* Called after each bus is probed, but before its children
		* are examined.
		@@ -318,13 +362,16 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
		{}
		};

		void __init dmi_check_pciprobe(void)
		{
		dmi_check_system(pciprobe_dmi_table);
		}

		struct pci_bus * __devinit pcibios_scan_root(int busnum)
		{
		struct pci_bus *bus = NULL;
		struct pci_sysdata *sd;

		dmi_check_system(pciprobe_dmi_table);

		while ((bus = pci_find_next_bus(bus)) != NULL) {
		if (bus->number == busnum) {
		/* Already scanned */
		@@ -462,6 +509,9 @@ char * __devinit pcibios_setup(char *str)
		} else if (!strcmp(str, "routeirq")) {
		pci_routeirq = 1;
		return NULL;
		} else if (!strcmp(str, "skip_isa_align")) {
		pci_probe \|= PCI_CAN_SKIP_ISA_ALIGN;
		return NULL;
		}
		return str;
		}
		@@ -489,7 +539,7 @@ void pcibios_disable_device (struct pci_dev *dev)
		pcibios_disable_irq(dev);
		}

		struct pci_bus pci_scan_bus_on_node(int busno, struct pci_ops ops, int node)
		struct pci_bus * __devinit pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node)
		{
		struct pci_bus *bus = NULL;
		struct pci_sysdata *sd;
		@@ -512,7 +562,7 @@ struct pci_bus pci_scan_bus_on_node(int busno, struct pci_ops ops, int node)
		return bus;
		}

		struct pci_bus *pci_scan_bus_with_sysdata(int busno)
		struct pci_bus * __devinit pci_scan_bus_with_sysdata(int busno)
		{
		return pci_scan_bus_on_node(busno, &pci_root_ops, -1);
		}

arch/x86/pci/fixup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -502,7 +502,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SIEMENS, 0x0015,
		*/
		static void fam10h_pci_cfg_space_size(struct pci_dev *dev)
		{
		dev->cfg_size = pci_cfg_space_size_ext(dev, 0);
		dev->cfg_size = pci_cfg_space_size_ext(dev);
		}

		DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, 0x1200, fam10h_pci_cfg_space_size);

arch/x86/pci/init.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,10 @@ static __init int pci_access_init(void)
		printk(KERN_ERR
		"PCI: Fatal: No config space access function found\n");

		dmi_check_pciprobe();

		dmi_check_skip_isa_align();

		return 0;
		}
		arch_initcall(pci_access_init);