Changeset 57

Timestamp:

Dec 14, 2010, 9:35:35 PM (15 years ago)

Author:

markus

Message:

fixed ata_cmd to FIS mapping (LBA-28); removed sector mapping test code

Location:

trunk/src/os2ahci

Files:

• ahci.c (modified) (4 diffs)
• ata.c (modified) (3 diffs)
• ata.h (modified) (1 diff)

trunk/src/os2ahci/ahci.c

@@ -33 +33 @@
 
 
-/* #define LBATEST
- * uncomment to perform sector mapping test of first drive */
-
-#define LBATEST_SECTORS_PER_READ     64
-#define LBATEST_SECTOR_SIZE         512
-
-
 /* ------------------------ typedefs and structures ------------------------ */
 
@@ -46 +39 @@
 static void ahci_setup_device     (AD_INFO *ai, int p, int d, u16 *id_buf);
 static void _cdecl _far timeout_callback (ULONG timer_handle, ULONG p1, ULONG p2);
-
-#ifdef LBATEST
-static void lba_test              (AD_INFO *ai, int p, int d, u16 *id_buf);
-#endif
 
 /* ------------------------ global/static variables ------------------------ */
@@ -1517 +1506 @@
   }
 
-#ifdef LBATEST
-  /* if LBATEST is defined, we perform a sector mapping test
-   * for the first HD attached to the first adapter.
-   * The purose of this test is to determine if the sector
-   * mapping is correct throughout the entire disk.
-   */
-  if (total_dev_cnt == 1) {
-    lba_test(ai, p, 0, id_buf);
-  }
-#endif
-
 
 }
@@ -1574 +1552 @@
 
 
-/*******************************************************************************
- * Perform LBA to CHS mapping test.
- * The purpose of this test is to find out if the driver's CHS to LBA mapping
- * is correct throughout the entire physical hard disk.
- *
- * To perform the test, attach the test HD to a Linux box and run lbatest
- * to write each sector's LBA to its first 4 bytes, then compile/install
- * the driver with LBATEST defined.
- */
-#ifdef LBATEST
-static void lba_test(AD_INFO *ai, int p, int d, u16 *id_buf)
-{
-  u32 total_sectors = 0;
-  u32 sector;
-  int i;
-  unsigned char _far *buf;
-  u32 err_cnt = 0;
-  int rc;
-  u16 cbt = LBATEST_SECTOR_SIZE * LBATEST_SECTORS_PER_READ;
-  u32 phys_addr;
-
-  /* determine number of sectors of this HD */
-  if (id_buf[ATA_ID_CFS_ENABLE_2] & 0x400) {
-    /* 48-bit LBA supported */
-    if (ATA_CAPACITY48_H(id_buf) != 0) {
-      /* more than 32 bits for number of sectors */
-      total_sectors = 0xffffffffUL;
-    } else {
-      total_sectors = ATA_CAPACITY48_L(id_buf);
-    }
-  } else {
-    /* 28-bit LBA */
-    total_sectors = ATA_CAPACITY(id_buf) & 0x0fffffffUL;
-  }
-
-  /* allocate buffer */
-  spin_lock(drv_lock);
-  if (DevHelp_AllocPhys(cbt, 1, &phys_addr)) {
-    printf("Failed to allocate %ld bytes phys memory for lbatest\n");
-    spin_unlock(drv_lock);
-    return;
-  }
-  if (DevHelp_PhysToVirt(phys_addr, (USHORT) cbt, (PVOID) &buf, &i)) {
-    printf("Failed to convert phys addr to virt\n");
-    DevHelp_FreePhys(phys_addr);
-    spin_unlock(drv_lock);
-    return;
-  }
-  spin_unlock(drv_lock);
-
-  /* go... */
-  memset(buf, 0x00, sizeof(buf));
-  for (sector = 0; sector < total_sectors; sector += LBATEST_SECTORS_PER_READ) {
-
-    /* write progress to serial terminal */
-    if (sector % 1000 == 0) {
-      printf("lbatest: read %ldk sectors\n", sector / 1000);
-    }
-
-    /* read appropriate number of sectors */
-    rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_READ_EXT,
-                              AP_SECTOR_48, sector, (u16) 0,
-                              AP_VADDR, (void _far *) buf, cbt,
-                              AP_COUNT, (u16) LBATEST_SECTORS_PER_READ,
-                              AP_DEVICE, 0x4000,
-                              AP_END);
-
-    /* verify lba numbers */
-    for (i = 0; i < LBATEST_SECTORS_PER_READ; i++) {
-      if (*((u32 _far*)(buf + i * LBATEST_SECTOR_SIZE)) != sector + i) {
-        printf("lbatest: read LBA 0x%08lx from sector 0x%08lx\n",
-               *((u32 _far*) buf), sector + i);
-        err_cnt++;
-      }
-               
-    }
-  }
-
-  printf("lbatest: passed with %ld errors\n", err_cnt);
-    
-cleanup_lbatest:
-  DevHelp_FreePhys(phys_addr);
-
-  LBA test compiled?
-
-}
-#endif

trunk/src/os2ahci/ata.c

@@ -118 +118 @@
       /* 28-bit sector address */
       ata_cmd.lba_l = va_arg(va, u32);
+      dprintf("LBA28: 0x%08lx\n", ata_cmd.lba_l);
       if (ata_cmd.lba_l & 0xf0000000UL) {
         dprintf("error: LBA-28 address %ld has more than 28 bits\n", ata_cmd.lba_l);
         return(-1);
       }
-      dprintf("LBA28: 0x%08lx\n", ata_cmd.lba_l);
+      /* add upper 4 bits to device field */
+      ata_cmd.device |= (ata_cmd.lba_l >> 24) & 0x0fU;
+      /* only lower 24 bits come into _debug lba_l */
+      ata_cmd.lba_l &= 0x00ffffffUL;
       break;
 
@@ -133 +137 @@
 
     case AP_DEVICE:
-      /* ATA device byte */
-      ata_cmd.device = va_arg(va, u16) >> 8;
+      /* ATA device byte; note that this byte contains the highest
+       * 4 bits of LBA-28 address; we have to leave them alone here. */
+      ata_cmd.device |= (va_arg(va, u16) & 0xf000U) >> 8;
       break;
 
@@ -313 +318 @@
   fis[12] = (u8) ata_cmd->count;
   fis[13] = (u8) (ata_cmd->count >> 8);
-
-  phex(fis, 14, "FIS:\n");
 }
 

trunk/src/os2ahci/ata.h

@@ -434 +434 @@
   u16  features;          /* feature bits */
   u16  count;             /* count register (e.g. number of sectors) */
-  u32  lba_l;             /* low 28 bits of LBA (32 bits for 48-bit devices) */
+  u32  lba_l;             /* low 24 bits of LBA-28 (32 bits for 48-bit devices) */
   u16  lba_h;             /* high 16 bits of LBA for 48-bit devices */
   u8   cmd;               /* ATA command field */
-  u8   device;            /* ATA device field */
+  u8   device;            /* ATA device field and upper 4 bits of LBA-28 */
 } ATA_CMD;