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

Commit ef59c4e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 69396dcf 3103039c

Documentation/feature-removal-schedule.txt

+14 −0
Original line number Diff line number Diff line
@@ -148,3 +148,17 @@ Why: The 8250 serial driver now has the ability to deal with the differences 
	brother on Alchemy SOCs.  The loss of features is not considered an

	issue.

Who:	Ralf Baechle <ralf@linux-mips.org>



---------------------------



What:	Legacy /proc/pci interface (PCI_LEGACY_PROC)

When:	March 2006

Why:	deprecated since 2.5.53 in favor of lspci(8)

Who:	Adrian Bunk <bunk@stusta.de>



---------------------------



What:	pci_module_init(driver)

When:	January 2007

Why:	Is replaced by pci_register_driver(pci_driver).

Who:	Richard Knutsson <ricknu-0@student.ltu.se> and Greg Kroah-Hartman <gregkh@suse.de>

arch/i386/pci/irq.c

+5 −0
Original line number Diff line number Diff line
@@ -539,6 +539,11 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route 
		case PCI_DEVICE_ID_INTEL_ICH7_30:

		case PCI_DEVICE_ID_INTEL_ICH7_31:

		case PCI_DEVICE_ID_INTEL_ESB2_0:

		case PCI_DEVICE_ID_INTEL_ICH8_0:

		case PCI_DEVICE_ID_INTEL_ICH8_1:

		case PCI_DEVICE_ID_INTEL_ICH8_2:

		case PCI_DEVICE_ID_INTEL_ICH8_3:

		case PCI_DEVICE_ID_INTEL_ICH8_4:

			r->name = "PIIX/ICH";

			r->get = pirq_piix_get;

			r->set = pirq_piix_set;

arch/i386/pci/mmconfig.c

+13 −2
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn) 
	while (1) {

		++cfg_num;

		if (cfg_num >= pci_mmcfg_config_num) {

			/* Not found - fallback to type 1 */

			return 0;

			break;

		}

		cfg = &pci_mmcfg_config[cfg_num];

		if (cfg->pci_segment_group_number != seg)
@@ -46,6 +45,18 @@ static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn) 
		    (cfg->end_bus_number >= bus))

			return cfg->base_address;

	}



	/* Handle more broken MCFG tables on Asus etc.

	   They only contain a single entry for bus 0-0. Assume

 	   this applies to all busses. */

	cfg = &pci_mmcfg_config[0];

	if (pci_mmcfg_config_num == 1 &&

		cfg->pci_segment_group_number == 0 &&

		(cfg->start_bus_number | cfg->end_bus_number) == 0)

		return cfg->base_address;



	/* Fall back to type 0 */

	return 0;

}



static inline void pci_exp_set_dev_base(unsigned int base, int bus, int devfn)

arch/x86_64/pci/mmconfig.c

+14 −5
Original line number Diff line number Diff line
@@ -29,11 +29,8 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus) 


	while (1) {

		++cfg_num;

		if (cfg_num >= pci_mmcfg_config_num) {

			/* Not found - fall back to type 1. This happens

			   e.g. on the internal devices of a K8 northbridge. */

			return NULL;

		}

		if (cfg_num >= pci_mmcfg_config_num)

			break;

		cfg = pci_mmcfg_virt[cfg_num].cfg;

		if (cfg->pci_segment_group_number != seg)

			continue;
@@ -41,6 +38,18 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus) 
		    (cfg->end_bus_number >= bus))

			return pci_mmcfg_virt[cfg_num].virt;

	}



	/* Handle more broken MCFG tables on Asus etc.

	   They only contain a single entry for bus 0-0. Assume

 	   this applies to all busses. */

	cfg = &pci_mmcfg_config[0];

	if (pci_mmcfg_config_num == 1 &&

		cfg->pci_segment_group_number == 0 &&

		(cfg->start_bus_number | cfg->end_bus_number) == 0)

		return cfg->base_address;



	/* Fall back to type 0 */

	return 0;

}



static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn)

drivers/pci/hotplug/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ config HOTPLUG_PCI 
	---help---

	  Say Y here if you have a motherboard with a PCI Hotplug controller.

	  This allows you to add and remove PCI cards while the machine is

	  powered up and running.  The file system pcihpfs must be mounted

	  in order to interact with any PCI Hotplug controllers.

	  powered up and running.



	  To compile this driver as a module, choose M here: the

	  module will be called pci_hotplug.