svn commit: r323309 - head/sys/arm64/arm64

Andrew Turner andrew at FreeBSD.org
Fri Sep 8 08:02:08 UTC 2017


Author: andrew
Date: Fri Sep  8 08:02:06 2017
New Revision: 323309
URL: https://svnweb.freebsd.org/changeset/base/323309

Log:
  Not all CPUs handle reading ID_AA64MMFR2_EL1 (e.g. qemu), disable it for now.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm64/arm64/identcpu.c

Modified: head/sys/arm64/arm64/identcpu.c
==============================================================================
--- head/sys/arm64/arm64/identcpu.c	Fri Sep  8 06:57:11 2017	(r323308)
+++ head/sys/arm64/arm64/identcpu.c	Fri Sep  8 08:02:06 2017	(r323309)
@@ -897,7 +897,11 @@ identify_cpu(void)
 	cpu_desc[cpu].id_aa64isar1 = READ_SPECIALREG(ID_AA64ISAR1_EL1);
 	cpu_desc[cpu].id_aa64mmfr0 = READ_SPECIALREG(ID_AA64MMFR0_EL1);
 	cpu_desc[cpu].id_aa64mmfr1 = READ_SPECIALREG(ID_AA64MMFR1_EL1);
+#ifdef NOTYET
 	cpu_desc[cpu].id_aa64mmfr2 = READ_SPECIALREG(ID_AA64MMFR2_EL1);
+#else
+	cpu_desc[cpu].id_aa64mmfr2 = 0;
+#endif
 	cpu_desc[cpu].id_aa64pfr0 = READ_SPECIALREG(ID_AA64PFR0_EL1);
 	cpu_desc[cpu].id_aa64pfr1 = READ_SPECIALREG(ID_AA64PFR1_EL1);
 


More information about the svn-src-head mailing list