Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-8
+3
Documentation/arm64/silicon-errata.rst
+3
Documentation/arm64/silicon-errata.rst
···
189
189
+----------------+-----------------+-----------------+-----------------------------+
190
190
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1024718 |
191
191
+----------------+-----------------+-----------------+-----------------------------+
192
+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1286807 |
193
+
+----------------+-----------------+-----------------+-----------------------------+
194
+
192
195
+----------------+-----------------+-----------------+-----------------------------+
193
196
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
194
197
+----------------+-----------------+-----------------+-----------------------------+
+4
arch/arm64/kernel/Makefile
+4
arch/arm64/kernel/Makefile
···
75
75
obj-y += vdso-wrap.o
76
76
obj-$(CONFIG_COMPAT_VDSO) += vdso32-wrap.o
77
77
78
+
# Force dependency (vdso*-wrap.S includes vdso.so through incbin)
79
+
$(obj)/vdso-wrap.o: $(obj)/vdso/vdso.so
80
+
$(obj)/vdso32-wrap.o: $(obj)/vdso32/vdso.so
81
+
78
82
obj-y += probes/
79
83
head-y := head.o
80
84
extra-y += $(head-y) vmlinux.lds
+2
arch/arm64/kernel/cpu_errata.c
+2
arch/arm64/kernel/cpu_errata.c
+1
-2
arch/arm64/kernel/cpufeature.c
+1
-2
arch/arm64/kernel/cpufeature.c
···
654
654
ARM64_FTR_REG(SYS_ID_AA64ISAR0_EL1, ftr_id_aa64isar0),
655
655
ARM64_FTR_REG_OVERRIDE(SYS_ID_AA64ISAR1_EL1, ftr_id_aa64isar1,
656
656
&id_aa64isar1_override),
657
-
ARM64_FTR_REG(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2),
658
657
ARM64_FTR_REG_OVERRIDE(SYS_ID_AA64ISAR2_EL1, ftr_id_aa64isar2,
659
658
&id_aa64isar2_override),
660
659
···
809
810
* to sys_id for subsequent binary search in get_arm64_ftr_reg()
810
811
* to work correctly.
811
812
*/
812
-
BUG_ON(arm64_ftr_regs[i].sys_id < arm64_ftr_regs[i - 1].sys_id);
813
+
BUG_ON(arm64_ftr_regs[i].sys_id <= arm64_ftr_regs[i - 1].sys_id);
813
814
}
814
815
}
815
816
-3
arch/arm64/kernel/vdso/Makefile
-3
arch/arm64/kernel/vdso/Makefile
···
52
52
targets += vdso.lds
53
53
CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
54
54
55
-
# Force dependency (incbin is bad)
56
-
$(obj)/vdso.o : $(obj)/vdso.so
57
-
58
55
# Link rule for the .so file, .lds has to be first
59
56
$(obj)/vdso.so.dbg: $(obj)/vdso.lds $(obj-vdso) FORCE
60
57
$(call if_changed,vdsold_and_vdso_check)
-3
arch/arm64/kernel/vdso32/Makefile
-3
arch/arm64/kernel/vdso32/Makefile
···
131
131
targets += vdso.lds
132
132
CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
133
133
134
-
# Force dependency (vdso.s includes vdso.so through incbin)
135
-
$(obj)/vdso.o: $(obj)/vdso.so
136
-
137
134
include/generated/vdso32-offsets.h: $(obj)/vdso.so.dbg FORCE
138
135
$(call if_changed,vdsosym)
139
136