Changeset 211 for trunk/src/os2ahci/os2ahci.c

Timestamp:

Jul 24, 2023, 5:51:46 PM (2 years ago)

Author:

David Azarewicz

Message:

Added workaround to help with VirtualBox issues.
Improved diagnostic messages.
Changed how timeouts are reset and how ctx hooks are triggered.
Added quirk for devices with issues executing some standard commands.
Changed to make /N the default.

File:

• trunk/src/os2ahci/os2ahci.c (modified) (18 diffs)

trunk/src/os2ahci/os2ahci.c

@@ -4 +4 @@
  * Copyright (c) 2011 thi.guten Software Development
  * Copyright (c) 2011 Mensys B.V.
- * Copyright (c) 2013-2021 David Azarewicz <david@88watts.net>
+ * Copyright (c) 2013-2023 David Azarewicz <david@88watts.net>
  *
  * Authors: Christian Mueller, Markus Thielen
@@ -26 +26 @@
  */
 
+#define INCL_LONGLONG
 #include "os2ahci.h"
 #include "ioctl.h"
@@ -58 +59 @@
 int thorough_scan = 1; /* if != 0, perform thorough PCI scan */
 int init_reset = 1;    /* if != 0, reset ports during init */
-int force_write_cache; /* if != 0, force write cache */
+int force_write_cache = 0; /* if != 0, force write cache */
 int iVerbose = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
 int use_mbr_test = 1;
@@ -190 +191 @@
   memset(ad_infos, 0, sizeof(ad_infos));
   memset(emulate_scsi, 1, sizeof(emulate_scsi)); /* set default enabled */
+  memset(enable_ncq, 1, sizeof(enable_ncq)); /* set default enabled */
   UtSetDriverName("OS2AHCI$");
   Header.ulCaps |= DEV_ADAPTER_DD; /* DAZ This flag is not really needed. */
@@ -423 +425 @@
   if (iVerbose) iprintf("OS2AHCI.ADD: driver version %d.%02d", DMAJOR, DMINOR);
 
-  #ifdef TESTVER
+  #if defined(TESTVER) && defined(DEBUG)
   #include "testver.c"
   #endif
@@ -443 +445 @@
 
     /* allocate context hooks */
-    KernAllocateContextHook(restart_ctxhook, 0, &restart_ctxhook_h);
-    KernAllocateContextHook(reset_ctxhook, 0, &reset_ctxhook_h);
+    KernAllocateContextHook(RestartCtxHook, 0, &RestartCtxHook_h);
+    KernAllocateContextHook(ResetCtxHook, 0, &ResetCtxHook_h);
     KernAllocateContextHook(engine_ctxhook, 0, &engine_ctxhook_h);
 
@@ -481 +483 @@
 {
   DPRINTF(DBG_FUNCBEG, DBG_PREFIX": IOCTL 0x%x/0x%x\n", ioctl->ioctl.bCategory, ioctl->ioctl.bFunction);
-  AhciStats.ulTestCount2++;
 
   switch (ioctl->ioctl.bCategory)
@@ -599 +600 @@
     memset(&pIorb->ADDWorkSpace, 0x00, sizeof(ADD_WORKSPACE));
 
-    #ifdef DEBUG
-    DumpIorb(pIorb); /* DAZ TESTING */
-    #endif
+    //#ifdef DEBUG
+    //DumpIorb(pIorb); /* DAZ TESTING */
+    //#endif
 
     if (iorb_driver_level(pIorb))
@@ -622 +623 @@
       {
         /* unit handle outside of the allowed range */
-        dprintf(0,"warning: IORB for %d.%d.%d out of range\n", a, p, d);
+        dprintf(0, DBG_PREFIX": ERROR: IORB for %d.%d.%d is out of range\n", a, p, d);
         pIorb->Status = IORB_ERROR;
         pIorb->ErrorCode = IOERR_CMD_SYNTAX;
@@ -920 +921 @@
 
     /* trigger reset context hook which will finish the abort processing */
-    KernArmHook(reset_ctxhook_h, 0, 0);
+    SafeArmCtxHook(ResetCtxHook_h, 0);
     break;
 
@@ -1071 +1072 @@
     if ((u32)(pPtr + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
     {
-      dprintf(0,"error: device table provided by DASD too small\n");
+      dprintf(0, DBG_PREFIX": error: device table provided by DASD too small\n");
       iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
       goto iocm_device_table_done;
@@ -1100 +1101 @@
         if (ad_info->busy)
         {
-          dprintf(0,"error: port scan requested while adapter was busy\n");
+          dprintf(0, DBG_PREFIX": error: port scan requested while adapter was busy\n");
           iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
@@ -1112 +1113 @@
         if (rc != 0)
         {
-          dprintf(0,"error: port scan failed on adapter #%d\n", dta);
+          dprintf(0, DBG_PREFIX": error: port scan failed on adapter #%d\n", dta);
           iorb_seterr(pIorb, IOERR_CMD_SW_RESOURCE);
           goto iocm_device_table_done;
@@ -1533 +1534 @@
  * separate function which is invoked via a context hook.
  */
-void __syscall timeout_callback(ULONG timer_handle, ULONG p1)
-{
-  IORBH FAR16DATA *vIorb = (IORBH FAR16DATA *)CastULONGToFar16(p1);
+void __syscall timeout_callback(ULONG timer_handle, ULONG ulArg)
+{
+  IORBH FAR16DATA *vIorb = (IORBH FAR16DATA *)CastULONGToFar16(ulArg);
   IORBH *pIorb = Far16ToFlat(vIorb);
   int a = iorb_unit_adapter(pIorb);
@@ -1541 +1542 @@
 
   Timer_CancelTimer(timer_handle);
-  dprintf(0,"timeout for IORB %x port=%x\n", vIorb, p);
-
-  /* Move the timed-out IORB to the abort queue. Since it's possible that the
-   * IORB has completed after the timeout has expired but before we got to
-   * this line of code, we'll check the return code of iorb_queue_del(): If it
-   * returns an error, the IORB must have completed a few microseconds ago and
-   * there is no timeout.
-   */
-  spin_lock(drv_lock);
-  if (iorb_queue_del(&ad_infos[a].ports[p].iorb_queue, vIorb) == 0)
-  {
-    iorb_queue_add(&abort_queue, vIorb, pIorb);
-    pIorb->ErrorCode = IOERR_ADAPTER_TIMEOUT;
-  }
-  spin_unlock(drv_lock);
+  dprintf(0, DBG_PREFIX": timeout for IORB %x port=%x.%x\n", ulArg, a, p);
 
   /* Trigger abort processing function. We don't really care whether this
@@ -1568 +1555 @@
    *    will process our IORB as well.
    */
-  KernArmHook(reset_ctxhook_h, 0, 0);
-
-  /* Set up a watchdog timer which calls the context hook manually in case
-   * some kernel thread is looping around the IORB_COMPLETE status bit
-   * without yielding the CPU (kernel threads don't preempt). This shouldn't
-   * happen per design because kernel threads are supposed to yield but it
-   * does in the early boot phase.
-   */
-  Timer_StartTimerMS(&th_reset_watchdog, 5000, reset_watchdog, 0);
+  SafeArmCtxHook(ResetCtxHook_h, ulArg);
 }
 
@@ -1590 +1569 @@
  * problems during the early boot phase.
  */
-void __syscall reset_watchdog(ULONG timer_handle, ULONG p1)
+void __syscall WatchdogTimer(ULONG timer_handle, ULONG ulArg)
 {
   /* reset watchdog timer */
   Timer_CancelTimer(timer_handle);
-  th_reset_watchdog = 0;
-  dprintf(0,"reset watchdog invoked\n");
-
-  /* You cannot call the reset_ctxhook directly because it does things
+  th_watchdog = 0;
+  dprintf(0, DBG_PREFIX": BEG %s\n", ulArg==ResetCtxHook_h?"Reset":"Restart");
+
+  /* The ctxhook cannot be called directly because it does things
    * that are illegal in an interrupt handler.
    */
-
-  KernArmHook(reset_ctxhook_h, 0, 0);
-
-  /* call context hook manually */
-  //reset_ctxhook(0);
+  SafeArmCtxHook(ulArg, 0);
 }
 
@@ -1634 +1609 @@
   if ((u32)(pUi + 1) - (u32)pDt > pIorb_conf->DeviceTableLen)
   {
-    dprintf(0,"error: device table provided by DASD too small\n");
+    dprintf(0, DBG_PREFIX": error: device table provided by DASD too small\n");
     iorb_seterr(&pIorb_conf->iorbh, IOERR_CMD_SW_RESOURCE);
     return(-1);