Commit c766ee72 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: handover page flags with a pgprot_t parameter 



In order to avoid multiple conversions, handover directly a
pgprot_t to map_kernel_page() as already done for radix.

Do the same for __ioremap_caller() and __ioremap_at().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 56f3c141

arch/powerpc/include/asm/book3s/32/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, 
#define __pte_to_swp_entry(pte)		((swp_entry_t) { pte_val(pte) >> 3 })

#define __swp_entry_to_pte(x)		((pte_t) { (x).val << 3 })



int map_kernel_page(unsigned long va, phys_addr_t pa, int flags);

int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot);



/* Generic accessors to PTE bits */

static inline int pte_write(pte_t pte)		{ return !!(pte_val(pte) & _PAGE_RW);}

arch/powerpc/include/asm/book3s/64/hash.h

+1 −2
Original line number Diff line number Diff line
@@ -201,8 +201,7 @@ static inline void hpte_do_hugepage_flush(struct mm_struct *mm, 
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */





extern int hash__map_kernel_page(unsigned long ea, unsigned long pa,

			     unsigned long flags);

int hash__map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot);

extern int __meminit hash__vmemmap_create_mapping(unsigned long start,

					      unsigned long page_size,

					      unsigned long phys);

arch/powerpc/include/asm/book3s/64/pgtable.h

+3 −4
Original line number Diff line number Diff line
@@ -1030,17 +1030,16 @@ extern struct page *pgd_page(pgd_t pgd); 
#define pgd_ERROR(e) \

	pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))



static inline int map_kernel_page(unsigned long ea, unsigned long pa,

				  unsigned long flags)

static inline int map_kernel_page(unsigned long ea, unsigned long pa, pgprot_t prot)

{

	if (radix_enabled()) {

#if defined(CONFIG_PPC_RADIX_MMU) && defined(DEBUG_VM)

		unsigned long page_size = 1 << mmu_psize_defs[mmu_io_psize].shift;

		WARN((page_size != PAGE_SIZE), "I/O page size != PAGE_SIZE");

#endif

		return radix__map_kernel_page(ea, pa, __pgprot(flags), PAGE_SIZE);

		return radix__map_kernel_page(ea, pa, prot, PAGE_SIZE);

	}

	return hash__map_kernel_page(ea, pa, flags);

	return hash__map_kernel_page(ea, pa, prot);

}



static inline int __meminit vmemmap_create_mapping(unsigned long start,

arch/powerpc/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ enum fixed_addresses { 
static inline void __set_fixmap(enum fixed_addresses idx,

				phys_addr_t phys, pgprot_t flags)

{

	map_kernel_page(fix_to_virt(idx), phys, pgprot_val(flags));

	map_kernel_page(fix_to_virt(idx), phys, flags);

}



#endif /* !__ASSEMBLY__ */

arch/powerpc/include/asm/io.h

+2 −2
Original line number Diff line number Diff line
@@ -786,12 +786,12 @@ extern void iounmap(volatile void __iomem *addr); 
extern void __iomem *__ioremap(phys_addr_t, unsigned long size,

			       unsigned long flags);

extern void __iomem *__ioremap_caller(phys_addr_t, unsigned long size,

				      unsigned long flags, void *caller);

				      pgprot_t prot, void *caller);



extern void __iounmap(volatile void __iomem *addr);



extern void __iomem * __ioremap_at(phys_addr_t pa, void *ea,

				   unsigned long size, unsigned long flags);

				   unsigned long size, pgprot_t prot);

extern void __iounmap_at(void *ea, unsigned long size);



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE