 7b67e75147
			
		
	
	
	7b67e75147
	
	
	
		
			
			* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (80 commits) x86/PCI: Expand the x86_msi_ops to have a restore MSIs. PCI: Increase resource array mask bit size in pcim_iomap_regions() PCI: DEVICE_COUNT_RESOURCE should be equal to PCI_NUM_RESOURCES PCI: pci_ids: add device ids for STA2X11 device (aka ConneXT) PNP: work around Dell 1536/1546 BIOS MMCONFIG bug that breaks USB x86/PCI: amd: factor out MMCONFIG discovery PCI: Enable ATS at the device state restore PCI: msi: fix imbalanced refcount of msi irq sysfs objects PCI: kconfig: English typo in pci/pcie/Kconfig PCI/PM/Runtime: make PCI traces quieter PCI: remove pci_create_bus() xtensa/PCI: convert to pci_scan_root_bus() for correct root bus resources x86/PCI: convert to pci_create_root_bus() and pci_scan_root_bus() x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented() x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan sparc32, leon/PCI: convert to pci_scan_root_bus() for correct root bus resources sparc/PCI: convert to pci_create_root_bus() sh/PCI: convert to pci_scan_root_bus() for correct root bus resources powerpc/PCI: convert to pci_create_root_bus() powerpc/PCI: split PHB part out of pcibios_map_io_space() ... Fix up conflicts in drivers/pci/msi.c and include/linux/pci_regs.h due to the same patches being applied in other branches.
		
			
				
	
	
		
			240 lines
		
	
	
	
		
			5.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			240 lines
		
	
	
	
		
			5.5 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * arch/arm/mach-dove/pcie.c
 | |
|  *
 | |
|  * PCIe functions for Marvell Dove 88AP510 SoC
 | |
|  *
 | |
|  * This file is licensed under the terms of the GNU General Public
 | |
|  * License version 2. This program is licensed "as is" without any
 | |
|  * warranty of any kind, whether express or implied.
 | |
|  */
 | |
| 
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/pci.h>
 | |
| #include <video/vga.h>
 | |
| #include <asm/mach/pci.h>
 | |
| #include <asm/mach/arch.h>
 | |
| #include <asm/setup.h>
 | |
| #include <asm/delay.h>
 | |
| #include <plat/pcie.h>
 | |
| #include <mach/irqs.h>
 | |
| #include <mach/bridge-regs.h>
 | |
| #include <plat/addr-map.h>
 | |
| #include "common.h"
 | |
| 
 | |
| struct pcie_port {
 | |
| 	u8			index;
 | |
| 	u8			root_bus_nr;
 | |
| 	void __iomem		*base;
 | |
| 	spinlock_t		conf_lock;
 | |
| 	char			io_space_name[16];
 | |
| 	char			mem_space_name[16];
 | |
| 	struct resource		res[2];
 | |
| };
 | |
| 
 | |
| static struct pcie_port pcie_port[2];
 | |
| static int num_pcie_ports;
 | |
| 
 | |
| 
 | |
| static int __init dove_pcie_setup(int nr, struct pci_sys_data *sys)
 | |
| {
 | |
| 	struct pcie_port *pp;
 | |
| 
 | |
| 	if (nr >= num_pcie_ports)
 | |
| 		return 0;
 | |
| 
 | |
| 	pp = &pcie_port[nr];
 | |
| 	pp->root_bus_nr = sys->busnr;
 | |
| 
 | |
| 	/*
 | |
| 	 * Generic PCIe unit setup.
 | |
| 	 */
 | |
| 	orion_pcie_set_local_bus_nr(pp->base, sys->busnr);
 | |
| 
 | |
| 	orion_pcie_setup(pp->base);
 | |
| 
 | |
| 	/*
 | |
| 	 * IORESOURCE_IO
 | |
| 	 */
 | |
| 	snprintf(pp->io_space_name, sizeof(pp->io_space_name),
 | |
| 		 "PCIe %d I/O", pp->index);
 | |
| 	pp->io_space_name[sizeof(pp->io_space_name) - 1] = 0;
 | |
| 	pp->res[0].name = pp->io_space_name;
 | |
| 	if (pp->index == 0) {
 | |
| 		pp->res[0].start = DOVE_PCIE0_IO_PHYS_BASE;
 | |
| 		pp->res[0].end = pp->res[0].start + DOVE_PCIE0_IO_SIZE - 1;
 | |
| 	} else {
 | |
| 		pp->res[0].start = DOVE_PCIE1_IO_PHYS_BASE;
 | |
| 		pp->res[0].end = pp->res[0].start + DOVE_PCIE1_IO_SIZE - 1;
 | |
| 	}
 | |
| 	pp->res[0].flags = IORESOURCE_IO;
 | |
| 	if (request_resource(&ioport_resource, &pp->res[0]))
 | |
| 		panic("Request PCIe IO resource failed\n");
 | |
| 	pci_add_resource(&sys->resources, &pp->res[0]);
 | |
| 
 | |
| 	/*
 | |
| 	 * IORESOURCE_MEM
 | |
| 	 */
 | |
| 	snprintf(pp->mem_space_name, sizeof(pp->mem_space_name),
 | |
| 		 "PCIe %d MEM", pp->index);
 | |
| 	pp->mem_space_name[sizeof(pp->mem_space_name) - 1] = 0;
 | |
| 	pp->res[1].name = pp->mem_space_name;
 | |
| 	if (pp->index == 0) {
 | |
| 		pp->res[1].start = DOVE_PCIE0_MEM_PHYS_BASE;
 | |
| 		pp->res[1].end = pp->res[1].start + DOVE_PCIE0_MEM_SIZE - 1;
 | |
| 	} else {
 | |
| 		pp->res[1].start = DOVE_PCIE1_MEM_PHYS_BASE;
 | |
| 		pp->res[1].end = pp->res[1].start + DOVE_PCIE1_MEM_SIZE - 1;
 | |
| 	}
 | |
| 	pp->res[1].flags = IORESOURCE_MEM;
 | |
| 	if (request_resource(&iomem_resource, &pp->res[1]))
 | |
| 		panic("Request PCIe Memory resource failed\n");
 | |
| 	pci_add_resource(&sys->resources, &pp->res[1]);
 | |
| 
 | |
| 	return 1;
 | |
| }
 | |
| 
 | |
| static struct pcie_port *bus_to_port(int bus)
 | |
| {
 | |
| 	int i;
 | |
| 
 | |
| 	for (i = num_pcie_ports - 1; i >= 0; i--) {
 | |
| 		int rbus = pcie_port[i].root_bus_nr;
 | |
| 		if (rbus != -1 && rbus <= bus)
 | |
| 			break;
 | |
| 	}
 | |
| 
 | |
| 	return i >= 0 ? pcie_port + i : NULL;
 | |
| }
 | |
| 
 | |
| static int pcie_valid_config(struct pcie_port *pp, int bus, int dev)
 | |
| {
 | |
| 	/*
 | |
| 	 * Don't go out when trying to access nonexisting devices
 | |
| 	 * on the local bus.
 | |
| 	 */
 | |
| 	if (bus == pp->root_bus_nr && dev > 1)
 | |
| 		return 0;
 | |
| 
 | |
| 	return 1;
 | |
| }
 | |
| 
 | |
| static int pcie_rd_conf(struct pci_bus *bus, u32 devfn, int where,
 | |
| 			int size, u32 *val)
 | |
| {
 | |
| 	struct pcie_port *pp = bus_to_port(bus->number);
 | |
| 	unsigned long flags;
 | |
| 	int ret;
 | |
| 
 | |
| 	if (pcie_valid_config(pp, bus->number, PCI_SLOT(devfn)) == 0) {
 | |
| 		*val = 0xffffffff;
 | |
| 		return PCIBIOS_DEVICE_NOT_FOUND;
 | |
| 	}
 | |
| 
 | |
| 	spin_lock_irqsave(&pp->conf_lock, flags);
 | |
| 	ret = orion_pcie_rd_conf(pp->base, bus, devfn, where, size, val);
 | |
| 	spin_unlock_irqrestore(&pp->conf_lock, flags);
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static int pcie_wr_conf(struct pci_bus *bus, u32 devfn,
 | |
| 			int where, int size, u32 val)
 | |
| {
 | |
| 	struct pcie_port *pp = bus_to_port(bus->number);
 | |
| 	unsigned long flags;
 | |
| 	int ret;
 | |
| 
 | |
| 	if (pcie_valid_config(pp, bus->number, PCI_SLOT(devfn)) == 0)
 | |
| 		return PCIBIOS_DEVICE_NOT_FOUND;
 | |
| 
 | |
| 	spin_lock_irqsave(&pp->conf_lock, flags);
 | |
| 	ret = orion_pcie_wr_conf(pp->base, bus, devfn, where, size, val);
 | |
| 	spin_unlock_irqrestore(&pp->conf_lock, flags);
 | |
| 
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static struct pci_ops pcie_ops = {
 | |
| 	.read = pcie_rd_conf,
 | |
| 	.write = pcie_wr_conf,
 | |
| };
 | |
| 
 | |
| static void __devinit rc_pci_fixup(struct pci_dev *dev)
 | |
| {
 | |
| 	/*
 | |
| 	 * Prevent enumeration of root complex.
 | |
| 	 */
 | |
| 	if (dev->bus->parent == NULL && dev->devfn == 0) {
 | |
| 		int i;
 | |
| 
 | |
| 		for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
 | |
| 			dev->resource[i].start = 0;
 | |
| 			dev->resource[i].end   = 0;
 | |
| 			dev->resource[i].flags = 0;
 | |
| 		}
 | |
| 	}
 | |
| }
 | |
| DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL, PCI_ANY_ID, rc_pci_fixup);
 | |
| 
 | |
| static struct pci_bus __init *
 | |
| dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)
 | |
| {
 | |
| 	struct pci_bus *bus;
 | |
| 
 | |
| 	if (nr < num_pcie_ports) {
 | |
| 		bus = pci_scan_root_bus(NULL, sys->busnr, &pcie_ops, sys,
 | |
| 					&sys->resources);
 | |
| 	} else {
 | |
| 		bus = NULL;
 | |
| 		BUG();
 | |
| 	}
 | |
| 
 | |
| 	return bus;
 | |
| }
 | |
| 
 | |
| static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 | |
| {
 | |
| 	struct pcie_port *pp = bus_to_port(dev->bus->number);
 | |
| 
 | |
| 	return pp->index ? IRQ_DOVE_PCIE1 : IRQ_DOVE_PCIE0;
 | |
| }
 | |
| 
 | |
| static struct hw_pci dove_pci __initdata = {
 | |
| 	.nr_controllers	= 2,
 | |
| 	.swizzle	= pci_std_swizzle,
 | |
| 	.setup		= dove_pcie_setup,
 | |
| 	.scan		= dove_pcie_scan_bus,
 | |
| 	.map_irq	= dove_pcie_map_irq,
 | |
| };
 | |
| 
 | |
| static void __init add_pcie_port(int index, unsigned long base)
 | |
| {
 | |
| 	printk(KERN_INFO "Dove PCIe port %d: ", index);
 | |
| 
 | |
| 	if (orion_pcie_link_up((void __iomem *)base)) {
 | |
| 		struct pcie_port *pp = &pcie_port[num_pcie_ports++];
 | |
| 
 | |
| 		printk(KERN_INFO "link up\n");
 | |
| 
 | |
| 		pp->index = index;
 | |
| 		pp->root_bus_nr = -1;
 | |
| 		pp->base = (void __iomem *)base;
 | |
| 		spin_lock_init(&pp->conf_lock);
 | |
| 		memset(pp->res, 0, sizeof(pp->res));
 | |
| 	} else {
 | |
| 		printk(KERN_INFO "link down, ignoring\n");
 | |
| 	}
 | |
| }
 | |
| 
 | |
| void __init dove_pcie_init(int init_port0, int init_port1)
 | |
| {
 | |
| 	vga_base = DOVE_PCIE0_MEM_PHYS_BASE;
 | |
| 
 | |
| 	if (init_port0)
 | |
| 		add_pcie_port(0, DOVE_PCIE0_VIRT_BASE);
 | |
| 
 | |
| 	if (init_port1)
 | |
| 		add_pcie_port(1, DOVE_PCIE1_VIRT_BASE);
 | |
| 
 | |
| 	pci_common_init(&dove_pci);
 | |
| }
 |