Changeset 102 for trunk

Timestamp:

Jun 6, 2011, 4:25:25 PM (14 years ago)

Author:

Markus Thielen

Message:

avoid possible IRQ storm during error handling

Location:

trunk/src/os2ahci

Files:

• Makefile (modified) (2 diffs)
• ahci.c (modified) (3 diffs)
• version.h (modified) (1 diff)

trunk/src/os2ahci/Makefile

@@ -110 +110 @@
 ioctl.obj:    ioctl.c    Makefile $(INCS) atapi.h ioctl.h
 
-os2ahci.def:  version.h os2ahci.def.template
+os2ahci.def:  version.h  os2ahci.def.template
 
 ###############################################################################
@@ -118 +118 @@
 # NOTE: OS/2 emacs etags.exe expects an empty file named c:\dev\null...
 tags:   $(SRCS) $(INCS)
-        etags.exe $(SRCS) $(INCS)
+        etags.exe $(SRCS) $(INCS) Makefile
 
 bldday.h:

trunk/src/os2ahci/ahci.c

@@ -1337 +1337 @@
 
   if (irq_stat & PORT_IRQ_ERROR) {
-    /* this is an error interrupt */
+    /* this is an error interrupt;
+     * disable port interrupts to avoid IRQ storm until error condition
+     * has been cleared by the restart handler
+     */
+    writel(port_mmio + PORT_IRQ_MASK, 0);
     ahci_error_intr(ai, p, irq_stat);
     return;
@@ -1443 +1447 @@
   if (reset_port) {
     /* need to reset the port; leave this to the reset context hook */
+
     ports_to_reset[ad_no(ai)] |= 1UL << p;
     DevHelp_ArmCtxHook(0, reset_ctxhook_h);
@@ -1454 +1459 @@
    * thus we need to offload this functionality to the restart context hook.
    */
-  if (irq_stat & PORT_IRQ_TF_ERR) {
-    ports_to_restart[ad_no(ai)] |= 1UL << p;
-    DevHelp_ArmCtxHook(0, restart_ctxhook_h);
-  }
+  ports_to_restart[ad_no(ai)] |= 1UL << p;
+  DevHelp_ArmCtxHook(0, restart_ctxhook_h);
 }
 

trunk/src/os2ahci/version.h

@@ -14 +14 @@
 
 
-#define VERSION            112       /* driver version (2 implied decimals) */
+#define VERSION            114       /* driver version (2 implied decimals) */