X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=b16dd075d6d78ccffbcff97de3e5590b309d19cd;hb=75d9c52b3ee8673c9f358b7815d2026da5319ca7;hp=269840e1e5529b39d72dfe84a5001fab99626133;hpb=028d9b71d4a4e6d49a22ad5904b6dd2f8c596a26;p=palacios.git diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c index 269840e..b16dd07 100644 --- a/palacios/src/devices/generic.c +++ b/palacios/src/devices/generic.c @@ -1,16 +1,17 @@ +/* (c) 2008, Peter Dinda */ +/* (c) 2008, The V3VEE Project */ + + #include -#include #include #include +#include -#define GENERIC_DEBUG 1 - -#if GENERIC_DEBUG -#define GENERIC_DEBUG_PRINT(first, rest...) do { SerialPrint(first, ## rest ); } while (0) -#else -#define GENERIC_DEBUG_PRINT(first, rest...) +#ifndef DEBUG_GENERIC +#undef PrintDebug +#define PrintDebug(fmt, args...) #endif @@ -18,12 +19,6 @@ #define MEM_HOOKS 0 // not yet implmented in device model #define IRQ_HOOKS 0 // not yet implemented in device model -extern struct vmm_os_hooks *os_hooks; - -extern void SerialPrint(const char *format, ...); - - - struct generic_internal { generic_port_range_type *port_ranges; uint_t num_port_ranges; @@ -34,15 +29,10 @@ struct generic_internal { }; - - - - - int generic_reset_device(struct vm_device * dev) { - GENERIC_DEBUG_PRINT("generic: reset device\n"); + PrintDebug("generic: reset device\n"); return 0; @@ -54,56 +44,125 @@ int generic_reset_device(struct vm_device * dev) int generic_start_device(struct vm_device *dev) { - GENERIC_DEBUG_PRINT("generic: start device\n"); + PrintDebug("generic: start device\n"); return 0; } int generic_stop_device(struct vm_device *dev) { - GENERIC_DEBUG_PRINT("generic: stop device\n"); + PrintDebug("generic: stop device\n"); return 0; } -int generic_write_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) +int generic_write_port_passthrough(ushort_t port, + void * src, + uint_t length, + struct vm_device * dev) { uint_t i; - GENERIC_DEBUG_PRINT("generic: writing 0x"); - for (i=0;ivm->vm_ops.raise_irq(dev->vm,irq,0); + dev->vm->vm_ops.raise_irq(dev->vm, irq); return 0; @@ -124,53 +183,63 @@ int generic_interrupt(uint_t irq, int generic_init_device(struct vm_device * dev) { - struct generic_internal *state = (struct generic_internal *) dev->private_data; - uint_t i,j; + struct generic_internal *state = (struct generic_internal *)(dev->private_data); + uint_t i, j; - GENERIC_DEBUG_PRINT("generic: init_device\n"); + PrintDebug("generic: init_device\n"); // Would read state here generic_reset_device(dev); - for (i=0;inum_port_ranges;i++) { - GENERIC_DEBUG_PRINT("generic: hooking ports 0x%x to 0x%x\n",state->port_ranges[i][0],state->port_ranges[i][1]); + for (i = 0; i < state->num_port_ranges; i++) { + PrintDebug("generic: hooking ports 0x%x to 0x%x as %x\n", state->port_ranges[i][0], state->port_ranges[i][1], state->port_ranges[i][2]==GENERIC_PRINT_AND_PASSTHROUGH ? "print-and-passthrough" : "print-and-ignore"); + #if PORT_HOOKS - for (j=state->port_ranges[i][0]; j<=state->port_ranges[i][1];j++) { - if (dev_hook_io(dev, j, &generic_read_port, &generic_write_port)) { - GENERIC_DEBUG_PRINT("generic: can't hook port 0x%x (already hooked?)\n",j); - } + for (j = state->port_ranges[i][0]; j <= state->port_ranges[i][1]; j++) { + if (state->port_ranges[i][2]==GENERIC_PRINT_AND_PASSTHROUGH) { + if (dev_hook_io(dev, j, &generic_read_port_passthrough, &generic_write_port_passthrough)) { + PrintDebug("generic: can't hook port 0x%x (already hooked?)\n", j); + } + } else if (state->port_ranges[i][2]==GENERIC_PRINT_AND_IGNORE) { + if (dev_hook_io(dev, j, &generic_read_port_ignore, &generic_write_port_ignore)) { + PrintDebug("generic: can't hook port 0x%x (already hooked?)\n", j); + } + } } #else - GENERIC_DEBUG_PRINT("generic: hooking ports not supported\n"); + PrintDebug("generic: hooking ports not supported\n"); #endif } - for (i=0;inum_address_ranges;i++) { - GENERIC_DEBUG_PRINT("generic: hooking addresses 0x%x to 0x%x\n",state->address_ranges[i][0],state->address_ranges[i][1]); + for (i = 0; i < state->num_address_ranges; i++) { + PrintDebug("generic: hooking addresses 0x%x to 0x%x\n",state->address_ranges[i][0],state->address_ranges[i][1]); + #if MEM_HOOKS - if (dev_hook_mem(dev, state->address_ranges[i][0],state->address_ranges[i][1])) { - GENERIC_DEBUG_PRINT("generic: Can't hook addresses 0x%x to 0x%x (already hooked?)\n", - state->address_ranges[i][0],state->address_ranges[i][1]); + if (dev_hook_mem(dev, state->address_ranges[i][0], state->address_ranges[i][1])) { + PrintDebug("generic: Can't hook addresses 0x%x to 0x%x (already hooked?)\n", + state->address_ranges[i][0], state->address_ranges[i][1]); } #else - GENERIC_DEBUG_PRINT("generic: hooking addresses not supported\n"); + PrintDebug("generic: hooking addresses not supported\n"); #endif } - for (i=0;inum_irq_ranges;i++) { - GENERIC_DEBUG_PRINT("generic: hooking irqs 0x%x to 0x%x\n",state->irq_ranges[i][0],state->irq_ranges[i][1]); + for (i = 0; i < state->num_irq_ranges; i++) { + PrintDebug("generic: hooking irqs 0x%x to 0x%x\n",state->irq_ranges[i][0],state->irq_ranges[i][1]); + #if IRQ_HOOKS - for (j=state->irq_ranges[i][0]; j<=state->irq_ranges[i][1];j++) { - if (dev_hook_irq(dev, j, &generic_interrupt)) { - GENERIC_DEBUG_PRINT("generic: can't hook irq 0x%x (already hooked?)\n",j); + for (j = state->irq_ranges[i][0]; j <= state->irq_ranges[i][1]; j++) { + if (dev_hook_irq(dev, j, &generic_interrupt)) { + PrintDebug("generic: can't hook irq 0x%x (already hooked?)\n", j); } } #else - GENERIC_DEBUG_PRINT("generic: hooking irqs not supported\n"); + PrintDebug("generic: hooking irqs not supported\n"); #endif + } return 0; @@ -178,47 +247,52 @@ int generic_init_device(struct vm_device * dev) int generic_deinit_device(struct vm_device *dev) { - struct generic_internal *state = (struct generic_internal *) dev->private_data; - uint_t i,j; + struct generic_internal *state = (struct generic_internal *)(dev->private_data); + uint_t i, j; + + PrintDebug("generic: deinit_device\n"); + - GENERIC_DEBUG_PRINT("generic: deinit_device\n"); + for (i = 0; i < state->num_irq_ranges; i++) { + PrintDebug("generic: unhooking irqs 0x%x to 0x%x\n", state->irq_ranges[i][0], state->irq_ranges[i][1]); - for (i=0;inum_irq_ranges;i++) { - GENERIC_DEBUG_PRINT("generic: unhooking irqs 0x%x to 0x%x\n",state->irq_ranges[i][0],state->irq_ranges[i][1]); #if IRQ_HOOKS - for (j=state->irq_ranges[i][0]; j<=state->irq_ranges[i][1];j++) { + for (j = state->irq_ranges[i][0]; j <= state->irq_ranges[i][1]; j++) { if (dev_unhook_irq(dev, j)) { - GENERIC_DEBUG_PRINT("generic: can't unhook irq 0x%x (already unhooked?)\n",j); + PrintDebug("generic: can't unhook irq 0x%x (already unhooked?)\n",j); } } #else - GENERIC_DEBUG_PRINT("generic: unhooking irqs not supported\n"); + PrintDebug("generic: unhooking irqs not supported\n"); #endif } - for (i=0;inum_address_ranges;i++) { - GENERIC_DEBUG_PRINT("generic: unhooking addresses 0x%x to 0x%x\n",state->address_ranges[i][0],state->address_ranges[i][1]); + for (i = 0; i < state->num_address_ranges; i++) { + PrintDebug("generic: unhooking addresses 0x%x to 0x%x\n",state->address_ranges[i][0],state->address_ranges[i][1]); + #if MEM_HOOKS - if (dev_unhook_mem(dev, state->address_ranges[i][0],state->address_ranges[i][1])) { - GENERIC_DEBUG_PRINT("generic: Can't unhook addresses 0x%x to 0x%x (already unhooked?)\n", - state->address_ranges[i][0],state->address_ranges[i][1]); + if (dev_unhook_mem(dev, state->address_ranges[i][0], state->address_ranges[i][1])) { + PrintDebug("generic: Can't unhook addresses 0x%x to 0x%x (already unhooked?)\n", + state->address_ranges[i][0], state->address_ranges[i][1]); } #else - GENERIC_DEBUG_PRINT("generic: unhooking addresses not supported\n"); + PrintDebug("generic: unhooking addresses not supported\n"); #endif + } - for (i=0;inum_port_ranges;i++) { - GENERIC_DEBUG_PRINT("generic: unhooking ports 0x%x to 0x%x\n",state->port_ranges[i][0],state->port_ranges[i][1]); + for (i = 0; i < state->num_port_ranges; i++) { + PrintDebug("generic: unhooking ports 0x%x to 0x%x\n",state->port_ranges[i][0],state->port_ranges[i][1]); + #if PORT_HOOKS - for (j=state->port_ranges[i][0]; j<=state->port_ranges[i][1];j++) { + for (j = state->port_ranges[i][0]; j <= state->port_ranges[i][1]; j++) { if (dev_unhook_io(dev, j)) { - GENERIC_DEBUG_PRINT("generic: can't unhook port 0x%x (already unhooked?)\n",j); + PrintDebug("generic: can't unhook port 0x%x (already unhooked?)\n", j); } } #else - GENERIC_DEBUG_PRINT("generic: unhooking ports not supported\n"); + PrintDebug("generic: unhooking ports not supported\n"); #endif } @@ -243,39 +317,68 @@ static struct vm_device_ops dev_ops = { struct vm_device *create_generic(generic_port_range_type port_ranges[], - uint_t num_port_ranges, generic_address_range_type address_ranges[], - uint_t num_address_ranges, - generic_irq_range_type irq_ranges[], - uint_t num_irq_ranges) + generic_irq_range_type irq_ranges[]) { - struct generic_internal * generic_state = os_hooks->malloc(sizeof(struct generic_internal)); + struct generic_internal * generic_state = (struct generic_internal *)V3_Malloc(sizeof(struct generic_internal)); + int i; + uint_t num_port_ranges, num_address_ranges, num_irq_ranges; + + num_port_ranges=0; + if (port_ranges!=NULL) { + i=0; + while (port_ranges[i]!=NULL && + !(port_ranges[i][0]==0 && port_ranges[i][1]==0 && port_ranges[i][2]==0)) + { num_port_ranges++; i++; } + } + + num_address_ranges=0; + if (address_ranges!=NULL) { + i=0; + while (address_ranges[i]!=NULL && + !(address_ranges[i][0]==0 && address_ranges[i][1]==0 && address_ranges[i][2]==0)) + { num_address_ranges++; i++; } + } - generic_state->num_port_ranges=num_port_ranges; - if (num_port_ranges>0) { - generic_state->port_ranges = os_hooks->malloc(sizeof(generic_address_range_type)*num_port_ranges); - memcpy(generic_state->port_ranges,port_ranges,sizeof(generic_port_range_type)*num_port_ranges); - } else { - generic_state->port_ranges=NULL; + num_irq_ranges=0; + if (irq_ranges!=NULL) { + i=0; + while (irq_ranges[i]!=NULL && + !(irq_ranges[i][0]==0 && irq_ranges[i][1]==0 && irq_ranges[i][2]==0) ) + { num_irq_ranges++; i++; } } + - generic_state->num_address_ranges=num_address_ranges; - if (num_address_ranges>0) { - generic_state->address_ranges = os_hooks->malloc(sizeof(generic_address_range_type)*num_address_ranges); - memcpy(generic_state->address_ranges,address_ranges,sizeof(generic_address_range_type)*num_address_ranges); + generic_state->num_port_ranges = num_port_ranges; + + if (num_port_ranges > 0) { + generic_state->port_ranges = V3_Malloc(sizeof(generic_address_range_type) * num_port_ranges); + memcpy(generic_state->port_ranges, port_ranges, sizeof(generic_port_range_type) * num_port_ranges); } else { - generic_state->address_ranges=NULL; + generic_state->port_ranges = NULL; } - generic_state->num_irq_ranges=num_irq_ranges; - if (num_irq_ranges>0) { - generic_state->irq_ranges = os_hooks->malloc(sizeof(generic_address_range_type)*num_irq_ranges); - memcpy(generic_state->irq_ranges,irq_ranges,sizeof(generic_irq_range_type)*num_port_ranges); + + + generic_state->num_address_ranges = num_address_ranges; + + if (num_address_ranges > 0) { + generic_state->address_ranges = V3_Malloc(sizeof(generic_address_range_type) * num_address_ranges); + memcpy(generic_state->address_ranges, address_ranges, sizeof(generic_address_range_type) * num_address_ranges); } else { - generic_state->irq_ranges=NULL; + generic_state->address_ranges = NULL; } + generic_state->num_irq_ranges = num_irq_ranges; + + if (num_irq_ranges > 0) { + generic_state->irq_ranges = V3_Malloc(sizeof(generic_address_range_type) * num_irq_ranges); + memcpy(generic_state->irq_ranges, irq_ranges, sizeof(generic_irq_range_type) * num_port_ranges); + } else { + generic_state->irq_ranges = NULL; + } + struct vm_device *device = create_device("GENERIC", &dev_ops, generic_state); return device;