X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpci_passthrough.c;h=a799e1f2122de321c84cede1bd3c3aec376b0864;hp=fd3f4eeb8a436794063131355a6408962b7efcc6;hb=73f7dfbeb661474a53ed5b3c73898a431e5e737e;hpb=1cd2958b5eb63b2ac63ced17447ba3b45c43f51a

diff --git a/palacios/src/devices/pci_passthrough.c b/palacios/src/devices/pci_passthrough.c
index fd3f4ee..a799e1f 100644
--- a/palacios/src/devices/pci_passthrough.c
+++ b/palacios/src/devices/pci_passthrough.c
@@ -35,11 +35,11 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_lowlevel.h>
+#include <palacios/vm_guest.h> // must include this to avoid dependency issue
 #include <palacios/vmm_sym_iface.h>
 
 #include <devices/pci.h>
 #include <devices/pci_types.h>
-#include <devices/pci_passthrough.h>
 
 
 // Hardcoded... Are these standard??
@@ -187,9 +187,12 @@ static int pci_bar_init(int bar_num, uint32_t * dst,void * private_data) {
 
 	//v3_irq_restore(irq_state);
 
-	pbar->size = ~PCI_IO_BASE(max_val) + 1;
+	V3_Print("max_val = %x\n", max_val);
+
+	pbar->size = (uint16_t)~PCI_IO_BASE(max_val) + 1;
 
 	
+	V3_Print("IO Bar with %d (%x) ports %x->%x\n", pbar->size, pbar->size, pbar->addr, pbar->addr + pbar->size);
 	// setup a set of null io hooks
 	// This allows the guest to do passthrough IO to these ports
 	// While still reserving them in the IO map
@@ -258,8 +261,6 @@ static int pci_bar_init(int bar_num, uint32_t * dst,void * private_data) {
 
 	}
     }
-    
-
 
 
     // Initially the virtual bars match the physical ones
@@ -275,8 +276,6 @@ static int pci_bar_init(int bar_num, uint32_t * dst,void * private_data) {
 	       state->virt_bars[bar_num].type, state->virt_bars[bar_num].addr, 
 	       state->virt_bars[bar_num].size);
 
-
-
     // Update the pci subsystem versions
     *dst = bar_val;
 
@@ -332,7 +331,11 @@ static int pci_bar_write(int bar_num, uint32_t * src, void * private_data) {
     struct pt_bar * pbar = &(state->phys_bars[bar_num]);
     struct pt_bar * vbar = &(state->virt_bars[bar_num]);
 
-    PrintDebug("Bar update src=0x%x\n", *src);
+    PrintDebug("Bar update: bar_num=%d, src=0x%x\n", bar_num,*src);
+    PrintDebug("vbar is size=%u, type=%d, addr=0x%x, val=0x%x\n",vbar->size, vbar->type, vbar->addr, vbar->val);
+    PrintDebug("pbar is size=%u, type=%d, addr=0x%x, val=0x%x\n",pbar->size, pbar->type, pbar->addr, pbar->val);
+
+
 
     if (vbar->type == PT_BAR_NONE) {
 	return 0;
@@ -506,7 +509,7 @@ static int setup_virt_pci_dev(struct guest_info * info, struct vm_device * dev)
 				     bus_num, -1, 0, 
 				     state->name, bars,
 				     pt_config_update, NULL, NULL, 
-				     dev, dev);
+				     dev);
     
     // This will overwrite the bar registers.. but that should be ok.
     memcpy(pci_dev->config_space, (uint8_t *)&(state->real_hdr), sizeof(struct pci_config_header));
@@ -533,7 +536,7 @@ static int irq_handler(struct guest_info * info, struct v3_interrupt * intr, voi
     struct vm_device * dev = (struct vm_device *)private_data;
     struct pt_dev_state * state = (struct pt_dev_state *)dev->private_data;
 
-    //   PrintDebug("Handling E1000 IRQ %d\n", intr->irq);
+//    PrintDebug("Handling E1000 IRQ %d\n", intr->irq);
 
     v3_pci_raise_irq(state->pci_bus, 0, state->pci_dev);
 
@@ -545,12 +548,11 @@ static int irq_handler(struct guest_info * info, struct v3_interrupt * intr, voi
 
 
 
-static int passthrough_init(struct guest_info * info, void * cfg_data) {
-    struct pci_passthrough_cfg * cfg = (struct pci_passthrough_cfg *)cfg_data;
+static int passthrough_init(struct guest_info * info, 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(info, cfg->pci_bus_name);
-    
+    struct vm_device * pci = v3_find_dev(info, v3_cfg_val(cfg, "bus"));
+    char * name = v3_cfg_val(cfg, "name");    
 
     memset(state, 0, sizeof(struct pt_dev_state));
 
@@ -560,28 +562,30 @@ static int passthrough_init(struct guest_info * info, void * cfg_data) {
     }
     
     state->pci_bus = pci;
-    strncpy(state->name, cfg->name, 32);
-
-
+    strncpy(state->name, name, 32);
 
 
-    dev = v3_allocate_device("PCI_PASSTHROUGH", &dev_ops, state);
+    dev = v3_allocate_device(name, &dev_ops, state);
 
     if (v3_attach_device(info, dev) == -1) {
-	PrintError("Could not attach device %s\n", "PCI_PASSTHROUGH");
+	PrintError("Could not attach device %s\n", name);
 	return -1;
     }
 
 
-    if (find_real_pci_dev(cfg->vendor_id, cfg->device_id, state) == -1) {
-	PrintError("Could not find PCI Device %x:%x\n", cfg->vendor_id, cfg->device_id);
+    if (find_real_pci_dev(atox(v3_cfg_val(cfg, "vendor_id")), 
+			  atox(v3_cfg_val(cfg, "device_id")), 
+			  state) == -1) {
+	PrintError("Could not find PCI Device %s:%s\n", 
+		   v3_cfg_val(cfg, "vendor_id"), 
+		   v3_cfg_val(cfg, "device_id"));
 	return 0;
     }
 
     setup_virt_pci_dev(info, dev);
 
-    v3_hook_irq(info, 59, irq_handler, dev);
-    v3_hook_irq(info, 64, irq_handler, dev);
+    v3_hook_irq(info, atoi(v3_cfg_val(cfg, "irq")), irq_handler, dev);
+    //    v3_hook_irq(info, 64, irq_handler, dev);
 
     return 0;
 }