X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fkeyboard.c;h=a3fda90543d69f28d7512f0afd6a8ef531d14077;hb=1598235b4d53e7ae2daf561f36be1962ba42d5bf;hp=8e378f2796eca0d5bb7329b4f46c0f5d65a5b9ff;hpb=51a4889bd4aceea8308b2b23adf6a68455c52936;p=palacios.git diff --git a/palacios/src/devices/keyboard.c b/palacios/src/devices/keyboard.c index 8e378f2..a3fda90 100644 --- a/palacios/src/devices/keyboard.c +++ b/palacios/src/devices/keyboard.c @@ -17,15 +17,18 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ -#include #include +#include #include #include #include +#include +#include +#include -#ifndef DEBUG_KEYBOARD +#ifndef CONFIG_DEBUG_KEYBOARD #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -263,7 +266,7 @@ static int push_to_output_queue(struct vm_device * dev, uint8_t value, uint8_t c q = &(state->kbd_queue); } - if (q->count == QUEUE_SIZE) { + if (q->count >= QUEUE_SIZE) { return 0; } @@ -273,7 +276,14 @@ static int push_to_output_queue(struct vm_device * dev, uint8_t value, uint8_t c state->status.cmd = 0; } - q->queue[q->end++] = value; + q->queue[q->end] = value; + + if (q->end >= (QUEUE_SIZE - 1)) { + q->end = 0; + } else { + q->end++; + } + q->count++; @@ -301,7 +311,14 @@ static int pull_from_output_queue(struct vm_device * dev, uint8_t * value) { return 0; } - *value = q->queue[q->start++]; + *value = q->queue[q->start]; + + if (q->start >= (QUEUE_SIZE - 1)) { + q->start = 0; + } else { + q->start++; + } + q->count--; @@ -314,9 +331,12 @@ static int pull_from_output_queue(struct vm_device * dev, uint8_t * value) { } +#include +#ifdef CONFIG_SYMMOD +#include +#endif - -static int key_event_handler(struct guest_info * info, +static int key_event_handler(struct v3_vm_info * vm, struct v3_keyboard_event * evt, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; @@ -325,9 +345,56 @@ static int key_event_handler(struct guest_info * info, PrintDebug("keyboard: injected status 0x%x, and scancode 0x%x\n", evt->status, evt->scan_code); if (evt->scan_code == 0x44) { // F10 debug dump - v3_print_guest_state(info); + int i = 0; + for (i = 0; i < vm->num_cores; i++) { + v3_print_guest_state(&(vm->cores[i])); + } // PrintGuestPageTables(info, info->shdw_pg_state.guest_cr3); + } +#ifdef CONFIG_SYMCALL + else if (evt->scan_code == 0x43) { // F9 Sym test + struct guest_info * core = &(vm->cores[0]); + PrintDebug("Testing sym call\n"); + sym_arg_t a0 = 0x1111; + sym_arg_t a1 = 0x2222; + sym_arg_t a2 = 0x3333; + sym_arg_t a3 = 0x4444; + sym_arg_t a4 = 0x5555; + uint64_t call_start = 0; + uint64_t call_end = 0; + + V3_Print("Exits before symcall: %d\n", (uint32_t)core->num_exits); + + rdtscll(call_start); + v3_sym_call5(core, SYMCALL_TEST, &a0, &a1, &a2, &a3, &a4); + rdtscll(call_end); + + V3_Print("Symcall latency = %d cycles (%d exits)\n", (uint32_t)(call_end - call_start), (uint32_t)core->num_exits); + + V3_Print("Symcall Test Returned arg0=%x, arg1=%x, arg2=%x, arg3=%x, arg4=%x\n", + (uint32_t)a0, (uint32_t)a1, (uint32_t)a2, (uint32_t)a3, (uint32_t)a4); + + } +#endif + else if (evt->scan_code == 0x42) { // F8 debug toggle + extern int v3_dbg_enable; + + PrintDebug("Toggling Debugging\n"); + v3_dbg_enable ^= 1; + + } +#ifdef CONFIG_TELEMETRY + + else if (evt->scan_code == 0x41) { // F7 telemetry dump + v3_print_telemetry(vm); + } +#endif +#ifdef CONFIG_SYMMOD + else if (evt->scan_code == 0x40) { // F6 Test symmod load + v3_load_sym_capsule(vm, "lnx_test"); } +#endif + addr_t irq_state = v3_lock_irqsave(state->kb_lock); @@ -343,7 +410,7 @@ static int key_event_handler(struct guest_info * info, } -static int mouse_event_handler(struct guest_info * info, +static int mouse_event_handler(struct v3_vm_info * vm, struct v3_mouse_event * evt, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; @@ -562,7 +629,7 @@ static int keyboard_write_delay(ushort_t port, void * src, uint_t length, struc } } -static int keyboard_read_delay(ushort_t port, void * dest, uint_t length, struct vm_device * dev) { +static int keyboard_read_delay(struct guest_info * core, ushort_t port, void * dest, uint_t length, struct vm_device * dev) { if (length == 1) { *(uint8_t *)dest = v3_inb(port); @@ -582,7 +649,7 @@ static int keyboard_read_delay(ushort_t port, void * dest, uint_t length, struct -static int keyboard_write_command(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int keyboard_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data); uint8_t cmd = *(uint8_t *)src; @@ -755,7 +822,7 @@ static int keyboard_write_command(ushort_t port, void * src, uint_t length, stru return length; } -static int keyboard_read_status(ushort_t port, void * dest, uint_t length, struct vm_device * dev) { +static int keyboard_read_status(struct guest_info * core, ushort_t port, void * dest, uint_t length, struct vm_device * dev) { struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); if (length != 1) { @@ -776,7 +843,7 @@ static int keyboard_read_status(ushort_t port, void * dest, uint_t length, struc return length; } -static int keyboard_write_output(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int keyboard_write_output(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct keyboard_internal *state = (struct keyboard_internal *)(dev->private_data); int ret = length; @@ -883,6 +950,10 @@ static int keyboard_write_output(ushort_t port, void * src, uint_t length, struc state->state = SET_LEDS; break; + case 0xee: // echo, used by FreeBSD to probe controller + push_to_output_queue(dev, 0xee, COMMAND, KEYBOARD); + break; + case 0xfe: // resend case 0xfd: // set key type make case 0xfc: // set key typ make/break @@ -911,7 +982,7 @@ static int keyboard_write_output(ushort_t port, void * src, uint_t length, struc return ret; } -static int keyboard_read_input(ushort_t port, void * dest, uint_t length, struct vm_device * dev) { +static int keyboard_read_input(struct guest_info * core, ushort_t port, void * dest, uint_t length, struct vm_device * dev) { struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data); if (length != 1) { @@ -934,39 +1005,8 @@ static int keyboard_read_input(ushort_t port, void * dest, uint_t length, struct -static int keyboard_init_device(struct vm_device * dev) { - struct keyboard_internal * state = (struct keyboard_internal *)(dev->private_data); - - PrintDebug("keyboard: init_device\n"); - - keyboard_reset_device(dev); - - - v3_lock_init(&(state->kb_lock)); - - // hook ports - v3_dev_hook_io(dev, KEYBOARD_64H, &keyboard_read_status, &keyboard_write_command); - v3_dev_hook_io(dev, KEYBOARD_60H, &keyboard_read_input, &keyboard_write_output); - - v3_hook_host_event(dev->vm, HOST_KEYBOARD_EVT, V3_HOST_EVENT_HANDLER(key_event_handler), dev); - v3_hook_host_event(dev->vm, HOST_MOUSE_EVT, V3_HOST_EVENT_HANDLER(mouse_event_handler), dev); - - -#if KEYBOARD_DEBUG_80H - v3_dev_hook_io(dev, KEYBOARD_DELAY_80H, &keyboard_read_delay, &keyboard_write_delay); -#endif - - - // - // We do not hook the IRQ here. Instead, the underlying device driver - // is responsible to call us back - // - - return 0; -} - -static int keyboard_deinit_device(struct vm_device * dev) { +static int keyboard_free(struct vm_device * dev) { v3_dev_unhook_io(dev, KEYBOARD_60H); v3_dev_unhook_io(dev, KEYBOARD_64H); @@ -981,9 +1021,8 @@ static int keyboard_deinit_device(struct vm_device * dev) { -static struct vm_device_ops dev_ops = { - .init = keyboard_init_device, - .deinit = keyboard_deinit_device, +static struct v3_device_ops dev_ops = { + .free = keyboard_free, .reset = keyboard_reset_device, .start = keyboard_start_device, .stop = keyboard_stop_device, @@ -992,11 +1031,16 @@ static struct vm_device_ops dev_ops = { -struct vm_device * v3_create_keyboard() { +static int keyboard_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct keyboard_internal * keyboard_state = NULL; + char * dev_id = v3_cfg_val(cfg, "ID"); + + PrintDebug("keyboard: init_device\n"); keyboard_state = (struct keyboard_internal *)V3_Malloc(sizeof(struct keyboard_internal)); + memset(keyboard_state, 0, sizeof(struct keyboard_internal)); + keyboard_state->mouse_queue.start = 0; keyboard_state->mouse_queue.end = 0; keyboard_state->mouse_queue.count = 0; @@ -1007,7 +1051,40 @@ struct vm_device * v3_create_keyboard() { keyboard_state->mouse_enabled = 0; - struct vm_device * device = v3_create_device("KEYBOARD", &dev_ops, keyboard_state); + struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, keyboard_state); + + if (v3_attach_device(vm, dev) == -1) { + PrintError("Could not attach device %s\n", dev_id); + return -1; + } + + + keyboard_reset_device(dev); + - return device; + v3_lock_init(&(keyboard_state->kb_lock)); + + + // hook ports + v3_dev_hook_io(dev, KEYBOARD_64H, &keyboard_read_status, &keyboard_write_command); + v3_dev_hook_io(dev, KEYBOARD_60H, &keyboard_read_input, &keyboard_write_output); + + v3_hook_host_event(vm, HOST_KEYBOARD_EVT, V3_HOST_EVENT_HANDLER(key_event_handler), dev); + v3_hook_host_event(vm, HOST_MOUSE_EVT, V3_HOST_EVENT_HANDLER(mouse_event_handler), dev); + + +#if KEYBOARD_DEBUG_80H + v3_dev_hook_io(dev, KEYBOARD_DELAY_80H, &keyboard_read_delay, &keyboard_write_delay); +#endif + + + // + // We do not hook the IRQ here. Instead, the underlying device driver + // is responsible to call us back + // + + return 0; } + + +device_register("KEYBOARD", keyboard_init)