Commit 9d84ad42 authored by Will Deacon's avatar Will Deacon
Browse files

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

* for-next/trivial:
  arm64: alternatives: add __init/__initconst to some functions/variables
  arm64/asm: Remove unused assembler DAIF save/restore macros
  arm64/kpti: Move DAIF masking to C code
  Revert "arm64/mm: Drop redundant BUG_ON(!pgtable_alloc)"
  arm64/mm: Drop unused restore_ttbr1
  arm64: alternatives: make apply_alternatives_vdso() static
  arm64/mm: Drop idmap_pg_end[] declaration
  arm64/mm: Drop redundant BUG_ON(!pgtable_alloc)
  arm64: make is_ttbrX_addr() noinstr-safe
  arm64/signal: Document our convention for choosing magic numbers
  arm64: atomics: lse: remove stale dependency on JUMP_LABEL
  arm64: paravirt: remove conduit check in has_pv_steal_clock
  arm64: entry: Fix typo
  arm64/booting: Add missing colon to FA64 entry
  arm64/mm: Drop ARM64_KERNEL_USES_PMD_MAPS
  arm64/asm: Remove unused enable_da macro
parents 70b1c62a 67bc5b2d

Documentation/arm64/booting.rst

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ Before jumping into the kernel, the following conditions must be met: 


    - HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.



  For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64)

  For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64):



  - If EL3 is present:

arch/arm64/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1737,7 +1737,6 @@ config ARM64_LSE_ATOMICS 


config ARM64_USE_LSE_ATOMICS

	bool "Atomic instructions"

	depends on JUMP_LABEL

	default y

	help

	  As part of the Large System Extensions, ARMv8.1 introduces new

arch/arm64/include/asm/assembler.h

+0 −25
Original line number Diff line number Diff line
@@ -34,11 +34,6 @@ 
	wx\n	.req	w\n

	.endr



	.macro save_and_disable_daif, flags

	mrs	\flags, daif

	msr	daifset, #0xf

	.endm



	.macro disable_daif

	msr	daifset, #0xf

	.endm
@@ -47,15 +42,6 @@ 
	msr	daifclr, #0xf

	.endm



	.macro	restore_daif, flags:req

	msr	daif, \flags

	.endm



	/* IRQ/FIQ are the lowest priority flags, unconditionally unmask the rest. */

	.macro enable_da

	msr	daifclr, #(8 | 4)

	.endm



/*

 * Save/restore interrupts.

 */
@@ -619,17 +605,6 @@ alternative_endif 
#endif

	.endm



/*

 * Perform the reverse of offset_ttbr1.

 * bic is used as it can cover the immediate value and, in future, won't need

 * to be nop'ed out when dealing with 52-bit kernel VAs.

 */

	.macro	restore_ttbr1, ttbr

#ifdef CONFIG_ARM64_VA_BITS_52

	bic	\ttbr, \ttbr, #TTBR1_BADDR_4852_OFFSET

#endif

	.endm



/*

 * Arrange a physical address in a TTBR register, taking care of 52-bit

 * addresses.

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

+3 −8
Original line number Diff line number Diff line
@@ -18,11 +18,6 @@ 
 * with 4K (section size = 2M) but not with 16K (section size = 32M) or

 * 64K (section size = 512M).

 */

#ifdef CONFIG_ARM64_4K_PAGES

#define ARM64_KERNEL_USES_PMD_MAPS 1

#else

#define ARM64_KERNEL_USES_PMD_MAPS 0

#endif



/*

 * The idmap and swapper page tables need some space reserved in the kernel
@@ -34,7 +29,7 @@ 
 * VA range, so pages required to map highest possible PA are reserved in all

 * cases.

 */

#if ARM64_KERNEL_USES_PMD_MAPS

#ifdef CONFIG_ARM64_4K_PAGES

#define SWAPPER_PGTABLE_LEVELS	(CONFIG_PGTABLE_LEVELS - 1)

#else

#define SWAPPER_PGTABLE_LEVELS	(CONFIG_PGTABLE_LEVELS)
@@ -96,7 +91,7 @@ 
#define INIT_IDMAP_DIR_PAGES	EARLY_PAGES(KIMAGE_VADDR, _end + MAX_FDT_SIZE + SWAPPER_BLOCK_SIZE, 1)



/* Initial memory map size */

#if ARM64_KERNEL_USES_PMD_MAPS

#ifdef CONFIG_ARM64_4K_PAGES

#define SWAPPER_BLOCK_SHIFT	PMD_SHIFT

#define SWAPPER_BLOCK_SIZE	PMD_SIZE

#define SWAPPER_TABLE_SHIFT	PUD_SHIFT
@@ -112,7 +107,7 @@ 
#define SWAPPER_PTE_FLAGS	(PTE_TYPE_PAGE | PTE_AF | PTE_SHARED)

#define SWAPPER_PMD_FLAGS	(PMD_TYPE_SECT | PMD_SECT_AF | PMD_SECT_S)



#if ARM64_KERNEL_USES_PMD_MAPS

#ifdef CONFIG_ARM64_4K_PAGES

#define SWAPPER_RW_MMUFLAGS	(PMD_ATTRINDX(MT_NORMAL) | SWAPPER_PMD_FLAGS)

#define SWAPPER_RX_MMUFLAGS	(SWAPPER_RW_MMUFLAGS | PMD_SECT_RDONLY)

#else

arch/arm64/include/asm/lse.h

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 


#include <linux/compiler_types.h>

#include <linux/export.h>

#include <linux/jump_label.h>

#include <linux/stringify.h>

#include <asm/alternative.h>

#include <asm/alternative-macros.h>