Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (942c88cc) · Commits · e / devices / android_kernel_xiaomi_markw

arch/mips/include/asm/pci.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,11 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
		/* We don't do dynamic PCI IRQ allocation */
		}

		#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);

		/*
		* Dynamic DMA mapping stuff.
		* MIPS has everything mapped statically.

+24 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,30 @@ EXPORT_SYMBOL(PCIBIOS_MIN_IO);
		EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
		#endif

		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;

		/*
		* I/O space can be accessed via normal processor loads and stores on
		* this platform but for now we elect not to do this and portable
		* drivers should not do this anyway.
		*/
		if (mmap_state == pci_mmap_io)
		return -EINVAL;

		/*
		* Ignore write-combine; for now only return uncached mappings.
		*/
		prot = pgprot_val(vma->vm_page_prot);
		prot = (prot & ~_CACHE_MASK) \| _CACHE_UNCACHED;
		vma->vm_page_prot = __pgprot(prot);

		return remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
		vma->vm_end - vma->vm_start, vma->vm_page_prot);
		}

		char * (pcibios_plat_setup)(char str) __devinitdata;

		char __devinit pcibios_setup(char str)