reworked PCI bus implmentation -- moved to mask based implementation -- added capabil...

[palacios.git] / palacios / src / devices / pci_passthrough.c

diff --git a/palacios/src/devices/pci_passthrough.c b/palacios/src/devices/pci_passthrough.c
index 1293c77..e8d72db 100644 (file)
--- a/palacios/src/devices/pci_passthrough.c
+++ b/palacios/src/devices/pci_passthrough.c
@@ -500,7 +500,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
        }
     } else if (vbar->type == PT_BAR_MEM32) {
        // remove old mapping
-       struct v3_shadow_region * old_reg = v3_get_shadow_region(dev->vm, V3_MEM_CORE_ANY, vbar->addr);
+       struct v3_mem_region * old_reg = v3_get_mem_region(dev->vm, V3_MEM_CORE_ANY, vbar->addr);
 
        if (old_reg == NULL) {
            // uh oh...
@@ -508,7 +508,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
            return -1;
        }
 
-       v3_delete_shadow_region(dev->vm, old_reg);
+       v3_delete_mem_region(dev->vm, old_reg);
 
        // clear the low bits to match the size
        *src &= ~(pbar->size - 1);
@@ -542,7 +542,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
 
     } else if (vbar->type == PT_BAR_MEM64_HI) {
        struct pt_bar * lo_vbar = &(state->virt_bars[bar_num - 1]);
-       struct v3_shadow_region * old_reg =  v3_get_shadow_region(dev->vm, V3_MEM_CORE_ANY, vbar->addr);
+       struct v3_mem_region * old_reg =  v3_get_mem_region(dev->vm, V3_MEM_CORE_ANY, vbar->addr);
 
        if (old_reg == NULL) {
            // uh oh...
@@ -552,7 +552,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
        }
 
        // remove old mapping
-       v3_delete_shadow_region(dev->vm, old_reg);
+       v3_delete_mem_region(dev->vm, old_reg);
 
        // We don't set size, because we assume region is less than 4GB
 
@@ -588,7 +588,7 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
 }
 
 
-static int pt_config_update(uint_t reg_num, void * src, uint_t length, void * private_data) {
+static int pt_config_update(struct pci_device * pci_dev, uint_t reg_num, void * src, uint_t length, void * private_data) {
     struct vm_device * dev = (struct vm_device *)private_data;
     struct pt_dev_state * state = (struct pt_dev_state *)dev->private_data;
     union pci_addr_reg pci_addr = {state->phys_pci_addr.value};
@@ -608,7 +608,7 @@ static int pt_config_update(uint_t reg_num, void * src, uint_t length, void * pr
 
 
 /* This is really iffy....
- * It was totally broken before, but it's totally fixed now
+ * It was totally broken before, but it's _not_ totally fixed now
  * The Expansion rom can be enabled/disabled via software using the low order bit
  * We should probably handle that somehow here... 
  */
@@ -625,7 +625,7 @@ static int pt_exp_rom_write(struct pci_device * pci_dev, uint32_t * src, void *
 
     // only remove old mapping if present, I.E. if the rom was enabled previously 
     if ((vrom->val & 0x1) == 0x1) {
-       struct v3_shadow_region * old_reg = v3_get_shadow_region(dev->vm, V3_MEM_CORE_ANY, vrom->addr);
+       struct v3_mem_region * old_reg = v3_get_mem_region(dev->vm, V3_MEM_CORE_ANY, vrom->addr);
        
        if (old_reg == NULL) {
            // uh oh...
@@ -633,7 +633,7 @@ static int pt_exp_rom_write(struct pci_device * pci_dev, uint32_t * src, void *
            return -1;
        }
     
-       v3_delete_shadow_region(dev->vm, old_reg);
+       v3_delete_mem_region(dev->vm, old_reg);
     }
     
     // clear the low bits to match the size
@@ -732,6 +732,7 @@ static int setup_virt_pci_dev(struct v3_vm_info * vm_info, struct vm_device * de
                                     bus_num, -1, 0, 
                                     state->name, bars,
                                     pt_config_update,
+                                    NULL, 
                                     NULL,
                                     pt_exp_rom_write,               
                                     dev);
@@ -753,9 +754,6 @@ static int setup_virt_pci_dev(struct v3_vm_info * vm_info, struct vm_device * de
 
 static struct v3_device_ops dev_ops = {
     .free = NULL,
-    .reset = NULL,
-    .start = NULL,
-    .stop = NULL,
 };
 
 
@@ -765,7 +763,7 @@ static int irq_handler(struct v3_vm_info * vm, struct v3_interrupt * intr, void
     struct pt_dev_state * state = (struct pt_dev_state *)dev->private_data;
 
 
-    v3_pci_raise_irq(state->pci_bus, 0, state->pci_dev);
+    v3_pci_raise_irq(state->pci_bus, state->pci_dev, 0);
 
     V3_ACK_IRQ(intr->irq);
 
@@ -779,7 +777,7 @@ static int passthrough_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pt_dev_state * state = V3_Malloc(sizeof(struct pt_dev_state));
     struct vm_device * dev = NULL;
     struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
-    char * name = v3_cfg_val(cfg, "name");    
+    char * dev_id = v3_cfg_val(cfg, "ID");    
 
 
     memset(state, 0, sizeof(struct pt_dev_state));
@@ -790,13 +788,14 @@ static int passthrough_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     }
     
     state->pci_bus = pci;
-    strncpy(state->name, name, 32);
+    strncpy(state->name, dev_id, 32);
 
 
-    dev = v3_allocate_device(name, &dev_ops, state);
+    dev = v3_add_device(vm, dev_id, &dev_ops, state);
 
-    if (v3_attach_device(vm, dev) == -1) {
-       PrintError("Could not attach device %s\n", name);
+    if (dev == NULL) {
+       PrintError("Could not attach device %s\n", dev_id);
+       V3_Free(state);
        return -1;
     }
 
@@ -807,6 +806,7 @@ static int passthrough_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        PrintError("Could not find PCI Device %s:%s\n", 
                   v3_cfg_val(cfg, "vendor_id"), 
                   v3_cfg_val(cfg, "device_id"));
+       v3_remove_device(dev);
        return 0;
     }