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

Commit 733abe4f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Make PCI device numa-node attribute visible in sysfs
  PCI: add systems for automatic breadth-first device sorting
  PCI: PCI devices get assigned redundant IRQs
  PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
  PCI: pci.txt fix __devexit() usage
  PCI/sysfs/kobject kernel-doc fixes
parents 5fe8252f 81bb0e19

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,12 @@ and is between 256 and 4096 characters. It is defined in the file 
				This sorting is done to get a device

				order compatible with older (<= 2.4) kernels.

		nobfsort	Don't sort PCI devices into breadth-first order.

		cbiosize=nn[KMG]	The fixed amount of bus space which is

				reserved for the CardBus bridge's IO window.

				The default value is 256 bytes.

		cbmemsize=nn[KMG]	The fixed amount of bus space which is

				reserved for the CardBus bridge's memory

				window. The default value is 64 megabytes.



	pcmv=		[HW,PCMCIA] BadgePAD 4

Documentation/pci.txt

+2 −2
Original line number Diff line number Diff line
@@ -205,8 +205,8 @@ Tips on when/where to use the above attributes: 
	  exclusively called by the probe() routine, can be marked __devinit.

	  Ditto for remove() and __devexit.



	o If mydriver_probe() is marked with __devinit(), then all address

	  references to mydriver_probe must use __devexit_p(mydriver_probe)

	o If mydriver_remove() is marked with __devexit(), then all address

	  references to mydriver_remove must use __devexit_p(mydriver_remove)

	  (in the struct pci_driver declaration for example).

	  __devexit_p() will generate the function name _or_ NULL if the

	  function will be discarded.  For an example, see drivers/net/tg3.c.

arch/i386/pci/common.c

+88 −0
Original line number Diff line number Diff line
@@ -191,6 +191,94 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2950"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL20p G3",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL20p G3"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL20p G4",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL20p G4"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL30p G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL30p G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL25p G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL25p G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL35p G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL35p G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL45p G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL45p G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL45p G2",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL45p G2"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL460c G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL460c G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL465c G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL465c G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL480c G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL480c G1"),

		},

	},

	{

		.callback = set_bf_sort,

		.ident = "HP ProLiant BL685c G1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant BL685c G1"),

		},

	},

	{}

};

drivers/pci/pci-driver.c

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ static struct kobj_type pci_driver_kobj_type = { 
 * __pci_register_driver - register a new pci driver

 * @drv: the driver structure to register

 * @owner: owner module of drv

 * @mod_name: module name string

 * 

 * Adds the driver structure to the list of registered drivers.

 * Returns a negative value on error, otherwise 0.

drivers/pci/pci-sysfs.c

+11 −0
Original line number Diff line number Diff line
@@ -143,6 +143,14 @@ static ssize_t is_enabled_show(struct device *dev, 
	return sprintf (buf, "%u\n", atomic_read(&pdev->enable_cnt));

}



#ifdef CONFIG_NUMA

static ssize_t

numa_node_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	return sprintf (buf, "%d\n", dev->numa_node);

}

#endif



static ssize_t

msi_bus_show(struct device *dev, struct device_attribute *attr, char *buf)

{
@@ -194,6 +202,9 @@ struct device_attribute pci_dev_attrs[] = { 
	__ATTR_RO(irq),

	__ATTR_RO(local_cpus),

	__ATTR_RO(modalias),

#ifdef CONFIG_NUMA

	__ATTR_RO(numa_node),

#endif

	__ATTR(enable, 0600, is_enabled_show, is_enabled_store),

	__ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),

		broken_parity_status_show,broken_parity_status_store),