Module Name: src
Committed By: jmcneill
Date: Sun Jul 15 23:48:08 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: files.fdt pmu_fdt.c
Log Message:
Add support for ARMv7 performance monitor (PMU).
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/fdt/files.fdt
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/pmu_fdt.c
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/arm/fdt/files.fdt
diff -u src/sys/arch/arm/fdt/files.fdt:1.20 src/sys/arch/arm/fdt/files.fdt:1.21
--- src/sys/arch/arm/fdt/files.fdt:1.20 Sun Jul 15 16:07:49 2018
+++ src/sys/arch/arm/fdt/files.fdt Sun Jul 15 23:48:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.20 2018/07/15 16:07:49 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.21 2018/07/15 23:48:08 jmcneill Exp $
include "dev/pckbport/files.pckbport"
@@ -53,6 +53,7 @@ file arch/arm/fdt/psci_fdt.c psci_fdt
device armpmu
attach armpmu at fdt with pmu_fdt
file arch/arm/fdt/pmu_fdt.c pmu_fdt
+file dev/tprof/tprof_armv7.c pmu_fdt & arm32
file dev/tprof/tprof_armv8.c pmu_fdt & aarch64
attach genfb at fdt with plfb_fdt: fdt_display_timing
Index: src/sys/arch/arm/fdt/pmu_fdt.c
diff -u src/sys/arch/arm/fdt/pmu_fdt.c:1.1 src/sys/arch/arm/fdt/pmu_fdt.c:1.2
--- src/sys/arch/arm/fdt/pmu_fdt.c:1.1 Sun Jul 15 16:07:49 2018
+++ src/sys/arch/arm/fdt/pmu_fdt.c Sun Jul 15 23:48:08 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmu_fdt.c,v 1.1 2018/07/15 16:07:49 jmcneill Exp $ */
+/* $NetBSD: pmu_fdt.c,v 1.2 2018/07/15 23:48:08 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.1 2018/07/15 16:07:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.2 2018/07/15 23:48:08 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -39,10 +39,14 @@ __KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v
#include <dev/fdt/fdtvar.h>
-#if defined(__aarch64__)
+#if defined(_ARM_ARCH_8)
#include <dev/tprof/tprof_armv8.h>
#define arm_pmu_intr armv8_pmu_intr
#define arm_pmu_init armv8_pmu_init
+#elif defined(_ARM_ARCH_7)
+#include <dev/tprof/tprof_armv7.h>
+#define arm_pmu_intr armv7_pmu_intr
+#define arm_pmu_init armv7_pmu_init
#endif
#include <arm/armreg.h>
@@ -59,6 +63,15 @@ static const char * const compatible[] =
"arm,cortex-a72-pmu",
"arm,cortex-a57-pmu",
"arm,cortex-a53-pmu",
+
+ "arm,cortex-a35-pmu",
+ "arm,cortex-a17-pmu",
+ "arm,cortex-a12-pmu",
+ "arm,cortex-a9-pmu",
+ "arm,cortex-a8-pmu",
+ "arm,cortex-a7-pmu",
+ "arm,cortex-a5-pmu",
+
NULL
};
