Skip to content

Commit 868dda0

Browse files
torvaldstorvalds
committed
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas: - Cortex-A76 erratum workaround - ftrace fix to enable syscall events on arm64 - Fix uninitialised pointer in iort_get_platform_device_domain() * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: ACPI/IORT: Fix iort_get_platform_device_domain() uninitialized pointer value arm64: ftrace: Fix to enable syscall events on arm64 arm64: Add workaround for Cortex-A76 erratum 1286807
2 parents 1f81742 + ea2412d commit 868dda0

File tree

6 files changed

+59
-6
lines changed

6 files changed

+59
-6
lines changed

‎Documentation/arm64/silicon-errata.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ stable kernels.
5757
| ARM | Cortex-A73 | #858921 | ARM64_ERRATUM_858921 |
5858
| ARM | Cortex-A55 | #1024718 | ARM64_ERRATUM_1024718 |
5959
| ARM | Cortex-A76 | #1188873 | ARM64_ERRATUM_1188873 |
60+
| ARM | Cortex-A76 | #1286807 | ARM64_ERRATUM_1286807 |
6061
| ARM | MMU-500 | #841119,#826419 | N/A |
6162
| | | | |
6263
| Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 |

‎arch/arm64/Kconfig

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,24 @@ config ARM64_ERRATUM_1188873
497497

498498
If unsure, say Y.
499499

500+
config ARM64_ERRATUM_1286807
501+
bool "Cortex-A76: Modification of the translation table for a virtual address might lead to read-after-read ordering violation"
502+
default y
503+
select ARM64_WORKAROUND_REPEAT_TLBI
504+
help
505+
This option adds workaround for ARM Cortex-A76 erratum 1286807
506+
507+
On the affected Cortex-A76 cores (r0p0 to r3p0), if a virtual
508+
address for a cacheable mapping of a location is being
509+
accessed by a core while another core is remapping the virtual
510+
address to a new physical page using the recommended
511+
break-before-make sequence, then under very rare circumstances
512+
TLBI+DSB completes before a read using the translation being
513+
invalidated has been observed by other observers. The
514+
workaround repeats the TLBI+DSB operation.
515+
516+
If unsure, say Y.
517+
500518
config CAVIUM_ERRATUM_22375
501519
bool "Cavium erratum 22375, 24313"
502520
default y
@@ -566,9 +584,16 @@ config QCOM_FALKOR_ERRATUM_1003
566584
is unchanged. Work around the erratum by invalidating the walk cache
567585
entries for the trampoline before entering the kernel proper.
568586

587+
config ARM64_WORKAROUND_REPEAT_TLBI
588+
bool
589+
help
590+
Enable the repeat TLBI workaround for Falkor erratum 1009 and
591+
Cortex-A76 erratum 1286807.
592+
569593
config QCOM_FALKOR_ERRATUM_1009
570594
bool "Falkor E1009: Prematurely complete a DSB after a TLBI"
571595
default y
596+
select ARM64_WORKAROUND_REPEAT_TLBI
572597
help
573598
On Falkor v1, the CPU may prematurely complete a DSB following a
574599
TLBI xxIS invalidate maintenance operation. Repeat the TLBI operation

‎arch/arm64/include/asm/ftrace.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,19 @@ static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs)
5656
{
5757
return is_compat_task();
5858
}
59+
60+
#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME
61+
62+
static inline bool arch_syscall_match_sym_name(const char *sym,
63+
const char *name)
64+
{
65+
/*
66+
* Since all syscall functions have __arm64_ prefix, we must skip it.
67+
* However, as we described above, we decided to ignore compat
68+
* syscalls, so we don't care about __arm64_compat_ prefix here.
69+
*/
70+
return !strcmp(sym + 8, name);
71+
}
5972
#endif /* ifndef __ASSEMBLY__ */
6073

6174
#endif /* __ASM_FTRACE_H */

‎arch/arm64/include/asm/tlbflush.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
ALTERNATIVE("nop\n nop", \
4242
"dsb ish\n tlbi " #op, \
4343
ARM64_WORKAROUND_REPEAT_TLBI, \
44-
CONFIG_QCOM_FALKOR_ERRATUM_1009) \
44+
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI) \
4545
: : )
4646

4747
#define __TLBI_1(op, arg) asm ("tlbi " #op ", %0\n" \
4848
ALTERNATIVE("nop\n nop", \
4949
"dsb ish\n tlbi " #op ", %0", \
5050
ARM64_WORKAROUND_REPEAT_TLBI, \
51-
CONFIG_QCOM_FALKOR_ERRATUM_1009) \
51+
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI) \
5252
: : "r" (arg))
5353

5454
#define __TLBI_N(op, arg, n, ...) __TLBI_##n(op, arg)

‎arch/arm64/kernel/cpu_errata.c

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -570,6 +570,20 @@ static const struct midr_range arm64_harden_el2_vectors[] = {
570570

571571
#endif
572572

573+
#ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI
574+
575+
static const struct midr_range arm64_repeat_tlbi_cpus[] = {
576+
#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009
577+
MIDR_RANGE(MIDR_QCOM_FALKOR_V1, 0, 0, 0, 0),
578+
#endif
579+
#ifdef CONFIG_ARM64_ERRATUM_1286807
580+
MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 3, 0),
581+
#endif
582+
{},
583+
};
584+
585+
#endif
586+
573587
const struct arm64_cpu_capabilities arm64_errata[] = {
574588
#if defined(CONFIG_ARM64_ERRATUM_826319) || \
575589
defined(CONFIG_ARM64_ERRATUM_827319) || \
@@ -695,11 +709,11 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
695709
.matches = is_kryo_midr,
696710
},
697711
#endif
698-
#ifdef CONFIG_QCOM_FALKOR_ERRATUM_1009
712+
#ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI
699713
{
700-
.desc = "Qualcomm Technologies Falkor erratum 1009",
714+
.desc = "Qualcomm erratum 1009, ARM erratum 1286807",
701715
.capability = ARM64_WORKAROUND_REPEAT_TLBI,
702-
ERRATA_MIDR_REV(MIDR_QCOM_FALKOR_V1, 0, 0),
716+
ERRATA_MIDR_RANGE_LIST(arm64_repeat_tlbi_cpus),
703717
},
704718
#endif
705719
#ifdef CONFIG_ARM64_ERRATUM_858921

‎drivers/acpi/arm64/iort.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@ static void iort_set_device_domain(struct device *dev,
700700
*/
701701
static struct irq_domain *iort_get_platform_device_domain(struct device *dev)
702702
{
703-
struct acpi_iort_node *node, *msi_parent;
703+
struct acpi_iort_node *node, *msi_parent = NULL;
704704
struct fwnode_handle *iort_fwnode;
705705
struct acpi_iort_its_group *its;
706706
int i;

0 commit comments

Comments
 (0)