Module Name: src
Committed By: martin
Date: Thu Sep 26 18:50:18 UTC 2019
Modified Files:
src/sys/arch/x86/x86 [netbsd-9]: identcpu.c
src/usr.sbin/cpuctl/arch [netbsd-9]: i386.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #242):
usr.sbin/cpuctl/arch/i386.c: revision 1.106
sys/arch/x86/x86/identcpu.c: revision 1.94
Call cpu_dcp_cacheinfo() only when the cpuid Topology Extension flag is set
on AMD processor.
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.93.2.1 src/sys/arch/x86/x86/identcpu.c
cvs rdiff -u -r1.104.2.1 -r1.104.2.2 src/usr.sbin/cpuctl/arch/i386.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/x86/x86/identcpu.c
diff -u src/sys/arch/x86/x86/identcpu.c:1.93 src/sys/arch/x86/x86/identcpu.c:1.93.2.1
--- src/sys/arch/x86/x86/identcpu.c:1.93 Fri Jul 26 10:03:40 2019
+++ src/sys/arch/x86/x86/identcpu.c Thu Sep 26 18:50:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: identcpu.c,v 1.93 2019/07/26 10:03:40 msaitoh Exp $ */
+/* $NetBSD: identcpu.c,v 1.93.2.1 2019/09/26 18:50:18 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.93 2019/07/26 10:03:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: identcpu.c,v 1.93.2.1 2019/09/26 18:50:18 martin Exp $");
#include "opt_xen.h"
@@ -357,7 +357,8 @@ cpu_probe_amd_cache(struct cpu_info *ci)
if (lfunc < 0x8000001d)
return;
- cpu_dcp_cacheinfo(ci, 0x8000001d);
+ if (ci->ci_feat_val[3] & CPUID_TOPOEXT)
+ cpu_dcp_cacheinfo(ci, 0x8000001d);
}
static void
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.104.2.1 src/usr.sbin/cpuctl/arch/i386.c:1.104.2.2
--- src/usr.sbin/cpuctl/arch/i386.c:1.104.2.1 Thu Sep 26 18:47:14 2019
+++ src/usr.sbin/cpuctl/arch/i386.c Thu Sep 26 18:50:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.104.2.1 2019/09/26 18:47:14 martin Exp $ */
+/* $NetBSD: i386.c,v 1.104.2.2 2019/09/26 18:50:18 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.104.2.1 2019/09/26 18:47:14 martin Exp $");
+__RCSID("$NetBSD: i386.c,v 1.104.2.2 2019/09/26 18:50:18 martin Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -1433,7 +1433,8 @@ amd_cpu_cacheinfo(struct cpu_info *ci)
if (lfunc < 0x8000001d)
return;
- cpu_dcp_cacheinfo(ci, 0x8000001d);
+ if (ci->ci_feat_val[3] & CPUID_TOPOEXT)
+ cpu_dcp_cacheinfo(ci, 0x8000001d);
}
static void
