From 71669c3b760548c317139164043c4c748b49d730 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 17 Dec 2013 13:07:26 +0100 Subject: [PATCH] Implement XEN VFB support. --- ChangeLog | 4 + configure.ac | 8 +- gentpl.py | 2 +- grub-core/Makefile.am | 12 + grub-core/Makefile.core.def | 3 + grub-core/kern/xen/init.c | 14 + grub-core/loader/i386/linux.c | 1 + grub-core/loader/i386/xen.c | 2 + grub-core/term/xen/console.c | 4 +- grub-core/term/xen/xen_kbd.c | 486 ++++++++++++++++++++++++++++ grub-core/video/xen/xenfb.c | 396 +++++++++++++++++++++++ include/grub/video.h | 3 +- include/grub/x86_64/xen/hypercall.h | 2 +- include/grub/xen.h | 9 + 14 files changed, 937 insertions(+), 9 deletions(-) create mode 100644 grub-core/term/xen/xen_kbd.c create mode 100644 grub-core/video/xen/xenfb.c diff --git a/ChangeLog b/ChangeLog index 606b8e18a..89eefba44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-17 Vladimir Serbinenko + + Implement XEN VFB support. + 2013-12-17 Vladimir Serbinenko Remove grub_bios_interrupt on coreboot. diff --git a/configure.ac b/configure.ac index be08d55be..e803b2a1a 100644 --- a/configure.ac +++ b/configure.ac @@ -1291,8 +1291,8 @@ if test x"$grub_build_mkfont_excuse" = x ; then else enable_build_grub_mkfont=no fi -if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then - AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports needs build-time grub-mkfont]) +if test x"$enable_build_grub_mkfont" = xno && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xxen || test "x$platform" = xcoreboot ); then + AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot, xen and loongson ports needs build-time grub-mkfont]) fi AC_SUBST([build_freetype_cflags]) @@ -1360,8 +1360,8 @@ if test x"$enable_build_grub_mkfont" = xno ; then FONT_SOURCE= fi -if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xcoreboot ); then - AC_MSG_ERROR([qemu, powerpc-ieee1275, coreboot and loongson ports need unifont]) +if test "x$FONT_SOURCE" = x && ( test "x$platform" = xqemu || test "x$platform" = xloongson || test "x$platform" = xqemu_mips || test "x$target_cpu"-"$platform" = xpowerpc-ieee1275 || test "x$platform" = xxen || test "x$platform" = xcoreboot ); then + AC_MSG_ERROR([qemu, powerpc-ieee1275, xen, coreboot and loongson ports need unifont]) fi AC_SUBST([FONT_SOURCE]) diff --git a/gentpl.py b/gentpl.py index bdcae1a1c..42acf0a72 100644 --- a/gentpl.py +++ b/gentpl.py @@ -64,7 +64,7 @@ GROUPS["pci"] = GROUPS["x86"] + ["mips_loongson"] GROUPS["usb"] = GROUPS["pci"] # If gfxterm is main output console integrate it into kernel -GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ] +GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ] + GROUPS["xen"] GROUPS["videomodules"] = GRUB_PLATFORMS[:]; for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i) diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am index 04764384b..c7adc1eba 100644 --- a/grub-core/Makefile.am +++ b/grub-core/Makefile.am @@ -135,6 +135,12 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h +KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h endif if COND_x86_64_xen @@ -144,6 +150,12 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h +KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h +KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h endif if COND_x86_64_efi diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def index 4102e73ba..e7e38a853 100644 --- a/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def @@ -192,6 +192,9 @@ kernel = { xen = term/xen/console.c; xen = disk/xen/xendisk.c; xen = commands/boot.c; + xen = commands/keylayouts.c; + xen = video/xen/xenfb.c; + xen = term/xen/xen_kbd.c; ia64_efi = kern/ia64/efi/startup.S; ia64_efi = kern/ia64/efi/init.c; diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c index 1d8eaec1a..79973b015 100644 --- a/grub-core/kern/xen/init.c +++ b/grub-core/kern/xen/init.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include grub_addr_t grub_modbase; struct start_info *grub_xen_start_page_addr; @@ -67,6 +69,7 @@ grub_xen_alloc_shared_page (domid_t dom, grub_xen_grant_t * grnum) ret = grub_memalign (GRUB_XEN_PAGE_SIZE, GRUB_XEN_PAGE_SIZE); if (!ret) return NULL; + grub_memset (ret, 0, GRUB_XEN_PAGE_SIZE); mfn = grub_xen_ptr2mfn (ret); entry->full_page.pad0 = 0; entry->full_page.frame = mfn; @@ -254,6 +257,8 @@ grub_xenstore_write_file (const char *dir, const void *buf, grub_size_t len) grub_size_t dirlen = grub_strlen (dir) + 1; char *resp; + grub_dprintf ("xen", "writing `%s'\n", dir); + grub_memset (&msg, 0, sizeof (msg)); msg.type = XS_WRITE; msg.len = dirlen + len; @@ -540,6 +545,13 @@ grub_machine_init (void) map_all_pages (); + grub_video_xen_init (); + grub_font_init (); + grub_gfxterm_init (); + + grub_keylayouts_init (); + grub_xen_keyboard_init (); + grub_console_init (); grub_tsc_init (); @@ -563,6 +575,8 @@ void grub_machine_fini (int flags __attribute__ ((unused))) { grub_xendisk_fini (); + grub_video_xen_fini (); + grub_xen_keyboard_fini (); grub_boot_fini (); } diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c index b14dbe714..cbd17eb37 100644 --- a/grub-core/loader/i386/linux.c +++ b/grub-core/loader/i386/linux.c @@ -344,6 +344,7 @@ grub_linux_setup_video (struct linux_kernel_params *params) case GRUB_VIDEO_DRIVER_IEEE1275: case GRUB_VIDEO_DRIVER_COREBOOT: /* Make gcc happy. */ + case GRUB_VIDEO_DRIVER_XEN: case GRUB_VIDEO_DRIVER_SDL: case GRUB_VIDEO_DRIVER_NONE: case GRUB_VIDEO_ADAPTER_CAPTURE: diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c index 91b66f8f5..732a47a87 100644 --- a/grub-core/loader/i386/xen.c +++ b/grub-core/loader/i386/xen.c @@ -222,6 +222,8 @@ grub_xen_boot (void) grub_xen_mfn_t *new_mfn_list; grub_size_t i; + grub_video_restore (); + if (grub_xen_n_allocated_shared_pages) return grub_error (GRUB_ERR_BUG, "active grants"); diff --git a/grub-core/term/xen/console.c b/grub-core/term/xen/console.c index a1f15f71a..ddbf5f35e 100644 --- a/grub-core/term/xen/console.c +++ b/grub-core/term/xen/console.c @@ -114,8 +114,8 @@ static struct grub_term_output grub_console_term_output = { void grub_console_init (void) { - grub_term_register_input ("console", &grub_console_term_input); - grub_term_register_output ("console", &grub_console_term_output); + grub_term_register_input_active ("console", &grub_console_term_input); + grub_term_register_output_active ("console", &grub_console_term_output); grub_terminfo_init (); grub_terminfo_output_register (&grub_console_term_output, "vt100-color"); diff --git a/grub-core/term/xen/xen_kbd.c b/grub-core/term/xen/xen_kbd.c new file mode 100644 index 000000000..38a6ffd50 --- /dev/null +++ b/grub-core/term/xen/xen_kbd.c @@ -0,0 +1,486 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2007,2008,2009 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +GRUB_MOD_LICENSE ("GPLv3+"); + +static short xen_keyboard_status = 0; + +static const grub_uint8_t mapping[128] = + { + /* 0x00 */ 0 /* Unused */, GRUB_KEYBOARD_KEY_ESCAPE, + /* 0x02 */ GRUB_KEYBOARD_KEY_1, GRUB_KEYBOARD_KEY_2, + /* 0x04 */ GRUB_KEYBOARD_KEY_3, GRUB_KEYBOARD_KEY_4, + /* 0x06 */ GRUB_KEYBOARD_KEY_5, GRUB_KEYBOARD_KEY_6, + /* 0x08 */ GRUB_KEYBOARD_KEY_7, GRUB_KEYBOARD_KEY_8, + /* 0x0a */ GRUB_KEYBOARD_KEY_9, GRUB_KEYBOARD_KEY_0, + /* 0x0c */ GRUB_KEYBOARD_KEY_DASH, GRUB_KEYBOARD_KEY_EQUAL, + /* 0x0e */ GRUB_KEYBOARD_KEY_BACKSPACE, GRUB_KEYBOARD_KEY_TAB, + /* 0x10 */ GRUB_KEYBOARD_KEY_Q, GRUB_KEYBOARD_KEY_W, + /* 0x12 */ GRUB_KEYBOARD_KEY_E, GRUB_KEYBOARD_KEY_R, + /* 0x14 */ GRUB_KEYBOARD_KEY_T, GRUB_KEYBOARD_KEY_Y, + /* 0x16 */ GRUB_KEYBOARD_KEY_U, GRUB_KEYBOARD_KEY_I, + /* 0x18 */ GRUB_KEYBOARD_KEY_O, GRUB_KEYBOARD_KEY_P, + /* 0x1a */ GRUB_KEYBOARD_KEY_LBRACKET, GRUB_KEYBOARD_KEY_RBRACKET, + /* 0x1c */ GRUB_KEYBOARD_KEY_ENTER, GRUB_KEYBOARD_KEY_LEFT_CTRL, + /* 0x1e */ GRUB_KEYBOARD_KEY_A, GRUB_KEYBOARD_KEY_S, + /* 0x20 */ GRUB_KEYBOARD_KEY_D, GRUB_KEYBOARD_KEY_F, + /* 0x22 */ GRUB_KEYBOARD_KEY_G, GRUB_KEYBOARD_KEY_H, + /* 0x24 */ GRUB_KEYBOARD_KEY_J, GRUB_KEYBOARD_KEY_K, + /* 0x26 */ GRUB_KEYBOARD_KEY_L, GRUB_KEYBOARD_KEY_SEMICOLON, + /* 0x28 */ GRUB_KEYBOARD_KEY_DQUOTE, GRUB_KEYBOARD_KEY_RQUOTE, + /* 0x2a */ GRUB_KEYBOARD_KEY_LEFT_SHIFT, GRUB_KEYBOARD_KEY_BACKSLASH, + /* 0x2c */ GRUB_KEYBOARD_KEY_Z, GRUB_KEYBOARD_KEY_X, + /* 0x2e */ GRUB_KEYBOARD_KEY_C, GRUB_KEYBOARD_KEY_V, + /* 0x30 */ GRUB_KEYBOARD_KEY_B, GRUB_KEYBOARD_KEY_N, + /* 0x32 */ GRUB_KEYBOARD_KEY_M, GRUB_KEYBOARD_KEY_COMMA, + /* 0x34 */ GRUB_KEYBOARD_KEY_DOT, GRUB_KEYBOARD_KEY_SLASH, + /* 0x36 */ GRUB_KEYBOARD_KEY_RIGHT_SHIFT, GRUB_KEYBOARD_KEY_NUMMUL, + /* 0x38 */ GRUB_KEYBOARD_KEY_LEFT_ALT, GRUB_KEYBOARD_KEY_SPACE, + /* 0x3a */ GRUB_KEYBOARD_KEY_CAPS_LOCK, GRUB_KEYBOARD_KEY_F1, + /* 0x3c */ GRUB_KEYBOARD_KEY_F2, GRUB_KEYBOARD_KEY_F3, + /* 0x3e */ GRUB_KEYBOARD_KEY_F4, GRUB_KEYBOARD_KEY_F5, + /* 0x40 */ GRUB_KEYBOARD_KEY_F6, GRUB_KEYBOARD_KEY_F7, + /* 0x42 */ GRUB_KEYBOARD_KEY_F8, GRUB_KEYBOARD_KEY_F9, + /* 0x44 */ GRUB_KEYBOARD_KEY_F10, GRUB_KEYBOARD_KEY_NUM_LOCK, + /* 0x46 */ GRUB_KEYBOARD_KEY_SCROLL_LOCK, GRUB_KEYBOARD_KEY_NUM7, + /* 0x48 */ GRUB_KEYBOARD_KEY_NUM8, GRUB_KEYBOARD_KEY_NUM9, + /* 0x4a */ GRUB_KEYBOARD_KEY_NUMMINUS, GRUB_KEYBOARD_KEY_NUM4, + /* 0x4c */ GRUB_KEYBOARD_KEY_NUM5, GRUB_KEYBOARD_KEY_NUM6, + /* 0x4e */ GRUB_KEYBOARD_KEY_NUMPLUS, GRUB_KEYBOARD_KEY_NUM1, + /* 0x50 */ GRUB_KEYBOARD_KEY_NUM2, GRUB_KEYBOARD_KEY_NUM3, + /* 0x52 */ GRUB_KEYBOARD_KEY_NUMDOT, GRUB_KEYBOARD_KEY_NUMDOT, + /* 0x54 */ 0, 0, + /* 0x56 */ GRUB_KEYBOARD_KEY_102ND, GRUB_KEYBOARD_KEY_F11, + /* 0x58 */ GRUB_KEYBOARD_KEY_F12, 0, + /* 0x5a */ 0, 0, + /* 0x5c */ 0, 0, + /* 0x5e */ 0, 0, + /* 0x60 */ 0, GRUB_KEYBOARD_KEY_RIGHT_CTRL, + /* 0x62 */ 0, 0, + /* 0x64 */ GRUB_KEYBOARD_KEY_RIGHT_ALT, 0, + /* 0x66 */ GRUB_KEYBOARD_KEY_HOME, GRUB_KEYBOARD_KEY_UP, + /* 0x68 */ GRUB_KEYBOARD_KEY_PPAGE, GRUB_KEYBOARD_KEY_LEFT, + /* 0x6a */ GRUB_KEYBOARD_KEY_RIGHT, GRUB_KEYBOARD_KEY_END, + /* 0x6c */ GRUB_KEYBOARD_KEY_DOWN, GRUB_KEYBOARD_KEY_NPAGE, + /* 0x6e */ GRUB_KEYBOARD_KEY_INSERT, GRUB_KEYBOARD_KEY_DELETE, + /* 0x70 */ 0, 0, + /* 0x72 */ 0, GRUB_KEYBOARD_KEY_JP_RO, + /* 0x74 */ 0, 0, + /* 0x76 */ 0, 0, + /* 0x78 */ 0, 0, + /* 0x7a */ 0, 0, + /* 0x7c */ 0, GRUB_KEYBOARD_KEY_JP_YEN, + /* 0x7e */ GRUB_KEYBOARD_KEY_KPCOMMA + }; + +struct virtkbd +{ + int handle; + char *fullname; + char *backend_dir; + char *frontend_dir; + struct xenkbd_page *kbdpage; + grub_xen_grant_t grant; + grub_xen_evtchn_t evtchn; +}; + +struct virtkbd vkbd; + +static grub_xen_mfn_t +grub_xen_ptr2mfn (void *ptr) +{ + grub_xen_mfn_t *mfn_list = + (grub_xen_mfn_t *) grub_xen_start_page_addr->mfn_list; + return mfn_list[(grub_addr_t) ptr >> GRUB_XEN_LOG_PAGE_SIZE]; +} + +static int +fill (const char *dir, void *data __attribute__ ((unused))) +{ + domid_t dom; + /* "dir" is just a number, at most 19 characters. */ + char fdir[200]; + char num[20]; + grub_err_t err; + void *buf; + struct evtchn_alloc_unbound alloc_unbound; + + if (vkbd.kbdpage) + return 1; + vkbd.handle = grub_strtoul (dir, 0, 10); + if (grub_errno) + { + grub_errno = 0; + return 0; + } + vkbd.fullname = 0; + vkbd.backend_dir = 0; + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s/backend", dir); + vkbd.backend_dir = grub_xenstore_get_file (fdir, NULL); + if (!vkbd.backend_dir) + goto out_fail_1; + + grub_snprintf (fdir, sizeof (fdir), "%s/dev", + vkbd.backend_dir); + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s/backend-id", dir); + buf = grub_xenstore_get_file (fdir, NULL); + if (!buf) + goto out_fail_1; + + dom = grub_strtoul (buf, 0, 10); + grub_free (buf); + if (grub_errno) + goto out_fail_1; + + vkbd.kbdpage = + grub_xen_alloc_shared_page (dom, &vkbd.grant); + if (!vkbd.kbdpage) + goto out_fail_1; + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s/page-ref", dir); + grub_snprintf (num, sizeof (num), "%llu", (unsigned long long) grub_xen_ptr2mfn (vkbd.kbdpage)); + err = grub_xenstore_write_file (fdir, num, grub_strlen (num)); + if (err) + goto out_fail_3; + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s/protocol", dir); + err = grub_xenstore_write_file (fdir, XEN_IO_PROTO_ABI_NATIVE, + grub_strlen (XEN_IO_PROTO_ABI_NATIVE)); + if (err) + goto out_fail_3; + + alloc_unbound.dom = DOMID_SELF; + alloc_unbound.remote_dom = dom; + + grub_xen_event_channel_op (EVTCHNOP_alloc_unbound, &alloc_unbound); + vkbd.evtchn = alloc_unbound.port; + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s/event-channel", dir); + grub_snprintf (num, sizeof (num), "%u", vkbd.evtchn); + err = grub_xenstore_write_file (fdir, num, grub_strlen (num)); + if (err) + goto out_fail_3; + + + struct gnttab_dump_table dt; + dt.dom = DOMID_SELF; + grub_xen_grant_table_op (GNTTABOP_dump_table, (void *) &dt, 1); + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s", dir); + + vkbd.frontend_dir = grub_strdup (fdir); + + vkbd.kbdpage->in_cons = 0; + vkbd.kbdpage->in_prod = 0; + vkbd.kbdpage->out_cons = 0; + vkbd.kbdpage->out_prod = 0; + + grub_snprintf (fdir, sizeof (fdir), "device/vkbd/%s/state", dir); + err = grub_xenstore_write_file (fdir, "3", 1); + if (err) + goto out_fail_3; + + while (1) + { + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vkbd.backend_dir); + buf = grub_xenstore_get_file (fdir, NULL); + if (!buf) + goto out_fail_3; + if (grub_strcmp (buf, "2") != 0) + break; + grub_free (buf); + grub_xen_sched_op (SCHEDOP_yield, 0); + } + grub_dprintf ("xen", "state=%s\n", (char *) buf); + grub_free (buf); + + return 1; + +out_fail_3: + grub_xen_free_shared_page (vkbd.kbdpage); +out_fail_1: + + vkbd.kbdpage = 0; + grub_free (vkbd.backend_dir); + grub_free (vkbd.fullname); + + grub_errno = 0; + return 0; +} + +static void +vkbd_fini (void) +{ + char fdir[200]; + + char *buf; + struct evtchn_close close_op = {.port = vkbd.evtchn }; + + if (!vkbd.kbdpage) + return; + + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vkbd.frontend_dir); + grub_xenstore_write_file (fdir, "6", 1); + + while (1) + { + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vkbd.backend_dir); + buf = grub_xenstore_get_file (fdir, NULL); + grub_dprintf ("xen", "state=%s\n", (char *) buf); + + if (!buf || grub_strcmp (buf, "6") == 0) + break; + grub_free (buf); + grub_xen_sched_op (SCHEDOP_yield, 0); + } + grub_free (buf); + + grub_snprintf (fdir, sizeof (fdir), "%s/page-ref", + vkbd.frontend_dir); + grub_xenstore_write_file (fdir, NULL, 0); + + grub_snprintf (fdir, sizeof (fdir), "%s/event-channel", + vkbd.frontend_dir); + grub_xenstore_write_file (fdir, NULL, 0); + + grub_xen_free_shared_page (vkbd.kbdpage); + vkbd.kbdpage = 0; + + grub_xen_event_channel_op (EVTCHNOP_close, &close_op); + + /* Prepare for handoff. */ + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vkbd.frontend_dir); + grub_xenstore_write_file (fdir, "1", 1); +} + +static grub_err_t +vkbd_init (void) +{ + if (vkbd.kbdpage) + vkbd_fini (); + grub_xenstore_dir ("device/vkbd", fill, NULL); + if (vkbd.kbdpage) + grub_errno = 0; + if (!vkbd.kbdpage) + return grub_error (GRUB_ERR_IO, "couldn't init vkbd"); + return GRUB_ERR_NONE; +} + +static int +fetch_key (int *is_break) +{ + grub_uint32_t prod; + + if (!vkbd.kbdpage) + { + *is_break = 0; + return -1; + } + + mb (); + + prod = vkbd.kbdpage->in_prod; + + mb (); + + for (;vkbd.kbdpage->in_cons < prod; vkbd.kbdpage->in_cons++) + { + grub_uint32_t keycode; + int ret = 0; + if (XENKBD_IN_RING_REF(vkbd.kbdpage, vkbd.kbdpage->in_cons).type != XENKBD_TYPE_KEY) + continue; + keycode = XENKBD_IN_RING_REF(vkbd.kbdpage, vkbd.kbdpage->in_cons).key.keycode; + *is_break = !XENKBD_IN_RING_REF(vkbd.kbdpage, vkbd.kbdpage->in_cons).key.pressed; + + if (keycode < ARRAY_SIZE (mapping)) + ret = mapping[keycode]; + if (ret == 0) + { + grub_printf ("unknown keycode = %lx\n", (unsigned long) keycode); + continue; + } + vkbd.kbdpage->in_cons++; + return ret; + } + *is_break = 0; + return -1; +} + +static int +grub_keyboard_isr (grub_keyboard_key_t key, int is_break) +{ + if (!is_break) + switch (key) + { + case GRUB_KEYBOARD_KEY_LEFT_SHIFT: + xen_keyboard_status |= GRUB_TERM_STATUS_LSHIFT; + return 1; + case GRUB_KEYBOARD_KEY_RIGHT_SHIFT: + xen_keyboard_status |= GRUB_TERM_STATUS_RSHIFT; + return 1; + case GRUB_KEYBOARD_KEY_LEFT_CTRL: + xen_keyboard_status |= GRUB_TERM_STATUS_LCTRL; + return 1; + case GRUB_KEYBOARD_KEY_RIGHT_CTRL: + xen_keyboard_status |= GRUB_TERM_STATUS_RCTRL; + return 1; + case GRUB_KEYBOARD_KEY_RIGHT_ALT: + xen_keyboard_status |= GRUB_TERM_STATUS_RALT; + return 1; + case GRUB_KEYBOARD_KEY_LEFT_ALT: + xen_keyboard_status |= GRUB_TERM_STATUS_LALT; + return 1; + default: + return 0; + } + else + switch (key) + { + case GRUB_KEYBOARD_KEY_LEFT_SHIFT: + xen_keyboard_status &= ~GRUB_TERM_STATUS_LSHIFT; + return 1; + case GRUB_KEYBOARD_KEY_RIGHT_SHIFT: + xen_keyboard_status &= ~GRUB_TERM_STATUS_RSHIFT; + return 1; + case GRUB_KEYBOARD_KEY_LEFT_CTRL: + xen_keyboard_status &= ~GRUB_TERM_STATUS_LCTRL; + return 1; + case GRUB_KEYBOARD_KEY_RIGHT_CTRL: + xen_keyboard_status &= ~GRUB_TERM_STATUS_RCTRL; + return 1; + case GRUB_KEYBOARD_KEY_RIGHT_ALT: + xen_keyboard_status &= ~GRUB_TERM_STATUS_RALT; + return 1; + case GRUB_KEYBOARD_KEY_LEFT_ALT: + xen_keyboard_status &= ~GRUB_TERM_STATUS_LALT; + return 1; + default: + return 0; + } +} + +/* If there is a raw key pending, return it; otherwise return -1. */ +static int +grub_keyboard_getkey (void) +{ + int key; + int is_break = 0; + + key = fetch_key (&is_break); + if (key == -1) + return -1; + + if (grub_keyboard_isr (key, is_break)) + return -1; + if (is_break) + return -1; + return key; +} + + +/* If there is a character pending, return it; + otherwise return GRUB_TERM_NO_KEY. */ +static int +grub_xen_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused))) +{ + int code; + + code = grub_keyboard_getkey (); + if (code == -1) + return GRUB_TERM_NO_KEY; + switch (code) + { + case GRUB_KEYBOARD_KEY_CAPS_LOCK: + xen_keyboard_status ^= GRUB_TERM_STATUS_CAPS; + return GRUB_TERM_NO_KEY; + case GRUB_KEYBOARD_KEY_NUM_LOCK: + xen_keyboard_status ^= GRUB_TERM_STATUS_NUM; + return GRUB_TERM_NO_KEY; + case GRUB_KEYBOARD_KEY_SCROLL_LOCK: + xen_keyboard_status ^= GRUB_TERM_STATUS_SCROLL; + return GRUB_TERM_NO_KEY; + default: + return grub_term_map_key (code, xen_keyboard_status); + } +} + +static grub_err_t +grub_keyboard_controller_init (struct grub_term_input *term __attribute__ ((unused))) +{ + vkbd_init (); + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_keyboard_controller_fini (struct grub_term_input *term __attribute__ ((unused))) +{ + vkbd_fini (); + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_xen_fini_hw (int noreturn __attribute__ ((unused))) +{ + vkbd_fini (); + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_xen_restore_hw (void) +{ + vkbd_init (); + return GRUB_ERR_NONE; +} + + +static struct grub_term_input grub_xen_keyboard_term = + { + .name = "xen_keyboard", + .init = grub_keyboard_controller_init, + .fini = grub_keyboard_controller_fini, + .getkey = grub_xen_keyboard_getkey + }; + +void +grub_xen_keyboard_init (void) +{ + grub_term_register_input ("xen_keyboard", &grub_xen_keyboard_term); + grub_loader_register_preboot_hook (grub_xen_fini_hw, grub_xen_restore_hw, + GRUB_LOADER_PREBOOT_HOOK_PRIO_CONSOLE); +} + +GRUB_MOD_FINI(xen_keyboard) +{ + grub_keyboard_controller_fini (NULL); + grub_term_unregister_input (&grub_xen_keyboard_term); +} diff --git a/grub-core/video/xen/xenfb.c b/grub-core/video/xen/xenfb.c new file mode 100644 index 000000000..7041e4ccb --- /dev/null +++ b/grub-core/video/xen/xenfb.c @@ -0,0 +1,396 @@ +/* + * GRUB -- GRand Unified Bootloader + * Copyright (C) 2013 Free Software Foundation, Inc. + * + * GRUB is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * GRUB is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with GRUB. If not, see . + */ + +#define grub_video_render_target grub_video_fbrender_target + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +GRUB_MOD_LICENSE ("GPLv3+"); + +struct virtfb +{ + int handle; + char *fullname; + char *backend_dir; + char *frontend_dir; + struct xenfb_page *fbpage; + grub_xen_grant_t grant; + grub_xen_evtchn_t evtchn; + char *framebuffer; + grub_xen_mfn_t *page_directory; + int width, height; +}; + +struct virtfb vfb; + +static grub_xen_mfn_t +grub_xen_ptr2mfn (void *ptr) +{ + grub_xen_mfn_t *mfn_list = + (grub_xen_mfn_t *) grub_xen_start_page_addr->mfn_list; + return mfn_list[(grub_addr_t) ptr >> GRUB_XEN_LOG_PAGE_SIZE]; +} + +static int +fill (const char *dir, void *data __attribute__ ((unused))) +{ + domid_t dom; + /* "dir" is just a number, at most 19 characters. */ + char fdir[200]; + char num[20]; + grub_err_t err; + void *buf; + struct evtchn_alloc_unbound alloc_unbound; + + if (vfb.fbpage) + return 1; + vfb.handle = grub_strtoul (dir, 0, 10); + if (grub_errno) + { + grub_errno = 0; + return 0; + } + vfb.fullname = 0; + vfb.backend_dir = 0; + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s/backend", dir); + vfb.backend_dir = grub_xenstore_get_file (fdir, NULL); + if (!vfb.backend_dir) + goto out_fail_1; + + grub_snprintf (fdir, sizeof (fdir), "%s/dev", + vfb.backend_dir); + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s/backend-id", dir); + buf = grub_xenstore_get_file (fdir, NULL); + if (!buf) + goto out_fail_1; + + dom = grub_strtoul (buf, 0, 10); + grub_free (buf); + if (grub_errno) + goto out_fail_1; + + vfb.fbpage = + grub_xen_alloc_shared_page (dom, &vfb.grant); + if (!vfb.fbpage) + goto out_fail_1; + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s/page-ref", dir); + grub_snprintf (num, sizeof (num), "%llu", (unsigned long long) grub_xen_ptr2mfn (vfb.fbpage)); + err = grub_xenstore_write_file (fdir, num, grub_strlen (num)); + if (err) + goto out_fail_3; + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s/protocol", dir); + err = grub_xenstore_write_file (fdir, XEN_IO_PROTO_ABI_NATIVE, + grub_strlen (XEN_IO_PROTO_ABI_NATIVE)); + if (err) + goto out_fail_3; + + alloc_unbound.dom = DOMID_SELF; + alloc_unbound.remote_dom = dom; + + grub_xen_event_channel_op (EVTCHNOP_alloc_unbound, &alloc_unbound); + vfb.evtchn = alloc_unbound.port; + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s/event-channel", dir); + grub_snprintf (num, sizeof (num), "%u", vfb.evtchn); + err = grub_xenstore_write_file (fdir, num, grub_strlen (num)); + if (err) + goto out_fail_3; + + + struct gnttab_dump_table dt; + dt.dom = DOMID_SELF; + grub_xen_grant_table_op (GNTTABOP_dump_table, (void *) &dt, 1); + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s", dir); + + vfb.frontend_dir = grub_strdup (fdir); + + grub_size_t i; + + const unsigned pages_per_pd = (GRUB_XEN_PAGE_SIZE / sizeof (grub_xen_mfn_t)); + + vfb.fbpage->in_cons = 0; + vfb.fbpage->in_prod = 0; + vfb.fbpage->out_cons = 0; + vfb.fbpage->out_prod = 0; + + vfb.fbpage->width = vfb.width; + vfb.fbpage->height = vfb.height; + vfb.fbpage->line_length = vfb.width * 4; + vfb.fbpage->depth = 32; + + grub_size_t fbsize = ALIGN_UP (vfb.width * vfb.height * 4, GRUB_XEN_PAGE_SIZE); + + vfb.fbpage->mem_length = fbsize; + + grub_size_t fbpages = fbsize / GRUB_XEN_PAGE_SIZE; + grub_size_t pd_size = ALIGN_UP (fbpages, pages_per_pd); + + vfb.framebuffer = grub_memalign (GRUB_XEN_PAGE_SIZE, fbsize); + if (!vfb.framebuffer) + goto out_fail_3; + vfb.page_directory = grub_memalign (GRUB_XEN_PAGE_SIZE, pd_size * sizeof (grub_xen_mfn_t)); + if (!vfb.page_directory) + goto out_fail_3; + + for (i = 0; i < fbpages; i++) + vfb.page_directory[i] = grub_xen_ptr2mfn (vfb.framebuffer + GRUB_XEN_PAGE_SIZE * i); + for (; i < pd_size; i++) + vfb.page_directory[i] = 0; + + for (i = 0; i < pd_size / pages_per_pd; i++) + vfb.fbpage->pd[i] = grub_xen_ptr2mfn (vfb.page_directory + (GRUB_XEN_PAGE_SIZE / sizeof (vfb.page_directory[0])) * i); + + + grub_snprintf (fdir, sizeof (fdir), "device/vfb/%s/state", dir); + err = grub_xenstore_write_file (fdir, "3", 1); + if (err) + goto out_fail_3; + + while (1) + { + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vfb.backend_dir); + buf = grub_xenstore_get_file (fdir, NULL); + if (!buf) + goto out_fail_3; + if (grub_strcmp (buf, "2") != 0) + break; + grub_free (buf); + grub_xen_sched_op (SCHEDOP_yield, 0); + } + grub_dprintf ("xen", "state=%s\n", (char *) buf); + grub_free (buf); + + return 1; + +out_fail_3: + grub_xen_free_shared_page (vfb.fbpage); +out_fail_1: + grub_free (vfb.framebuffer); + vfb.framebuffer = 0; + grub_free (vfb.page_directory); + vfb.page_directory = 0; + + vfb.fbpage = 0; + grub_free (vfb.backend_dir); + grub_free (vfb.fullname); + + grub_errno = 0; + return 0; +} + +static void +vfb_fini (void) +{ + char fdir[200]; + + char *buf; + struct evtchn_close close_op = {.port = vfb.evtchn }; + + if (!vfb.fbpage) + return; + + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vfb.frontend_dir); + grub_xenstore_write_file (fdir, "6", 1); + + while (1) + { + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vfb.backend_dir); + buf = grub_xenstore_get_file (fdir, NULL); + grub_dprintf ("xen", "state=%s\n", (char *) buf); + + if (!buf || grub_strcmp (buf, "6") == 0) + break; + grub_free (buf); + grub_xen_sched_op (SCHEDOP_yield, 0); + } + grub_free (buf); + + grub_snprintf (fdir, sizeof (fdir), "%s/page-ref", + vfb.frontend_dir); + grub_xenstore_write_file (fdir, NULL, 0); + + grub_snprintf (fdir, sizeof (fdir), "%s/event-channel", + vfb.frontend_dir); + grub_xenstore_write_file (fdir, NULL, 0); + + grub_xen_free_shared_page (vfb.fbpage); + vfb.fbpage = 0; + + grub_xen_event_channel_op (EVTCHNOP_close, &close_op); + + /* Prepare for handoff. */ + grub_snprintf (fdir, sizeof (fdir), "%s/state", + vfb.frontend_dir); + grub_xenstore_write_file (fdir, "1", 1); + + grub_free (vfb.framebuffer); + vfb.framebuffer = 0; + grub_free (vfb.page_directory); + vfb.page_directory = 0; +} + +static grub_err_t +vfb_init (int width, int height) +{ + if (vfb.fbpage) + vfb_fini (); + vfb.width = width; + vfb.height = height; + grub_xenstore_dir ("device/vfb", fill, NULL); + if (vfb.fbpage) + grub_errno = 0; + if (!vfb.fbpage) + return grub_error (GRUB_ERR_IO, "couldn't init vfb"); + return GRUB_ERR_NONE; +} + +static void +grub_video_xenfb_fill_mode_info (struct grub_video_mode_info *out) +{ + grub_memset (out, 0, sizeof (*out)); + + out->pitch = vfb.width * 4; + out->width = vfb.width; + out->height = vfb.height; + + out->mode_type = GRUB_VIDEO_MODE_TYPE_RGB; + out->bpp = 32; + out->bytes_per_pixel = 4; + out->number_of_colors = 256; + out->reserved_mask_size = 8; + out->reserved_field_pos = 24; + out->red_mask_size = 8; + out->red_field_pos = 16; + out->green_mask_size = 8; + out->green_field_pos = 8; + out->blue_mask_size = 8; + out->blue_field_pos = 0; + + out->blit_format = grub_video_get_blit_format (out); +} + +static grub_err_t +grub_video_ieee1275_setup (unsigned int width, unsigned int height, + unsigned int mode_type __attribute__ ((unused)), + unsigned int mode_mask __attribute__ ((unused))) +{ + struct grub_video_mode_info modeinfo; + grub_err_t err; + + err = vfb_init (width ? : 800, height ? : 600); + if (err) + return err; + grub_video_xenfb_fill_mode_info (&modeinfo); + + err = grub_video_fb_setup (mode_type, mode_mask, + &modeinfo, + vfb.framebuffer, NULL, NULL); + if (err) + return err; + + err = grub_video_fb_set_palette (0, GRUB_VIDEO_FBSTD_NUMCOLORS, + grub_video_fbstd_colors); + + return err; +} + +static grub_err_t +grub_video_xenfb_get_info_and_fini (struct grub_video_mode_info *mode_info, + void **framebuf) +{ + grub_video_xenfb_fill_mode_info (mode_info); + *framebuf = vfb.framebuffer; + + grub_video_fb_fini (); + + return GRUB_ERR_NONE; +} + +static grub_err_t +grub_video_vfb_fini (void) +{ + vfb_fini (); + return grub_video_fb_fini (); +} + + +static struct grub_video_adapter grub_video_xen_adapter = + { + .name = "XEN video driver", + + .prio = GRUB_VIDEO_ADAPTER_PRIO_NATIVE, + .id = GRUB_VIDEO_DRIVER_XEN, + + .init = grub_video_fb_init, + .fini = grub_video_vfb_fini, + .setup = grub_video_ieee1275_setup, + .get_info = grub_video_fb_get_info, + .get_info_and_fini = grub_video_xenfb_get_info_and_fini, + .set_palette = grub_video_fb_set_palette, + .get_palette = grub_video_fb_get_palette, + .set_viewport = grub_video_fb_set_viewport, + .get_viewport = grub_video_fb_get_viewport, + .set_region = grub_video_fb_set_region, + .get_region = grub_video_fb_get_region, + .set_area_status = grub_video_fb_set_area_status, + .get_area_status = grub_video_fb_get_area_status, + .map_color = grub_video_fb_map_color, + .map_rgb = grub_video_fb_map_rgb, + .map_rgba = grub_video_fb_map_rgba, + .unmap_color = grub_video_fb_unmap_color, + .fill_rect = grub_video_fb_fill_rect, + .blit_bitmap = grub_video_fb_blit_bitmap, + .blit_render_target = grub_video_fb_blit_render_target, + .scroll = grub_video_fb_scroll, + .swap_buffers = grub_video_fb_swap_buffers, + .create_render_target = grub_video_fb_create_render_target, + .delete_render_target = grub_video_fb_delete_render_target, + .set_active_render_target = grub_video_fb_set_active_render_target, + .get_active_render_target = grub_video_fb_get_active_render_target, + + .next = 0 + }; + +void +grub_video_xen_init (void) +{ + grub_video_register (&grub_video_xen_adapter); +} + +void +grub_video_xen_fini (void) +{ + vfb_fini (); + grub_video_unregister (&grub_video_xen_adapter); +} diff --git a/include/grub/video.h b/include/grub/video.h index bca677789..14e7054e8 100644 --- a/include/grub/video.h +++ b/include/grub/video.h @@ -290,7 +290,8 @@ typedef enum grub_video_driver_id GRUB_VIDEO_DRIVER_RADEON_FULOONG2E, GRUB_VIDEO_DRIVER_COREBOOT, GRUB_VIDEO_DRIVER_IEEE1275, - GRUB_VIDEO_ADAPTER_CAPTURE + GRUB_VIDEO_ADAPTER_CAPTURE, + GRUB_VIDEO_DRIVER_XEN } grub_video_driver_id_t; typedef enum grub_video_adapter_prio diff --git a/include/grub/x86_64/xen/hypercall.h b/include/grub/x86_64/xen/hypercall.h index ad89d6c62..e5ea26ba9 100644 --- a/include/grub/x86_64/xen/hypercall.h +++ b/include/grub/x86_64/xen/hypercall.h @@ -21,7 +21,7 @@ int EXPORT_FUNC (grub_xen_sched_op) (int cmd, void *arg) __attribute__ ((sysv_abi)); int grub_xen_update_va_mapping (void *addr, uint64_t pte, uint64_t flags) __attribute__ ((sysv_abi)); -int grub_xen_event_channel_op (int op, void *arg) __attribute__ ((sysv_abi)); +int EXPORT_FUNC (grub_xen_event_channel_op) (int op, void *arg) __attribute__ ((sysv_abi)); int grub_xen_mmuext_op (mmuext_op_t * ops, unsigned int count, diff --git a/include/grub/xen.h b/include/grub/xen.h index 062c95d9f..f7bf2340a 100644 --- a/include/grub/xen.h +++ b/include/grub/xen.h @@ -82,6 +82,15 @@ void grub_console_init (void); void grub_xendisk_fini (void); void grub_xendisk_init (void); +void +grub_xen_keyboard_init (void); +void +grub_xen_keyboard_fini (void); +void +grub_video_xen_init (void); +void +grub_video_xen_fini (void); + #ifdef __x86_64__ typedef grub_uint64_t grub_xen_mfn_t; #else