Both were located at dbg-write.c before. This patch moves them to
separate files.
This is only a split-up, no functional changes are introduced (besides
removing the static qualifier of the *_{init,read} functions)
Signed-off-by: Ralf Ramsauer <[email protected]>
---
hypervisor/arch/x86/Kbuild | 1 +
hypervisor/arch/x86/dbg-write.c | 176 +--------------------------------
hypervisor/arch/x86/include/asm/uart.h | 16 +++
hypervisor/arch/x86/include/asm/vga.h | 18 ++++
hypervisor/arch/x86/uart.c | 115 +++++++++++++++++++++
hypervisor/arch/x86/vga.c | 87 ++++++++++++++++
6 files changed, 239 insertions(+), 174 deletions(-)
create mode 100644 hypervisor/arch/x86/include/asm/uart.h
create mode 100644 hypervisor/arch/x86/include/asm/vga.h
create mode 100644 hypervisor/arch/x86/uart.c
create mode 100644 hypervisor/arch/x86/vga.c
diff --git a/hypervisor/arch/x86/Kbuild b/hypervisor/arch/x86/Kbuild
index b459f8fbb36e..07bc50cea572 100644
--- a/hypervisor/arch/x86/Kbuild
+++ b/hypervisor/arch/x86/Kbuild
@@ -15,6 +15,7 @@
BUILT_IN_OBJECTS := built-in-amd.o built-in-intel.o
COMMON_OBJECTS := apic.o dbg-write.o entry.o setup.o control.o mmio.o iommu.o \
paging.o ../../pci.o pci.o ioapic.o i8042.o vcpu.o \
+ uart.o vga.o \
../../pci_ivshmem.o
always := $(BUILT_IN_OBJECTS)
diff --git a/hypervisor/arch/x86/dbg-write.c b/hypervisor/arch/x86/dbg-write.c
index 045ce6510b5f..d966d294fb60 100644
--- a/hypervisor/arch/x86/dbg-write.c
+++ b/hypervisor/arch/x86/dbg-write.c
@@ -2,190 +2,18 @@
* Jailhouse, a Linux-based partitioning hypervisor
*
* Copyright (c) Siemens AG, 2013-2016
- * Copyright (c) Toshiba, 2016
*
* Authors:
* Jan Kiszka <[email protected]>
- * Daniel Sangorrin <[email protected]>
*
* This work is licensed under the terms of the GNU GPL, version 2. See
* the COPYING file in the top-level directory.
*/
#include <jailhouse/control.h>
-#include <jailhouse/entry.h>
-#include <jailhouse/mmio.h>
#include <jailhouse/printk.h>
-#include <jailhouse/processor.h>
-#include <asm/io.h>
-
-#define VGA_LIMIT 0x100000 /* <1M means VGA */
-
-#define UART_TX 0x0
-#define UART_DLL 0x0
-#define UART_DLM 0x1
-#define UART_LCR 0x3
-#define UART_LCR_8N1 0x03
-#define UART_LCR_DLAB 0x80
-#define UART_LSR 0x5
-#define UART_LSR_THRE 0x20
-
-static u64 uart_base;
-
-static void uart_pio_out(unsigned int reg, u8 value)
-{
- outb(value, uart_base + reg);
-}
-
-static u8 uart_pio_in(unsigned int reg)
-{
- return inb(uart_base + reg);
-}
-
-static void uart_mmio8_out(unsigned int reg, u8 value)
-{
- mmio_write8((void *)(uart_base + reg), value);
-}
-
-static u8 uart_mmio8_in(unsigned int reg)
-{
- return mmio_read8((void *)(uart_base + reg));
-}
-
-static void uart_mmio32_out(unsigned int reg, u8 value)
-{
- mmio_write32((void *)(uart_base + reg * 4), value);
-}
-
-static u8 uart_mmio32_in(unsigned int reg)
-{
- return mmio_read32((void *)(uart_base + reg * 4));
-}
-
-static void (*uart_reg_out)(unsigned int, u8) = uart_pio_out;
-static u8 (*uart_reg_in)(unsigned int) = uart_pio_in;
-
-static void uart_init(void)
-{
- u64 flags = system_config->debug_console.flags;
-
- if (system_config->debug_console.phys_start == 0)
- return;
-
- if (flags & JAILHOUSE_MEM_IO) {
- if (system_config->debug_console.phys_start < VGA_LIMIT)
- return; /* VGA memory */
-
- if (flags & JAILHOUSE_MEM_IO_32) {
- uart_reg_out = uart_mmio32_out;
- uart_reg_in = uart_mmio32_in;
- } else {
- uart_reg_out = uart_mmio8_out;
- uart_reg_in = uart_mmio8_in;
- }
- uart_base = (u64)hypervisor_header.debug_console_base;
- } else {
- uart_base = system_config->debug_console.phys_start;
- }
-
- uart_reg_out(UART_LCR, UART_LCR_DLAB);
-#ifdef CONFIG_SERIAL_OXPCIE952
- outb(0x22, uart_base + UART_DLL);
-#else
- uart_reg_out(UART_DLL, 1);
-#endif
- uart_reg_out(UART_DLM, 0);
- uart_reg_out(UART_LCR, UART_LCR_8N1);
-}
-
-static void uart_write(const char *msg)
-{
- char c = 0;
-
- while (1) {
- if (c == '\n')
- c = '\r';
- else
- c = *msg++;
- if (!c)
- break;
- while (!(uart_reg_in(UART_LSR) & UART_LSR_THRE))
- cpu_relax();
- if (panic_in_progress && panic_cpu != phys_processor_id())
- break;
- uart_reg_out(UART_TX, c);
- }
-}
-
-#define VGA_WIDTH 80
-#define VGA_HEIGHT 25
-#define VGA_BLACK 0x0
-#define VGA_BRIGHT_GREEN 0xA
-#define VGA_BG_COLOR VGA_BLACK
-#define VGA_FG_COLOR VGA_BRIGHT_GREEN
-#define VGA_ATTRIBUTE ((VGA_BG_COLOR | VGA_FG_COLOR) << 8)
-#define VGA_U16(c) ((u16)(c) | (u16)VGA_ATTRIBUTE)
-#define ASCII_NONPRINTABLE '?'
-
-static u16 *vga_mem;
-
-static void vga_init(void)
-{
- if (system_config->debug_console.phys_start < VGA_LIMIT)
- vga_mem = hypervisor_header.debug_console_base;
-}
-
-static void vga_scroll(void)
-{
- unsigned int i;
-
- for (i = 0; i < (VGA_HEIGHT - 1) * VGA_WIDTH; i++)
- vga_mem[i] = vga_mem[i + VGA_WIDTH];
-
- for (i = 0; i < VGA_WIDTH; i++)
- vga_mem[(VGA_HEIGHT - 1) * VGA_WIDTH + i] = VGA_U16(' ');
-}
-
-static void vga_write(const char *msg)
-{
- static u32 row_line;
- unsigned int pos;
- u16 row, line;
-
- /* panic_printk avoids locking 'printk_lock' due to a potential
- deadlock in case a crash occurs while holding it. For avoiding
- a data race between printk and panic_printk we take a local
- snapshot of both static variables and update them on return */
- row = (u16)((row_line & 0xFFFF0000) >> 16);
- line = (u16)(row_line & 0x0000FFFF);
-
- while (*msg != 0) {
- if (panic_in_progress && panic_cpu != phys_processor_id())
- return;
- if (row == VGA_WIDTH || *msg == '\n') {
- row = 0;
- if (line == (VGA_HEIGHT - 1))
- vga_scroll();
- else
- line++;
- }
- pos = line * VGA_WIDTH + row;
- switch (*msg) {
- case '\n':
- msg++;
- continue;
- case ' ' ... '~':
- vga_mem[pos] = VGA_U16(*msg);
- break;
- default:
- vga_mem[pos] = VGA_U16(ASCII_NONPRINTABLE);
- }
- row++;
- msg++;
- }
-
- row_line = ((u32)row << 16) | (u32)line;
-}
+#include <asm/uart.h>
+#include <asm/vga.h>
void arch_dbg_write_init(void)
{
diff --git a/hypervisor/arch/x86/include/asm/uart.h
b/hypervisor/arch/x86/include/asm/uart.h
new file mode 100644
index 000000000000..8dcfa7eb062c
--- /dev/null
+++ b/hypervisor/arch/x86/include/asm/uart.h
@@ -0,0 +1,16 @@
+/*
+ * Jailhouse, a Linux-based partitioning hypervisor
+ *
+ * Copyright (c) OTH Regensburg, 2016
+ *
+ * Authors:
+ * Ralf Ramsauer <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+
+extern u64 uart_base;
+
+void uart_init(void);
+void uart_write(const char *msg);
diff --git a/hypervisor/arch/x86/include/asm/vga.h
b/hypervisor/arch/x86/include/asm/vga.h
new file mode 100644
index 000000000000..b6ed6096dc41
--- /dev/null
+++ b/hypervisor/arch/x86/include/asm/vga.h
@@ -0,0 +1,18 @@
+/*
+ * Jailhouse, a Linux-based partitioning hypervisor
+ *
+ * Copyright (c) OTH Regensburg, 2016
+ *
+ * Authors:
+ * Ralf Ramsauer <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+
+#define VGA_LIMIT 0x100000 /* <1M means VGA */
+
+extern u16 *vga_mem;
+
+void vga_init(void);
+void vga_write(const char *msg);
diff --git a/hypervisor/arch/x86/uart.c b/hypervisor/arch/x86/uart.c
new file mode 100644
index 000000000000..09c66f01a7c3
--- /dev/null
+++ b/hypervisor/arch/x86/uart.c
@@ -0,0 +1,115 @@
+/*
+ * Jailhouse, a Linux-based partitioning hypervisor
+ *
+ * Copyright (c) Siemens AG, 2013-2016
+ *
+ * Authors:
+ * Jan Kiszka <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+
+#include <jailhouse/control.h>
+#include <jailhouse/mmio.h>
+#include <jailhouse/printk.h>
+#include <jailhouse/processor.h>
+#include <asm/io.h>
+#include <asm/uart.h>
+#include <asm/vga.h>
+
+#define UART_TX 0x0
+#define UART_DLL 0x0
+#define UART_DLM 0x1
+#define UART_LCR 0x3
+#define UART_LCR_8N1 0x03
+#define UART_LCR_DLAB 0x80
+#define UART_LSR 0x5
+#define UART_LSR_THRE 0x20
+
+u64 uart_base;
+
+static void uart_pio_out(unsigned int reg, u8 value)
+{
+ outb(value, uart_base + reg);
+}
+
+static u8 uart_pio_in(unsigned int reg)
+{
+ return inb(uart_base + reg);
+}
+
+static void uart_mmio8_out(unsigned int reg, u8 value)
+{
+ mmio_write8((void *)(uart_base + reg), value);
+}
+
+static u8 uart_mmio8_in(unsigned int reg)
+{
+ return mmio_read8((void *)(uart_base + reg));
+}
+
+static void uart_mmio32_out(unsigned int reg, u8 value)
+{
+ mmio_write32((void *)(uart_base + reg * 4), value);
+}
+
+static u8 uart_mmio32_in(unsigned int reg)
+{
+ return mmio_read32((void *)(uart_base + reg * 4));
+}
+
+static void (*uart_reg_out)(unsigned int, u8) = uart_pio_out;
+static u8 (*uart_reg_in)(unsigned int) = uart_pio_in;
+
+void uart_init(void)
+{
+ u64 flags = system_config->debug_console.flags;
+
+ if (system_config->debug_console.phys_start == 0)
+ return;
+
+ if (flags & JAILHOUSE_MEM_IO) {
+ if (system_config->debug_console.phys_start < VGA_LIMIT)
+ return; /* VGA memory */
+
+ if (flags & JAILHOUSE_MEM_IO_32) {
+ uart_reg_out = uart_mmio32_out;
+ uart_reg_in = uart_mmio32_in;
+ } else {
+ uart_reg_out = uart_mmio8_out;
+ uart_reg_in = uart_mmio8_in;
+ }
+ uart_base = (u64)hypervisor_header.debug_console_base;
+ } else {
+ uart_base = system_config->debug_console.phys_start;
+ }
+
+ uart_reg_out(UART_LCR, UART_LCR_DLAB);
+#ifdef CONFIG_SERIAL_OXPCIE952
+ outb(0x22, uart_base + UART_DLL);
+#else
+ uart_reg_out(UART_DLL, 1);
+#endif
+ uart_reg_out(UART_DLM, 0);
+ uart_reg_out(UART_LCR, UART_LCR_8N1);
+}
+
+void uart_write(const char *msg)
+{
+ char c = 0;
+
+ while (1) {
+ if (c == '\n')
+ c = '\r';
+ else
+ c = *msg++;
+ if (!c)
+ break;
+ while (!(uart_reg_in(UART_LSR) & UART_LSR_THRE))
+ cpu_relax();
+ if (panic_in_progress && panic_cpu != phys_processor_id())
+ break;
+ uart_reg_out(UART_TX, c);
+ }
+}
diff --git a/hypervisor/arch/x86/vga.c b/hypervisor/arch/x86/vga.c
new file mode 100644
index 000000000000..53a2f8e00c93
--- /dev/null
+++ b/hypervisor/arch/x86/vga.c
@@ -0,0 +1,87 @@
+/*
+ * Jailhouse, a Linux-based partitioning hypervisor
+ *
+ * Copyright (c) Toshiba, 2016
+ *
+ * Authors:
+ * Daniel Sangorrin <[email protected]>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2. See
+ * the COPYING file in the top-level directory.
+ */
+
+#include <jailhouse/control.h>
+#include <jailhouse/printk.h>
+#include <jailhouse/processor.h>
+#include <asm/io.h>
+#include <asm/vga.h>
+
+#define VGA_WIDTH 80
+#define VGA_HEIGHT 25
+#define VGA_BLACK 0x0
+#define VGA_BRIGHT_GREEN 0xA
+#define VGA_BG_COLOR VGA_BLACK
+#define VGA_FG_COLOR VGA_BRIGHT_GREEN
+#define VGA_ATTRIBUTE ((VGA_BG_COLOR | VGA_FG_COLOR) << 8)
+#define VGA_U16(c) ((u16)(c) | (u16)VGA_ATTRIBUTE)
+#define ASCII_NONPRINTABLE '?'
+
+u16 *vga_mem;
+
+void vga_init(void)
+{
+ if (system_config->debug_console.phys_start < VGA_LIMIT)
+ vga_mem = hypervisor_header.debug_console_base;
+}
+
+static void vga_scroll(void)
+{
+ unsigned int i;
+
+ for (i = 0; i < (VGA_HEIGHT - 1) * VGA_WIDTH; i++)
+ vga_mem[i] = vga_mem[i + VGA_WIDTH];
+
+ for (i = 0; i < VGA_WIDTH; i++)
+ vga_mem[(VGA_HEIGHT - 1) * VGA_WIDTH + i] = VGA_U16(' ');
+}
+
+void vga_write(const char *msg)
+{
+ static u32 row_line;
+ unsigned int pos;
+ u16 row, line;
+
+ /* panic_printk avoids locking 'printk_lock' due to a potential
+ deadlock in case a crash occurs while holding it. For avoiding
+ a data race between printk and panic_printk we take a local
+ snapshot of both static variables and update them on return */
+ row = (u16)((row_line & 0xFFFF0000) >> 16);
+ line = (u16)(row_line & 0x0000FFFF);
+
+ while (*msg != 0) {
+ if (panic_in_progress && panic_cpu != phys_processor_id())
+ return;
+ if (row == VGA_WIDTH || *msg == '\n') {
+ row = 0;
+ if (line == (VGA_HEIGHT - 1))
+ vga_scroll();
+ else
+ line++;
+ }
+ pos = line * VGA_WIDTH + row;
+ switch (*msg) {
+ case '\n':
+ msg++;
+ continue;
+ case ' ' ... '~':
+ vga_mem[pos] = VGA_U16(*msg);
+ break;
+ default:
+ vga_mem[pos] = VGA_U16(ASCII_NONPRINTABLE);
+ }
+ row++;
+ msg++;
+ }
+
+ row_line = ((u32)row << 16) | (u32)line;
+}
--
2.10.2
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
