Changeset 3de67b4c in mainline

Timestamp:

2013-06-27T20:43:29Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4339f09

Parents:

9f391e9

Message:

ata_bd needs to use hw_res (PIO resource configration protcol).

Location:

uspace/drv

Files:

• block/ata_bd/ata_bd.c (modified) (2 diffs)
• block/ata_bd/ata_bd.h (modified) (1 diff)
• block/ata_bd/main.c (modified) (4 diffs)
• bus/isa/isa.dev (modified) (1 diff)

uspace/drv/block/ata_bd/ata_bd.c

@@ -81 +81 @@
  */
 static const size_t identify_data_size = 512;
-
-/** 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 int ata_bd_init_io(ata_ctrl_t *ctrl);
@@ -145 +137 @@
 
 /** Initialize ATA controller. */
-int ata_ctrl_init(ata_ctrl_t *ctrl)
+int ata_ctrl_init(ata_ctrl_t *ctrl, ata_base_t *res)
 {
         int i, rc;
         int n_disks;
-        unsigned ctl_num;
 
         ddf_msg(LVL_DEBUG, "ata_ctrl_init()");
 
-        ctl_num = 1;
-
         fibril_mutex_initialize(&ctrl->lock);
-        ctrl->cmd_physical = legacy_base[ctl_num - 1].cmd;
-        ctrl->ctl_physical = legacy_base[ctl_num - 1].ctl;
+        ctrl->cmd_physical = res->cmd;
+        ctrl->ctl_physical = res->ctl;
 
         ddf_msg(LVL_NOTE, "I/O address %p/%p", (void *) ctrl->cmd_physical,

uspace/drv/block/ata_bd/ata_bd.h

@@ -152 +152 @@
 } ata_fun_t;
 
-extern int ata_ctrl_init(ata_ctrl_t *);
+extern int ata_ctrl_init(ata_ctrl_t *, ata_base_t *);
 extern int ata_ctrl_remove(ata_ctrl_t *);
 extern int ata_ctrl_gone(ata_ctrl_t *);

uspace/drv/block/ata_bd/main.c

@@ -36 +36 @@
 #include <ddf/driver.h>
 #include <ddf/log.h>
+#include <device/hw_res_parsed.h>
 
 #include "ata_bd.h"
@@ -61 +62 @@
 };
 
+static int ata_get_res(ddf_dev_t *dev, ata_base_t *ata_res)
+{
+        async_sess_t *parent_sess;
+        hw_res_list_parsed_t hw_res;
+        int rc;
+
+        parent_sess = ddf_dev_parent_sess_create(dev,
+            EXCHANGE_SERIALIZE);
+        if (parent_sess == NULL)
+                return ENOMEM;
+
+        hw_res_list_parsed_init(&hw_res);
+        rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
+        if (rc != EOK)
+                return rc;
+
+        if (hw_res.io_ranges.count != 2) {
+                rc = EINVAL;
+                goto error;
+                return EINVAL;
+        }
+
+        ata_res->cmd = hw_res.io_ranges.ranges[0].address;
+        ata_res->ctl = hw_res.io_ranges.ranges[1].address;
+
+        if (hw_res.io_ranges.ranges[0].size < sizeof(ata_ctl_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (hw_res.io_ranges.ranges[1].size < sizeof(ata_cmd_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        return EOK;
+error:
+        hw_res_list_parsed_clean(&hw_res);
+        return rc;
+}
 
 /** Add new device
@@ -70 +111 @@
 {
         ata_ctrl_t *ctrl;
-        int rc;
+        ata_base_t res;
+        int rc;
+
+        rc = ata_get_res(dev, &res);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
+                return EINVAL;
+        }
 
         ctrl = ddf_dev_data_alloc(dev, sizeof(ata_ctrl_t));
@@ -81 +129 @@
         ctrl->dev = dev;
 
-        rc = ata_ctrl_init(ctrl);
+        rc = ata_ctrl_init(ctrl, &res);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");

uspace/drv/bus/isa/isa.dev

@@ -32 +32 @@
         io_range 70 2
 
-ata_bd:
+ata-c1:
         match 100 isa/ata_bd
+        io_range 0x1f0 8
+        io_range 0x3f0 8
+
+ata-c2:
+        match 100 isa/ata_bd
+        io_range 0x170 8
+        io_range 0x370 8
+
+ata-c3:
+        match 100 isa/ata_bd
+        io_range 0x1e8 8
+        io_range 0x3e8 8
+
+ata-c4:
+        match 100 isa/ata_bd
+        io_range 0x168 8
+        io_range 0x368 8