Changeset 190 for trunk/src/os2ahci/ahci.c

Timestamp:

Jul 17, 2017, 4:31:51 AM (8 years ago)

Author:

David Azarewicz

Message:

Added MSI support.

File:

• trunk/src/os2ahci/ahci.c (modified) (6 diffs)

trunk/src/os2ahci/ahci.c

@@ -661 +661 @@
   DPRINTF(1,"ahci_complete_init: completing initialization of adapter #%d\n", ad_no(ai));
 
-  /* register IRQ handlers; each IRQ level is registered only once */
-  for (i = 0; i < irq_used_cnt; i++)
-  {
-    if (irq_used[i] == ai->irq) break; /* we already have this IRQ registered */
-  }
-  if (i >= irq_used_cnt)
-  {
-    if (i >= MAX_IRQ_HANDLERS) return -1; /* no more handlers available */
-    DPRINTF(2,"registering interrupt #%d\n", ai->irq);
-    if (Dev32Help_SetIRQ(ahci_intr, ai->irq, 1, ai->irq) != 0)
-    {
-      DPRINTF(0,"failed to register shared interrupt\n");
-      if (Dev32Help_SetIRQ(ahci_intr, ai->irq, 0, ai->irq) != 0)
+  if (!ai->int_set)
+  {
+    /* register IRQ handler; each IRQ level is registered only once */
+    p = 1; /* int count */
+    if (!(ai->flags & AHCI_HFLAG_NO_MSI))
+    {
+      if (PsdMsiAlloc(ai->bus_dev_func, &p, &ai->irq)) p = 1; /* shared flag */
+      else
       {
-        dprintf(0,"failed to register interrupt %d\n", ai->irq);
+        /* we have an msi interrupt */
+        ai->irq_pin = 0;
+        p = 0; /* exclusive flag */
+      }
+    }
+    for (i = 0; i < irq_used_cnt; i++)
+    {
+      if (irq_used[i] == ai->irq) break; /* we already have this IRQ registered */
+    }
+    if (i >= irq_used_cnt)
+    {
+      if (i >= MAX_IRQ_HANDLERS) return -1; /* no more handlers available */
+      DPRINTF(2,"registering interrupt #%d\n", ai->irq);
+
+      rc = Dev32Help_SetIRQ(ahci_intr, ai->irq, p, ai->irq);
+      if (rc && p) /* if failed and was shared */
+      {
+        p = 0; /* try exclusive */
+        rc = Dev32Help_SetIRQ(ahci_intr, ai->irq, p, ai->irq);
+      }
+      if (rc)
+      {
+       dprintf(0,"failed to register interrupt %d\n", ai->irq);
         return(-1);
       }
-    }
-    irq_used[irq_used_cnt++] = ai->irq;
+      irq_used[irq_used_cnt++] = ai->irq;
+      ai->int_set = 1;
+      RmUpdateAddIrq(rm_drvh, ai->rm_adh, ai->irq, ai->irq_pin, p?RS_IRQ_SHARED:RS_IRQ_EXCLUSIVE);
+    }
   }
 
@@ -1396 +1415 @@
  */
 #pragma aux ahci_intr parm [eax]
-int ahci_intr(u16 irq)
+int ahci_intr(u32 irq)
 {
   u32 irq_stat;
@@ -1570 +1589 @@
 
     vNext = pIorb->pNxtIORB;
+
     iorb_complete(vIorb, pIorb);
   }
@@ -1768 +1788 @@
   ai->ports[p].devs[d].dev_type  = UIB_TYPE_DISK;
   pDevName = ai->ports[p].devs[d].dev_name;
-  strncpy(pDevName, ata_dev_name(id_buf), sizeof(ai->ports[0].devs[0].dev_name));
+  strlcpy(pDevName, ata_dev_name(id_buf), sizeof(ai->ports[0].devs[0].dev_name));
 
   if (id_buf[ATA_ID_CONFIG] & 0x8000U)
@@ -1797 +1817 @@
   }
 
-  DPRINTF(2,"found device %d.%d.%d: removable = %d, dev_type = %d, atapi = %d, "
-          "ncq_max = %d\n", ad_no(ai), p, d,
+  DPRINTF(2,"found device %d.%d.%d: removable=%d dev_type=%d atapi=%d ncq_max=%d\n",
+          ad_no(ai), p, d,
           ai->ports[p].devs[d].removable,
           ai->ports[p].devs[d].dev_type,
@@ -1819 +1839 @@
   if (ai->ports[p].devs[d].removable)
   {
-    sprintf(dev_name, RM_CD_PREFIX "%s", p, d, pDevName);
+    snprintf(dev_name, sizeof(dev_name), RM_CD_PREFIX "%s", p, d, pDevName);
   }
   else
   {
-    sprintf(dev_name, RM_HD_PREFIX "%s", p, d, pDevName);
+    snprintf(dev_name, sizeof(dev_name), RM_HD_PREFIX "%s", p, d, pDevName);
   }