Changeset 156

Timestamp:

May 6, 2013, 7:57:39 PM (12 years ago)

Author:

David Azarewicz

Message:

debugging updates

Location:

trunk

Files:

• src/os2ahci/Makefile (modified) (1 diff)
• src/os2ahci/README (modified) (6 diffs)
• src/os2ahci/ahci.c (modified) (1 diff)
• src/os2ahci/ata.c (modified) (3 diffs)
• src/os2ahci/libc.c (modified) (4 diffs)
• src/os2ahci/os2ahci.c (modified) (7 diffs)
• src/os2ahci/os2ahci.h (modified) (2 diffs)
• src/os2ahci/trace.c (modified) (1 diff)
• tools/update.cmd (added)

trunk/src/os2ahci/Makefile

@@ -32 +32 @@
 BLD_MINOR=27 # must be 2 digits
 BLD_REV=0 # not used at this time
+FIXPACK=Test Build
 
 !ifndef %WATCOM # if not defined in the environment

trunk/src/os2ahci/README

@@ -93 +93 @@
 ============
 
-- Copy the driver file, OS2AHCI.ADD, to C:\OS2\BOOT
+- Run the included update.cmd,
+  or copy the driver file, OS2AHCI.ADD, to \OS2\BOOT on your boot disk.
 
 - Add the following line to CONFIG.SYS:
@@ -106 +107 @@
 Option                 Description
 ------------------------------------------------------------------------------
-/c:<addr>              Set debug COM port base address in hex (default = 0);
-                       if used, this option should come before any /d options.
-                       If <addr> is set to 0, the COM port is turned off and
-                       all output is directed to an internal trace ring buffer
-                       that can be dumped on an OS/2 command prompt with the
-                       command "type os2ahci$"; see the OS2AHCI project page
-                       at http://svn.ecomstation.nl/ahci/wiki/AhciTrace
-                       for more info. COM0=3f8, COM1=2f8
-/d                     Debug output on COM port/trace buffer; multiple "/d"
-                       options will increase verbosity:
+/b:<baud>              Initialize the COM port to the specified baud rate. Allowable
+                       baud values are: 300, 600, 1200, 2400, 4800, 9600, 19200,
+                       38400, 57600, and 115200. /b has no effect if /c is not also
+                       specified. If /b is not specified, the COM port is not
+                       initialized. For example, if you are using the kernel debugger,
+                       the kernel debugger initializes the COM port so you should not
+                       use this switch.
+
+/c:<n>                 Set debug COM port base address. Values for n can be:
+                         1 = COM1
+                         2 = COM2
+                         a hex value (COM port base address) COM1=3f8, COM2=2f8
+                       The default is 0. If set to 0 then no output goes to the COM port.
+
+/d[:n]                 Debug output to COM port/trace buffer. Values for n can be:
                          1 = requests
                          2 = detailed
                          3 = verbose, including MMIO operations
-/v                     display adapter info during boot
+                       If :n is not specified the debug level is incremented for
+                       each /d specified.
+
+/w                     Allows the trace buffer to wrap when full.
+
+/v[:n]                 Display informational messages during boot. Values for n can be:
+                         1 = Display sign on banner
+                         2 = Display adapter information
+                       If :n is not specified the verbosity level is incremented for
+                       each /v specified.
+
 /g:<vendor>:<device>   Add generic PCI ID to list of supported AHCI adapters
                        (e.g. /g:8086:2829)
+
 /t                     Perform thorough PCI ID scan; default = on, can be
                        turned off with /!t to perform only a PCI class scan
+
 /f                     Force the use of the HW write cache when using NCQ
                        commands; see "Native Command Queuing" below for
                        further explanation (default = off)
+
 /r                     Reset ports during initialization (default = on)
                        Can be turned off with /!r, however, when the
@@ -132 +151 @@
                        initialized by the BIOS in SATA mode, ports will
                        always be reset even when /!r was specified
-/a                     Set adapter for adapter-specific options
+
+/a:n                   Set adapter to n for adapter-specific options
                        (default = -1, all adapters)
-/p                     Set port for port-specific options
+
+/p:n                   Set port to n for port-specific options
                        (default = -1, all ports)
 
@@ -149 +170 @@
 /s                     Enable SCSI emulation for ATAPI units (default = off)
                        SCSI emulation is required for tools like cdrecord.
+
 /n                     Enable NCQ (Native Command Queuing) for hard disks
                        (default = off)
+
 /ls                    Set link speed (default = 0):
                          0 = maximum,
@@ -156 +179 @@
                          2 = limit to generation 2
                          3 = limit to generation 3
+
 /lp                    Set link power management (default = 0):
                          0 = full power management,
                          1 = transitions to "partial slumber state" disabled,
                          2 = transitions to "slumber state" disabled,
-                         3 = transitions to both partial and slumber states
-                             disabled
+                         3 = transitions to both partial and slumber states disabled
+
 /4                     Force track size to be 56 sectors regardless of the
                        reported disk geometry to optimize partition boundaries
@@ -371 +395 @@
    DSKSP_GEN_GET_COUNTERS IOCTL request.
 
+
+Change Log
+==========
+
+v.1.27 23-Apr-2013 - David Azarewicz
+  Added LVM aware disk geometry reporting.
+  Begin to add disk information report - not finished yet.
+  Removed undocumented /q switch and made the driver quiet by default.
+  Debug output improvements.
+  Added /b switch for setting debug baud rate.
+
+v.1.26 26-Mar-2013 - David Azarewicz
+  Fix spin-up / power-up issue on some hardware
+  Reorganized and improved debug output.
+
+v.1.26 21-Feb-2013 - rousseau
+  Virtual box fix
+  Some SMP fixes
+  Changed default for port reset to always
+
+v.1.25 02-Oct-2012 - markus.thi
+  Added support for trap dumps
+
+v.1.24 21-May-2012 - markus.thi
+  Fixed JFS long format hang (ticket 16)
+
+V.1.23 16-May-2012 - markus.thi
+  added IDC entry point to allow switching back to BIOS mode
+
+v.1.22 17-Oct-2011 - markus.thi
+  Added "IBMS506" header to accomodate broken SMART tools.

trunk/src/os2ahci/ahci.c

@@ -957 +957 @@
   writel(port_mmio + PORT_CMD, tmp);
 
-  /* wait for completion, spec says 500ms, give it 1000 */
+  /* wait for completion, spec says 500ms, give it 1000ms */
   while (timeout > 0 && (readl(port_mmio + PORT_CMD) & PORT_CMD_FIS_ON)) {
     mdelay(10);

trunk/src/os2ahci/ata.c

@@ -441 +441 @@
 }
 
-/******************************************************************************
- * Try to read LVM information from the disk. If found, use the LVM geometry.
- * This function will only work at init time. A better strategy would be to
- * calculate the geometry during ahci_scan_ports and save it away and then just
- * return the saved values when ata_get_geometry() is called.
- */
-int is_lvm_geometry(IORBH _far *iorb)
+int check_lvm(IORBH _far *iorb, ULONG sector)
 {
   ADD_WORKSPACE _far *aws = add_workspace(iorb);
@@ -454 +448 @@
   PDLA_Table_Sector pDLA;
   int p = iorb_unit_port(iorb);
+  int rc;
+
+  rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_READ,
+         AP_SECTOR_28, (u32) sector-1,
+         AP_COUNT, (u16) 1,
+         AP_VADDR, (void _far *) aws->buf, 512,
+         AP_DEVICE, 0x40,
+         AP_END);
+  if (rc) return 0;
+
+  pDLA = (PDLA_Table_Sector)aws->buf;
+  ddphex(pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
+
+  if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2)) {
+    ddprintf("is_lvm_geometry found at sector %d\n", sector);
+    geometry->TotalCylinders = pDLA->Cylinders;
+    geometry->NumHeads = pDLA->Heads_Per_Cylinder;
+    geometry->SectorsPerTrack = pDLA->Sectors_Per_Track;
+    return 1;
+  }
+
+  return 0;
+}
+
+/******************************************************************************
+ * Try to read LVM information from the disk. If found, use the LVM geometry.
+ * This function will only work at init time. A better strategy would be to
+ * calculate the geometry during ahci_scan_ports and save it away and then just
+ * return the saved values when ata_get_geometry() is called.
+ */
+int is_lvm_geometry(IORBH _far *iorb)
+{
+  GEOMETRY _far *geometry = ((IORB_GEOMETRY _far *) iorb)->pGeometry;
+  AD_INFO *ai = ad_infos + iorb_unit_adapter(iorb);
+  int p = iorb_unit_port(iorb);
   int d = iorb_unit_device(iorb);
-  int rc;
   ULONG sector;
 
@@ -463 +491 @@
     ddprintf("is_lvm_geometry (%d.%d.%d)\n", ad_no(ai), p, d);
 
+    /* First check the sector reported by the hardware */
+    if (check_lvm(iorb, geometry->SectorsPerTrack)) return 1;
+
     for (sector = 255; sector >= 63; sector >>= 1) {
-      rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_READ,
-             AP_SECTOR_28, (u32) sector-1,
-             AP_COUNT, (u16) 1,
-             AP_VADDR, (void _far *) aws->buf, 512,
-             AP_DEVICE, 0x40,
-             AP_END);
-      if (rc) continue;
-
-      pDLA = (PDLA_Table_Sector)aws->buf;
-      ddphex(pDLA, sizeof(DLA_Table_Sector), "DLA sector %d:\n", sector-1);
-
-      if ((pDLA->DLA_Signature1 == DLA_TABLE_SIGNATURE1) && (pDLA->DLA_Signature2 == DLA_TABLE_SIGNATURE2)) {
-        ddprintf("is_lvm_geometry found at sector %d\n", sector);
-        geometry->TotalCylinders = pDLA->Cylinders;
-        geometry->NumHeads = pDLA->Heads_Per_Cylinder;
-        geometry->SectorsPerTrack = pDLA->Sectors_Per_Track;
-        return 1;
-      }
+      if (sector == geometry->SectorsPerTrack) continue;
+      if (check_lvm(iorb, sector)) return 1;
     }
   }

trunk/src/os2ahci/libc.c

@@ -75 +75 @@
 };
 
-/* COM port initialization sequence */
 static struct {
-  int reg;
-  u8  data;
-} com_init_sequence[] = {
-  3, 0x80,   /* overlay divisor latch register at 0x3f8 and 0x3f9 */
-  0, 0x01,   /* set low byte of divisor to 1 (115200 baud) */
-  1, 0x00,   /* set high byte of divisor to 0 */
-  3, 0x03,   /* reset divisor latch register overlay and set 8,n,1 */
-  1, 0x00,   /* disable interrupts */
-  4, 0x0f,   /* modem control register */
-  -1, 0x00
+  long Baud;
+  u16 Data;
+} BaudCodes[] = {
+  115200, 0x0001,
+  57600, 0x0002,
+  38400, 0x0003,
+  19200, 0x0006,
+  9600, 0x000C,
+  4800, 24,
+  2400, 48,
+  1200, 96,
+  600, 192,
+  300, 384,
+  0, 0 /* end of list */
 };
 
@@ -132 +135 @@
  *       to be fixed eventually...
  */
-void init_com(void)
+void init_com(long BaudRate)
 {
   int i;
-
-  if (com_base == 0) {
-    /* no com port in use */
-    return;
-  }
+  u16 RegData;
+
+  if (com_base == 0) return; /* no com port in use */
+
+  /* Find the baud code for the given baud rate */
+  for (i = 0; BaudCodes[i].Baud; i++) if (BaudCodes[i].Baud == BaudRate) break;
+  if (BaudCodes[i].Baud == 0) i = 0; /* default to 115200 */
+  RegData = BaudCodes[i].Data;
 
   spin_lock(com_lock);
 
-  for (i = 0; com_init_sequence[i].reg != -1; i++) {
-    u16 port = com_base + com_init_sequence[i].reg;
-    u8  data = com_init_sequence[i].data;
-    _asm {
-      mov  dx, port;
-      mov  al, data;
-      out  dx, al;
-    }
+  __asm {
+    mov     bx,RegData
+    mov     dx,com_base     ; Base address
+    cli
+    add     dx,3            ; Line Control (+3)
+    mov     al,10000000b    ; Set baud flag
+    out     dx,al           ; for speed setting
+
+    ; Set Baud
+    dec     dx              ; High divisor address
+    dec     dx              ; (+1)
+    mov     al,bh           ; High divisor value
+    out     dx,al           ; set it
+    dec     dx              ; Low divisor address (+0)
+    mov     al,bl           ; Low divisor value
+    out     dx,al           ; set baud rate
+
+    ; Set frame
+    mov      al,00000011b   ; Set 8 bit, none, none
+    add      dx,3           ; Line Control (+3)
+    out      dx,al
+
+    inc      dx
+    mov      al,3
+    out      dx,al          ; DTR & RTS to High
+    sti
   }
 
@@ -753 +777 @@
   ULONG start;
   ULONG end;
+  ULONG event_id;
 
   if (gis == NULL) {
@@ -762 +787 @@
   start = gis->msecs;
   end = start + millies;
+  event_id = (ULONG)&msleep;
 
   if (end < start) {
     /* wrap-around; wait until 'msecs' has wrapped, too */
     while (gis->msecs >= start) {
-      DevHelp_Yield();
+      DevHelp_ProcBlock(event_id, 1, WAIT_IS_INTERRUPTABLE);
     }
   }
 
   while (gis->msecs <= end) {
-    DevHelp_Yield();
+    DevHelp_ProcBlock(event_id, 1, WAIT_IS_INTERRUPTABLE);
   }
 }

trunk/src/os2ahci/os2ahci.c

@@ -45 +45 @@
   }
 
+#define drv_parm_int_optional(s, value, type, radix) \
+  { \
+    char _far *_ep; \
+    if ((s)[1] == ':') { \
+      value = (type) strtol((s) + 2, (const char _far* _far*) &_ep, radix); \
+      s = _ep; \
+    } else { \
+      value++; \
+    } \
+  }
+
 /* set two-dimensional array of port options */
 #define set_port_option(opt, val)                         \
@@ -88 +99 @@
 int             init_reset = 1;    /* if != 0, reset ports during init */
 int             force_write_cache; /* if != 0, force write cache */
-int             verbosity = 1;     /* == 1 -> show sign on banner
-                                    *  > 1 -> show adapter info during boot */
+int             verbosity = 0;     /* default is quiet. 1=show sign on banner, >1=show adapter info during boot */
 int             use_lvm_info = 1;
+int             wrap_trace_buffer = 0;
+long            com_baud = 0;
 
 PFN             Device_Help = 0;   /* pointer to device helper entry point */
@@ -243 +255 @@
         goto init_fail;
 
+      case 'b':
+        drv_parm_int(s, com_baud, u32, 10);
+        break;
+
       case 'c':
         /* set COM port base address for debug messages */
@@ -252 +268 @@
       case 'd':
         /* increase debug level */
-        debug++;
+        drv_parm_int_optional(s, debug, int, 10);
         break;
 
@@ -347 +363 @@
 
       case 'z':
+        /* Specify to not use the LVM information. There is no reason why anyone would
+         * want to do this, but previous versions of this driver did not have LVM capability,
+         * so this switch is here temporarily just in case.
+         */
         use_lvm_info = !invert_option;
         break;
@@ -352 +372 @@
       case 'v':
         /* be verbose during boot */
-        verbosity++;
+        drv_parm_int_optional(s, verbosity, int, 10);
+        break;
+
+      case 'w':
+        /* Specify to allow the trace buffer to wrap when full. */
+        wrap_trace_buffer = !invert_option;
         break;
 
       case 'q':
-        /* be quiet */
-        verbosity = -1000;
+        /* Temporarily output a non-fatal message to get anyone using this
+         * undocumented switch to stop using it. This will be removed soon
+         * and the error will become fatal.
+         */
+        cprintf("%s: unknown option: /%c\n", drv_name, *s);
         break;
 
@@ -370 +398 @@
   ciprintf(init_msg, drv_name, VERSION / 100, VERSION % 100);
 
-//#ifdef ECS_BUILD
-//  ciprintf("This driver is licensed for use only in conjunction with eComStation.\n");
-//#else
-//  ciprintf("This is the Open Watcom build.\n");
-//#endif
-
-  if (debug) {
-    /* initialize com port for debug output */
-    //DAZ init_com();
-  }
+  if (com_baud) init_com(com_baud); /* initialize com port for debug output */
 
   /* initialize trace buffer if applicable */

trunk/src/os2ahci/os2ahci.h

@@ -500 +500 @@
 /* libc.c */
 extern void        init_libc     (void);
-extern void        init_com      (void);
+extern void        init_com      (long BaudRate);
 extern int         vsprintf      (char _far *buf, const char *fmt, va_list va);
 extern int         sprintf       (char _far *buf, const char *fmt, ...);
@@ -574 +574 @@
 extern int           verbosity;     /* if != 0, show some info during boot */
 extern int           use_lvm_info;
+extern int           wrap_trace_buffer;
 
 extern HDRIVER       rm_drvh;       /* resource manager driver handle */

trunk/src/os2ahci/trace.c

@@ -136 +136 @@
 
   while (len) {
-    /* The following line causes filling the trace buffer to stop when full.
-     * Comment the following line to keep filling and see the last buffer of data.
-     * Uncomment the following line to stop filling / see the first buffer of data.
-     */
-    if ( ((ahci_trace_buf.writep+1) & ahci_trace_buf.mask) == ahci_trace_buf.readp ) break; /* buffer is full */
+    if ( !wrap_trace_buffer && (((ahci_trace_buf.writep+1) & ahci_trace_buf.mask) == ahci_trace_buf.readp) ) break; /* buffer is full */
 
     ahci_trace_buf.tbuf[ahci_trace_buf.writep] = *s++;