Page MenuHomeFreeBSD
Files F154679366

D3184.id7425.diff
No OneTemporary
Actions

D3184.id7425.diff
View Options

Index: sys/arm64/arm64/gic_v3.c
===================================================================
--- sys/arm64/arm64/gic_v3.c
+++ sys/arm64/arm64/gic_v3.c
@@ -48,6 +48,7 @@
#include <vm/pmap.h>
#include <machine/bus.h>
+#include <machine/cpu.h>
#include <machine/intr.h>
#include "pic_if.h"
@@ -230,7 +231,18 @@
uint64_t active_irq;
while (1) {
+ if (CPU_MATCH_ERRATA_CAVIUM_THUNDER_1_1) {
+ /*
+ * Hardware: Cavium ThunderX
+ * Chip revision: Pass 1.0, Pass 1.1
+ * ERRATUM: 22978, 23154
+ */
+ __asm __volatile("nop;nop;nop;nop;nop;nop;nop;nop;\n"
+ "mrs %0, ICC_IAR1_EL1\n"
+ "nop;nop;nop;nop;dsb sy;" : "=&r" (active_irq));
+ } else {
active_irq = gic_icc_read(IAR1);
+ }
if (__predict_false(active_irq == ICC_IAR1_EL1_SPUR))
break;
Index: sys/arm64/conf/GENERIC
===================================================================
--- sys/arm64/conf/GENERIC
+++ sys/arm64/conf/GENERIC
@@ -109,6 +109,9 @@
# Note that 'bpf' is required for DHCP.
device bpf # Berkeley packet filter
+# Chip-specific errata
+options THUNDERX_PASS_1_1_ERRATA
+
options FDT
device acpi
Index: sys/arm64/include/cpu.h
===================================================================
--- sys/arm64/include/cpu.h
+++ sys/arm64/include/cpu.h
@@ -105,6 +105,26 @@
#define CPU_MATCH_RAW(mask, devid) \
(((mask) & PCPU_GET(midr)) == ((mask) & (devid)))
+/*
+ * Chip-specific errata. This defines are intended to be
+ * booleans used within if statements. When an appropriate
+ * kernel option is disabled, these defines must be defined
+ * as 0 to allow the compiler to remove a dead code thus
+ * produce better optimized kernel image.
+ */
+/*
+ * Vendor: Cavium
+ * Chip: ThunderX
+ * Revision(s): Pass 1.0, Pass 1.1
+ */
+#ifdef THUNDERX_PASS_1_1_ERRATA
+#define CPU_MATCH_ERRATA_CAVIUM_THUNDER_1_1 \
+ CPU_MATCH(CPU_IMPL_MASK | CPU_PART_MASK, CPU_IMPL_CAVIUM, CPU_PART_THUNDER, 0, 0)
+#else
+#define CPU_MATCH_ERRATA_CAVIUM_THUNDER_1_1 0
+#endif
+
+
extern char btext[];
extern char etext[];
Index: sys/conf/options.arm64
===================================================================
--- sys/conf/options.arm64
+++ sys/conf/options.arm64
@@ -1,6 +1,7 @@
# $FreeBSD$
ARM64 opt_global.h
+THUNDERX_PASS_1_1_ERRATA opt_global.h
SOCDEV_PA opt_global.h
SOCDEV_VA opt_global.h
VFP opt_global.h

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 5:17 AM (22 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32452800
Default Alt Text
D3184.id7425.diff (2 KB)

Event Timeline