Changeset 133 for trunk

Timestamp:

May 16, 2012, 10:19:24 AM (13 years ago)

Author:

Markus Thielen

Message:

• (#13) added IDC entry point to allow switching back to BIOS mode
• added IDCTEST driver and program for testing the IDC entry point
• fixed bug in IOCTL handling (missing 'break')

Location:

trunk/src

Files:

• idctest (added)
• idctest/Makefile (added)
• idctest/idctest.c (added)
• idctest/idctest.def (added)
• idctest/idctest.h (added)
• idctest/init.asm (added)
• idctest/testprog.c (added)
• include/ahci-idc.h (added)
• os2ahci/Makefile (modified) (3 diffs)
• os2ahci/init.asm (modified) (4 diffs)
• os2ahci/os2ahci.c (modified) (3 diffs)
• os2ahci/os2ahci.h (modified) (1 diff)
• os2ahci/version.h (modified) (1 diff)

trunk/src/os2ahci/Makefile

@@ -50 +50 @@
 !endif
 
-CC_INCLUDE   = -I$(DDK)\base\h \
+CC_INCLUDE   = -I..\include \
+               -I$(DDK)\base\h \
                -I$(DDK)\base\ibmh \
                -I$(DDK)\base\src\dev\dasd\diskh \
@@ -78 +79 @@
            ctxhook.obj apm.obj ioctl.obj trace.obj
 
-INCS     = os2ahci.h ahci.h version.h
+INCS     = os2ahci.h ahci.h version.h ioctl.h ..\include\ahci-idc.h
 
 
@@ -122 +123 @@
         etags.exe $(SRCS) $(INCS) $(DDK)\base\src\dev\dasd\diskh\dhcalls.h \
         $(DDK)\base\src\dev\dasd\diskh\iorb.h \
-        $(DDK)\base\h\bsedos16.h
+        $(DDK)\base\h\bsedos16.h \
+        $(DDK)\base\h\devcmd.h \
+        $(DDK)\base\h\reqpkt.h
 
 bldday.h:

trunk/src/os2ahci/init.asm

@@ -6 +6 @@
 
 ; -----------------------------------------------------------------------------
+; Constants
+                DEV_IDC  EQU    0400h        ;  IDC bit for ADD flags
+        
+; -----------------------------------------------------------------------------
 ; Public symbols
 
                 PUBLIC  _asm_strat           ; low-level strategy routine
+                PUBLIC  _asm_idc_entry       ; low-level IDC entry point 
                 PUBLIC  _readl               ; MMIO read (32 bits)
                 PUBLIC  _writel              ; MMIO write (32 bits)
@@ -29 +34 @@
 DEVHDR          SEGMENT WORD PUBLIC 'DATA'
 _dev_hdr        dd      _legacy_hdr             ; next device header
-                dw      DEVLEV_3 + DEV_CHAR_DEV ; flags for ADD drivers
+                dw      DEVLEV_3 + DEV_CHAR_DEV + DEV_IDC ; flags for ADD drivers
                 dw      OFFSET _asm_strat       ; strategy routine
-                dw      0                       ; no IDC routine
+                dw      OFFSET _asm_idc_entry   ; IDC entry point
                 db      "OS2AHCI$"              ; name of character device
                 dq      0                       ; 8 reserved bytes
@@ -40 +45 @@
                 dw      DEVLEV_3 + DEV_CHAR_DEV ; flags for ADD drivers
                 dw      OFFSET _asm_strat       ; strategy routine
-                dw      0                       ; no IDC routine
+                dw      0                       ; IDC entry point
                 db      "IBMS506$"              ; name of character device
                 dq      0                       ; 8 reserved bytes
@@ -129 +134 @@
                 RET
 _asm_strat      ENDP
+
+
+; IDC entry point (Assembler stub)
+_asm_idc_entry  PROC    FAR
+        
+                ; push request packet address
+                PUSH    ES
+                PUSH    BX
+                CLD
+
+                ; call C IDC entry point - which is the strategy routine
+                CALL    _c_strat
+
+                POP     BX
+                POP     ES
+                MOV     WORD PTR ES:[BX+3], AX
+                RET
+_asm_idc_entry  ENDP
 
                 .386

trunk/src/os2ahci/os2ahci.c

@@ -124 +124 @@
  * for initialization purposes; all other calls go directly to the adapter
  * device driver's strategy function.
+ *
+ * NOTE: this is also used as the IDC entry point. We expect an IOCTL request
+ *       packet for IDC calls, so they can be handled by gen_ioctl.
  */
 USHORT _cdecl c_strat(RPH _far *req)
@@ -247 +250 @@
       case 'r':
         /* reset ports during initialization */
-        init_reset = 1;
+        init_reset = 1;
         break;
 
@@ -427 +430 @@
 
     }
+    break;
+
+  case OS2AHCI_IDC_CATEGORY:
+    switch (ioctl->Function) {
+
+    case OS2AHCI_IDC_BIOSMODE:
+      /* reconfigure adapters in BIOS/int13 mode; needed for generating 
+       * trap dumps on some machines. This is called by ACPI.PSD.
+       *
+       * To enter BIOS mode, we flush all write caches, turn off interrupts
+       * and restore the BIOS configuration. This is exactly what 
+       * apm_suspend() does.
+       */
+      apm_suspend();
+      return(STDON);
+
+    case OS2AHCI_IDC_BEEP:
+      /* IOCTL for IDC testing - just beep */
+      DevHelp_Beep(2000, 100);
+      return(STDON);
+    }
+    break;
 
   case DSKSP_CAT_GENERIC:

trunk/src/os2ahci/os2ahci.h

@@ -63 +63 @@
 
 #include "ahci.h"
+#include "ahci-idc.h"
 #include "version.h"
 

trunk/src/os2ahci/version.h

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