Changeset 55

Timestamp:

Dec 14, 2010, 12:03:32 PM (15 years ago)

Author:

markus

Message:

fixed readtest to run under OS/2 Ring3 above 2GB; commented out ADD read sector dump code

Location:

trunk/src

Files:

• lbatest/readtest.c (modified) (12 diffs)
• os2ahci/ahci.c (modified) (2 diffs)
• os2ahci/ata.c (modified) (3 diffs)
• os2ahci/os2ahci.def (modified) (1 diff)

trunk/src/lbatest/readtest.c

@@ -7 +7 @@
   matches its real LBA.
 
-  To run the test, attach a HD to an AHCI controller with os2ahci.add loaded
-  and run the test with the drive letter as a parameter.
+  To run the test, run lbatest under Linux, then attach the drive to an OS/2
+  system an create a single primary partition that stretches the entire drive.
+  Then run readtest.exe with the drive letter as a parameter.
+ 
 
   Author: Markus Thielen
@@ -47 +49 @@
 
 #define SECTOR_SIZE        512
-#define SECTORS_PER_WRITE  200
+#define SECTORS_PER_READ   200
 
 
@@ -62 +64 @@
 unsigned long lba_pos;
 unsigned long first_wrong_sector = 0xffffffff;
-char mode;
+
 
 /*--- start of code ---------------------------------------------------------*/
@@ -71 +73 @@
 int main(int argc, char **argv)
 {
-  char *drv;
   HFILE hf;
+  char drv[50];
 
   if (argc < 2) {
@@ -79 +81 @@
   }
 
-  drv = argv[1];
-  if (drv[1] != ':' && drv[2] != '\0') {
-    /* we want a drive letter, which is a letter and a colon */
+  if (isalpha(argv[1][0])) {
+    sprintf(drv, "\\\\.\\%c", toupper(argv[1][0]));
+  } else if (isdigit(argv[1][0])) {
+    sprintf(drv, "\\\\.\\Physical_Disk%c", argv[1][0]);
+  } else {
     usage();
     return -1;
@@ -99 +103 @@
   unsigned long action;
   unsigned long cb_read;
-  char buf[SECTOR_SIZE];
+  char *buf;
   int rc = 0;
+  unsigned long cb_take = SECTOR_SIZE * SECTORS_PER_READ;
   unsigned long err_cnt = 0;
   float gbf = 1024.0 * 1024.0 * 1024.0 / 512.0;
-  long long lba = 0;
+  LONGLONG cbfile = {0};
+  int s;
+  unsigned long sectors;
+  unsigned long val;
+
+  buf = calloc(SECTOR_SIZE, SECTORS_PER_READ);
 
   /* open drive */
-  ret = DosOpenL(drv, &hf_disk, &action, 0, 0, OPEN_ACTION_OPEN_IF_EXISTS,
-                OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR |
-                OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_NO_CACHE |
-                OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYREADWRITE |
-                OPEN_ACCESS_READONLY,
-                NULL);
+  ret = DosOpen(drv, &hf_disk, &action, 0, 0, 
+                OPEN_ACTION_OPEN_IF_EXISTS,
+/*                   OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR | */
+/*                   OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_NO_CACHE | */
+/*                   OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYREADWRITE | */
+                OPEN_SHARE_DENYNONE | OPEN_ACCESS_READONLY,
+                NULL);
   if (ret != NO_ERROR) {
     fprintf(stderr, "Failed to open disk %s for reading: %d\n", drv, ret);
@@ -118 +129 @@
 
   /* lock disk */
-  ret = DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_LOCKDRIVE, NULL, 0,
-                    &action, NULL, 0, &cb_read);
-  if (ret != NO_ERROR) {
-    fprintf(stderr, "Failed to lock drive, code %d\n", ret);
-    rc = -1;
-    goto cleanup;
-  }
+/*    ret = DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_LOCKDRIVE, NULL, 0, */
+/*                  &action, NULL, 0, &cb_read); */
+/*    if (ret != NO_ERROR) { */
+/*      fprintf(stderr, "Failed to lock drive, code %d\n", ret); */
+/*      rc = -1; */
+/*      goto cleanup; */
+/*    } */
 
   /* catch Ctrl+C */
@@ -131 +142 @@
   /* go... */
   memset(buf, 0x00, sizeof(buf));
-  for (lba = 64; ; lba++) {
-    ret = DosRead(hf_disk, buf, SECTOR_SIZE, &cb_read);
+  for (lba_pos = 0; ; lba_pos += SECTORS_PER_READ) {
+    ret = DosRead(hf_disk, buf, cb_take, &cb_read);
     if (ret != NO_ERROR) {
       fprintf(stderr, "\nFailed to read from disk %s, code %d\n", drv, ret);
@@ -139 +150 @@
     }
 
-    if (*((long long*) buf) != lba_pos) {
-      printf("\nWrong sector number: read %d from sector %d\n",
-              *((long long*) buf), lba_pos);
-      err_cnt++;
-      if (first_wrong_sector == 0xffffffff) {
-        first_wrong_sector = lba_pos;
+    if (cb_read == 0) {
+      goto cleanup;
+    }
+
+    sectors = cb_read / SECTOR_SIZE;
+
+    for (s = 0; s < sectors; s++) {
+
+      if (lba_pos + s < 64) {
+        continue;
       }
+
+      val = *((unsigned long*) (buf + s * SECTOR_SIZE));
+      if (val == 0xf6f6f6f6) {
+        /* appearantly, this is the funny first partition sector 
+         * created by LVM - skip it */
+        continue;
+      }
+
+      if (val != lba_pos + s) {
+        printf("\nWrong sector number: read 0x%08x from sector 0x%08x",
+               val, lba_pos + s);
+        err_cnt++;
+        if (first_wrong_sector == 0xffffffff) {
+          first_wrong_sector = lba_pos + s;
+        }
+      }
     }
 
     /* progress */
-    if (lba_pos % 100 == 0) {
-      printf("\r%dk sectors read (%0.02f GB)", lba_pos / 1000, 
-             (float) lba_pos / gbf);
-    }
+    printf("\r%dk sectors read (%0.02f GB)", lba_pos / 1000, 
+           (float) lba_pos / gbf);
   }
 
@@ -160 +189 @@
               NULL, 0, &cb_read);
   DosClose(hf_disk);
+  free(buf);
 
   /* print summary */
@@ -176 +206 @@
 {
   printf("LBA (read sector number) test for os2ahci.add\n"
+         "Call with a drive letter (for logical drive) or 1-based disk number (for\n"
+         "physical drive)\n\n"
          "Usage:\n\n"
-         "lbatest <drive letter>\n\n");
+         "lbatest <drive letter|drive number>\n\n");
 }
 
@@ -187 +219 @@
 {
 
-  if (sig_no == SIGINT && mode == 'R') {
+  if (sig_no == SIGINT) {
     /* read mode interrupted; show summary */
-    printf("\n\nLast block read:    %u\n", lba_pos);
+    printf("\n\nLast block read:    0x%08x\n", lba_pos);
     if (first_wrong_sector != 0xffffffff) {
-      printf("First wrong sector: %u\n", first_wrong_sector);
+      printf("First wrong sector: 0x%08x\n", first_wrong_sector);
     } else {
       printf("All sectors read ok\n");

trunk/src/os2ahci/ahci.c

@@ -32 +32 @@
                               ? atapi_##func : ata_##func
 
+
+/* #define LBATEST
+ * uncomment to perform sector mapping test of first drive */
+
 #define LBATEST_SECTORS_PER_READ     64
 #define LBATEST_SECTOR_SIZE         512
 
-#define LBATEST
 
 /* ------------------------ typedefs and structures ------------------------ */
@@ -1654 +1657 @@
   DevHelp_FreePhys(phys_addr);
 
+  LBA test compiled?
+
 }
 #endif

trunk/src/os2ahci/ata.c

@@ -618 +618 @@
 {
   IORB_EXECUTEIO _far *io = (IORB_EXECUTEIO _far *) iorb;
+/*    unsigned char _far *p; */
+/*    u16 mode_sw; */
 
   io->BlocksXferred += add_workspace(iorb)->blocks;
@@ -628 +630 @@
     /* requeue this IORB for next iteration */
     iorb_requeue(iorb);
-  }
+/*      printf("MT: IORB requeued\n"); */
+  }
+
+  /* MT: print hex dump of first sector read */
+/*    if (io->cSGList) { */
+/*      if (DevHelp_PhysToVirt(io->pSGList->ppXferBuf,  */
+/*                             (USHORT) io->pSGList->XferBufLen,  */
+/*                             (PVOID) &p, &mode_sw)) { */
+/*        printf("MT: failed to convert S/G pointer to virt address\n"); */
+/*      } else { */
+/*        phex(p, (int) io->pSGList->XferBufLen, "sector dump, RBA=0x%08lx\n", */
+/*             io->RBA); */
+/*      } */
+/*    } */
+  
 }
 
@@ -778 +794 @@
 
   rc = ata_cmd(ai, p, d, slot, 0,
-               AP_SGLIST,   apt->pSGList, apt->ppSGLIST,
+               AP_SGLIST,   apt->pSGList, apt->cSGList,
                AP_ATA_CMD,  apt->pControllerCmd,
                AP_WRITE,    !(apt->Flags & PT_DIRECTION_IN),

trunk/src/os2ahci/os2ahci.def

@@ -1 +1 @@
 library os2ahci
-Description '$@#thi.guten (www.thiguten.de):1.00.20101202#@OS/2 AHCI Adapter Device Driver'
+Description '$@#thi.guten (www.thiguten.de):1.00.20101214#@OS/2 AHCI Adapter Device Driver'
 protmode