Commit 1bb31cc7 authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'for-next/mm' into for-next/core 

* for-next/mm:
  arm64: mm: always map fixmap at page granularity
  arm64: mm: move fixmap code to its own file
  arm64: add FIXADDR_TOT_{START,SIZE}
  Revert "Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()""
  arm: uaccess: Remove memcpy_page_flushcache()
  mm,kfence: decouple kfence from page granularity mapping judgement
parents 81444b77 414c109b

arch/arm64/include/asm/fixmap.h

+11 −11
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#ifndef __ASSEMBLY__

#include <linux/kernel.h>

#include <linux/math.h>

#include <linux/sizes.h>

#include <asm/boot.h>

#include <asm/page.h>
@@ -36,17 +37,13 @@ enum fixed_addresses { 
	FIX_HOLE,



	/*

	 * Reserve a virtual window for the FDT that is 2 MB larger than the

	 * maximum supported size, and put it at the top of the fixmap region.

	 * The additional space ensures that any FDT that does not exceed

	 * MAX_FDT_SIZE can be mapped regardless of whether it crosses any

	 * 2 MB alignment boundaries.

	 *

	 * Keep this at the top so it remains 2 MB aligned.

	 * Reserve a virtual window for the FDT that is a page bigger than the

	 * maximum supported size. The additional space ensures that any FDT

	 * that does not exceed MAX_FDT_SIZE can be mapped regardless of

	 * whether it crosses any page boundary.

	 */

#define FIX_FDT_SIZE		(MAX_FDT_SIZE + SZ_2M)

	FIX_FDT_END,

	FIX_FDT = FIX_FDT_END + FIX_FDT_SIZE / PAGE_SIZE - 1,

	FIX_FDT = FIX_FDT_END + DIV_ROUND_UP(MAX_FDT_SIZE, PAGE_SIZE) + 1,



	FIX_EARLYCON_MEM_BASE,

	FIX_TEXT_POKE0,
@@ -97,10 +94,13 @@ enum fixed_addresses { 


#define FIXADDR_SIZE		(__end_of_permanent_fixed_addresses << PAGE_SHIFT)

#define FIXADDR_START		(FIXADDR_TOP - FIXADDR_SIZE)

#define FIXADDR_TOT_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)

#define FIXADDR_TOT_START	(FIXADDR_TOP - FIXADDR_TOT_SIZE)



#define FIXMAP_PAGE_IO     __pgprot(PROT_DEVICE_nGnRE)



void __init early_fixmap_init(void);

void __init fixmap_copy(pgd_t *pgdir);



#define __early_set_fixmap __set_fixmap

arch/arm64/include/asm/kernel-pgtable.h

+4 −1
Original line number Diff line number Diff line
@@ -59,8 +59,11 @@ 
#define EARLY_KASLR	(0)

#endif



#define SPAN_NR_ENTRIES(vstart, vend, shift) \

	((((vend) - 1) >> (shift)) - ((vstart) >> (shift)) + 1)



#define EARLY_ENTRIES(vstart, vend, shift, add) \

	((((vend) - 1) >> (shift)) - ((vstart) >> (shift)) + 1 + add)

	(SPAN_NR_ENTRIES(vstart, vend, shift) + (add))



#define EARLY_PGDS(vstart, vend, add) (EARLY_ENTRIES(vstart, vend, PGDIR_SHIFT, add))

arch/arm64/include/asm/kfence.h

+10 −0
Original line number Diff line number Diff line
@@ -19,4 +19,14 @@ static inline bool kfence_protect_page(unsigned long addr, bool protect) 
	return true;

}



#ifdef CONFIG_KFENCE

extern bool kfence_early_init;

static inline bool arm64_kfence_can_set_direct_map(void)

{

	return !kfence_early_init;

}

#else /* CONFIG_KFENCE */

static inline bool arm64_kfence_can_set_direct_map(void) { return false; }

#endif /* CONFIG_KFENCE */



#endif /* __ASM_KFENCE_H */

arch/arm64/include/asm/mmu.h

+2 −0
Original line number Diff line number Diff line
@@ -65,6 +65,8 @@ extern void paging_init(void); 
extern void bootmem_init(void);

extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);

extern void init_mem_pgprot(void);

extern void create_mapping_noalloc(phys_addr_t phys, unsigned long virt,

				   phys_addr_t size, pgprot_t prot);

extern void create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,

			       unsigned long virt, phys_addr_t size,

			       pgprot_t prot, bool page_mappings_only);

arch/arm64/include/asm/uaccess.h

+0 −2
Original line number Diff line number Diff line
@@ -449,8 +449,6 @@ extern long strncpy_from_user(char *dest, const char __user *src, long count); 
extern __must_check long strnlen_user(const char __user *str, long n);



#ifdef CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE

struct page;

void memcpy_page_flushcache(char *to, struct page *page, size_t offset, size_t len);

extern unsigned long __must_check __copy_user_flushcache(void *to, const void __user *from, unsigned long n);



static inline int __copy_from_user_flushcache(void *dst, const void __user *src, unsigned size)