Changes in / [f418e51:e682af1] in mainline

Location:

uspace

Files:

• app/init/init.c (modified) (1 diff)
• srv/bd/ata_bd/ata_bd.c (modified) (7 diffs)
• srv/bd/ata_bd/ata_bd.h (modified) (4 diffs)
• srv/bd/ata_bd/ata_hw.h (added)

uspace/app/init/init.c

@@ -61 +61 @@
 
 #define DATA_FS_TYPE      "fat"
-#define DATA_DEVICE       "bd/disk0"
+#define DATA_DEVICE       "bd/ata1disk0"
 #define DATA_MOUNT_POINT  "/data"
 

uspace/srv/bd/ata_bd/ata_bd.c

@@ -65 +65 @@
 #include <macros.h>
 
+#include "ata_hw.h"
 #include "ata_bd.h"
 
@@ -70 +71 @@
 #define NAMESPACE  "bd"
 
+/** Number of defined legacy controller base addresses. */
+#define LEGACY_CTLS 4
+
 /** Physical block size. Should be always 512. */
 static const size_t block_size = 512;
@@ -77 +81 @@
 
 /** I/O base address of the command registers. */
-static uintptr_t cmd_physical = 0x1f0;
+static uintptr_t cmd_physical;
 /** I/O base address of the control registers. */
-static uintptr_t ctl_physical = 0x170;
+static uintptr_t ctl_physical;
+
+/** I/O base addresses for legacy (ISA-compatible) controllers. */
+static ata_base_t legacy_base[LEGACY_CTLS] = {
+        { 0x1f0, 0x3f0 },
+        { 0x170, 0x370 },
+        { 0x1e8, 0x3e8 },
+        { 0x168, 0x368 }
+};
 
 static ata_cmd_t *cmd;
@@ -87 +99 @@
 static disk_t disk[MAX_DISKS];
 
+static void print_syntax(void);
 static int ata_bd_init(void);
 static void ata_bd_connection(ipc_callid_t iid, ipc_call_t *icall);
@@ -110 +123 @@
         int i, rc;
         int n_disks;
+        unsigned ctl_num;
+        char *eptr;
 
         printf(NAME ": ATA disk driver\n");
 
-        printf("I/O address %p/%p\n", (void *) ctl_physical,
-            (void *) cmd_physical);
+        if (argc > 1) {
+                ctl_num = strtoul(argv[1], &eptr, 0);
+                if (*eptr != '\0' || ctl_num == 0 || ctl_num > 4) {
+                        printf("Invalid argument.\n");
+                        print_syntax();
+                        return -1;
+                }
+        } else {
+                ctl_num = 1;
+        }
+
+        cmd_physical = legacy_base[ctl_num - 1].cmd;
+        ctl_physical = legacy_base[ctl_num - 1].ctl;
+
+        printf("I/O address %p/%p\n", (void *) cmd_physical,
+            (void *) ctl_physical);
 
         if (ata_bd_init() != EOK)
@@ -139 +168 @@
                         continue;
                 
-                snprintf(name, 16, "%s/disk%d", NAMESPACE, i);
+                snprintf(name, 16, "%s/ata%udisk%d", NAMESPACE, ctl_num, i);
                 rc = devmap_device_register(name, &disk[i].devmap_handle);
                 if (rc != EOK) {
@@ -160 +189 @@
         /* Not reached */
         return 0;
+}
+
+
+static void print_syntax(void)
+{
+        printf("Syntax: " NAME " <controller_number>\n");
+        printf("Controller number = 1..4\n");
 }
 

uspace/srv/bd/ata_bd/ata_bd.h

@@ -30 +30 @@
  * @{
  */
-/** @file
+/** @file ATA driver definitions.
  */
 
@@ -40 +40 @@
 #include <str.h>
 
-enum {
-        CTL_READ_START  = 0,
-        CTL_WRITE_START = 1,
-};
-
-enum {
-        STATUS_FAILURE = 0
-};
-
-enum {
-        MAX_DISKS       = 2
-};
-
-/** ATA Command Register Block. */
-typedef union {
-        /* Read/Write */
-        struct {
-                uint16_t data_port;
-                uint8_t sector_count;
-                uint8_t sector_number;
-                uint8_t cylinder_low;
-                uint8_t cylinder_high;
-                uint8_t drive_head;
-                uint8_t pad_rw0;                
-        };
-
-        /* Read Only */
-        struct {
-                uint8_t pad_ro0;
-                uint8_t error;
-                uint8_t pad_ro1[5];
-                uint8_t status;
-        };
-
-        /* Write Only */
-        struct {
-                uint8_t pad_wo0;
-                uint8_t features;
-                uint8_t pad_wo1[5];
-                uint8_t command;
-        };
-} ata_cmd_t;
-
-typedef union {
-        /* Read */
-        struct {
-                uint8_t pad0[6];
-                uint8_t alt_status;
-                uint8_t drive_address;
-        };
-
-        /* Write */
-        struct {
-                uint8_t pad1[6];
-                uint8_t device_control;
-                uint8_t pad2;
-        };
-} ata_ctl_t;
-
-enum devctl_bits {
-        DCR_SRST        = 0x04, /**< Software Reset */
-        DCR_nIEN        = 0x02  /**< Interrupt Enable (negated) */
-};
-
-enum status_bits {
-        SR_BSY          = 0x80, /**< Busy */
-        SR_DRDY         = 0x40, /**< Drive Ready */
-        SR_DWF          = 0x20, /**< Drive Write Fault */
-        SR_DSC          = 0x10, /**< Drive Seek Complete */
-        SR_DRQ          = 0x08, /**< Data Request */
-        SR_CORR         = 0x04, /**< Corrected Data */
-        SR_IDX          = 0x02, /**< Index */
-        SR_ERR          = 0x01  /**< Error */
-};
-
-enum drive_head_bits {
-        DHR_LBA         = 0x40, /**< Use LBA addressing mode */
-        DHR_DRV         = 0x10  /**< Select device 1 */
-};
-
-enum error_bits {
-        ER_BBK          = 0x80, /**< Bad Block Detected */
-        ER_UNC          = 0x40, /**< Uncorrectable Data Error */
-        ER_MC           = 0x20, /**< Media Changed */
-        ER_IDNF         = 0x10, /**< ID Not Found */
-        ER_MCR          = 0x08, /**< Media Change Request */
-        ER_ABRT         = 0x04, /**< Aborted Command */
-        ER_TK0NF        = 0x02, /**< Track 0 Not Found */
-        ER_AMNF         = 0x01  /**< Address Mark Not Found */
-};
-
-enum ata_command {
-        CMD_READ_SECTORS        = 0x20,
-        CMD_READ_SECTORS_EXT    = 0x24,
-        CMD_WRITE_SECTORS       = 0x30,
-        CMD_WRITE_SECTORS_EXT   = 0x34,
-        CMD_IDENTIFY_DRIVE      = 0xEC
-};
+/** Base addresses for ATA I/O blocks. */
+typedef struct {
+        uintptr_t cmd;  /**< Command block base address. */
+        uintptr_t ctl;  /**< Control block base address. */
+} ata_base_t;
 
 /** Timeout definitions. Unit is 10 ms. */
@@ -144 +51 @@
         TIMEOUT_BSY     =  100, /*  1 s */
         TIMEOUT_DRDY    = 1000  /* 10 s */
-};
-
-/** Data returned from @c identify command. */
-typedef struct {
-        uint16_t gen_conf;
-        uint16_t cylinders;
-        uint16_t _res2;
-        uint16_t heads;
-        uint16_t _vs4;
-        uint16_t _vs5;
-        uint16_t sectors;
-        uint16_t _vs7;
-        uint16_t _vs8;
-        uint16_t _vs9;
-
-        uint16_t serial_number[10];
-        uint16_t _vs20;
-        uint16_t _vs21;
-        uint16_t vs_bytes;
-        uint16_t firmware_rev[4];
-        uint16_t model_name[20];
-
-        uint16_t max_rw_multiple;
-        uint16_t _res48;
-        uint16_t caps;
-        uint16_t _res50;
-        uint16_t pio_timing;
-        uint16_t dma_timing;
-
-        uint16_t validity;
-        uint16_t cur_cyl;
-        uint16_t cur_heads;
-        uint16_t cur_sectors;
-        uint16_t cur_capacity0;
-        uint16_t cur_capacity1;
-        uint16_t mss;
-        uint16_t total_lba28_0;
-        uint16_t total_lba28_1;
-        uint16_t sw_dma;
-        uint16_t mw_dma;
-        uint16_t pio_modes;
-        uint16_t min_mw_dma_cycle;
-        uint16_t rec_mw_dma_cycle;
-        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 _vs128[1 + 159 - 128];
-        uint16_t _res160[1 + 255 - 160];
-} identify_data_t;
-
-enum ata_caps {
-        cap_iordy       = 0x0800,
-        cap_iordy_cbd   = 0x0400,
-        cap_lba         = 0x0200,
-        cap_dma         = 0x0100
-};
-
-/** Bits of @c identify_data_t.cmd_set1 */
-enum ata_cs1 {
-        cs1_addr48      = 0x0400        /**< 48-bit address feature set */
 };
 
@@ -269 +87 @@
 } block_coord_t;
 
+/** ATA device state structure. */
 typedef struct {
         bool present;