X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fpiix3.c;h=8752943e31a31b41800f3c003b785ea5f08f8ae5;hb=f88a692d094459f0326c5c891df5ea81b5476ba6;hp=669d147f19bdabe0a6680bbf7d11965359c3917c;hpb=c337a47be935380fba4b7425e80be7c089e45e6c;p=palacios-OLD.git

diff --git a/palacios/src/devices/piix3.c b/palacios/src/devices/piix3.c
index 669d147..8752943 100644
--- a/palacios/src/devices/piix3.c
+++ b/palacios/src/devices/piix3.c
@@ -361,7 +361,15 @@ static int reset_piix3(struct v3_southbridge * piix3) {
 }
 
 
-//irq is pirq_rc[intr_pin + pci_dev_num - 1] & 0x3
+//irq is pirq_rc[intr_pin + pci_dev_num - 1] & 0xf
+/*
+struct pirq_rc_reg {
+       uint8_t irq         : 4;
+       uint8_t rsvd        : 3;
+       uint8_t disabled    : 1; // (1=disabled, 0=enabled)
+}
+*/
+
 
 static int raise_pci_irq(struct pci_device * pci_dev, void * dev_data) {
     struct v3_southbridge * piix3 = dev_data;
@@ -372,7 +380,15 @@ static int raise_pci_irq(struct pci_device * pci_dev, void * dev_data) {
     
     //PrintError("Raising PCI IRQ %d, %p\n", piix3_cfg->pirq_rc[irq_index], piix3->vm);
     
-    v3_raise_irq(piix3->vm, piix3_cfg->pirq_rc[irq_index]);
+    if (piix3_cfg->pirq_rc[irq_index] < 16) {
+	v3_raise_irq(piix3->vm, piix3_cfg->pirq_rc[irq_index] & 0xf);
+    } 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;
+    }
 
     return 0;
 }
@@ -388,20 +404,32 @@ static int lower_pci_irq(struct pci_device * pci_dev, void * dev_data) {
     
     //    PrintError("Lowering PCI IRQ %d\n", piix3_cfg->pirq_rc[irq_index]);
     
-    v3_lower_irq(piix3->vm, piix3_cfg->pirq_rc[irq_index]);
+    if (piix3_cfg->pirq_rc[irq_index] < 16) {
+	v3_lower_irq(piix3->vm, piix3_cfg->pirq_rc[irq_index] & 0xf);
+    } 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;
+    }
 
     return 0;
 }
 
 
 
-static int piix_free(struct vm_device * dev) {
+static int piix_free(struct v3_southbridge * piix3) {
+
+    // unregister pci
+
+    V3_Free(piix3);
     return 0;
 }
 
 
 static struct v3_device_ops dev_ops = {
-    .free = piix_free,
+    .free = (int (*)(void *))piix_free,
 };