Permalink
Browse files

x86: Remove VGA debug console support

VGA is considered legacy by now, and - if at all - it is only available
anymore when booting a system in legacy mode. Therefore, it's getting
harder and harder to make use of this console. At the same time, we now
have a modern alternative with the EFI framebuffer driver.

CC: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
  • Loading branch information...
jan-kiszka committed Jul 10, 2018
1 parent e9ad931 commit d2aa16765e54eb95f503fb51dddf94bef2c4c7ed
@@ -18,11 +18,8 @@ default if nothing else is chosen:
Possible debug outputs for x86:
- JAILHOUSE_CON_TYPE_8250 /* 8250-compatible UART (PIO or MMIO) */
- JAILHOUSE_CON_TYPE_VGA /* VGA console */
- JAILHOUSE_CON_TYPE_EFIFB /* EFI framebuffer console */
For further documentation on VGA output see [vga-console.md](vga-console.md).
Possible debug outputs for arm and arm64:
- JAILHOUSE_CON_TYPE_8250 /* 8250 compatible UART*/
@@ -167,7 +164,7 @@ arm: none, 8250, hscif, imx, mvebu, pl011, scifa, xuartps
Similar to the hypervisor configuration, a zero value for con-divider will skip
initialisation of the UART interface.
On x86, VGA and EFI framebuffer output are not available for inmates.
On x86, EFI framebuffer output is not available for inmates.
### Examples
Example command line parameters for PIO based debug output on x86, where the

This file was deleted.

Oops, something went wrong.
@@ -19,7 +19,7 @@ ccflags-$(CONFIG_JAILHOUSE_GCOV) += -fprofile-arcs -ftest-coverage
always := lib-amd.a lib-intel.a
common-objs-y := apic.o dbg-write.o entry.o setup.o control.o mmio.o iommu.o \
paging.o pci.o i8042.o vcpu.o vga.o efifb.o ivshmem.o
paging.o pci.o i8042.o vcpu.o efifb.o ivshmem.o
CFLAGS_efifb.o := -I$(src)
@@ -17,7 +17,6 @@
#include <jailhouse/uart.h>
#include <asm/efifb.h>
#include <asm/io.h>
#include <asm/vga.h>
static void reg_out_pio(struct uart_chip *chip, unsigned int reg, u32 value)
{
@@ -47,9 +46,6 @@ void arch_dbg_write_init(void)
}
uart->init(uart);
arch_dbg_write = uart_write;
} else if (dbg_type == JAILHOUSE_CON_TYPE_VGA) {
vga_init();
arch_dbg_write = vga_write;
} else if (dbg_type == JAILHOUSE_CON_TYPE_EFIFB) {
efifb_init();
arch_dbg_write = efifb_write;

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
@@ -41,15 +41,14 @@
/* Those definitions are used for the type in struct jailhouse_console */
#define JAILHOUSE_CON_TYPE_NONE 0x0000
#define JAILHOUSE_CON_TYPE_VGA 0x0001
#define JAILHOUSE_CON_TYPE_EFIFB 0x0001
#define JAILHOUSE_CON_TYPE_8250 0x0002
#define JAILHOUSE_CON_TYPE_PL011 0x0003
#define JAILHOUSE_CON_TYPE_XUARTPS 0x0004
#define JAILHOUSE_CON_TYPE_MVEBU 0x0005
#define JAILHOUSE_CON_TYPE_HSCIF 0x0006
#define JAILHOUSE_CON_TYPE_SCIFA 0x0007
#define JAILHOUSE_CON_TYPE_IMX 0x0008
#define JAILHOUSE_CON_TYPE_EFIFB 0x0009
/* Flags: bit 0 is used to select PIO (cleared) or MMIO (set) access */
#define JAILHOUSE_CON_ACCESS_PIO 0x0000

0 comments on commit d2aa167

Please sign in to comment.