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

Commit d1e6dc91 authored by Liviu Dudau's avatar Liviu Dudau Committed by Bjorn Helgaas
Browse files

arm64: Add architectural support for PCI 



Use the generic PCI domain and OF functions to provide support for PCI
on arm64.

[bhelgaas: Change comments to use generic PCI, not just PCIe.  Nothing at
this level is PCIe-specific.]
Signed-off-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 8b921acf

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)

arch/arm64/include/asm/pci.h

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#ifndef __ASM_PCI_H

#define __ASM_PCI_H

#ifdef __KERNEL__



#include <linux/types.h>

#include <linux/slab.h>

#include <linux/dma-mapping.h>



#include <asm/io.h>

#include <asm-generic/pci-bridge.h>

#include <asm-generic/pci-dma-compat.h>



#define PCIBIOS_MIN_IO		0x1000

#define PCIBIOS_MIN_MEM		0



/*

 * Set to 1 if the kernel should re-assign all PCI bus numbers

 */

#define pcibios_assign_all_busses() \

	(pci_has_flag(PCI_REASSIGN_ALL_BUS))



/*

 * PCI address space differs from physical memory address space

 */

#define PCI_DMA_BUS_IS_PHYS	(0)



extern int isa_dma_bridge_buggy;



#ifdef CONFIG_PCI

static inline int pci_proc_domain(struct pci_bus *bus)

{

	return 1;

}

#endif  /* CONFIG_PCI */



#endif  /* __KERNEL__ */

#endif  /* __ASM_PCI_H */

arch/arm64/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -296,6 +296,8 @@ static inline int has_transparent_hugepage(void) 
	__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRnE) | PTE_PXN | PTE_UXN)

#define pgprot_writecombine(prot) \

	__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_NORMAL_NC) | PTE_PXN | PTE_UXN)

#define pgprot_device(prot) \

	__pgprot_modify(prot, PTE_ATTRINDX_MASK, PTE_ATTRINDX(MT_DEVICE_nGnRE) | PTE_PXN | PTE_UXN)

#define __HAVE_PHYS_MEM_ACCESS_PROT

struct file;

extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,