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

Commit ce077326 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "UPSTREAM: arm64: mm: Map entry trampoline into trampoline and kernel page tables"

parents f93a6c31 153c648a

arch/arm64/include/asm/fixmap.h

+5 −0
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ enum fixed_addresses { 


	FIX_EARLYCON_MEM_BASE,

	FIX_TEXT_POKE0,



#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

	FIX_ENTRY_TRAMP_TEXT,

#define TRAMP_VALIAS		(__fix_to_virt(FIX_ENTRY_TRAMP_TEXT))

#endif /* CONFIG_UNMAP_KERNEL_AT_EL0 */

	__end_of_permanent_fixed_addresses,



	/*

arch/arm64/include/asm/pgtable.h

+1 −0
Original line number Diff line number Diff line
@@ -707,6 +707,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, 


extern pgd_t swapper_pg_dir[PTRS_PER_PGD];

extern pgd_t idmap_pg_dir[PTRS_PER_PGD];

extern pgd_t tramp_pg_dir[PTRS_PER_PGD];



/*

 * Encode and decode a swap entry:

arch/arm64/kernel/asm-offsets.c

+5 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/kvm_host.h>

#include <linux/suspend.h>

#include <asm/cpufeature.h>

#include <asm/fixmap.h>

#include <asm/thread_info.h>

#include <asm/memory.h>

#include <asm/smp_plat.h>
@@ -147,11 +148,14 @@ int main(void) 
  DEFINE(ARM_SMCCC_RES_X2_OFFS,		offsetof(struct arm_smccc_res, a2));

  DEFINE(ARM_SMCCC_QUIRK_ID_OFFS,	offsetof(struct arm_smccc_quirk, id));

  DEFINE(ARM_SMCCC_QUIRK_STATE_OFFS,	offsetof(struct arm_smccc_quirk, state));



  BLANK();

  DEFINE(HIBERN_PBE_ORIG,	offsetof(struct pbe, orig_address));

  DEFINE(HIBERN_PBE_ADDR,	offsetof(struct pbe, address));

  DEFINE(HIBERN_PBE_NEXT,	offsetof(struct pbe, next));

  DEFINE(ARM64_FTR_SYSVAL,	offsetof(struct arm64_ftr_reg, sys_val));

  BLANK();

#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

  DEFINE(TRAMP_VALIAS,		TRAMP_VALIAS);

#endif

  return 0;

}

arch/arm64/mm/mmu.c

+23 −0
Original line number Diff line number Diff line
@@ -458,6 +458,29 @@ static void __init map_kernel_segment(pgd_t *pgd, void *va_start, void *va_end, 
	vm_area_add_early(vma);

}



#ifdef CONFIG_UNMAP_KERNEL_AT_EL0

static int __init map_entry_trampoline(void)

{

	extern char __entry_tramp_text_start[];



	pgprot_t prot = PAGE_KERNEL_EXEC;

	phys_addr_t pa_start = __pa_symbol(__entry_tramp_text_start);



	/* The trampoline is always mapped and can therefore be global */

	pgprot_val(prot) &= ~PTE_NG;



	/* Map only the text into the trampoline page table */

	memset(tramp_pg_dir, 0, PGD_SIZE);

	__create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE,

			     prot, pgd_pgtable_alloc, 0);



	/* ...as well as the kernel page table */

	__set_fixmap(FIX_ENTRY_TRAMP_TEXT, pa_start, prot);

	return 0;

}

core_initcall(map_entry_trampoline);

#endif



/*

 * Create fine-grained mappings for the kernel.

 */