Changeset d30e067 in mainline for uspace/drv/block/pci-ide/main.c

Timestamp:

2025-03-02T20:02:33Z (12 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

8cdf360

Parents:

7debda3 (diff), 4285f384 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 'upstream/master' into helenraid-para

File:

• uspace/drv/block/pci-ide/main.c (modified) (3 diffs)

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;