X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpiix3.c;h=0143de5ed83be8736372533a92b6547948a2eb58;hb=d597d493eb303496f3bb32e2a73a094a8a20a022;hp=8752943e31a31b41800f3c003b785ea5f08f8ae5;hpb=bfb93bc6b870c04acade48143dd6829e1056d376;p=palacios.git

diff --git a/palacios/src/devices/piix3.c b/palacios/src/devices/piix3.c
index 8752943..0143de5 100644
--- a/palacios/src/devices/piix3.c
+++ b/palacios/src/devices/piix3.c
@@ -74,7 +74,7 @@ struct top_of_mem_reg {
 	uint8_t value;
 	struct {
 	    uint8_t rsvd1                    : 1;
-	    uint8_t isadma_reg_fwd_en        : 1;
+    uint8_t isadma_reg_fwd_en        : 1;
 	    uint8_t piix_rsvd                : 1;
 	    uint8_t isadma_lo_bios_fwd_en    : 1;
 	    uint8_t top_of_mem               : 4;
@@ -371,47 +371,70 @@ struct pirq_rc_reg {
 */
 
 
-static int raise_pci_irq(struct pci_device * pci_dev, void * dev_data) {
+static int raise_pci_irq(struct pci_device * pci_dev, void * dev_data, struct v3_irq * vec) {
     struct v3_southbridge * piix3 = dev_data;
     struct pci_device * piix3_pci = piix3->southbridge_pci;
     struct piix3_config_space * piix3_cfg = (struct piix3_config_space *)(piix3_pci->config_data);
     int intr_pin = pci_dev->config_header.intr_pin - 1;
     int irq_index = (intr_pin + pci_dev->dev_num - 1) & 0x3;
-    
-    //PrintError("Raising PCI IRQ %d, %p\n", piix3_cfg->pirq_rc[irq_index], piix3->vm);
-    
+    struct v3_irq irq; // Make a copy of the irq state because we will switch the irq number
+
+    irq.ack = vec->ack;
+    irq.private_data = vec->private_data;
+
+    /*
+    PrintError("Raising PCI dev %d intr %d via IOAPIC as IRQ %d and via PIRQ as IRQ %d on VM %p\n", 
+	       pci_dev->dev_num, pci_dev->config_header.intr_pin, 
+	       16+irq_index,
+	       piix3_cfg->pirq_rc[irq_index], piix3->vm);
+    */
+
+    // deliver first by PIRQ, if it exists
+    //
     if (piix3_cfg->pirq_rc[irq_index] < 16) {
-	v3_raise_irq(piix3->vm, piix3_cfg->pirq_rc[irq_index] & 0xf);
+	irq.irq = piix3_cfg->pirq_rc[irq_index] & 0xf;
+
+	//	V3_Print("Raising PIIX IRQ %d\n", irq.irq);
+	v3_raise_acked_irq(piix3->vm, irq);
     } else {
-	PrintError("Tried to raise interrupt on disabled PIRQ entry (%d)\n", irq_index);
-	PrintError("\tpirq_rc values: 0=0x%x, 1=0x%x, 2=0x%x, 3=0x%x\n", 
-		   piix3_cfg->pirq_rc[0], piix3_cfg->pirq_rc[1],
-		   piix3_cfg->pirq_rc[2], piix3_cfg->pirq_rc[3]);
-	return -1;
+      // not an error
     }
 
+    // deliver next via the PCI0 to ioapic mapping defined in the 
+    // mptable (ioapic, pins 16->19 are used for PCI0)
+    // ideally this would check to verify that an ioapic is actually available
+    irq.irq = (irq_index + 1) + 16;
+    //    V3_Print("Raising PIIX IRQ (#2) %d\n", irq.irq);
+    v3_raise_acked_irq(piix3->vm, irq);
+    
+
     return 0;
 }
 
 
 
-static int lower_pci_irq(struct pci_device * pci_dev, void * dev_data) {
+static int lower_pci_irq(struct pci_device * pci_dev, void * dev_data, struct v3_irq * vec) {
     struct v3_southbridge * piix3 = dev_data;
     struct pci_device * piix3_pci = piix3->southbridge_pci;
     struct piix3_config_space * piix3_cfg = (struct piix3_config_space *)(piix3_pci->config_data);
     int intr_pin = pci_dev->config_header.intr_pin - 1;
     int irq_index = (intr_pin + pci_dev->dev_num - 1) & 0x3;
-    
+    struct v3_irq irq; // Make a copy of the irq state because we will switch the irq number
+
+    irq.ack = vec->ack;
+    irq.private_data = vec->private_data;
     //    PrintError("Lowering PCI IRQ %d\n", piix3_cfg->pirq_rc[irq_index]);
+
+    // First, lower the pin on the ioapic
+    irq.irq = (irq_index + 1) + 16;
+    v3_lower_acked_irq(piix3->vm, irq);
     
+    // Next, lower whatever we asserted by the PIRQs
     if (piix3_cfg->pirq_rc[irq_index] < 16) {
-	v3_lower_irq(piix3->vm, piix3_cfg->pirq_rc[irq_index] & 0xf);
+	irq.irq = piix3_cfg->pirq_rc[irq_index] & 0xf;
+	v3_lower_acked_irq(piix3->vm, irq);
     } else {
-	PrintError("Tried to lower interrupt on disabled PIRQ entry (%d)\n", irq_index);
-	PrintError("\tpirq_rc values: 0=0x%x, 1=0x%x, 2=0x%x, 3=0x%x\n", 
-		   piix3_cfg->pirq_rc[0], piix3_cfg->pirq_rc[1],
-		   piix3_cfg->pirq_rc[2], piix3_cfg->pirq_rc[3]);
-	return -1;
+      // not an error
     }
 
     return 0;
@@ -448,7 +471,7 @@ static int setup_pci(struct v3_southbridge * piix3) {
     pci_dev = v3_pci_register_device(piix3->pci_bus, PCI_MULTIFUNCTION, 
 				     bus_num, -1, 0, 
 				     "PIIX3", bars, 
-				     NULL, NULL, NULL, piix3);
+				     NULL, NULL, NULL, NULL, piix3);
     if (pci_dev == NULL) {
 	PrintError("Could not register PCI Device for PIIX3\n");
 	return -1;
@@ -474,6 +497,11 @@ static int piix3_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct vm_device * pci = v3_find_dev(vm, v3_cfg_val(cfg, "bus"));
     char * dev_id = v3_cfg_val(cfg, "ID");
 
+    if (!piix3) {
+	PrintError("Cannot allocate in init\n");
+	return -1;
+    }
+
     if (!pci) {
 	PrintError("Could not find PCI device\n");
 	return -1;