X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=130c7081d66be8184e194201af201eedfcae23d3;hb=9029ed7acfdc4bb51342173384e1861621044d12;hp=bf27ca0dbbac7cf7b24327d27abbbf227559aa9b;hpb=f4b430cdef58c5d13260c57f46a077c07c72864e;p=palacios.releases.git diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c index bf27ca0..130c708 100644 --- a/palacios/src/devices/generic.c +++ b/palacios/src/devices/generic.c @@ -1,6 +1,23 @@ -/* (c) 2008, Peter Dinda */ -/* (c) 2008, The V3VEE Project */ - +/* + * This file is part of the Palacios Virtual Machine Monitor developed + * by the V3VEE Project with funding from the United States National + * Science Foundation and the Department of Energy. + * + * The V3VEE Project is a joint project between Northwestern University + * and the University of New Mexico. You can find out more at + * http://www.v3vee.org + * + * Copyright (c) 2008, Peter Dinda + * Copyright (c) 2008, The V3VEE Project + * All rights reserved. + * + * Author: Peter Dinda + * Contributor: 2008, Jack Lange + * + * + * This is free software. You are permitted to use, + * redistribute, and modify it as specified in the file "V3VEE_LICENSE". + */ #include #include @@ -21,11 +38,11 @@ struct generic_internal { - struct list_head port_range; + struct list_head port_list; uint_t num_port_ranges; - struct list_head mem_range; + struct list_head mem_list; uint_t num_mem_ranges; - struct list_head irq_range; + struct list_head irq_list; uint_t num_irq_ranges; }; @@ -34,46 +51,41 @@ struct port_range { uint_t start; uint_t end; uint_t type; - struct list_head range_list; + struct list_head range_link; }; struct mem_range { void * start; void * end; uint_t type; - struct list_head range_list; + struct list_head range_link; }; struct irq_range { uint_t start; uint_t end; uint_t type; - struct list_head range_list; + struct list_head range_link; }; -int generic_reset_device(struct vm_device * dev) -{ +static int generic_reset_device(struct vm_device * dev) { PrintDebug("generic: reset device\n"); - return 0; - } -int generic_start_device(struct vm_device * dev) -{ +static int generic_start_device(struct vm_device * dev) { PrintDebug("generic: start device\n"); return 0; } -int generic_stop_device(struct vm_device * dev) -{ +static int generic_stop_device(struct vm_device * dev) { PrintDebug("generic: stop device\n"); return 0; } @@ -81,11 +93,10 @@ int generic_stop_device(struct vm_device * dev) -int generic_write_port_passthrough(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_write_port_passthrough(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; PrintDebug("generic: writing 0x"); @@ -99,7 +110,6 @@ int generic_write_port_passthrough(ushort_t port, switch (length) { case 1: - v3_outb(port,((uchar_t*)src)[0]); break; case 2: @@ -107,7 +117,6 @@ int generic_write_port_passthrough(ushort_t port, break; case 4: v3_outdw(port,((uint_t*)src)[0]); - break; default: for (i = 0; i < length; i++) { @@ -121,11 +130,10 @@ int generic_write_port_passthrough(ushort_t port, return length; } -int generic_read_port_passthrough(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_read_port_passthrough(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); @@ -158,11 +166,10 @@ int generic_read_port_passthrough(ushort_t port, return length; } -int generic_write_port_ignore(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_write_port_ignore(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; PrintDebug("generic: writing 0x"); @@ -176,11 +183,10 @@ int generic_write_port_ignore(ushort_t port, return length; } -int generic_read_port_ignore(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) -{ +static int generic_read_port_ignore(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { PrintDebug("generic: reading 0x%x bytes from port 0x%x ...", length, port); @@ -192,16 +198,16 @@ int generic_read_port_ignore(ushort_t port, -int generic_interrupt(uint_t irq, struct vm_device * dev) { +static int generic_interrupt(uint_t irq, struct vm_device * dev) { PrintDebug("generic: interrupt 0x%x - injecting into VM\n", irq); - dev->vm->vm_ops.raise_irq(dev->vm, irq); + v3_raise_irq(dev->vm, irq); return 0; } -int generic_init_device(struct vm_device * dev) { +static int generic_init_device(struct vm_device * dev) { struct generic_internal * state = (struct generic_internal *)(dev->private_data); PrintDebug("generic: init_device\n"); @@ -209,9 +215,9 @@ int generic_init_device(struct vm_device * dev) { if (PORT_HOOKS) { // This is a runtime conditional on a #define - struct port_range * tmp; + struct port_range * tmp = NULL; - list_for_each_entry(tmp, &(state->port_range), range_list) { + list_for_each_entry(tmp, &(state->port_list), range_link) { uint_t i = 0; PrintDebug("generic: hooking ports 0x%x to 0x%x as %x\n", @@ -221,13 +227,13 @@ int generic_init_device(struct vm_device * dev) { for (i = tmp->start; i <= tmp->end; i++) { if (tmp->type == GENERIC_PRINT_AND_PASSTHROUGH) { - if (dev_hook_io(dev, i, &generic_read_port_passthrough, &generic_write_port_passthrough)) { + if (v3_dev_hook_io(dev, i, &generic_read_port_passthrough, &generic_write_port_passthrough)) { PrintDebug("generic: can't hook port 0x%x (already hooked?)\n", i); } } else if (tmp->type == GENERIC_PRINT_AND_IGNORE) { - if (dev_hook_io(dev, i, &generic_read_port_ignore, &generic_write_port_ignore)) { + if (v3_dev_hook_io(dev, i, &generic_read_port_ignore, &generic_write_port_ignore)) { PrintDebug("generic: can't hook port 0x%x (already hooked?)\n", i); } } @@ -243,13 +249,13 @@ int generic_init_device(struct vm_device * dev) { if (MEM_HOOKS) { // This is a runtime conditional on a #define struct mem_range * tmp; - list_for_each_entry(tmp, &(state->mem_range), range_list) { + list_for_each_entry(tmp, &(state->mem_list), range_link) { PrintDebug("generic: hooking addresses 0x%x to 0x%x\n", tmp->start, tmp->end); - if (dev_hook_mem(dev, tmp->start, tmp->end)) { + if (v3_dev_hook_mem(dev, tmp->start, tmp->end)) { PrintDebug("generic: Can't hook addresses 0x%x to 0x%x (already hooked?)\n", tmp->start, tmp->end); } @@ -264,14 +270,14 @@ int generic_init_device(struct vm_device * dev) { if (IRQ_HOOKS) { // This is a runtime conditional on a #define struct irq_range * tmp; - list_for_each_entry(tmp, &(state->irq_range), range_list) { + list_for_each_entry(tmp, &(state->irq_list), range_link) { uint_t i; PrintDebug("generic: hooking irqs 0x%x to 0x%x\n", tmp->start, tmp->end); for (i = tmp->start; i <= tmp->end; i++) { - if (dev_hook_irq(dev, i, &generic_interrupt)) { + if (v3_dev_hook_irq(dev, i, &generic_interrupt)) { PrintDebug("generic: can't hook irq 0x%x (already hooked?)\n", i); } } @@ -286,7 +292,7 @@ int generic_init_device(struct vm_device * dev) { return 0; } -int generic_deinit_device(struct vm_device * dev) { +static int generic_deinit_device(struct vm_device * dev) { struct generic_internal * state = (struct generic_internal *)(dev->private_data); @@ -297,7 +303,7 @@ int generic_deinit_device(struct vm_device * dev) { struct irq_range * tmp; struct irq_range * cur; - list_for_each_entry_safe(cur, tmp, &(state->irq_range), range_list) { + list_for_each_entry_safe(cur, tmp, &(state->irq_list), range_link) { uint_t i; PrintDebug("generic: unhooking irqs 0x%x to 0x%x\n", @@ -305,11 +311,13 @@ int generic_deinit_device(struct vm_device * dev) { for (i = cur->start; i <= cur->end; i++) { - if (dev_unhook_irq(dev, i)) { + if (v3_dev_unhook_irq(dev, i)) { PrintDebug("generic: can't unhook irq 0x%x (already unhooked?)\n", i); } } + list_del(&(cur->range_link)); + state->num_irq_ranges--; V3_Free(cur); } } else { @@ -321,16 +329,18 @@ int generic_deinit_device(struct vm_device * dev) { struct mem_range * tmp; struct mem_range * cur; - list_for_each_entry_safe(cur, tmp, &(state->mem_range), range_list) { + list_for_each_entry_safe(cur, tmp, &(state->mem_list), range_link) { PrintDebug("generic: unhooking addresses 0x%x to 0x%x\n", cur->start, cur->end); - if (dev_unhook_mem(dev, cur->start, cur->end)) { + if (v3_dev_unhook_mem(dev, cur->start, cur->end)) { PrintDebug("generic: Can't unhook addresses 0x%x to 0x%x (already unhooked?)\n", cur->start, cur->end); } + list_del(&(cur->range_link)); + state->num_mem_ranges--; V3_Free(cur); } } else { @@ -342,18 +352,20 @@ int generic_deinit_device(struct vm_device * dev) { struct port_range * tmp; struct port_range * cur; - list_for_each_entry_safe(cur, tmp, &(state->mem_range), range_list) { + list_for_each_entry_safe(cur, tmp, &(state->port_list), range_link) { uint_t i; PrintDebug("generic: unhooking ports 0x%x to 0x%x\n", cur->start, cur->end); for (i = cur->start; i <= cur->end; i++) { - if (dev_unhook_io(dev, i)) { + if (v3_dev_unhook_io(dev, i)) { PrintDebug("generic: can't unhook port 0x%x (already unhooked?)\n", i); } } + list_del(&(cur->range_link)); + state->num_port_ranges--; V3_Free(cur); } } else { @@ -391,7 +403,12 @@ int v3_generic_add_port_range(struct vm_device * dev, uint_t start, uint_t end, range->end = end; range->type = type; - list_add(&(state->port_range), &(range->range_list)); + + PrintDebug("generic: Adding Port Range: 0x%x to 0x%x as %x\n", + range->start, range->end, + (range->type == GENERIC_PRINT_AND_PASSTHROUGH) ? "print-and-passthrough" : "print-and-ignore"); + + list_add(&(range->range_link), &(state->port_list)); state->num_port_ranges++; } else { PrintDebug("generic: hooking IO ports not supported\n"); @@ -411,7 +428,7 @@ int v3_generic_add_mem_range(struct vm_device * dev, void * start, void * end, u range->end = end; range->type = type; - list_add(&(state->port_range), &(range->range_list)); + list_add(&(range->range_link), &(state->port_list)); state->num_mem_ranges++; } else { PrintDebug("generic: hooking memory not supported\n"); @@ -432,7 +449,7 @@ int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, u range->end = end; range->type = type; - list_add(&(state->port_range), &(range->range_list)); + list_add(&(range->range_link), &(state->port_list)); state->num_irq_ranges++; } else { PrintDebug("generic: hooking IRQs not supported\n"); @@ -444,18 +461,18 @@ int v3_generic_add_irq_range(struct vm_device * dev, uint_t start, uint_t end, u -struct vm_device *create_generic() { +struct vm_device * v3_create_generic() { struct generic_internal * generic_state = (struct generic_internal *)V3_Malloc(sizeof(struct generic_internal)); generic_state->num_port_ranges = 0; generic_state->num_mem_ranges = 0; generic_state->num_irq_ranges = 0; - INIT_LIST_HEAD(&(generic_state->port_range)); - INIT_LIST_HEAD(&(generic_state->mem_range)); - INIT_LIST_HEAD(&(generic_state->irq_range)); + INIT_LIST_HEAD(&(generic_state->port_list)); + INIT_LIST_HEAD(&(generic_state->mem_list)); + INIT_LIST_HEAD(&(generic_state->irq_list)); - struct vm_device * device = create_device("GENERIC", &dev_ops, generic_state); + struct vm_device * device = v3_create_device("GENERIC", &dev_ops, generic_state); return device; }