Changeset 646849b3 in mainline for uspace/drv/block/isa-ide/main.c

Timestamp:

2024-05-17T12:25:26Z (10 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

60744cb

Parents:

59c0f478

git-author:

Jiri Svoboda <jiri@…> (2024-05-16 19:25:07)

git-committer:

Jiri Svoboda <jiri@…> (2024-05-17 12:25:26)

Message:

Handle both IDE channels in the same driver instance

We need to work around libdrv not allowing us to distinguish
between two interrupts registered with the same device.

File:

• uspace/drv/block/isa-ide/main.c (modified) (12 diffs)

uspace/drv/block/isa-ide/main.c

@@ -81 +81 @@
                 return rc;
 
-        if (hw_res.io_ranges.count != 2) {
+        if (hw_res.io_ranges.count != 4) {
                 rc = EINVAL;
                 goto error;
@@ -88 +88 @@
         /* I/O ranges */
 
-        addr_range_t *cmd_rng = &hw_res.io_ranges.ranges[0];
-        addr_range_t *ctl_rng = &hw_res.io_ranges.ranges[1];
-        ata_res->cmd = RNGABS(*cmd_rng);
-        ata_res->ctl = RNGABS(*ctl_rng);
-
-        if (RNGSZ(*ctl_rng) < sizeof(ata_ctl_t)) {
-                rc = EINVAL;
-                goto error;
-        }
-
-        if (RNGSZ(*cmd_rng) < sizeof(ata_cmd_t)) {
+        addr_range_t *cmd1_rng = &hw_res.io_ranges.ranges[0];
+        addr_range_t *ctl1_rng = &hw_res.io_ranges.ranges[1];
+        addr_range_t *cmd2_rng = &hw_res.io_ranges.ranges[2];
+        addr_range_t *ctl2_rng = &hw_res.io_ranges.ranges[3];
+        ata_res->cmd1 = RNGABS(*cmd1_rng);
+        ata_res->ctl1 = RNGABS(*ctl1_rng);
+        ata_res->cmd2 = RNGABS(*cmd2_rng);
+        ata_res->ctl2 = RNGABS(*ctl2_rng);
+
+        if (RNGSZ(*ctl1_rng) < sizeof(ata_ctl_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (RNGSZ(*cmd1_rng) < sizeof(ata_cmd_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (RNGSZ(*ctl2_rng) < sizeof(ata_ctl_t)) {
+                rc = EINVAL;
+                goto error;
+        }
+
+        if (RNGSZ(*cmd2_rng) < sizeof(ata_cmd_t)) {
                 rc = EINVAL;
                 goto error;
@@ -105 +119 @@
         /* IRQ */
         if (hw_res.irqs.count > 0) {
-                ata_res->irq = hw_res.irqs.irqs[0];
+                ata_res->irq1 = hw_res.irqs.irqs[0];
         } else {
-                ata_res->irq = -1;
+                ata_res->irq1 = -1;
+        }
+
+        if (hw_res.irqs.count > 1) {
+                ata_res->irq2 = hw_res.irqs.irqs[1];
+        } else {
+                ata_res->irq2 = -1;
         }
 
@@ -142 +162 @@
         ctrl->dev = dev;
 
-        rc = isa_ide_ctrl_init(ctrl, &res);
+        rc = isa_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
+        if (rc == ENOENT)
+                goto error;
+
+        rc = isa_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
         if (rc == ENOENT)
                 goto error;
@@ -157 +181 @@
 }
 
-static char *isa_ide_fun_name(unsigned idx)
+static char *isa_ide_fun_name(isa_ide_channel_t *chan, unsigned idx)
 {
         char *fun_name;
 
-        if (asprintf(&fun_name, "d%u", idx) < 0)
+        if (asprintf(&fun_name, "c%ud%u", chan->chan_id, idx) < 0)
                 return NULL;
 
@@ -167 +191 @@
 }
 
-errno_t isa_ide_fun_create(isa_ide_ctrl_t *ctrl, unsigned idx, void *charg)
+errno_t isa_ide_fun_create(isa_ide_channel_t *chan, unsigned idx, void *charg)
 {
         errno_t rc;
@@ -175 +199 @@
         bool bound = false;
 
-        fun_name = isa_ide_fun_name(idx);
+        fun_name = isa_ide_fun_name(chan, idx);
         if (fun_name == NULL) {
                 ddf_msg(LVL_ERROR, "Out of memory.");
@@ -182 +206 @@
         }
 
-        fun = ddf_fun_create(ctrl->dev, fun_exposed, fun_name);
+        fun = ddf_fun_create(chan->ctrl->dev, fun_exposed, fun_name);
         if (fun == NULL) {
                 ddf_msg(LVL_ERROR, "Failed creating DDF function.");
@@ -232 +256 @@
 }
 
-errno_t isa_ide_fun_remove(isa_ide_ctrl_t *ctrl, unsigned idx)
+errno_t isa_ide_fun_remove(isa_ide_channel_t *chan, unsigned idx)
 {
         errno_t rc;
         char *fun_name;
-        isa_ide_fun_t *ifun = ctrl->fun[idx];
-
-        fun_name = isa_ide_fun_name(idx);
+        isa_ide_fun_t *ifun = chan->fun[idx];
+
+        fun_name = isa_ide_fun_name(chan, idx);
         if (fun_name == NULL) {
                 ddf_msg(LVL_ERROR, "Out of memory.");
@@ -267 +291 @@
 }
 
-errno_t isa_ide_fun_unbind(isa_ide_ctrl_t *ctrl, unsigned idx)
+errno_t isa_ide_fun_unbind(isa_ide_channel_t *chan, unsigned idx)
 {
         errno_t rc;
         char *fun_name;
-        isa_ide_fun_t *ifun = ctrl->fun[idx];
-
-        fun_name = isa_ide_fun_name(idx);
+        isa_ide_fun_t *ifun = chan->fun[idx];
+
+        fun_name = isa_ide_fun_name(chan, idx);
         if (fun_name == NULL) {
                 ddf_msg(LVL_ERROR, "Out of memory.");
@@ -299 +323 @@
 {
         isa_ide_ctrl_t *ctrl = (isa_ide_ctrl_t *)ddf_dev_data_get(dev);
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "isa_ide_dev_remove(%p)", dev);
 
-        return isa_ide_ctrl_remove(ctrl);
+        rc = isa_ide_channel_fini(&ctrl->channel[0]);
+        if (rc != EOK)
+                return rc;
+
+        rc = isa_ide_channel_fini(&ctrl->channel[1]);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
 }
 
@@ -308 +341 @@
 {
         isa_ide_ctrl_t *ctrl = (isa_ide_ctrl_t *)ddf_dev_data_get(dev);
+        errno_t rc;
 
         ddf_msg(LVL_DEBUG, "isa_ide_dev_gone(%p)", dev);
 
-        return isa_ide_ctrl_gone(ctrl);
+        rc = isa_ide_channel_fini(&ctrl->channel[0]);
+        if (rc != EOK)
+                return rc;
+
+        rc = isa_ide_channel_fini(&ctrl->channel[1]);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
 }