Changeset 190 for trunk

Timestamp:

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

Author:

David Azarewicz

Message:

Added MSI support.

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (1 diff)
• src/os2ahci/ReadMe.txt (modified) (3 diffs)
• src/os2ahci/ahci.c (modified) (6 diffs)
• src/os2ahci/ata.c (modified) (2 diffs)
• src/os2ahci/os2ahci.c (modified) (2 diffs)
• src/os2ahci/os2ahci.h (modified) (3 diffs)
• src/os2ahci/pci.c (modified) (5 diffs)
• src/os2ahci/thunk.asm (added)
• tools/AddToFile.cmd (modified) (5 diffs)
• tools/CreatePath.cmd (added)

trunk/src/os2ahci/Makefile

@@ -12 +12 @@
 # Define default build version if not specified in environment
 BLD_MAJOR=2
-BLD_MINOR=02 # must be 2 digits
+BLD_MINOR=03 # must be 2 digits
 BLD_REV=0 # not used at this time
 

trunk/src/os2ahci/ReadMe.txt

@@ -1 @@
-AHCI Driver for OS/2 v2.01
+AHCI Driver for OS/2 v2.03
 
 
@@ -357 +357 @@
    DSKSP_GEN_GET_COUNTERS IOCTL request.
 
+Known Issues and Limitations
+============================
+
+Hot swap is not supported.
+
 
 Manual Installation
@@ -384 +389 @@
 Change Log
 ==========
+
+v.2.03 15-Jul-2017 - David Azarewicz
+  Added MSI support.
+
+v.2.02 07-Jun-2017 - David Azarewicz
+  Fixed interrupt handler issue for multiple adapters.
 
 v.2.01 01-Oct-2016 - David Azarewicz

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);
   }
 

trunk/src/os2ahci/ata.c

@@ -885 +885 @@
 
   io->BlocksXferred += add_workspace(pIorb)->blocks;
-  DPRINTF(7,"ata_read_pp(): blocks transferred = %d\n", io->BlocksXferred);
+  DPRINTF(7,__func__": blocks transferred = %d\n", io->BlocksXferred);
 
   if (io->BlocksXferred >= io->BlockCount)
@@ -1392 +1392 @@
       if (Dev32Help_PhysToLin(phys_addr, l, (PVOID) &p))
       {
-        panic("sg_memcpy(): DevHelp_PhysToLin() failed");
+        panic(__func__": DevHelp_PhysToLin() failed");
       }
       if (dir == SG_TO_BUF)

trunk/src/os2ahci/os2ahci.c

@@ -1103 +1103 @@
 
       pPtr->AdapterDevBus = AI_DEVBUS_ST506 | AI_DEVBUS_32BIT;
-      sprintf(pPtr->AdapterName, "AHCI_%d", dta);
+      snprintf(pPtr->AdapterName, sizeof(pPtr->AdapterName), "AHCI_%d", dta);
 
       if (!ad_info->port_scan_done)
@@ -1162 +1162 @@
       /* set adapter name and bus type to mimic a SCSI controller */
       pPtr->AdapterDevBus = AI_DEVBUS_SCSI_2 | AI_DEVBUS_16BIT;
-      sprintf(pPtr->AdapterName, "AHCI_SCSI_0");
+      snprintf(pPtr->AdapterName, sizeof(pPtr->AdapterName), "AHCI_SCSI_0");
 
       /* add all ATAPI units to be emulated by this virtual adaper */

trunk/src/os2ahci/os2ahci.h

@@ -280 +280 @@
   unsigned      busy : 1;              /*    if != 0, adapter is busy */
   unsigned      hw_ports : 6;          /*    number of ports as reported by the hardware */
+  unsigned      int_set:1;             /* interrupt has been set */
 
   u32           port_map;              /* 08   bitmap of active ports */
@@ -294 +295 @@
   HRESOURCE     rm_adh;                /* 44 resource handle for adapter */
   HRESOURCE     rm_bars[6];            /* 48 resource handle for MMIO and I/O BARs */
-  HRESOURCE     rm_irq;                /* 60 resource handle for IRQ */
 
   u16           bus_dev_func;          /* 64 PCI bus number PCI device and function number */
-  u16           irq;                   /* 66 interrupt number */
+  u8            irq;                   /* 66 interrupt number */
+  u8            irq_pin;               /* 67 irq pin */
 
   u32           mmio_phys;             /* 68 physical address of MMIO region */
@@ -424 +425 @@
 extern int ahci_flush_cache(AD_INFO *ai, int p, int d);
 
-extern int ahci_intr(u16 irq);
+extern int ahci_intr(u32 irq);
 extern void ahci_port_intr(AD_INFO *ai, int p);
 extern void ahci_error_intr(AD_INFO *ai, int p, u32 irq_stat);

trunk/src/os2ahci/pci.c

@@ -513 +513 @@
   rc_list->NumResource = 0;
 
-  /* Register IRQ with resource manager */
-  ret = RmAddIrq(rm_drvh, &ad_info->rm_irq, irq, pin);
-  if (ret)
-  {
-    if (ret == RMRC_RES_ALREADY_CLAIMED)
-    {
-      ciiprintf("Device already claimed.");
-    }
-    else
-    {
-      iprintf("%s: couldn't register IRQ %d (rc = %s)", drv_name, irq, rmerr(ret));
-    }
-    return;
-  }
-  rc_list->hResource[rc_list->NumResource++] = ad_info->rm_irq;
-
   /* Allocate all I/O and MMIO addresses offered by this device. In theory,
    * we need only BAR #5, the AHCI MMIO BAR, but in order to prevent any
@@ -600 +584 @@
   ad_info->bus_dev_func = BusDevFunc;
   ad_info->irq = irq;
+  ad_info->irq_pin = pin;
 
   ad_info->mmio = MapPhysToLin(ad_info->mmio_phys, ad_info->mmio_size);
@@ -612 +597 @@
 
   memset(&adapter, 0x00, sizeof(adapter));
-  sprintf(tmp, "AHCI_%d Controller", ad_info_cnt);
+  snprintf(tmp, sizeof(tmp), "AHCI_%d Controller", ad_info_cnt);
   adapter.AdaptDescriptName = tmp;
   adapter.AdaptFlags        = 0;
@@ -650 +635 @@
   return;
 
-
 add_pci_fail:
   /* something went wrong; try to clean up as far as possible */
@@ -657 +641 @@
     if (ad_info->rm_bars[i] != 0) RMDeallocResource(rm_drvh, ad_info->rm_bars[i]);
   }
-  if (ad_info->rm_irq != 0) RMDeallocResource(rm_drvh, ad_info->rm_irq);
 }
 

trunk/tools/AddToFile.cmd

@@ -11 +11 @@
 call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
 call SysLoadFuncs
-parse arg OutFile','String','Function','Parm1','Parm2','Parm3','Parm4;
+parse arg OutFile','String','Function','Parm1','Parm2','Parm3','Parm4','Parm5;
 
 if (OutFile='') then do
@@ -33 +33 @@
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
   call 'AddToFile.cmd' MyCmd;
-  MyCmd=MyFile||',option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack';
+  MyCmd=MyFile||',option description,BLDLEVEL,Vendor,1.2.3,Description,Fixpack,Asd';
   rc=LineOut(MyFile, '--- AddToFile.cmd '||MyCmd);
   call 'AddToFile.cmd' MyCmd;
@@ -92 +92 @@
     /* get fixpack from SVN version */
     if (Parm4='SVN') then Parm4='SVN'||SvnVersion();
+    if (Parm2='DATE') then Parm2=SUBSTR(DATE('S'), 1, 4)||'.'||SUBSTR(DATE('S'), 5, 2)||'.'||SUBSTR(DATE('S'), 7, 2);
 
     parse var Parm2 major'.'minor'.'ProjVersion;
@@ -100 +101 @@
     end
 
-    NewStr='@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||'::::'||ProjVersion||'::'||Parm4||'@@'||Parm3;
+    NewStr='@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||':'||Parm5||':::'||ProjVersion||'::'||Parm4||'@@'||Parm3;
     if (Type='2') then do
       /*OutStr=String||' "@#'||Parm1||':'||Parm2||'#@##1## '||ProjString||'::::'||ProjVersion||'::'||Parm4||'@@'||Parm3||'"';*/
@@ -134 +135 @@
   when (Function='DATEDAY') then do
     NewStr=FORMAT(SUBSTR(DATE('S'), 7, 2));
+    RepLoc=Pos('%A', String);
+    if (RepLoc>0) then OutStr=Substr(String,1,RepLoc-1)||NewStr||Substr(String,RepLoc+2);
+    else OutStr=String||' '||NewStr;
+    rc=lineout(OutFile, OutStr);
+    rc=lineout(OutFile);
+  end
+
+  when (Function='DATE1') then do
+    parse value Date('N') with MyDay MyMonth MyYear;
+    NewStr=MyYear||'-'||MyMonth||'-'||Right(MyDay, 2, 0);
     RepLoc=Pos('%A', String);
     if (RepLoc>0) then OutStr=Substr(String,1,RepLoc-1)||NewStr||Substr(String,RepLoc+2);