svn commit: r322204 - in stable/11/sys: amd64/amd64 i386/i386 x86/include x86/x86

[Jung-uk Kim]

Author: jkim
Date: Mon Aug  7 22:28:27 2017
New Revision: 322204
URL: https://svnweb.freebsd.org/changeset/base/322204

Log:
  MFC:	r322076
  
  Detect hypervisor early so that we set lower hz on it.

Modified:
  stable/11/sys/amd64/amd64/machdep.c
  stable/11/sys/i386/i386/machdep.c
  stable/11/sys/x86/include/x86_var.h
  stable/11/sys/x86/x86/identcpu.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/11/sys/amd64/amd64/machdep.c	Mon Aug  7 21:38:10 2017	(r322203)
+++ stable/11/sys/amd64/amd64/machdep.c	Mon Aug  7 22:28:27 2017	(r322204)
@@ -1544,6 +1544,8 @@ hammer_time(u_int64_t modulep, u_int64_t physfree)
 
 	kmdp = init_ops.parse_preload_data(modulep);
 
+	identify_hypervisor();
+
 	/* Init basic tunables, hz etc */
 	init_param1();
 

Modified: stable/11/sys/i386/i386/machdep.c
==============================================================================
--- stable/11/sys/i386/i386/machdep.c	Mon Aug  7 21:38:10 2017	(r322203)
+++ stable/11/sys/i386/i386/machdep.c	Mon Aug  7 22:28:27 2017	(r322204)
@@ -2472,6 +2472,8 @@ init386(int first)
 	else
 		init_static_kenv(NULL, 0);
 
+	identify_hypervisor();
+
 	/* Init basic tunables, hz etc */
 	init_param1();
 

Modified: stable/11/sys/x86/include/x86_var.h
==============================================================================
--- stable/11/sys/x86/include/x86_var.h	Mon Aug  7 21:38:10 2017	(r322203)
+++ stable/11/sys/x86/include/x86_var.h	Mon Aug  7 22:28:27 2017	(r322204)
@@ -116,6 +116,7 @@ void	cpu_setregs(void);
 void	dump_add_page(vm_paddr_t);
 void	dump_drop_page(vm_paddr_t);
 void	identify_cpu(void);
+void	identify_hypervisor(void);
 void	initializecpu(void);
 void	initializecpucache(void);
 bool	fix_cpuid(void);

Modified: stable/11/sys/x86/x86/identcpu.c
==============================================================================
--- stable/11/sys/x86/x86/identcpu.c	Mon Aug  7 21:38:10 2017	(r322203)
+++ stable/11/sys/x86/x86/identcpu.c	Mon Aug  7 22:28:27 2017	(r322204)
@@ -1252,7 +1252,7 @@ static const char *const vm_pnames[] = {
 	NULL
 };
 
-static void
+void
 identify_hypervisor(void)
 {
 	u_int regs[4];
@@ -1403,7 +1403,6 @@ identify_cpu(void)
 	cpu_feature2 = regs[2];
 #endif
 
-	identify_hypervisor();
 	cpu_vendor_id = find_cpu_vendor_id();
 
 	if (fix_cpuid()) {