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

Commit 889e4dd9 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/resource-mmap' into next 

* pci/resource-mmap:
  ia64: Use generic pci_mmap_resource_range()
  ia64: Remove redundant checks for WC in pci_mmap_page_range()
  ia64: Remove redundant valid_mmap_phys_addr_range() from pci_mmap_page_range()
  PCI: Add I/O BAR support to generic pci_mmap_resource_range()
  x86/PCI: Use generic pci_mmap_resource_range()
  unicore32/PCI: Use generic pci_mmap_resource_range()
  sh/PCI: Use generic pci_mmap_resource_range()
  parisc: Use generic pci_mmap_resource_range()
  mn10300/PCI: Use generic pci_mmap_resource_range()
  MIPS: PCI: Use generic pci_mmap_resource_range()
  cris/PCI: Use generic pci_mmap_resource_range()
  ARM/PCI: Use generic pci_mmap_resource_range()
  PCI: Add pci_mmap_resource_range() and use it for ARM64
  PCI: Add BAR index argument to pci_mmap_page_range()
  PCI: Use BAR index in sysfs attr->private instead of resource pointer
  PCI: Add arch_can_pci_mmap_io() on architectures which can mmap() I/O space
  PCI: Move multiple declarations of pci_mmap_page_range() to <linux/pci.h>
  PCI: Add arch_can_pci_mmap_wc() macro
  xtensa/PCI: Do not mmap PCI BARs to userspace as write-through
  PCI: Only allow WC mmap on prefetchable resources
  PCI: Fix another sanity check bug in /proc/pci mmap
  PCI: Fix pci_mmap_fits() for HAVE_PCI_RESOURCE_TO_USER platforms
parents 78f09838 d9c102de

Documentation/filesystems/sysfs-pci.txt

+12 −3
Original line number Diff line number Diff line
@@ -113,9 +113,18 @@ Supporting PCI access on new platforms 
--------------------------------------



In order to support PCI resource mapping as described above, Linux platform

code must define HAVE_PCI_MMAP and provide a pci_mmap_page_range function.

Platforms are free to only support subsets of the mmap functionality, but

useful return codes should be provided.

code should ideally define ARCH_GENERIC_PCI_MMAP_RESOURCE and use the generic

implementation of that functionality. To support the historical interface of

mmap() through files in /proc/bus/pci, platforms may also set HAVE_PCI_MMAP.



Alternatively, platforms which set HAVE_PCI_MMAP may provide their own

implementation of pci_mmap_page_range() instead of defining

ARCH_GENERIC_PCI_MMAP_RESOURCE.



Platforms which support write-combining maps of PCI resources must define

arch_can_pci_mmap_wc() which shall evaluate to non-zero at runtime when

write-combining is permitted. Platforms which support maps of I/O resources

define arch_can_pci_mmap_io() similarly.



Legacy resources are protected by the HAVE_PCI_LEGACY define.  Platforms

wishing to support legacy functionality should define it and provide

arch/arm/include/asm/pci.h

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ static inline int pci_proc_domain(struct pci_bus *bus) 
#define PCI_DMA_BUS_IS_PHYS     (1)



#define HAVE_PCI_MMAP

extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

                               enum pci_mmap_state mmap_state, int write_combine);

#define ARCH_GENERIC_PCI_MMAP_RESOURCE



static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

{

arch/arm/kernel/bios32.c

+0 −19
Original line number Diff line number Diff line
@@ -597,25 +597,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res, 
	return start;

}



int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

			enum pci_mmap_state mmap_state, int write_combine)

{

	if (mmap_state == pci_mmap_io)

		return -EINVAL;



	/*

	 * Mark this as IO

	 */

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);



	if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

			     vma->vm_end - vma->vm_start,

			     vma->vm_page_prot))

		return -EAGAIN;



	return 0;

}



void __init pci_map_io_early(unsigned long pfn)

{

	struct map_desc pci_io_desc = {

arch/arm64/include/asm/pci.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
 */

#define PCI_DMA_BUS_IS_PHYS	(0)



#define ARCH_GENERIC_PCI_MMAP_RESOURCE	1



extern int isa_dma_bridge_buggy;



#ifdef CONFIG_PCI

arch/cris/arch-v32/drivers/pci/bios.c

+0 −22
Original line number Diff line number Diff line
@@ -14,28 +14,6 @@ void pcibios_set_master(struct pci_dev *dev) 
	pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat);

}



int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

			enum pci_mmap_state mmap_state, int write_combine)

{

	unsigned long prot;



	/* Leave vm_pgoff as-is, the PCI space address is the physical

	 * address on this platform.

	 */

	prot = pgprot_val(vma->vm_page_prot);

	vma->vm_page_prot = __pgprot(prot);



	/* Write-combine setting is ignored, it is changed via the mtrr

	 * interfaces on this platform.

	 */

	if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

			     vma->vm_end - vma->vm_start,

			     vma->vm_page_prot))

		return -EAGAIN;



	return 0;

}



resource_size_t

pcibios_align_resource(void *data, const struct resource *res,

		       resource_size_t size, resource_size_t align)