X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpci_passthrough.c;h=25b22629d5a7f8b2c7f9dab63138c66391688857;hp=5c5a46877f510c4bd5c4527a03643fc988bcec7d;hb=afb2a35b2e15ba0fa932c4e49a3678f958a4502a;hpb=3a4e54ec208ea3589963b410d2d73292bbc4a8fe

diff --git a/palacios/src/devices/pci_passthrough.c b/palacios/src/devices/pci_passthrough.c
index 5c5a468..25b2262 100644
--- a/palacios/src/devices/pci_passthrough.c
+++ b/palacios/src/devices/pci_passthrough.c
@@ -35,7 +35,7 @@
 #include <palacios/vmm_dev_mgr.h>
 #include <palacios/vmm_sprintf.h>
 #include <palacios/vmm_lowlevel.h>
-
+#include <palacios/vmm_sym_iface.h>
 
 #include <devices/pci.h>
 #include <devices/pci_types.h>
@@ -46,7 +46,7 @@
 #define PCI_CFG_ADDR    0xcf8
 #define PCI_CFG_DATA    0xcfc
 
-#define PCI_BUS_MAX  4
+#define PCI_BUS_MAX  7
 #define PCI_DEV_MAX 32
 #define PCI_FN_MAX   7
 
@@ -451,7 +451,7 @@ static int find_real_pci_dev(uint16_t vendor_id, uint16_t device_id, struct pt_d
     } __attribute__((packed)) pci_hdr = {0};
 
 
-
+    //PrintDebug("Scanning PCI busses for vendor=%x, device=%x\n", vendor_id, device_id);
     for (i = 0, pci_addr.bus = 0; i < PCI_BUS_MAX; i++, pci_addr.bus++) {
 	for (j = 0, pci_addr.dev = 0; j < PCI_DEV_MAX; j++, pci_addr.dev++) {
 	    for (k = 0, pci_addr.func = 0; k < PCI_FN_MAX; k++, pci_addr.func++) {
@@ -459,6 +459,8 @@ static int find_real_pci_dev(uint16_t vendor_id, uint16_t device_id, struct pt_d
 		v3_outdw(PCI_CFG_ADDR, pci_addr.value);
 		pci_hdr.value = v3_indw(PCI_CFG_DATA);
 
+		//PrintDebug("\bus=%d, tvendor=%x, device=%x\n", pci_addr.bus, pci_hdr.vendor, pci_hdr.device);
+
 		if ((pci_hdr.vendor == vendor_id) && (pci_hdr.device == device_id)) {
 		    uint32_t * cfg_space = (uint32_t *)&state->real_hdr;
     
@@ -504,11 +506,16 @@ 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));
 
+    state->pci_dev = pci_dev;
+
+    v3_sym_map_pci_passthrough(info, pci_dev->bus_num, pci_dev->dev_num, pci_dev->fn_num);
+
+
     return 0;
 }
 
@@ -522,6 +529,22 @@ static struct v3_device_ops dev_ops = {
 
 
 
+static int irq_handler(struct guest_info * info, struct v3_interrupt * intr, void * private_data) {
+    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);
+
+    v3_pci_raise_irq(state->pci_bus, 0, state->pci_dev);
+
+    V3_ACK_IRQ(intr->irq);
+
+    return 0;
+}
+
+
+
+
 static int passthrough_init(struct guest_info * info, void * cfg_data) {
     struct pci_passthrough_cfg * cfg = (struct pci_passthrough_cfg *)cfg_data;
     struct pt_dev_state * state = V3_Malloc(sizeof(struct pt_dev_state));
@@ -541,6 +564,7 @@ static int passthrough_init(struct guest_info * info, void * cfg_data) {
 
 
 
+
     dev = v3_allocate_device("PCI_PASSTHROUGH", &dev_ops, state);
 
     if (v3_attach_device(info, dev) == -1) {
@@ -556,6 +580,9 @@ static int passthrough_init(struct guest_info * info, void * cfg_data) {
 
     setup_virt_pci_dev(info, dev);
 
+    v3_hook_irq(info, 59, irq_handler, dev);
+    v3_hook_irq(info, 64, irq_handler, dev);
+
     return 0;
 }