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

PCI: Add pci_remap_iospace() to map bus I/O resources 



Add pci_remap_iospace() to map bus I/O resources into the CPU virtual
address space.  Architectures with special needs may provide their own
version, but most should be able to use this one.

This function is useful for PCI host bridge drivers that need to map the
PCI I/O resources into virtual memory space.

[bhelgaas: phys_addr description, drop temporary "err" variable]
Signed-off-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
CC: Arnd Bergmann <arnd@arndb.de>
parent cbe4097f

drivers/pci/pci.c

+31 −0
Original line number Original line Diff line number Diff line
@@ -2704,6 +2704,37 @@ int pci_request_regions_exclusive(struct pci_dev *pdev, const char *res_name) 
}

}

EXPORT_SYMBOL(pci_request_regions_exclusive);

EXPORT_SYMBOL(pci_request_regions_exclusive);





/**

 *	pci_remap_iospace - Remap the memory mapped I/O space

 *	@res: Resource describing the I/O space

 *	@phys_addr: physical address of range to be mapped

 *

 *	Remap the memory mapped I/O space described by the @res

 *	and the CPU physical address @phys_addr into virtual address space.

 *	Only architectures that have memory mapped IO functions defined

 *	(and the PCI_IOBASE value defined) should call this function.

 */

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

{

#if defined(PCI_IOBASE) && defined(CONFIG_MMU)

	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_device(PAGE_KERNEL));

#else

	/* this architecture does not have memory mapped I/O space,

	   so this function should never be called */

	WARN_ONCE(1, "This architecture does not support memory mapped I/O\n");

	return -ENODEV;

#endif

}



static void __pci_set_master(struct pci_dev *dev, bool enable)

static void __pci_set_master(struct pci_dev *dev, bool enable)

{

{

	u16 old_cmd, cmd;

	u16 old_cmd, cmd;

include/asm-generic/pgtable.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -249,6 +249,10 @@ static inline int pmd_same(pmd_t pmd_a, pmd_t pmd_b) 
#define pgprot_writecombine pgprot_noncached

#define pgprot_writecombine pgprot_noncached

#endif

#endif





#ifndef pgprot_device

#define pgprot_device pgprot_noncached

#endif



/*

/*

 * When walking page tables, get the address of the next boundary,

 * When walking page tables, get the address of the next boundary,

 * or the end address of the range if that comes earlier.  Although no

 * or the end address of the range if that comes earlier.  Although no

include/linux/pci.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -1100,6 +1100,9 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus, 
						  resource_size_t),

						  resource_size_t),

			void *alignf_data);

			void *alignf_data);







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



static inline dma_addr_t pci_bus_address(struct pci_dev *pdev, int bar)

static inline dma_addr_t pci_bus_address(struct pci_dev *pdev, int bar)

{

{

	struct pci_bus_region region;

	struct pci_bus_region region;

CRA Git | Maintained and supported by SUSTech CRA and CCSE