inmates: x86: AMD: use the correct vmmcall instruction

I silently broke AMD inmates a while ago.

In 4d6eb915ca78, I removed the call of hypercall_init() without
reintroducing it at the right location again. No one noticed so far, as
the bug (crash of the cell due to a wrong instruction) only happens on
AMD machines only if they use the virtual debugging console.

Instead of calling hypercall_init() somewhere inside printk, let's move
it to setup.c, as we now have a arch_init_early() routine, which is the
right place for these kind of initialisations.

Also remove X86_FEATURE_VMX, it was never used.

Fixes: 4d6eb915ca78e ("inmates: x86: Use virtual console as additional console")
Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
[Jan: also remove hypercall_init from inmate.h]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

4 files changed, 20 insertions, 65 deletions

diff --git a/inmates/lib/x86/Makefile b/inmates/lib/x86/Makefile
index 15db65f8..97a37341 100644
--- a/inmates/lib/x86/Makefile
+++ b/inmates/lib/x86/Makefile
@@ -40,7 +40,7 @@ include $(INMATES_LIB)/Makefile.lib
 
 always := lib.a lib32.a
 
-TARGETS := header.o hypercall.o ioapic.o printk.o setup.o smp.o uart.o
+TARGETS := header.o ioapic.o printk.o setup.o smp.o uart.o
 TARGETS += ../alloc.o ../pci.o ../string.o ../cmdline.o ../setup.o
 TARGETS += ../uart-8250.o ../printk.o
 TARGETS_64_ONLY := int.o mem.o pci.o timing.o
diff --git a/inmates/lib/x86/hypercall.c b/inmates/lib/x86/hypercall.c
deleted file mode 100644
index fc5cd5ac..00000000
--- a/inmates/lib/x86/hypercall.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Jailhouse, a Linux-based partitioning hypervisor
- *
- * Copyright (c) Valentine Sinitsyn, 2014
- *
- * Authors:
- *  Valentine Sinitsyn <valentine.sinitsyn@gmail.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2.  See
- * the COPYING file in the top-level directory.
- *
- * Alternatively, you can use or redistribute this file under the following
- * BSD license:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <inmate.h>
-
-#define X86_FEATURE_VMX         (1 << 5)
-
-bool jailhouse_use_vmcall = true;
-
-#define AUTHENTIC_AMD(n)        (((const u32 *)"AuthenticAMD")[n])
-
-void hypercall_init(void)
-{
-        u32 eax, ebx, ecx, edx;
-
-        asm volatile("cpuid"
-                : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
-                : "a" (0)
-                : "memory"
-        );
-
-        if (ebx == AUTHENTIC_AMD(0) &&
-            edx == AUTHENTIC_AMD(1) &&
-            ecx == AUTHENTIC_AMD(2))
-                jailhouse_use_vmcall = false;
-}
diff --git a/inmates/lib/x86/include/inmate.h b/inmates/lib/x86/include/inmate.h
index 5fe4e102..b6bc6145 100644
--- a/inmates/lib/x86/include/inmate.h
+++ b/inmates/lib/x86/include/inmate.h
@@ -235,8 +235,6 @@ void ioapic_pin_set_vector(unsigned int pin,
                            enum ioapic_trigger_mode trigger_mode,
                            unsigned int vector);
 
-void hypercall_init(void);
-
 unsigned long pm_timer_read(void);
 
 unsigned long tsc_read_ns(void);
diff --git a/inmates/lib/x86/setup.c b/inmates/lib/x86/setup.c
index f79fd736..869e0962 100644
--- a/inmates/lib/x86/setup.c
+++ b/inmates/lib/x86/setup.c
@@ -1,10 +1,12 @@
 /*
  * Jailhouse, a Linux-based partitioning hypervisor
  *
- * Copyright (c) OTH Regensburg, 2018
+ * Copyright (c) OTH Regensburg, 2018-2019
+ * Copyright (c) Valentine Sinitsyn, 2014
  *
  * Authors:
  *  Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de>
+ *  Valentine Sinitsyn <valentine.sinitsyn@gmail.com>
  *
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
@@ -38,6 +40,22 @@
 
 #include <inmate.h>
 
+#define AUTHENTIC_AMD(n)        (((const u32 *)"AuthenticAMD")[n])
+
+bool jailhouse_use_vmcall = true;
+
 void arch_init_early(void)
 {
+        u32 eax, ebx, ecx, edx;
+
+        asm volatile("cpuid"
+                : "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
+                : "a" (0)
+                : "memory"
+        );
+
+        if (ebx == AUTHENTIC_AMD(0) &&
+            edx == AUTHENTIC_AMD(1) &&
+            ecx == AUTHENTIC_AMD(2))
+                jailhouse_use_vmcall = false;
 }