Changes in uspace/drv/block/isa-ide/main.c [2a5d4649:443695e] in mainline

File:

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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 
 #include "isa-ide.h"
-#include "isa-ide_hw.h"
 #include "main.h"
 
@@ -49 +48 @@
 static errno_t isa_ide_dev_remove(ddf_dev_t *dev);
 static errno_t isa_ide_dev_gone(ddf_dev_t *dev);
-static errno_t isa_ide_dev_quiesce(ddf_dev_t *dev);
 static errno_t isa_ide_fun_online(ddf_fun_t *fun);
 static errno_t isa_ide_fun_offline(ddf_fun_t *fun);
@@ -56 +54 @@
 
 static driver_ops_t driver_ops = {
-        .dev_add = isa_ide_dev_add,
-        .dev_remove = isa_ide_dev_remove,
-        .dev_gone = isa_ide_dev_gone,
-        .dev_quiesce = isa_ide_dev_quiesce,
-        .fun_online = isa_ide_fun_online,
-        .fun_offline = isa_ide_fun_offline
+        .dev_add = &isa_ide_dev_add,
+        .dev_remove = &isa_ide_dev_remove,
+        .dev_gone = &isa_ide_dev_gone,
+        .fun_online = &isa_ide_fun_online,
+        .fun_offline = &isa_ide_fun_offline
 };
 
@@ -73 +70 @@
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        hw_res_claims_t claims;
+        hw_res_flags_t flags;
         errno_t rc;
 
@@ -80 +77 @@
                 return ENOMEM;
 
-        rc = hw_res_query_legacy_io(parent_sess, &claims);
-        if (rc != EOK) {
-                ddf_msg(LVL_NOTE, "Error getting HW resource flags.");
-                return rc;
+        rc = hw_res_get_flags(parent_sess, &flags);
+        if (rc != EOK)
+                return rc;
+
+        /*
+         * Prevent attaching to the legacy ISA IDE register block
+         * on a system with PCI not to conflict with PCI IDE.
+         *
+         * XXX This is a simplification. If we had a PCI-based system without
+         * PCI-IDE or with PCI-IDE disabled and would still like to use
+         * an ISA IDE controller, this would prevent us from doing so.
+         */
+        if (flags & hwf_isa_bridge) {
+                ddf_msg(LVL_NOTE, "Will not attach to PCI/ISA bridge.");
+                return EIO;
         }
 
         hw_res_list_parsed_init(&hw_res);
         rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
-        if (rc != EOK) {
-                ddf_msg(LVL_NOTE, "Error getting HW resource list.");
-                return rc;
-        }
+        if (rc != EOK)
+                return rc;
 
         if (hw_res.io_ranges.count != 4) {
@@ -142 +148 @@
         }
 
-        /*
-         * Only attach to legacy ISA IDE register block if it
-         * is not claimed by PCI IDE driver.
-         */
-        if (res->cmd1 == leg_ide_ata_cmd_p &&
-            res->cmd2 == leg_ide_ata_cmd_s &&
-            (claims & hwc_isa_ide) != 0) {
-                ddf_msg(LVL_NOTE, "Will not attach to ISA legacy ports "
-                    "since they are already handled by PCI.");
-                return EBUSY;
-        }
-
         return EOK;
 error:
@@ -169 +163 @@
         isa_ide_ctrl_t *ctrl;
         isa_ide_hwres_t res;
-        unsigned chans;
         errno_t rc;
 
         rc = isa_ide_get_res(dev, &res);
         if (rc != EOK) {
-                if (rc == EINVAL)
-                        ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
+                ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
                 return EINVAL;
         }
@@ -188 +180 @@
         ctrl->dev = dev;
 
-        chans = 0;
-
         rc = isa_ide_channel_init(ctrl, &ctrl->channel[0], 0, &res);
-        if (rc == EOK)
-                ++chans;
-        else if (rc != ENOENT)
+        if (rc == ENOENT)
                 goto error;
 
         rc = isa_ide_channel_init(ctrl, &ctrl->channel[1], 1, &res);
-        if (rc == EOK)
-                ++chans;
-        else if (rc != ENOENT)
-                goto error;
-
-        if (chans == 0) {
-                ddf_msg(LVL_ERROR, "No ISA IDE devices found.");
+        if (rc == ENOENT)
+                goto error;
+
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
                 rc = EIO;
                 goto error;
@@ -388 +374 @@
 }
 
-static errno_t isa_ide_dev_quiesce(ddf_dev_t *dev)
-{
-        isa_ide_ctrl_t *ctrl = (isa_ide_ctrl_t *)ddf_dev_data_get(dev);
-
-        ddf_msg(LVL_DEBUG, "isa_ide_dev_quiesce(%p)", dev);
-
-        isa_ide_channel_quiesce(&ctrl->channel[0]);
-        isa_ide_channel_quiesce(&ctrl->channel[1]);
-        return EOK;
-}
-
 static errno_t isa_ide_fun_online(ddf_fun_t *fun)
 {