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

File:

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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 
 #include "isa-ide.h"
+#include "isa-ide_hw.h"
 #include "main.h"
 
@@ -70 +71 @@
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        hw_res_flags_t flags;
+        hw_res_claims_t claims;
         errno_t rc;
 
@@ -77 +78 @@
                 return ENOMEM;
 
-        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;
+        rc = hw_res_query_legacy_io(parent_sess, &claims);
+        if (rc != EOK) {
+                ddf_msg(LVL_NOTE, "Error getting HW resource flags.");
+                return rc;
         }
 
         hw_res_list_parsed_init(&hw_res);
         rc = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
-        if (rc != EOK)
-                return rc;
+        if (rc != EOK) {
+                ddf_msg(LVL_NOTE, "Error getting HW resource list.");
+                return rc;
+        }
 
         if (hw_res.io_ranges.count != 4) {
@@ -148 +140 @@
         }
 
+        /*
+         * 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:
@@ -167 +171 @@
         rc = isa_ide_get_res(dev, &res);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
+                if (rc == EINVAL)
+                        ddf_msg(LVL_ERROR, "Invalid HW resource configuration.");
                 return EINVAL;
         }