Commit 13a6ddb0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

x86/pci: add pci=skip_isa_align command lines. 



so we don't align the io port start address for pci cards.

also move out dmi check out acpi.c, because it has nothing to do with acpi.
it could spare some calling when we have several peer root buses.

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 70b9f7dc

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -1518,6 +1518,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

+47 −0
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.
@@ -462,6 +506,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;

}

arch/x86/pci/init.c

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ static __init int pci_access_init(void) 
		printk(KERN_ERR

		"PCI: Fatal: No config space access function found\n");



	dmi_check_skip_isa_align();



	return 0;

}

arch_initcall(pci_access_init);

arch/x86/pci/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ enum pci_bf_sort_state { 
	pci_dmi_bf,

};



extern void __init dmi_check_skip_isa_align(void);



/* pci-i386.c */



extern unsigned int pcibios_max_latency;

CRA Git | Maintained and supported by SUSTech CRA and CCSE