 556f12f602
			
		
	
	
	556f12f602
	
	
	
		
			
			Host bridge hotplug
     - Major overhaul of ACPI host bridge add/start (Rafael Wysocki, Yinghai Lu)
     - Major overhaul of PCI/ACPI binding (Rafael Wysocki, Yinghai Lu)
     - Split out ACPI host bridge and ACPI PCI device hotplug (Yinghai Lu)
     - Stop caching _PRT and make independent of bus numbers (Yinghai Lu)
 
   PCI device hotplug
     - Clean up cpqphp dead code (Sasha Levin)
     - Disable ARI unless device and upstream bridge support it (Yijing Wang)
     - Initialize all hot-added devices (not functions 0-7) (Yijing Wang)
 
   Power management
     - Don't touch ASPM if disabled (Joe Lawrence)
     - Fix ASPM link state management (Myron Stowe)
 
   Miscellaneous
     - Fix PCI_EXP_FLAGS accessor (Alex Williamson)
     - Disable Bus Master in pci_device_shutdown (Konstantin Khlebnikov)
     - Document hotplug resource and MPS parameters (Yijing Wang)
     - Add accessor for PCIe capabilities (Myron Stowe)
     - Drop pciehp suspend/resume messages (Paul Bolle)
     - Make pci_slot built-in only (not a module) (Jiang Liu)
     - Remove unused PCI/ACPI bind ops (Jiang Liu)
     - Removed used pci_root_bus (Bjorn Helgaas)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJRKS3hAAoJEFmIoMA60/r8xxoP/j1CS4oCZAnBIVT9fKBkis+/
 CENcfHIUKj6J9iMfJEVvqBELvqaLqtpeNwAGMcGPxV7VuT3K1QumChfaTpRDP0HC
 VDRmrjcmfenEK+YPOG7acsrTyqk2wjpLOyu9MKRxtC5u7tF6376KQpkEFpO4haL4
 eUHTxfE76OkrPBSvx3+PUSf6jqrvrNbjX8K6HdDVVlm3sVAQKmYJU/Wphv2NPOqa
 CAMyCzEGybFjr8hDRwvWgr+06c718GMwQUbnrPdHXAe7lMNMrN/XVBmU9ABN3Aas
 icd3lrDs+yPObgcO/gT8+sAZErCtdJ9zuHGYHdYpRbIQj/5JT4TMk7tw/Bj7vKY9
 Mqmho9GR5YmYTRN9f1r+2n5AQ/KYWXJDrRNOnt5/ys5BOM3vwJ7WJ902zpSwtFQp
 nLX+oD/hLfzpnoIQGDuBAoAXp2Kam3XWRgVvG78buRNrPj+kUzimk14a8qQeY+CB
 El6UKuwi5Uv/qgs1gAqqjmZmsAkon2DnsRZa6Fl8NTkDlis7LY4gp9OU38ySFpB+
 PhCmRyCZmDDqTVtwj6XzR3nPQ5LBSbvsTfgMxYMIUSXHa06tyb2q5p4mEIas0OmU
 RKaP5xQqZuTgD8fbdYrx0xgSrn7JHt/j/X//Qs6unlLCWhlpm3LjJZKxyw2FwBGr
 o4Lci+PiBh3MowCrju9D
 =ER3b
 -----END PGP SIGNATURE-----
Merge tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI changes from Bjorn Helgaas:
 "Host bridge hotplug
    - Major overhaul of ACPI host bridge add/start (Rafael Wysocki, Yinghai Lu)
    - Major overhaul of PCI/ACPI binding (Rafael Wysocki, Yinghai Lu)
    - Split out ACPI host bridge and ACPI PCI device hotplug (Yinghai Lu)
    - Stop caching _PRT and make independent of bus numbers (Yinghai Lu)
  PCI device hotplug
    - Clean up cpqphp dead code (Sasha Levin)
    - Disable ARI unless device and upstream bridge support it (Yijing Wang)
    - Initialize all hot-added devices (not functions 0-7) (Yijing Wang)
  Power management
    - Don't touch ASPM if disabled (Joe Lawrence)
    - Fix ASPM link state management (Myron Stowe)
  Miscellaneous
    - Fix PCI_EXP_FLAGS accessor (Alex Williamson)
    - Disable Bus Master in pci_device_shutdown (Konstantin Khlebnikov)
    - Document hotplug resource and MPS parameters (Yijing Wang)
    - Add accessor for PCIe capabilities (Myron Stowe)
    - Drop pciehp suspend/resume messages (Paul Bolle)
    - Make pci_slot built-in only (not a module) (Jiang Liu)
    - Remove unused PCI/ACPI bind ops (Jiang Liu)
    - Removed used pci_root_bus (Bjorn Helgaas)"
* tag 'pci-v3.9-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (51 commits)
  PCI/ACPI: Don't cache _PRT, and don't associate them with bus numbers
  PCI: Fix PCI Express Capability accessors for PCI_EXP_FLAGS
  ACPI / PCI: Make pci_slot built-in only, not a module
  PCI/PM: Clear state_saved during suspend
  PCI: Use atomic_inc_return() rather than atomic_add_return()
  PCI: Catch attempts to disable already-disabled devices
  PCI: Disable Bus Master unconditionally in pci_device_shutdown()
  PCI: acpiphp: Remove dead code for PCI host bridge hotplug
  PCI: acpiphp: Create companion ACPI devices before creating PCI devices
  PCI: Remove unused "rc" in virtfn_add_bus()
  PCI: pciehp: Drop suspend/resume ENTRY messages
  PCI/ASPM: Don't touch ASPM if forcibly disabled
  PCI/ASPM: Deallocate upstream link state even if device is not PCIe
  PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
  PCI: Document hpiosize= and hpmemsize= resource reservation parameters
  PCI: Use PCI Express Capability accessor
  PCI: Introduce accessor to retrieve PCIe Capabilities Register
  PCI: Put pci_dev in device tree as early as possible
  PCI: Skip attaching driver in device_add()
  PCI: acpiphp: Keep driver loaded even if no slots found
  ...
		
	
			
		
			
				
	
	
		
			165 lines
		
	
	
	
		
			3.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			165 lines
		
	
	
	
		
			3.6 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * numaq_32.c - Low-level PCI access for NUMA-Q machines
 | |
|  */
 | |
| 
 | |
| #include <linux/pci.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/nodemask.h>
 | |
| #include <asm/apic.h>
 | |
| #include <asm/mpspec.h>
 | |
| #include <asm/pci_x86.h>
 | |
| #include <asm/numaq.h>
 | |
| 
 | |
| #define BUS2QUAD(global) (mp_bus_id_to_node[global])
 | |
| 
 | |
| #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
 | |
| 
 | |
| #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
 | |
| 
 | |
| #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \
 | |
| 	(0x80000000 | (BUS2LOCAL(bus) << 16) | (devfn << 8) | (reg & ~3))
 | |
| 
 | |
| static void write_cf8(unsigned bus, unsigned devfn, unsigned reg)
 | |
| {
 | |
| 	unsigned val = PCI_CONF1_MQ_ADDRESS(bus, devfn, reg);
 | |
| 	if (xquad_portio)
 | |
| 		writel(val, XQUAD_PORT_ADDR(0xcf8, BUS2QUAD(bus)));
 | |
| 	else
 | |
| 		outl(val, 0xCF8);
 | |
| }
 | |
| 
 | |
| static int pci_conf1_mq_read(unsigned int seg, unsigned int bus,
 | |
| 			     unsigned int devfn, int reg, int len, u32 *value)
 | |
| {
 | |
| 	unsigned long flags;
 | |
| 	void *adr __iomem = XQUAD_PORT_ADDR(0xcfc, BUS2QUAD(bus));
 | |
| 
 | |
| 	WARN_ON(seg);
 | |
| 	if (!value || (bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255))
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	raw_spin_lock_irqsave(&pci_config_lock, flags);
 | |
| 
 | |
| 	write_cf8(bus, devfn, reg);
 | |
| 
 | |
| 	switch (len) {
 | |
| 	case 1:
 | |
| 		if (xquad_portio)
 | |
| 			*value = readb(adr + (reg & 3));
 | |
| 		else
 | |
| 			*value = inb(0xCFC + (reg & 3));
 | |
| 		break;
 | |
| 	case 2:
 | |
| 		if (xquad_portio)
 | |
| 			*value = readw(adr + (reg & 2));
 | |
| 		else
 | |
| 			*value = inw(0xCFC + (reg & 2));
 | |
| 		break;
 | |
| 	case 4:
 | |
| 		if (xquad_portio)
 | |
| 			*value = readl(adr);
 | |
| 		else
 | |
| 			*value = inl(0xCFC);
 | |
| 		break;
 | |
| 	}
 | |
| 
 | |
| 	raw_spin_unlock_irqrestore(&pci_config_lock, flags);
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int pci_conf1_mq_write(unsigned int seg, unsigned int bus,
 | |
| 			      unsigned int devfn, int reg, int len, u32 value)
 | |
| {
 | |
| 	unsigned long flags;
 | |
| 	void *adr __iomem = XQUAD_PORT_ADDR(0xcfc, BUS2QUAD(bus));
 | |
| 
 | |
| 	WARN_ON(seg);
 | |
| 	if ((bus >= MAX_MP_BUSSES) || (devfn > 255) || (reg > 255)) 
 | |
| 		return -EINVAL;
 | |
| 
 | |
| 	raw_spin_lock_irqsave(&pci_config_lock, flags);
 | |
| 
 | |
| 	write_cf8(bus, devfn, reg);
 | |
| 
 | |
| 	switch (len) {
 | |
| 	case 1:
 | |
| 		if (xquad_portio)
 | |
| 			writeb(value, adr + (reg & 3));
 | |
| 		else
 | |
| 			outb((u8)value, 0xCFC + (reg & 3));
 | |
| 		break;
 | |
| 	case 2:
 | |
| 		if (xquad_portio)
 | |
| 			writew(value, adr + (reg & 2));
 | |
| 		else
 | |
| 			outw((u16)value, 0xCFC + (reg & 2));
 | |
| 		break;
 | |
| 	case 4:
 | |
| 		if (xquad_portio)
 | |
| 			writel(value, adr + reg);
 | |
| 		else
 | |
| 			outl((u32)value, 0xCFC);
 | |
| 		break;
 | |
| 	}
 | |
| 
 | |
| 	raw_spin_unlock_irqrestore(&pci_config_lock, flags);
 | |
| 
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| #undef PCI_CONF1_MQ_ADDRESS
 | |
| 
 | |
| static const struct pci_raw_ops pci_direct_conf1_mq = {
 | |
| 	.read	= pci_conf1_mq_read,
 | |
| 	.write	= pci_conf1_mq_write
 | |
| };
 | |
| 
 | |
| 
 | |
| static void pci_fixup_i450nx(struct pci_dev *d)
 | |
| {
 | |
| 	/*
 | |
| 	 * i450NX -- Find and scan all secondary buses on all PXB's.
 | |
| 	 */
 | |
| 	int pxb, reg;
 | |
| 	u8 busno, suba, subb;
 | |
| 	int quad = BUS2QUAD(d->bus->number);
 | |
| 
 | |
| 	dev_info(&d->dev, "searching for i450NX host bridges\n");
 | |
| 	reg = 0xd0;
 | |
| 	for(pxb=0; pxb<2; pxb++) {
 | |
| 		pci_read_config_byte(d, reg++, &busno);
 | |
| 		pci_read_config_byte(d, reg++, &suba);
 | |
| 		pci_read_config_byte(d, reg++, &subb);
 | |
| 		dev_dbg(&d->dev, "i450NX PXB %d: %02x/%02x/%02x\n",
 | |
| 			pxb, busno, suba, subb);
 | |
| 		if (busno) {
 | |
| 			/* Bus A */
 | |
| 			pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, busno));
 | |
| 		}
 | |
| 		if (suba < subb) {
 | |
| 			/* Bus B */
 | |
| 			pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, suba+1));
 | |
| 		}
 | |
| 	}
 | |
| 	pcibios_last_bus = -1;
 | |
| }
 | |
| DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
 | |
| 
 | |
| int __init pci_numaq_init(void)
 | |
| {
 | |
| 	int quad;
 | |
| 
 | |
| 	raw_pci_ops = &pci_direct_conf1_mq;
 | |
| 
 | |
| 	pcibios_scan_root(0);
 | |
| 	if (num_online_nodes() > 1)
 | |
| 		for_each_online_node(quad) {
 | |
| 			if (quad == 0)
 | |
| 				continue;
 | |
| 			printk("Scanning PCI bus %d for quad %d\n", 
 | |
| 				QUADLOCAL2BUS(quad,0), quad);
 | |
| 			pci_scan_bus_with_sysdata(QUADLOCAL2BUS(quad, 0));
 | |
| 		}
 | |
| 	return 0;
 | |
| }
 |