Commit 4b1967c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "The critical one here is a fix for fpsimd register corruption across
  signals which was introduced by the SVE support code (the register
  files overlap), but the others are worth having as well.

  Summary:

   - Fix FP register corruption when SVE is not available or in use

   - Fix out-of-tree module build failure when CONFIG_ARM64_MODULE_PLTS=y

   - Missing 'const' generating errors with LTO builds

   - Remove unsupported events from Cortex-A73 PMU description

   - Removal of stale and incorrect comments"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: context: Fix comments and remove pointless smp_wmb()
  arm64: cpu_ops: Add missing 'const' qualifiers
  arm64: perf: remove unsupported events for Cortex-A73
  arm64: fpsimd: Fix failure to restore FPSIMD state after signals
  arm64: pgd: Mark pgd_cache as __ro_after_init
  arm64: ftrace: emit ftrace-mod.o contents through code
  arm64: module-plts: factor out PLT generation code for ftrace
  arm64: mm: cleanup stale AIVIVT references
parents a0651c7f 3a33c760

arch/arm64/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -83,9 +83,6 @@ endif 


ifeq ($(CONFIG_ARM64_MODULE_PLTS),y)

KBUILD_LDFLAGS_MODULE	+= -T $(srctree)/arch/arm64/kernel/module.lds

ifeq ($(CONFIG_DYNAMIC_FTRACE),y)

KBUILD_LDFLAGS_MODULE	+= $(objtree)/arch/arm64/kernel/ftrace-mod.o

endif

endif



# Default value

arch/arm64/include/asm/cacheflush.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
 *

 *	See Documentation/cachetlb.txt for more information. Please note that

 *	the implementation assumes non-aliasing VIPT D-cache and (aliasing)

 *	VIPT or ASID-tagged VIVT I-cache.

 *	VIPT I-cache.

 *

 *	flush_cache_mm(mm)

 *

arch/arm64/include/asm/module.h

+45 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ struct mod_arch_specific { 
	struct mod_plt_sec	init;



	/* for CONFIG_DYNAMIC_FTRACE */

	void			*ftrace_trampoline;

	struct plt_entry 	*ftrace_trampoline;

};

#endif
@@ -45,4 +45,48 @@ extern u64 module_alloc_base; 
#define module_alloc_base	((u64)_etext - MODULES_VSIZE)

#endif



struct plt_entry {

	/*

	 * A program that conforms to the AArch64 Procedure Call Standard

	 * (AAPCS64) must assume that a veneer that alters IP0 (x16) and/or

	 * IP1 (x17) may be inserted at any branch instruction that is

	 * exposed to a relocation that supports long branches. Since that

	 * is exactly what we are dealing with here, we are free to use x16

	 * as a scratch register in the PLT veneers.

	 */

	__le32	mov0;	/* movn	x16, #0x....			*/

	__le32	mov1;	/* movk	x16, #0x...., lsl #16		*/

	__le32	mov2;	/* movk	x16, #0x...., lsl #32		*/

	__le32	br;	/* br	x16				*/

};



static inline struct plt_entry get_plt_entry(u64 val)

{

	/*

	 * MOVK/MOVN/MOVZ opcode:

	 * +--------+------------+--------+-----------+-------------+---------+

	 * | sf[31] | opc[30:29] | 100101 | hw[22:21] | imm16[20:5] | Rd[4:0] |

	 * +--------+------------+--------+-----------+-------------+---------+

	 *

	 * Rd     := 0x10 (x16)

	 * hw     := 0b00 (no shift), 0b01 (lsl #16), 0b10 (lsl #32)

	 * opc    := 0b11 (MOVK), 0b00 (MOVN), 0b10 (MOVZ)

	 * sf     := 1 (64-bit variant)

	 */

	return (struct plt_entry){

		cpu_to_le32(0x92800010 | (((~val      ) & 0xffff)) << 5),

		cpu_to_le32(0xf2a00010 | ((( val >> 16) & 0xffff)) << 5),

		cpu_to_le32(0xf2c00010 | ((( val >> 32) & 0xffff)) << 5),

		cpu_to_le32(0xd61f0200)

	};

}



static inline bool plt_entries_equal(const struct plt_entry *a,

				     const struct plt_entry *b)

{

	return a->mov0 == b->mov0 &&

	       a->mov1 == b->mov1 &&

	       a->mov2 == b->mov2;

}



#endif /* __ASM_MODULE_H */

arch/arm64/kernel/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -61,6 +61,3 @@ extra-y += $(head-y) vmlinux.lds 
ifeq ($(CONFIG_DEBUG_EFI),y)

AFLAGS_head.o += -DVMLINUX_PATH="\"$(realpath $(objtree)/vmlinux)\""

endif
 


# will be included by each individual module but not by the core kernel itself

extra-$(CONFIG_DYNAMIC_FTRACE) += ftrace-mod.o

arch/arm64/kernel/cpu_ops.c

+3 −3
Original line number Diff line number Diff line
@@ -31,13 +31,13 @@ extern const struct cpu_operations cpu_psci_ops; 


const struct cpu_operations *cpu_ops[NR_CPUS] __ro_after_init;



static const struct cpu_operations *dt_supported_cpu_ops[] __initconst = {

static const struct cpu_operations *const dt_supported_cpu_ops[] __initconst = {

	&smp_spin_table_ops,

	&cpu_psci_ops,

	NULL,

};



static const struct cpu_operations *acpi_supported_cpu_ops[] __initconst = {

static const struct cpu_operations *const acpi_supported_cpu_ops[] __initconst = {

#ifdef CONFIG_ARM64_ACPI_PARKING_PROTOCOL

	&acpi_parking_protocol_ops,

#endif
@@ -47,7 +47,7 @@ static const struct cpu_operations *acpi_supported_cpu_ops[] __initconst = { 


static const struct cpu_operations * __init cpu_get_ops(const char *name)

{

	const struct cpu_operations **ops;

	const struct cpu_operations *const *ops;



	ops = acpi_disabled ? dt_supported_cpu_ops : acpi_supported_cpu_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE