Changeset 201 for trunk

Timestamp:

Aug 24, 2019, 6:36:37 PM (6 years ago)

Author:

David Azarewicz

Message:

Fixed trap in hardware failure recovery.

Location:

trunk/src/os2ahci

Files:

• ReadMe.txt (modified) (4 diffs)
• ahci.c (modified) (24 diffs)
• ctxhook.c (modified) (2 diffs)
• os2ahci.c (modified) (1 diff)

trunk/src/os2ahci/ReadMe.txt

@@ -1 @@
-AHCI Driver for OS/2 v2.06
+AHCI Driver for OS/2 v2.07
 
 Introduction
@@ -173 +173 @@
   BASEDEV=OS2AHCI.ADD /A:0 /P:0 /I
 
-Means to ingore the disk plugged into port 0 on adapeter 0.
+Means to ignore the disk plugged into port 0 on adapeter 0.
 
 
@@ -184 +184 @@
 to reorder I/O requests to minimize head movements, resulting in improved
 performance when executing random I/Os. In practice, this will be most
-noticable when multiple programs request I/O services to different parts
+noticeable when multiple programs request I/O services to different parts
 of the disk -- a single program typically won't queue up I/O's but instead
 will wait for each I/O to complete (with the exception of programs like
@@ -388 +388 @@
 Change Log
 ==========
+v.2.07 19-May-2019 - David Azarewicz
+  Fixed hardware failure recovery to arm ctx hook in watchdog timer.
 
 v.2.06 19-Sep-2018 - David Azarewicz

trunk/src/os2ahci/ahci.c

@@ -274 +274 @@
   }
 
-  DPRINTF(3,"ahci_save_bios_config: BIOS AHCI mode is %d\n", ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN);
+  DPRINTF(3,__func__": BIOS AHCI mode is %d\n", ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN);
 
   if ((ai->bios_config[HOST_CTL / sizeof(u32)] & HOST_AHCI_EN) == 0 && ai->pci_vendor == PCI_VENDOR_ID_INTEL)
@@ -296 +296 @@
 int ahci_restore_bios_config(AD_INFO *ai)
 {
-  DPRINTF(3,"ahci_restore_bios_config: restoring AHCI BIOS configuration on adapter %d\n", ad_no(ai));
+  DPRINTF(3,__func__": restoring AHCI BIOS configuration on adapter %d\n", ad_no(ai));
 
   /* Restore saved BIOS configuration; please note that HOST_CTL is restored
@@ -354 +354 @@
 int ahci_restore_initial_config(AD_INFO *ai)
 {
-  DPRINTF(3,"ahci_restore_initial_config: restoring initial configuration on adapter %d\n", ad_no(ai));
+  DPRINTF(3,__func__": restoring initial configuration on adapter %d\n", ad_no(ai));
 
   /* restore saved BIOS configuration */
@@ -535 +535 @@
   int i;
 
-  DPRINTF(1,"ahci_complete_init: completing initialization of adapter #%d\n", ad_no(ai));
+  DPRINTF(1,__func__": completing initialization of adapter #%d\n", ad_no(ai));
 
   if (!ai->int_set)
@@ -592 +592 @@
       if (init_reset)
       {
-        DPRINTF(3,"ahci_complete_init: resetting port %d\n", p);
+        DPRINTF(3,__func__": resetting port %d\n", p);
         ahci_reset_port(ai, p, 1);
       }
       else
       {
-        DPRINTF(3,"ahci_complete_init: restarting port #%d\n", p);
+        DPRINTF(3,__func__": restarting port #%d\n", p);
         ahci_stop_port(ai, p);
         ahci_start_port(ai, p, 1);
@@ -615 +615 @@
   /* pci_enable_int(ai->bus, ai->dev_func); */
 
-  DPRINTF(1,"ahci_complete_init: done\n");
+  DPRINTF(1,__func__": done\n");
   return(0);
 }
@@ -918 +918 @@
   TIMER Timer;
 
-  DPRINTF(2,"ahci_reset_port: resetting port %d.%d\n", ad_no(ai), p);
+  DPRINTF(2,__func__": resetting port %d.%d\n", ad_no(ai), p);
   DUMP_PORT_REGS(2,ai,p);
 
@@ -935 +935 @@
 
   /* set link speed and power management options */
-  DPRINTF(3,"ahci_reset_port: setting link speed and power management options\n");
+  DPRINTF(3,__func__": setting link speed and power management options\n");
   tmp = readl(port_mmio + PORT_SCR_CTL) & ~0x00000fffUL;
   tmp |= (link_speed[ad_no(ai)][p] & 0x0f) << 4;
@@ -942 +942 @@
 
   /* issue COMRESET on the port */
-  DPRINTF(3,"ahci_reset_port: issuing COMRESET on port %d\n", p);
+  DPRINTF(3,__func__": issuing COMRESET on port %d\n", p);
   writel(port_mmio + PORT_SCR_CTL, tmp | 1);
   readl(port_mmio + PORT_SCR_CTL);  /* flush */
@@ -969 +969 @@
 
   /* start port so we can receive the COMRESET FIS */
-  DPRINTF(2,"ahci_reset_port: starting port %d again\n", p);
+  DPRINTF(2,__func__": starting port %d again\n", p);
   ahci_start_port(ai, p, ei);
 
@@ -983 +983 @@
     }
   }
-  DPRINTF(3,"ahci_reset_port: PORT_TFDATA = 0x%x\n", readl(port_mmio + PORT_TFDATA));
+  DPRINTF(3,__func__": PORT_TFDATA = 0x%x\n", readl(port_mmio + PORT_TFDATA));
 
   return(0);
@@ -996 +996 @@
   u32 status;
 
-  DPRINTF(3,"ahci_start_port %d.%d\n", ad_no(ai), p);
+  DPRINTF(3,__func__": %d.%d\n", ad_no(ai), p);
   /* check whether device presence is detected and link established */
 
   status = readl(port_mmio + PORT_SCR_STAT);
-  DPRINTF(3,"ahci_start_port: PORT_SCR_STAT = 0x%x\n", status);
+  DPRINTF(3,__func__": PORT_SCR_STAT = 0x%x\n", status);
   if ((status & 0xf) != 3) return(-1);
 
   /* clear SError, if any */
   status = readl(port_mmio + PORT_SCR_ERR);
-  DPRINTF(3,"ahci_start_port: PORT_SCR_ERR  = 0x%x\n", status);
+  DPRINTF(3,__func__": PORT_SCR_ERR  = 0x%x\n", status);
   writel(port_mmio + PORT_SCR_ERR, status);
 
@@ -1093 +1093 @@
   int rc;
 
-  DPRINTF(3,"ahci_stop_port %d.%d\n", ad_no(ai), p);
+  DPRINTF(3,__func__": %d.%d\n", ad_no(ai), p);
 
   /* disable port interrupts */
@@ -1101 +1101 @@
   if ((rc = ahci_stop_fis_rx(ai, p)) != 0)
   {
-    dprintf(0,"error: failed to stop FIS receive (%d)\n", rc);
+    dprintf(0,__func__": failed to stop FIS receive (%d)\n", rc);
     return(rc);
   }
@@ -1108 +1108 @@
   if ((rc = ahci_stop_engine(ai, p)) != 0)
   {
-    dprintf(0,"error: failed to stop port HW engine (%d)\n", rc);
+    dprintf(0,__func__": failed to stop port HW engine (%d)\n", rc);
     return(rc);
   }
@@ -1236 +1236 @@
   }
 
-  DPRINTF(7,"---------- ahci_exec_iorb: iorb=%x\n", vIorb);
+  DPRINTF(7,"---------- "__func__": iorb=%x\n", vIorb);
 
   /* Enable AHCI mode; apparently, the AHCI mode may end up becoming
@@ -1262 +1262 @@
       cmd_max = ai->cmd_max;
     }
-    DPRINTF(8,"NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
+    DPRINTF(8,__func__": NCQ command; cmd_max = %d->%d\n", ai->cmd_max, cmd_max);
   }
 
@@ -1315 +1315 @@
         aws->cmd_slot = port->cmd_slot;
 
-        DPRINTF(7,"Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
+        DPRINTF(7,__func__": Issuing command Slot=%d cmds=%x\n", port->cmd_slot, *cmds);
         if (aws->is_ncq)
         {
@@ -1408 +1408 @@
   {
     /* successfully prepared cmd; issue cmd and wait for completion */
-    DPRINTF(3,"---------- executing polled cmd on slot 0...");
+    DPRINTF(3,"---------- "__func__" executing polled cmd on slot 0...");
     writel(port_mmio + PORT_CMD_ISSUE, 1);
     TimerInit(&Timer, timeout);
@@ -1479 +1479 @@
   if (readl(port_mmio + PORT_CMD_ISSUE) & 1)
   {
-    DPRINTF(3,"port %d slot 0 is not idle; not executing polled cmd\n", p);
+    DPRINTF(3,__func__": port %d slot 0 is not idle; not executing polled cmd\n", p);
     return(-1);
   }
@@ -1488 +1488 @@
 
   /* start command execution for slot 0 */
-  DPRINTF(3,"---------- executing polled cmd...");
+  DPRINTF(3,"---------- "__func__" executing polled cmd...");
   writel(port_mmio + PORT_CMD_ISSUE, 1);
 
@@ -1540 +1540 @@
   if (!ai->ports[p].devs[d].atapi)
   {
-    DPRINTF(2,"flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
+    DPRINTF(2,__func__": flushing cache on %d.%d.%d\n", ad_no(ai), p, d);
     return(ahci_exec_polled_cmd(ai, p, d, 30000,
            ai->ports[p].devs[d].lba48 ? ATA_CMD_FLUSH_EXT : ATA_CMD_FLUSH, AP_END));
@@ -1557 +1557 @@
 int ahci_set_dev_idle(AD_INFO *ai, int p, int d, int idle)
 {
-  DPRINTF(3,"sending IDLE=%d command to port %d\n", idle, p);
+  DPRINTF(3,__func__": sending IDLE=%d command to port %d\n", idle, p);
   return ahci_exec_polled_cmd(ai, p, d, 500, ATA_CMD_IDLE, AP_COUNT, idle ? 1 : 0, AP_END);
 }
@@ -1615 +1615 @@
     if ((u32)&irq_stat < 0xf000)
     {
-      DPRINTF(0,"IRQ stack running low; arming engine context hook\n");
+      DPRINTF(0,__func__": IRQ stack running low; arming engine context hook\n");
       /* Rousseau:
        * A context hook cannot be re-armed before it has completed.

trunk/src/os2ahci/ctxhook.c

@@ -342 +342 @@
   rearm_ctx_hook = 0;
 
-  DPRINTF(8,"reset_ctxhook() started\n");
+  //DPRINTF(8,"reset_ctxhook() started\n");
+  dprintf(0, __func__": BEG\n");
   memset(&done_queue, 0x00, sizeof(done_queue));
 
@@ -473 +474 @@
   if (rearm_ctx_hook)
   {
-    msleep(250);
-    KernArmHook(reset_ctxhook_h, 0, 0);
-  }
-
+    /* we cannot rearm ourself because we will execute immediately leaving
+     * no time to process and clear the reason we need to rearm. Therefore
+     * we set the timer again.
+     */
+    //msleep(250);
+    //KernArmHook(reset_ctxhook_h, 0, 0);
+    Timer_StartTimerMS(&th_reset_watchdog, 250, reset_watchdog, 0);
+  }
+
+  dprintf(0,__func__": END\n");
   KernThunkStackTo16();
 }

trunk/src/os2ahci/os2ahci.c

@@ -1603 +1603 @@
   /* 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
+   * that are illegal in an interrupt handler.
+   */
+
+  KernArmHook(reset_ctxhook_h, 0, 0);
+
   /* call context hook manually */
-  reset_ctxhook(0);
+  //reset_ctxhook(0);
 }