Changeset 832cbe7 in mainline for uspace/drv/block

Timestamp:

2025-02-05T12:30:20Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

accdf882

Parents:

0dab4850

git-author:

Jiri Svoboda <jiri@…> (2025-02-04 21:30:06)

git-committer:

Jiri Svoboda <jiri@…> (2025-02-05 12:30:20)

Message:

Add proper IDE PCI to ISA fallback mechanism.

To determine if legacy IDE I/O ports are free, isa-ide asks isa,
who asks pciintel. pciintel waits for bus enumeration to complete,
then waits for all functions except the one who is asking
(which is ISA bus) to stabilize. During attach pci-ide will claim
the legacy IDE ports. Thus, if at this point legacy IDE ports
are unclaimed, pciintel tells ISA they are free, which tells isa-ide,
which continues to attach. If they are not free, isa-ide will not
attach.

This works for all use cases, including system without PCI bus,
system with PCI bus, but no (or disabled) PCI IDE, system with PCI
IDE with unrecognized VID/PID (which we will handle in legacy ISA mode).

Location:

uspace/drv/block

Files:

• isa-ide/isa-ide_hw.h (added)
• isa-ide/main.c (modified) (6 diffs)
• pc-floppy/main.c (modified) (3 diffs)
• pci-ide/main.c (modified) (3 diffs)
• pci-ide/pci-ide.c (modified) (2 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;
         }

uspace/drv/block/pc-floppy/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -73 +73 @@
         async_sess_t *parent_sess;
         hw_res_list_parsed_t hw_res;
-        hw_res_flags_t flags;
         errno_t rc;
 
@@ -79 +78 @@
         if (parent_sess == NULL)
                 return ENOMEM;
-
-        rc = hw_res_get_flags(parent_sess, &flags);
-        if (rc != EOK)
-                return rc;
 
         hw_res_list_parsed_init(&hw_res);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -133 +133 @@
         pci_ide_ctrl_t *ctrl;
         pci_ide_hwres_t res;
+        async_sess_t *parent_sess;
         errno_t rc;
 
@@ -164 +165 @@
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed initializing ATA controller.");
+                rc = EIO;
+                goto error;
+        }
+
+        parent_sess = ddf_dev_parent_sess_get(dev);
+        if (parent_sess == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        /* Claim legacy I/O range to prevent ISA IDE from attaching there. */
+        rc = hw_res_claim_legacy_io(parent_sess, hwc_isa_ide);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Failed claiming legacy I/O range.");
                 rc = EIO;
                 goto error;

uspace/drv/block/pci-ide/pci-ide.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -189 +189 @@
 
         ddf_msg(LVL_DEBUG, "pci_ide_channel_init()");
+
+        memset(&params, 0, sizeof(params));
 
         chan->ctrl = ctrl;