Commit 07a7cbd3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/host-generic' into next 

* pci/host-generic:
  arm64: Add architectural support for PCI
  PCI: Add pci_remap_iospace() to map bus I/O resources
  of/pci: Add support for parsing PCI host bridge resources from DT
  of/pci: Add pci_get_new_domain_nr() and of_get_pci_domain_nr()
  PCI: Add generic domain handling
  of/pci: Fix the conversion of IO ranges into IO resources
  of/pci: Move of_pci_range_to_resource() to of/address.c
  ARM: Define PCI_IOBASE as the base of virtual PCI IO space
  of/pci: Add pci_register_io_range() and pci_pio_to_address()
  asm-generic/io.h: Fix ioport_map() for !CONFIG_GENERIC_IOMAP

Conflicts:
	drivers/pci/host/pci-tegra.c
parents cc0cb67a d1e6dc91

arch/arm/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -178,6 +178,7 @@ static inline void __iomem *__typesafe_io(unsigned long addr) 


/* PCI fixed i/o mapping */

#define PCI_IO_VIRT_BASE	0xfee00000

#define PCI_IOBASE		((void __iomem *)PCI_IO_VIRT_BASE)



#if defined(CONFIG_PCI)

void pci_ioremap_set_mem_type(int mem_type);

arch/arm/mach-integrator/pci_v3.c

+12 −11
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ static void __init pci_v3_preinit(void) 
{

	unsigned long flags;

	unsigned int temp;

	phys_addr_t io_address = pci_pio_to_address(io_mem.start);



	pcibios_min_mem = 0x00100000;
@@ -701,7 +702,7 @@ static void __init pci_v3_preinit(void) 
	/*

	 * Setup window 2 - PCI IO

	 */

	v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_mem.start) |

	v3_writel(V3_LB_BASE2, v3_addr_to_lb_base2(io_address) |

			V3_LB_BASE_ENABLE);

	v3_writew(V3_LB_MAP2, v3_addr_to_lb_map2(0));
@@ -742,6 +743,7 @@ static void __init pci_v3_preinit(void) 
static void __init pci_v3_postinit(void)

{

	unsigned int pci_cmd;

	phys_addr_t io_address = pci_pio_to_address(io_mem.start);



	pci_cmd = PCI_COMMAND_MEMORY |

		  PCI_COMMAND_MASTER | PCI_COMMAND_INVALIDATE;
@@ -758,7 +760,7 @@ static void __init pci_v3_postinit(void) 
		       "interrupt: %d\n", ret);

#endif



	register_isa_ports(non_mem.start, io_mem.start, 0);

	register_isa_ports(non_mem.start, io_address, 0);

}



/*
@@ -867,33 +869,32 @@ static int __init pci_v3_probe(struct platform_device *pdev) 


	for_each_of_pci_range(&parser, &range) {

		if (!range.flags) {

			of_pci_range_to_resource(&range, np, &conf_mem);

			ret = of_pci_range_to_resource(&range, np, &conf_mem);

			conf_mem.name = "PCIv3 config";

		}

		if (range.flags & IORESOURCE_IO) {

			of_pci_range_to_resource(&range, np, &io_mem);

			ret = of_pci_range_to_resource(&range, np, &io_mem);

			io_mem.name = "PCIv3 I/O";

		}

		if ((range.flags & IORESOURCE_MEM) &&

			!(range.flags & IORESOURCE_PREFETCH)) {

			non_mem_pci = range.pci_addr;

			non_mem_pci_sz = range.size;

			of_pci_range_to_resource(&range, np, &non_mem);

			ret = of_pci_range_to_resource(&range, np, &non_mem);

			non_mem.name = "PCIv3 non-prefetched mem";

		}

		if ((range.flags & IORESOURCE_MEM) &&

			(range.flags & IORESOURCE_PREFETCH)) {

			pre_mem_pci = range.pci_addr;

			pre_mem_pci_sz = range.size;

			of_pci_range_to_resource(&range, np, &pre_mem);

			ret = of_pci_range_to_resource(&range, np, &pre_mem);

			pre_mem.name = "PCIv3 prefetched mem";

		}

	}



	if (!conf_mem.start || !io_mem.start ||

	    !non_mem.start || !pre_mem.start) {

		if (ret < 0) {

			dev_err(&pdev->dev, "missing ranges in device node\n");

		return -EINVAL;

			return ret;

		}

	}



	pci_v3.map_irq = of_irq_parse_and_map_pci;

arch/arm64/Kconfig

+21 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ config MMU 
	def_bool y



config NO_IOPORT_MAP

	def_bool y

	def_bool y if !PCI



config STACKTRACE_SUPPORT

	def_bool y
@@ -156,6 +156,26 @@ menu "Bus support" 
config ARM_AMBA

	bool



config PCI

	bool "PCI support"

	help

	  This feature enables support for PCI bus system. If you say Y

	  here, the kernel will include drivers and infrastructure code

	  to support PCI bus devices.



config PCI_DOMAINS

	def_bool PCI



config PCI_DOMAINS_GENERIC

	def_bool PCI



config PCI_SYSCALL

	def_bool PCI



source "drivers/pci/Kconfig"

source "drivers/pci/pcie/Kconfig"

source "drivers/pci/hotplug/Kconfig"



endmenu



menu "Kernel Features"

arch/arm64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ generic-y += mman.h 
generic-y += msgbuf.h

generic-y += mutex.h

generic-y += pci.h

generic-y += pci-bridge.h

generic-y += poll.h

generic-y += preempt.h

generic-y += resource.h

arch/arm64/include/asm/io.h

+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) 
/*

 *  I/O port access primitives.

 */

#define IO_SPACE_LIMIT		0xffff

#define arch_has_dev_port()	(1)

#define IO_SPACE_LIMIT		(SZ_32M - 1)

#define PCI_IOBASE		((void __iomem *)(MODULES_VADDR - SZ_32M))



static inline u8 inb(unsigned long addr)

CRA Git | Maintained and supported by SUSTech CRA and CCSE