Changeset 112

Timestamp:

Jul 6, 2011, 10:02:47 AM (14 years ago)

Author:

Markus Thielen

Message:

• removed RAS calls (tracing to OS/2 kernel trace buffer was unreliable)
• added private trace ring buffer implementation
• support read from OS2AHCI$ character device
• contents of trace ring buffer are accesible via OS2AHCI$ character device
• updated WATCOM makefile; WATCOM build still produces a non-working driver
• code cleanup (unused variables etc.)

Location:

trunk/src/os2ahci

Files:

• Makefile (modified) (3 diffs)
• ahci.c (modified) (5 diffs)
• ata.c (modified) (1 diff)
• atapi.c (modified) (3 diffs)
• atapi.h (modified) (1 diff)
• libc.c (modified) (6 diffs)
• os2ahci.c (modified) (3 diffs)
• os2ahci.h (modified) (6 diffs)
• pci.c (modified) (2 diffs)
• version.h (modified) (1 diff)
• wmakefile (modified) (8 diffs)

trunk/src/os2ahci/Makefile ¶

@@ -73 +73 @@
 
 SRCS     = init.asm libc.c os2ahci.c pci.c ahci.c ata.c atapi.c ctxhook.c \
-           apm.c ioctl.c
+           apm.c ioctl.c trace.c
 
 OBJS     = init.obj libc.obj os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj \
-           ctxhook.obj apm.obj ioctl.obj
+           ctxhook.obj apm.obj ioctl.obj trace.obj
 
 INCS     = os2ahci.h ahci.h version.h
@@ -84 +84 @@
 
 clean:
-        rm -f $(OBJS) $(TARGET)
+        rm -f $(OBJS) $(TARGET) *.cod *.lst
 
 
@@ -109 +109 @@
 
 ioctl.obj:    ioctl.c    Makefile $(INCS) atapi.h ioctl.h
+
+trace.obj:    trace.c    Makefile $(INCS)
 
 os2ahci.def:  version.h  os2ahci.def.template

trunk/src/os2ahci/ahci.c ¶

@@ -542 +542 @@
       if (rc == 0) {
         /* we have a valid IDENTIFY or IDENTIFY_PACKET response */
-        ddphex(id_buf, 512, TRACE_MINOR_ATA_IDENTIFY,
-               "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
+        ddphex(id_buf, 512, "ATA_IDENTIFY%s results:\n", (is_ata) ? "" : "_PACKET");
         ahci_setup_device(ai, p, 0, id_buf);
       } else {
@@ -922 +921 @@
  * Determine whether a port is busy executing commands.
  */
-ahci_port_busy(AD_INFO *ai, int p)
+int ahci_port_busy(AD_INFO *ai, int p)
 {
   u8 _far *port_mmio = port_base(ai, p);
@@ -1239 +1238 @@
                                 AP_END));
   }
+  return 0;
 }
 
@@ -1551 +1551 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        TRACE_MINOR_EXEC_CDB, "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
+        "ahci_execute_cdb(%d.%d.%d): ", a, p, d);
 
   if (ad_infos[a].ports[p].devs[d].atapi) {
@@ -1573 +1573 @@
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
-        TRACE_MINOR_EXEC_ATA, "ahci_execute_ata(%d.%d.%d): ", a, p, d);
+        "ahci_execute_ata(%d.%d.%d): ", a, p, d);
 
   ahci_exec_iorb(iorb, 0, ata_execute_ata);

trunk/src/os2ahci/ata.c ¶

@@ -279 +279 @@
   if (debug >= 2) {
     printf("ATA command for %d.%d.%d:\n", ad_no(ai), p, d);
-    phex(cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), 
-         TRACE_MINOR_CMD_HDR, "cmd_hdr:   ");
-    phex(&ata_cmd, sizeof(ata_cmd), TRACE_MINOR_ATA_CMD, "ata_cmd:   ");
+    phex(cmd_hdr, offsetof(AHCI_CMD_HDR, reserved), "cmd_hdr:   ");
+    phex(&ata_cmd, sizeof(ata_cmd), "ata_cmd:   ");
     if (atapi_cmd != NULL) {
-      phex(atapi_cmd, atapi_cmd_len, TRACE_MINOR_ATAPI_CMD, "atapi_cmd: ");
+      phex(atapi_cmd, atapi_cmd_len, "atapi_cmd: ");
     }
     if (n > 0) {
-      phex(cmd_tbl->sg_list, sizeof(*cmd_tbl->sg_list) * n, 
-           TRACE_MINOR_SG_LIST, "sg_list:   ");
+      phex(cmd_tbl->sg_list, sizeof(*cmd_tbl->sg_list) * n, "sg_list:   ");
     }
   }

trunk/src/os2ahci/atapi.c ¶

@@ -162 +162 @@
   cdb.cmd = ATAPI_CMD_READ_12;
   SET_CDB_32(cdb.lba, io->RBA + io->BlocksXferred);
-  SET_CDB_32(cdb.trans_len, 1);
+  SET_CDB_32(cdb.trans_len, 1UL);
 
   /* allocate transfer buffer */
@@ -340 +340 @@
   ATAPI_SENSE_DATA *psd = (ATAPI_SENSE_DATA *) aws->buf;
 
-  dphex(psd, sizeof(*psd), TRACE_MINOR_SENSE_BUF, "sense buffer:\n");
+  dphex(psd, sizeof(*psd), "sense buffer:\n");
 
   if ((iorb->RequestControl & IORB_REQ_STATUSBLOCK) &&
@@ -443 +443 @@
     tmp = GET_CDB_24(cmd_in + 1) & 0x1fffffUL;
     SET_CDB_32(p12->lba, tmp);
-    SET_CDB_32(p12->trans_len, cmd_in[4]);
+    SET_CDB_32(p12->trans_len, (u32)(cmd_in[4]));
     p12->control = cmd_in[5];
     break;

trunk/src/os2ahci/atapi.h ¶

@@ -33 +33 @@
  * macros to fill in ATAPI CDB values
  */
-#define SET_CDB_16(_t, _v)  (_t)[0] = (u8) ((_v) >> 8);       \
+#define SET_CDB_16(_t, _v)  (_t)[0] = (u8) ((_v) >> 8); \
                             (_t)[1] = (u8)  (_v)
-#define SET_CDB_24(_t, _v)  (_t)[0] = (u8) ((_v) >> 16);      \
-                            (_t)[1] = (u8) ((_v) >> 8);       \
+#define SET_CDB_24(_t, _v)  (_t)[0] = (u8) ((_v) >> 16) \
+                            (_t)[1] = (u8) ((_v) >> 8); \
                             (_t)[2] = (u8)  (_v)
-#define SET_CDB_32(_t, _v)  (_t)[0] = (u8) ((_v) >> 24);      \
-                            (_t)[1] = (u8) ((_v) >> 16);      \
-                            (_t)[2] = (u8) ((_v) >> 8);       \
+#define SET_CDB_32(_t, _v)  (_t)[0] = (u8) ((_v) >> 24);\
+                            (_t)[1] = (u8) ((_v) >> 16);\
+                            (_t)[2] = (u8) ((_v) >> 8); \
                             (_t)[3] = (u8)  (_v)
 

trunk/src/os2ahci/libc.c ¶

@@ -58 +58 @@
                                                 ULONG parm2);
 static int              mdelay_cal_end         (void);
-static int              trace_enabled          (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -67 +66 @@
 static char  hex_digits[] = "0123456789abcdef";
 static ULONG mem_lock;
-static ULONG com_lock;
+ULONG com_lock;
 
 /* message table for DosHelp_Save_Message() which prints the first string */
@@ -283 +282 @@
 
    if (com_base == 0) {
-    /* write debug message to trace buffer, not COM port */
-    trace(debug, len, buf);
-    spin_unlock(com_lock);
-    return;
-  }
+     /* write debug message to trace buffer, not COM port */
+     trace_write(buf, len);
+     spin_unlock(com_lock);
+     return;
+   }
 
   /* write debug message to serial port */
@@ -367 +366 @@
  * Print hex buffer to COM port.
  */
-void phex(const void _far *p, int len, u16 trace_minor_code, const char *fmt, ...)
+void phex(const void _far *p, int len, const char *fmt, ...)
 {
   va_list va;
@@ -374 +373 @@
 
   if (!debug) {
-    return;
-  }
-
-  if (!com_base) {
-    /* dump to kernel trace buffer, not serial port;
-     * just dump the buffer, it is formatted by TRACEFMT 
-     *
-     * NOTE: writing the header to the trace buffer causes
-     *       the trace facility to hick up and swallow the
-     *       binary data that follows...
-     */
-    trace(trace_minor_code, len, buf);
     return;
   }
@@ -866 +853 @@
 }
 
-/******************************************************************************
- * is_trace_enabled - checks if kernel tracing is enabled
- */
-int is_trace_enabled(void)
-{
-  int ret = 1; /* if global info seg is not present/known, 
-                * we enable tracing for now */
-
-  /* check global info segment's trace enabled bitmap if our
-   * major trace code is enabled 
-   */
-  if (gis) {
-    u8 trace_bitmap = gis->amecRAS[AHCI_TRACE_MAJOR / 8];
-    if (trace_bitmap & (0x80 >> (AHCI_TRACE_MAJOR % 8))) { 
-      ret = 1;
-    } else {
-      ret = 0;
-    }
-  }
-
-  return ret;
-}
-
-/******************************************************************************
- * trace - write a buffer to the kernel trace buffer
- */
-void trace(u16 minor_code, u16 cb_buf, const char _far *buf)
-{
-  if (!is_trace_enabled()) {
-    return;
-  }
-
-  DevHelp_RAS(AHCI_TRACE_MAJOR, minor_code, cb_buf, (PBYTE) buf);
-}
-

trunk/src/os2ahci/os2ahci.c ¶

@@ -140 +140 @@
     break;
 
+  case CMDINPUT:
+    rc = char_dev_input((RP_RWV _far *) req);
+    break;
+    
   default:
     rc = STDON | STATUS_ERR_UNKCMD;
@@ -313 +317 @@
   }
 
+  /* initialize trace buffer if applicable */
+  if (TRACE_ACTIVE) {
+    /* debug is on, but COM port is off -> use our trace buffer */
+    trace_init();
+  }
+
   /* scan PCI bus for supported devices */
   scan_pci_bus();
@@ -383 +393 @@
 
     }
+  }
+  return(STDON | STATUS_ERR_UNKCMD);
+}
+
+/******************************************************************************
+ * Read from character device. If tracing is on (internal ring buffer trace),
+ * we return data from the trace buffer; if not, we might return a device
+ * dump similar to IBM1S506.ADD/DANIS506.ADD (TODO).
+ */
+USHORT char_dev_input(RP_RWV _far *rwrb)
+{
+  if (TRACE_ACTIVE) {
+    return(trace_char_dev(rwrb));
   }
   return(STDON | STATUS_ERR_UNKCMD);

trunk/src/os2ahci/os2ahci.h ¶

@@ -94 +94 @@
 #define dddprintf if (debug > 2) printf
 #define dddphex   if (debug > 2) phex
+
+/* TRACE macros (for our internal ring buffer trace) */
+#define TRACE_ACTIVE  (debug > 0 && com_base == 0)
 
 /* adapter number from AD_INFO pointer; mainly for dprintf() purposes */
@@ -251 +254 @@
 #define ANSI_RESET      "\x1b[0m"
 
-/******************************************************************************
- * trace constants
- */
-#define AHCI_TRACE_MAJOR 0x00faU
-#define TRACE_MINOR_ATA_IDENTIFY  0x0020
-#define TRACE_MINOR_EXEC_CDB      0x0021
-#define TRACE_MINOR_EXEC_ATA      0x0022
-#define TRACE_MINOR_ATA_CMD       0x0023
-#define TRACE_MINOR_ATAPI_CMD     0x0024
-#define TRACE_MINOR_SG_LIST       0x0025
-#define TRACE_MINOR_SENSE_BUF     0x0026
-#define TRACE_MINOR_OEMHLP_PARM   0x0027
-#define TRACE_MINOR_OEMHLP_DATA   0x0028
-#define TRACE_MINOR_CMD_HDR       0x0029
-
-
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -390 +377 @@
 extern USHORT  init_drv               (RPINITIN _far *req);
 extern USHORT  gen_ioctl              (RP_GENIOCTL _far *ioctl);
+extern USHORT  char_dev_input         (RP_RWV _far *rwrb);
 extern USHORT  exit_drv               (int func);
 extern void _cdecl _far _loadds add_entry    (IORBH _far *iorb);
@@ -463 +451 @@
 extern void _cdecl printf        (const char *fmt, ...);
 extern void        cprintf       (const char *fmt, ...);
-extern void        phex          (const void _far *p, int len,
-                                  u16 trace_minor_code, const char *fmt, ...);
+extern void        phex          (const void _far *p, int len, const char *fmt, ...);
 extern size_t      strlen        (const char _far *s);
 extern char _far  *strcpy        (char _far *dst, const char _far *src);
@@ -482 +469 @@
 extern int         disable       (void);
 extern void        enable        (void);
-extern void        trace         (u16 minor_code, u16 cb_buf, 
-                                  const char _far *buf);
+
+/* trace.c */
+extern void        trace_init    (void);
+extern void        trace_exit    (void);
+extern void        trace_write   (u8 _far *s, int len);
+extern u16         trace_read    (void _far *buf, u16 cb_buf);
+extern u16         trace_bytes_avail(void);
+extern u16         trace_char_dev(RP_RWV _far *rwrb);
 
 /* pci.c */
@@ -524 +517 @@
 extern PCI_ID        pci_ids[];     /* SATA adapter PCI IDs */
 extern ULONG         drv_lock;      /* driver-level spinlock */
+extern ULONG         com_lock;      /* debug log spinlock */
 extern IORB_QUEUE    driver_queue;  /* driver-level IORB queue */
 extern AD_INFO       ad_infos[];    /* adapter information list */

trunk/src/os2ahci/pci.c ¶

@@ -183 +183 @@
 
 static char s_generic[]       = "Generic";
-
-/******************************************************************************
- * other strings
- */
-static char s_already_claimed[] = "Warning: device already claimed by another driver.\n";
 
 
@@ -937 +932 @@
   }
 
-  dddphex(parm, sizeof(*parm), TRACE_MINOR_OEMHLP_PARM, "oemhlp_parm: ");
-  dddphex(data, sizeof(*data), TRACE_MINOR_OEMHLP_DATA, "oemhlp_data: ");
+  dddphex(parm, sizeof(*parm), "oemhlp_parm: ");
+  dddphex(data, sizeof(*data), "oemhlp_data: ");
 
   if (ioctl.rph.Status & STERR) {

trunk/src/os2ahci/version.h ¶

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

trunk/src/os2ahci/wmakefile ¶

@@ -3 +3 @@
 #
 # Copyright (c) 2010 Christian Mueller, Markus Thielen.
-# Parts copied from/inspired by the Linux AHCI driver; 
+# Parts copied from/inspired by the Linux AHCI driver;
 # those parts are (c) Linux AHCI/ATA maintainers
 #
@@ -19 +19 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+###############################################################################
+# Calling Syntax
+#
+# wmake -ms -f wmakefile
+#
+# NOTE: we use MS compatibility mode (-ms) so we can use a syntax similar
+#       to the well known nmake syntax.
+#
+
+#
+# THE WATCOM BUILD IS BROKEN!
+#
+# It might run through but produces a non-working driver
+#
+
+###############################################################################
+# wmake directives
+.HOLD # do not prompt for deletion of created files on error; leave them alone
+
 
 
@@ -38 +58 @@
                -I$(DDK)\base\ibmh \
                -I$(DDK)\base\src\dev\dasd\diskh \
-               -I$(WATCOM)\h
+               -I$(DDK)\base\src\dev\thinkpad\dockii\apmcalls \
+               -I$(CC16)\include
 
 AS_INCLUDE   = -I:$(DDK)\base\inc \
@@ -45 +66 @@
 LIB_DIRS     = $(DDK)\base\lib\ \
                $(DDK)\base\src\dev\dasd\devhlp\ \
-
+               $(DDK)\base\src\dev\thinkpad\dockii\apmcalls\ \
 
 ###############################################################################
 # Tool Chain
 #
-# This makefile uses the Watcom 16bit compiler. 
+# This makefile uses the Watcom 16bit compiler.
 # Linker and assembler are link.exe and alp.exe that ship with the OS/2 DDK
 #
@@ -62 +83 @@
 
 AFLAGS        = -Mb
-CFLAGS        = -d3 -hc -bt=os2 -ms -zu -5 -w2 -wcd=138 -zp1 -q -s -zgp -zfp -oi
+CFLAGS        = -d3 -hc -bt=os2 -ms -zu -5 -w3 -wcd=138 -wcd=300 -ecc -zp1 -q -s -zgp -zfp -oi
 CFLAGS_DEBUG  = -d3 -hc
-LFLAGS        = /noe /nod /packd /a:16 /batch /map /line 
+LFLAGS        = /noe /nod /packd /a:16 /batch /map /line
 
 ###############################################################################
@@ -71 +92 @@
 TARGET   = os2ahci.add
 
-LIBS     = addcalls doscalls rmcalls # dhcalls not needed, see local devhelp.h
+LIBS     = addcalls doscalls rmcalls apmcalls # dhcalls not needed, see local devhelp.h
 
 SRCS     = init.asm math.asm libc.c os2ahci.c pci.c ahci.c ata.c atapi.c \
-           ctxhook.c
+           ctxhook.c trace.c ioctl.c apm.c
 
 OBJS     = init.obj libc.obj os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj \
-           ctxhook.obj
+           ctxhook.obj trace.obj ioctl.obj apm.obj
 
 INCS     = os2ahci.h ahci.h version.h
@@ -85 +106 @@
 
 clean:
-        rm -f $(OBJS) $(TARGET)
+        rm -f $(OBJS) $(TARGET) *.lst *.cod
 
 ###############################################################################
 # Object/source dependencies
 
-init.obj:     init.asm   wmakefile
+init.obj:     init.asm   Makefile
 
-libc.obj:     libc.c     wmakefile $(INCS)
+libc.obj:     libc.c     Makefile $(INCS)
 
-os2ahci.obj:  os2ahci.c  wmakefile $(INCS) bldday.h
+os2ahci.obj:  os2ahci.c  Makefile $(INCS) bldday.h ioctl.h
 
-pci.obj:      pci.c      wmakefile $(INCS)
+pci.obj:      pci.c      Makefile $(INCS)
 
-ahci.obj:     ahci.c     wmakefile $(INCS) ata.h atapi.h
+ahci.obj:     ahci.c     Makefile $(INCS) ata.h atapi.h
 
-ata.obj:      ata.c      wmakefile $(INCS) ata.h
+ata.obj:      ata.c      Makefile $(INCS) ata.h
 
-atapi.obj:    atapi.c    wmakefile $(INCS) ata.h atapi.h
+atapi.obj:    atapi.c    Makefile $(INCS) ata.h atapi.h
 
-ctxhook.obj:  ctxhook.c  wmakefile $(INCS) ata.h atapi.h
+ctxhook.obj:  ctxhook.c  Makefile $(INCS) ata.h atapi.h
+
+apm.obj:      apm.c      Makefile $(INCS)
+
+ioctl.obj:    ioctl.c    Makefile $(INCS) atapi.h ioctl.h
+
+trace.obj:    trace.c    Makefile $(INCS)
+
+os2ahci.def:  version.h  os2ahci.def.template
 
 ###############################################################################
@@ -124 +153 @@
         wdis -l $*.obj
 
+os2ahci.def:
+        $(BLDLEVEL) os2ahci.def.template os2ahci.def version.h
+
 $(TARGET): $(OBJS) os2ahci.def wmakefile
-        $(BLDLEVEL) os2ahci.def version.h
         $(LD) $(LFLAGS) $(OBJS),$(TARGET),$*.map,$(LIB_DIRS) $(LIBS),$*.def
         mapsym os2ahci