Commit bc02973a authored by Pali Rohár's avatar Pali Rohár Committed by Lorenzo Pieralisi
Browse files

arm: ioremap: Implement standard PCI function pci_remap_iospace() 

pci_remap_iospace() is standard PCI core function. Architecture code can
reimplement default core implementation if needs custom arch specific
functionality.

ARM needs custom implementation due to pci_ioremap_set_mem_type() hook
which allows ARM platforms to change mem type for iospace.

Implement this pci_remap_iospace() function for ARM architecture to
correctly handle pci_ioremap_set_mem_type() hook, which allows usage of
this standard PCI core function also for platforms which needs different
mem type (e.g. Marvell Armada 375, 38x and 39x).

Link: https://lore.kernel.org/r/20211124154116.916-2-pali@kernel.org


Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent fa55b7dc

arch/arm/include/asm/io.h

+5 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ static inline void pci_ioremap_set_mem_type(int mem_type) {} 


extern int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr);



struct resource;



#define pci_remap_iospace pci_remap_iospace

int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);



/*

 * PCI configuration space mapping function.

 *

arch/arm/mm/ioremap.c

+15 −0
Original line number Diff line number Diff line
@@ -459,6 +459,21 @@ void pci_ioremap_set_mem_type(int mem_type) 
	pci_ioremap_mem_type = mem_type;

}



int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr)

{

	unsigned long vaddr = (unsigned long)PCI_IOBASE + res->start;



	if (!(res->flags & IORESOURCE_IO))

		return -EINVAL;



	if (res->end > IO_SPACE_LIMIT)

		return -EINVAL;



	return ioremap_page_range(vaddr, vaddr + resource_size(res), phys_addr,

				  __pgprot(get_mem_type(pci_ioremap_mem_type)->prot_pte));

}

EXPORT_SYMBOL(pci_remap_iospace);



int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr)

{

	BUG_ON(offset + SZ_64K - 1 > IO_SPACE_LIMIT);