X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpci.c;h=05272a875b919b5148e2ff8283d2280d9247ec00;hb=afd094814f0380b442515f7a58eb00e7ac98a3b1;hp=3a7eef365152d9304a6f596dca615a6ac3348030;hpb=a0d3be5212e7a5053ba213ce7bd26c7124cf01e3;p=palacios.releases.git

diff --git a/palacios/src/devices/pci.c b/palacios/src/devices/pci.c
index 3a7eef3..05272a8 100644
--- a/palacios/src/devices/pci.c
+++ b/palacios/src/devices/pci.c
@@ -37,7 +37,7 @@
 
 
 
-#ifndef CONFIG_DEBUG_PCI
+#ifndef V3_CONFIG_DEBUG_PCI
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
 #endif
@@ -82,9 +82,9 @@ struct pci_bus {
     uint8_t dev_map[MAX_BUS_DEVICES / 8];
 
 
-    int (*raise_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev);
-    int (*lower_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev);
-    struct vm_device * irq_bridge_dev;
+    int (*raise_pci_irq)(struct pci_device * pci_dev, void * dev_data);
+    int (*lower_pci_irq)(struct pci_device * pci_dev, void * dev_data);
+    void * irq_dev_data;
 };
 
 
@@ -104,7 +104,7 @@ struct pci_internal {
 
 
 
-#ifdef CONFIG_DEBUG_PCI
+#ifdef V3_CONFIG_DEBUG_PCI
 
 static void pci_dump_state(struct pci_internal * pci_state) {
     struct rb_node * node = v3_rb_first(&(pci_state->bus_list[0].devices));
@@ -597,11 +597,6 @@ static int data_port_write(struct guest_info * core, ushort_t port, void * src,
 
 
 
-static int pci_free(struct vm_device * dev) {
-    
-    return 0;
-}
-
 
 
 static void init_pci_busses(struct pci_internal * pci_state) {
@@ -615,11 +610,129 @@ static void init_pci_busses(struct pci_internal * pci_state) {
 }
 
 
+static int pci_free(struct pci_internal * pci_state) {
+    int i;
 
 
-static struct v3_device_ops dev_ops = {
-    .free = pci_free,
+    // cleanup devices
+    for (i = 0; i < PCI_BUS_COUNT; i++) {
+	struct pci_bus * bus = &(pci_state->bus_list[i]);
+	struct rb_node * node = v3_rb_first(&(bus->devices));
+	struct pci_device * dev = NULL;
+
+	while (node) {
+	    dev = rb_entry(node, struct pci_device, dev_tree_node);
+	    node = v3_rb_next(node);
+	    
+	    v3_rb_erase(&(dev->dev_tree_node), &(bus->devices));
+	    V3_Free(dev);
+	}
+
+    }
+    
+    V3_Free(pci_state);
+    return 0;
+}
+
+#ifdef V3_CONFIG_CHECKPOINT
+
+#include <palacios/vmm_sprintf.h>
 
+static int pci_save(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct pci_internal * pci = (struct pci_internal *)private_data;
+    char buf[128];
+    int i = 0;    
+    
+    v3_chkpt_save_32(ctx, "ADDR_REG", &(pci->addr_reg.val));
+    v3_chkpt_save_16(ctx, "IO_BASE", &(pci->dev_io_base));
+
+    for (i = 0; i < PCI_BUS_COUNT; i++) {
+	struct pci_bus * bus = &(pci->bus_list[i]);
+	struct rb_node * node = v3_rb_first(&(bus->devices));
+	struct pci_device * dev = NULL;
+	struct v3_chkpt_ctx * bus_ctx = NULL;
+
+	snprintf(buf, 128, "pci-%d\n", i);
+	
+	bus_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf);
+
+	while (node) {
+	    struct v3_chkpt_ctx * dev_ctx = NULL;
+	    int bar_idx = 0;
+	    dev = rb_entry(node, struct pci_device, dev_tree_node);
+
+	    snprintf(buf, 128, "pci-%d.%d-%d", i, dev->dev_num, dev->fn_num);
+	    dev_ctx = v3_chkpt_open_ctx(bus_ctx->chkpt, bus_ctx, buf);
+	    
+	    v3_chkpt_save(dev_ctx, "CONFIG_SPACE", 256, dev->config_space);
+
+	    for (bar_idx = 0; bar_idx < 6; bar_idx++) {
+		snprintf(buf, 128, "BAR-%d", bar_idx);
+		v3_chkpt_save_32(dev_ctx, buf, &(dev->bar[bar_idx].val));
+	    }
+
+	    node = v3_rb_next(node);
+	}
+    }
+
+
+    return 0;
+}
+
+
+static int pci_load(struct v3_chkpt_ctx * ctx, void * private_data) {
+    struct pci_internal * pci = (struct pci_internal *)private_data;
+    char buf[128];
+    int i = 0;    
+    
+    v3_chkpt_load_32(ctx, "ADDR_REG", &(pci->addr_reg.val));
+    v3_chkpt_load_16(ctx, "IO_BASE", &(pci->dev_io_base));
+
+    for (i = 0; i < PCI_BUS_COUNT; i++) {
+	struct pci_bus * bus = &(pci->bus_list[i]);
+	struct rb_node * node = v3_rb_first(&(bus->devices));
+	struct pci_device * dev = NULL;
+	struct v3_chkpt_ctx * bus_ctx = NULL;
+
+	snprintf(buf, 128, "pci-%d\n", i);
+	
+	bus_ctx = v3_chkpt_open_ctx(ctx->chkpt, ctx, buf);
+
+	while (node) {
+	    struct v3_chkpt_ctx * dev_ctx = NULL;
+	    int bar_idx = 0;
+	    dev = rb_entry(node, struct pci_device, dev_tree_node);
+
+	    snprintf(buf, 128, "pci-%d.%d-%d", i, dev->dev_num, dev->fn_num);
+	    dev_ctx = v3_chkpt_open_ctx(bus_ctx->chkpt, bus_ctx, buf);
+	    
+	    v3_chkpt_load(dev_ctx, "CONFIG_SPACE", 256, dev->config_space);
+
+	    for (bar_idx = 0; bar_idx < 6; bar_idx++) {
+		snprintf(buf, 128, "BAR-%d", bar_idx);
+		v3_chkpt_load_32(dev_ctx, buf, &(dev->bar[bar_idx].val));
+	    }
+
+	    node = v3_rb_next(node);
+	}
+    }
+
+
+    return 0;
+}
+
+
+#endif
+
+
+
+
+static struct v3_device_ops dev_ops = {
+    .free = (int (*)(void *))pci_free,
+#ifdef V3_CONFIG_CHECKPOINT
+    .save = pci_save,
+    .load = pci_load
+#endif
 };
 
 
@@ -629,13 +742,15 @@ static int pci_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct pci_internal * pci_state = V3_Malloc(sizeof(struct pci_internal));
     int i = 0;
     char * dev_id = v3_cfg_val(cfg, "ID");
+    int ret = 0;
     
     PrintDebug("PCI internal at %p\n",(void *)pci_state);
     
-    struct vm_device * dev = v3_allocate_device(dev_id, &dev_ops, pci_state);
+    struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, pci_state);
     
-    if (v3_attach_device(vm, dev) == -1) {
+    if (dev == NULL) {
 	PrintError("Could not attach device %s\n", dev_id);
+	V3_Free(pci_state);
 	return -1;
     }
 
@@ -648,8 +763,14 @@ static int pci_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     PrintDebug("Sizeof config header=%d\n", (int)sizeof(struct pci_config_header));
     
     for (i = 0; i < 4; i++) {
-	v3_dev_hook_io(dev, CONFIG_ADDR_PORT + i, &addr_port_read, &addr_port_write);
-	v3_dev_hook_io(dev, CONFIG_DATA_PORT + i, &data_port_read, &data_port_write);
+	ret |= v3_dev_hook_io(dev, CONFIG_ADDR_PORT + i, &addr_port_read, &addr_port_write);
+	ret |= v3_dev_hook_io(dev, CONFIG_DATA_PORT + i, &data_port_read, &data_port_write);
+    }
+    
+    if (ret != 0) {
+	PrintError("Error hooking PCI IO ports\n");
+	v3_remove_device(dev);
+	return -1;
     }
 
     return 0;
@@ -747,15 +868,15 @@ static inline int init_bars(struct v3_vm_info * vm, struct pci_device * pci_dev)
 
 
 int v3_pci_set_irq_bridge(struct  vm_device * pci_bus, int bus_num, 
-			  int (*raise_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev),
-			  int (*lower_pci_irq)(struct vm_device * dev, struct pci_device * pci_dev),
-			  struct vm_device * bridge_dev) {
+			  int (*raise_pci_irq)(struct pci_device * pci_dev, void * dev_data),
+			  int (*lower_pci_irq)(struct pci_device * pci_dev, void * dev_data),
+			  void * priv_data) {
     struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
 
 
     pci_state->bus_list[bus_num].raise_pci_irq = raise_pci_irq;
     pci_state->bus_list[bus_num].lower_pci_irq = lower_pci_irq;
-    pci_state->bus_list[bus_num].irq_bridge_dev = bridge_dev;
+    pci_state->bus_list[bus_num].irq_dev_data = priv_data;
 
     return 0;
 }
@@ -764,14 +885,14 @@ int v3_pci_raise_irq(struct vm_device * pci_bus, int bus_num, struct pci_device
    struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
    struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
 
-   return bus->raise_pci_irq(bus->irq_bridge_dev, dev);
+   return bus->raise_pci_irq(dev, bus->irq_dev_data);
 }
 
 int v3_pci_lower_irq(struct vm_device * pci_bus, int bus_num, struct pci_device * dev) {
    struct pci_internal * pci_state = (struct pci_internal *)pci_bus->private_data;
    struct pci_bus * bus = &(pci_state->bus_list[bus_num]);
 
-   return bus->lower_pci_irq(bus->irq_bridge_dev, dev);
+   return bus->lower_pci_irq(dev, bus->irq_dev_data);
 }
 
 // if dev_num == -1, auto assign 
@@ -896,7 +1017,7 @@ struct pci_device * v3_pci_register_device(struct vm_device * pci,
     // add the device
     add_device_to_bus(bus, pci_dev);
 
-#ifdef CONFIG_DEBUG_PCI
+#ifdef V3_CONFIG_DEBUG_PCI
     pci_dump_state(pci_state);
 #endif
 
@@ -964,7 +1085,7 @@ struct pci_device * v3_pci_register_passthrough_device(struct vm_device * pci,
     // add the device
     add_device_to_bus(bus, pci_dev);
 
-#ifdef CONFIG_DEBUG_PCI
+#ifdef V3_CONFIG_DEBUG_PCI
     pci_dump_state(pci_state);
 #endif