Changes in / [21d8020:22af3af] in mainline

Location:

uspace/srv/bd/ata_bd

Files:

• ata_bd.c (modified) (14 diffs)
• ata_bd.h (modified) (7 diffs)

uspace/srv/bd/ata_bd/ata_bd.c

@@ -35 +35 @@
  * @brief ATA disk driver
  *
- * This driver supports CHS, 28-bit and 48-bit LBA addressing. It only uses
- * PIO transfers. There is no support DMA, the PACKET feature set or any other
- * fancy features such as S.M.A.R.T, removable devices, etc.
- *
- * This driver is based on the ATA-1, ATA-2, ATA-3 and ATA/ATAPI-4 through 7
- * standards, as published by the ANSI, NCITS and INCITS standards bodies,
- * which are freely available. This driver contains no vendor-specific
- * code at this moment.
+ * This driver currently works only with CHS addressing and uses PIO.
+ * Currently based on the (now obsolete) ATA-1, ATA-2 standards.
  *
  * The driver services a single controller which can have up to two disks
@@ -95 +89 @@
 static int drive_identify(int drive_id, void *buf);
 static void disk_print_summary(disk_t *d);
-static int coord_calc(disk_t *d, uint64_t blk_idx, block_coord_t *bc);
-static void coord_sc_program(const block_coord_t *bc, uint16_t scnt);
 static int wait_status(unsigned set, unsigned n_reset, uint8_t *pstatus,
     unsigned timeout);
@@ -108 +100 @@
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address 0x%p/0x%p\n", ctl_physical, cmd_physical);
+        printf("I/O address 0x%x\n", cmd_physical);
 
         if (ata_bd_init() != EOK)
@@ -164 +156 @@
         printf("%s: ", d->model);
 
-        switch (d->amode) {
-        case am_chs:
+        if (d->amode == am_chs) {
                 printf("CHS %u cylinders, %u heads, %u sectors",
                     disk->geom.cylinders, disk->geom.heads, disk->geom.sectors);
-                break;
-        case am_lba28:
+        } else {
                 printf("LBA-28");
-                break;
-        case am_lba48:
-                printf("LBA-48");
-                break;
         }
 
@@ -302 +288 @@
         size_t pos, len;
         int rc;
-        unsigned i;
+        int i;
 
         rc = drive_identify(disk_id, &idata);
@@ -319 +305 @@
 
                 d->blocks = d->geom.cylinders * d->geom.heads * d->geom.sectors;
-        } else if ((idata.cmd_set1 & cs1_addr48) == 0) {
-                /* Device only supports LBA-28 addressing. */
+        } else {
+                /* Device supports LBA-28. */
                 d->amode = am_lba28;
 
@@ -328 +314 @@
 
                 d->blocks =
-                     (uint32_t) idata.total_lba28_0 | 
-                    ((uint32_t) idata.total_lba28_1 << 16);
-        } else {
-                /* Device supports LBA-48 addressing. */
-                d->amode = am_lba48;
-
-                d->geom.cylinders = 0;
-                d->geom.heads = 0;
-                d->geom.sectors = 0;
-
-                d->blocks =
-                     (uint64_t) idata.total_lba48_0 |
-                    ((uint64_t) idata.total_lba48_1 << 16) |
-                    ((uint64_t) idata.total_lba48_2 << 32) | 
-                    ((uint64_t) idata.total_lba48_3 << 48);
+                    (uint32_t) idata.total_lba_sec0 | 
+                    ((uint32_t) idata.total_lba_sec1 << 16);
         }
 
@@ -478 +451 @@
         uint16_t data;
         uint8_t status;
+        uint64_t c, h, s;
+        uint64_t idx;
         uint8_t drv_head;
         disk_t *d;
-        block_coord_t bc;
 
         d = &disk[disk_id];
-        bc.h = 0;       /* Silence warning. */
-
-        /* Compute block coordinates. */
-        if (coord_calc(d, blk_idx, &bc) != EOK)
+
+        /* Check device bounds. */
+        if (blk_idx >= d->blocks)
                 return EINVAL;
+
+        if (d->amode == am_chs) {
+                /* Compute CHS coordinates. */
+                c = blk_idx / (d->geom.heads * d->geom.sectors);
+                idx = blk_idx % (d->geom.heads * d->geom.sectors);
+
+                h = idx / d->geom.sectors;
+                s = 1 + (idx % d->geom.sectors);
+        } else {
+                /* Compute LBA-28 coordinates. */
+                s = blk_idx & 0xff;             /* bits 0-7 */
+                c = (blk_idx >> 8) & 0xffff;    /* bits 8-23 */
+                h = (blk_idx >> 24) & 0x0f;     /* bits 24-27 */
+        }
 
         /* New value for Drive/Head register */
@@ -493 +480 @@
             ((disk_id != 0) ? DHR_DRV : 0) |
             ((d->amode != am_chs) ? DHR_LBA : 0) |
-            (bc.h & 0x0f);
+            (h & 0x0f);
 
         fibril_mutex_lock(&d->lock);
@@ -511 +498 @@
         }
 
-        /* Program block coordinates into the device. */
-        coord_sc_program(&bc, 1);
-
-        pio_write_8(&cmd->command, d->amode == am_lba48 ?
-            CMD_READ_SECTORS_EXT : CMD_READ_SECTORS);
+        pio_write_8(&cmd->sector_count, 1);
+        pio_write_8(&cmd->sector_number, s);
+        pio_write_8(&cmd->cylinder_low, c & 0xff);
+        pio_write_8(&cmd->cylinder_high, c >> 16);
+
+        pio_write_8(&cmd->command, CMD_READ_SECTORS);
 
         if (wait_status(0, ~SR_BSY, &status, TIMEOUT_BSY) != EOK) {
@@ -552 +540 @@
         size_t i;
         uint8_t status;
+        uint64_t c, h, s;
+        uint64_t idx;
         uint8_t drv_head;
         disk_t *d;
-        block_coord_t bc;
 
         d = &disk[disk_id];
-        bc.h = 0;       /* Silence warning. */
-
-        /* Compute block coordinates. */
-        if (coord_calc(d, blk_idx, &bc) != EOK)
+
+        /* Check device bounds. */
+        if (blk_idx >= d->blocks)
                 return EINVAL;
+
+        if (d->amode == am_chs) {
+                /* Compute CHS coordinates. */
+                c = blk_idx / (d->geom.heads * d->geom.sectors);
+                idx = blk_idx % (d->geom.heads * d->geom.sectors);
+
+                h = idx / d->geom.sectors;
+                s = 1 + (idx % d->geom.sectors);
+        } else {
+                /* Compute LBA-28 coordinates. */
+                s = blk_idx & 0xff;             /* bits 0-7 */
+                c = (blk_idx >> 8) & 0xffff;    /* bits 8-23 */
+                h = (blk_idx >> 24) & 0x0f;     /* bits 24-27 */
+        }
 
         /* New value for Drive/Head register */
@@ -567 +569 @@
             ((disk_id != 0) ? DHR_DRV : 0) |
             ((d->amode != am_chs) ? DHR_LBA : 0) |
-            (bc.h & 0x0f);
+            (h & 0x0f);
 
         fibril_mutex_lock(&d->lock);
@@ -585 +587 @@
         }
 
-        /* Program block coordinates into the device. */
-        coord_sc_program(&bc, 1);
-
-        pio_write_8(&cmd->command, d->amode == am_lba48 ?
-            CMD_WRITE_SECTORS_EXT : CMD_WRITE_SECTORS);
+        pio_write_8(&cmd->sector_count, 1);
+        pio_write_8(&cmd->sector_number, s);
+        pio_write_8(&cmd->cylinder_low, c & 0xff);
+        pio_write_8(&cmd->cylinder_high, c >> 16);
+
+        pio_write_8(&cmd->command, CMD_WRITE_SECTORS);
 
         if (wait_status(0, ~SR_BSY, &status, TIMEOUT_BSY) != EOK) {
@@ -610 +613 @@
 
         return EOK;
-}
-
-/** Calculate block coordinates.
- *
- * Calculates block coordinates in the best coordinate system supported
- * by the device. These can be later programmed into the device using
- * @c coord_sc_program().
- *
- * @return EOK on success or EINVAL if block index is past end of device.
- */
-static int coord_calc(disk_t *d, uint64_t blk_idx, block_coord_t *bc)
-{
-        uint64_t c;
-        uint64_t idx;
-
-        /* Check device bounds. */
-        if (blk_idx >= d->blocks)
-                return EINVAL;
-
-        bc->amode = d->amode;
-
-        switch (d->amode) {
-        case am_chs:
-                /* Compute CHS coordinates. */
-                c = blk_idx / (d->geom.heads * d->geom.sectors);
-                idx = blk_idx % (d->geom.heads * d->geom.sectors);
-
-                bc->cyl_lo = c & 0xff;
-                bc->cyl_hi = (c >> 8) & 0xff;
-                bc->h      = (idx / d->geom.sectors) & 0x0f;
-                bc->sector = (1 + (idx % d->geom.sectors)) & 0xff;
-                break;
-
-        case am_lba28:
-                /* Compute LBA-28 coordinates. */
-                bc->c0 = blk_idx & 0xff;                /* bits 0-7 */
-                bc->c1 = (blk_idx >> 8) & 0xff;         /* bits 8-15 */
-                bc->c2 = (blk_idx >> 16) & 0xff;        /* bits 16-23 */
-                bc->h  = (blk_idx >> 24) & 0x0f;        /* bits 24-27 */
-                break;
-
-        case am_lba48:
-                /* Compute LBA-48 coordinates. */
-                bc->c0 = blk_idx & 0xff;                /* bits 0-7 */
-                bc->c1 = (blk_idx >> 8) & 0xff;         /* bits 8-15 */
-                bc->c2 = (blk_idx >> 16) & 0xff;        /* bits 16-23 */
-                bc->c3 = (blk_idx >> 24) & 0xff;        /* bits 24-31 */
-                bc->c4 = (blk_idx >> 32) & 0xff;        /* bits 32-39 */
-                bc->c5 = (blk_idx >> 40) & 0xff;        /* bits 40-47 */
-                bc->h  = 0;
-                break;
-        }
-
-        return EOK;
-}
-
-/** Program block coordinates and sector count into ATA registers.
- *
- * Note that bc->h must be programmed separately into the device/head register.
- */
-static void coord_sc_program(const block_coord_t *bc, uint16_t scnt)
-{
-        if (bc->amode == am_lba48) {
-                /* Write high-order bits. */
-                pio_write_8(&cmd->sector_count, scnt >> 8);
-                pio_write_8(&cmd->sector_number, bc->c3);
-                pio_write_8(&cmd->cylinder_low, bc->c4);
-                pio_write_8(&cmd->cylinder_high, bc->c5);
-        }
-
-        /* Write low-order bits. */
-        pio_write_8(&cmd->sector_count, scnt & 0x00ff);
-        pio_write_8(&cmd->sector_number, bc->c0);
-        pio_write_8(&cmd->cylinder_low, bc->c1);
-        pio_write_8(&cmd->cylinder_high, bc->c2);
 }
 

uspace/srv/bd/ata_bd/ata_bd.h

@@ -132 +132 @@
 
 enum ata_command {
+        CMD_IDENTIFY_DRIVE      = 0xEC,
         CMD_READ_SECTORS        = 0x20,
-        CMD_READ_SECTORS_EXT    = 0x24,
-        CMD_WRITE_SECTORS       = 0x30,
-        CMD_WRITE_SECTORS_EXT   = 0x34,
-        CMD_IDENTIFY_DRIVE      = 0xEC
+        CMD_WRITE_SECTORS       = 0x30
 };
 
@@ -158 +156 @@
         uint16_t _vs8;
         uint16_t _vs9;
-
         uint16_t serial_number[10];
         uint16_t _vs20;
@@ -165 +162 @@
         uint16_t firmware_rev[4];
         uint16_t model_name[20];
-
         uint16_t max_rw_multiple;
         uint16_t _res48;
@@ -172 +168 @@
         uint16_t pio_timing;
         uint16_t dma_timing;
-
         uint16_t validity;
         uint16_t cur_cyl;
@@ -180 +175 @@
         uint16_t cur_capacity1;
         uint16_t mss;
-        uint16_t total_lba28_0;
-        uint16_t total_lba28_1;
+        uint16_t total_lba_sec0;
+        uint16_t total_lba_sec1;
         uint16_t sw_dma;
         uint16_t mw_dma;
@@ -189 +184 @@
         uint16_t min_raw_pio_cycle;
         uint16_t min_iordy_pio_cycle;
-
         uint16_t _res69;
         uint16_t _res70;
-        uint16_t _res71;
-        uint16_t _res72;
-        uint16_t _res73;
-        uint16_t _res74;
-
-        uint16_t queue_depth;
-        uint16_t _res76[1 + 79 - 76];
-        uint16_t version_maj;
-        uint16_t version_min;
-        uint16_t cmd_set0;
-        uint16_t cmd_set1;
-        uint16_t csf_sup_ext;
-        uint16_t csf_enabled0;
-        uint16_t csf_enabled1;
-        uint16_t csf_default;
-        uint16_t udma;
-
-        uint16_t _res89[1 + 99 - 89];
-
-        /* Total number of blocks in LBA-48 addressing */
-        uint16_t total_lba48_0;
-        uint16_t total_lba48_1;
-        uint16_t total_lba48_2;
-        uint16_t total_lba48_3;
-
-        /* Note: more fields are defined in ATA/ATAPI-7 */
-        uint16_t _res104[1 + 127 - 104];
+        uint16_t _res71[1 + 127 - 71];
         uint16_t _vs128[1 + 159 - 128];
         uint16_t _res160[1 + 255 - 160];
@@ -230 +198 @@
 };
 
-/** Bits of @c identify_data_t.cmd_set1 */
-enum ata_cs1 {
-        cs1_addr48      = 0x0400        /**< 48-bit address feature set */
-};
-
 /** Block addressing mode. */
 enum addr_mode {
-        am_chs,         /**< CHS block addressing */
-        am_lba28,       /**< LBA-28 block addressing */
-        am_lba48        /**< LBA-48 block addressing */
-};
-
-/** Block coordinates */
-typedef struct {
-        /** Addressing mode used */
-        enum addr_mode amode;
-
-        union {
-                /** CHS coordinates */
-                struct {
-                        uint8_t sector;
-                        uint8_t cyl_lo;
-                        uint8_t cyl_hi;
-                };
-                /** LBA coordinates */
-                struct {
-                        uint8_t c0;
-                        uint8_t c1;
-                        uint8_t c2;
-                        uint8_t c3;
-                        uint8_t c4;
-                        uint8_t c5;
-                };
-        };
-
-        /** Lower 4 bits for device/head register */
-        uint8_t h;
-} block_coord_t;
+        am_chs,
+        am_lba28
+};
 
 typedef struct {