Module Name: src
Committed By: skrll
Date: Sun Nov 18 15:52:04 UTC 2018
Modified Files:
src/sys/arch/aarch64/conf: files.aarch64
src/sys/arch/aarch64/include: param.h
src/sys/arch/evbarm/conf: GENERIC64
Log Message:
Add CPU_THUNDERX which sets COHERENCY_UNIT and CACHE_LINE_SIZE to 128
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/aarch64/conf/files.aarch64
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/include/param.h
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/evbarm/conf/GENERIC64
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/conf/files.aarch64
diff -u src/sys/arch/aarch64/conf/files.aarch64:1.9 src/sys/arch/aarch64/conf/files.aarch64:1.10
--- src/sys/arch/aarch64/conf/files.aarch64:1.9 Sun Oct 28 10:21:42 2018
+++ src/sys/arch/aarch64/conf/files.aarch64 Sun Nov 18 15:52:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.aarch64,v 1.9 2018/10/28 10:21:42 jmcneill Exp $
+# $NetBSD: files.aarch64,v 1.10 2018/11/18 15:52:03 skrll Exp $
defflag opt_cpuoptions.h AARCH64_ALIGNMENT_CHECK
defflag opt_cpuoptions.h AARCH64_EL0_STACK_ALIGNMENT_CHECK
@@ -10,6 +10,7 @@ defflag opt_cputypes.h CPU_CORTEX: CPU_
defflag opt_cputypes.h CPU_CORTEXA35: CPU_CORTEX
defflag opt_cputypes.h CPU_CORTEXA53: CPU_CORTEX
defflag opt_cputypes.h CPU_CORTEXA57: CPU_CORTEX
+defflag opt_cputypes.h CPU_THUNDERX: CPU_ARMV8
# Interrupt implementation header definition
defparam opt_arm_intr_impl.h ARM_INTR_IMPL
Index: src/sys/arch/aarch64/include/param.h
diff -u src/sys/arch/aarch64/include/param.h:1.6 src/sys/arch/aarch64/include/param.h:1.7
--- src/sys/arch/aarch64/include/param.h:1.6 Thu Nov 15 04:56:52 2018
+++ src/sys/arch/aarch64/include/param.h Sun Nov 18 15:52:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.6 2018/11/15 04:56:52 riastradh Exp $ */
+/* $NetBSD: param.h,v 1.7 2018/11/18 15:52:03 skrll Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,6 +34,10 @@
#ifdef __aarch64__
+#ifdef _KERNEL_OPT
+#include "opt_cputypes.h"
+#endif
+
/*
* Machine dependent constants for all ARM processors
*/
@@ -131,18 +135,23 @@
#endif
#ifdef _KERNEL
+
+#if defined(CPU_THUNDERX)
+#define COHERENCY_UNIT 128
+#define CACHE_LINE_SIZE 128
+#endif
+
#ifndef __HIDE_DELAY
void delay(unsigned int);
#define DELAY(x) delay(x)
#endif
-#endif
/*
* Compatibility /dev/zero mapping.
*/
-#ifdef _KERNEL
#ifdef COMPAT_16
#define COMPAT_ZERODEV(x) (x == makedev(0, _DEV_ZERO_oARM))
#endif
+
#endif /* _KERNEL */
#define aarch64_btop(x) ((unsigned long)(x) >> PGSHIFT)
Index: src/sys/arch/evbarm/conf/GENERIC64
diff -u src/sys/arch/evbarm/conf/GENERIC64:1.63 src/sys/arch/evbarm/conf/GENERIC64:1.64
--- src/sys/arch/evbarm/conf/GENERIC64:1.63 Sun Nov 18 15:50:26 2018
+++ src/sys/arch/evbarm/conf/GENERIC64 Sun Nov 18 15:52:04 2018
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC64,v 1.63 2018/11/18 15:50:26 skrll Exp $
+# $NetBSD: GENERIC64,v 1.64 2018/11/18 15:52:04 skrll Exp $
#
# GENERIC ARM (aarch64) kernel
#
@@ -58,6 +58,7 @@ makeoptions DTS="
"
options CPU_CORTEXA53
options CPU_CORTEXA57
+#options CPU_THUNDERX
options SOC_BCM2837
options SOC_RK3328
options SOC_RK3399
