Commit 91bdba85 authored May 13, 2022 by Linus Torvalds

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

Pull arm64 fixes from Will Deacon:

 - TLB invalidation workaround for Qualcomm Kryo-4xx "gold" CPUs

 - Fix broken dependency in the vDSO Makefile

 - Fix pointer authentication overrides in ISAR2 ID register

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: Enable repeat tlbi workaround on KRYO4XX gold CPUs
  arm64: cpufeature: remove duplicate ID_AA64ISAR2_EL1 entry
  arm64: vdso: fix makefile dependency on vdso.so

parents 359ee4f4 51f559d6

Documentation/arm64/silicon-errata.rst

+3 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,9 @@ stable kernels.
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| Kryo4xx Silver \| N/A \| ARM64_ERRATUM_1024718 \|
		+----------------+-----------------+-----------------+-----------------------------+
		\| Qualcomm Tech. \| Kryo4xx Gold \| N/A \| ARM64_ERRATUM_1286807 \|
		+----------------+-----------------+-----------------+-----------------------------+

		+----------------+-----------------+-----------------+-----------------------------+
		\| Fujitsu \| A64FX \| E#010001 \| FUJITSU_ERRATUM_010001 \|
		+----------------+-----------------+-----------------+-----------------------------+

arch/arm64/kernel/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -75,6 +75,10 @@ obj-$(CONFIG_ARM64_MTE) += mte.o
		obj-y += vdso-wrap.o
		obj-$(CONFIG_COMPAT_VDSO) += vdso32-wrap.o

		# Force dependency (vdso*-wrap.S includes vdso.so through incbin)
		$(obj)/vdso-wrap.o: $(obj)/vdso/vdso.so
		$(obj)/vdso32-wrap.o: $(obj)/vdso32/vdso.so

		obj-y += probes/
		head-y := head.o
		extra-y += $(head-y) vmlinux.lds

arch/arm64/kernel/cpu_errata.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -208,6 +208,8 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
		#ifdef CONFIG_ARM64_ERRATUM_1286807
		{
		ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0),
		/* Kryo4xx Gold (rcpe to rfpe) => (r0p0 to r3p0) */
		ERRATA_MIDR_RANGE(MIDR_QCOM_KRYO_4XX_GOLD, 0xc, 0xe, 0xf, 0xe),
		},
		#endif
		{},

arch/arm64/kernel/cpufeature.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -654,7 +654,6 @@ static const struct __ftr_reg_entry {
		ARM64_FTR_REG(SYS_ID_AA64ISAR0_EL1, ftr_id_aa64isar0),
		ARM64_FTR_REG_OVERRIDE(SYS_ID_AA64ISAR1_EL1, ftr_id_aa64isar1,
		&id_aa64isar1_override),
		ARM64_FTR_REG(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2),
		ARM64_FTR_REG_OVERRIDE(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2,
		&id_aa64isar2_override),

		@@ -810,7 +809,7 @@ static void __init sort_ftr_regs(void)
		* to sys_id for subsequent binary search in get_arm64_ftr_reg()
		* to work correctly.
		*/
		BUG_ON(arm64_ftr_regs[i].sys_id < arm64_ftr_regs[i - 1].sys_id);
		BUG_ON(arm64_ftr_regs[i].sys_id <= arm64_ftr_regs[i - 1].sys_id);
		}
		}

arch/arm64/kernel/vdso/Makefile

+0 −3

Original line number	Diff line number	Diff line
		@@ -52,9 +52,6 @@ GCOV_PROFILE := n
		targets += vdso.lds
		CPPFLAGS_vdso.lds += -P -C -U$(ARCH)

		# Force dependency (incbin is bad)
		$(obj)/vdso.o : $(obj)/vdso.so

		# Link rule for the .so file, .lds has to be first
		$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
		$(call if_changed,vdsold_and_vdso_check)