Changeset 07039850 in mainline for uspace/drv/block/isa-ide

Timestamp:

2025-03-05T21:41:03Z (12 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

1c7b0db7

Parents:

a64970e1

Message:

Implement quiesce in ISA and PCI IDE and in PC Floppy.

Location:

uspace/drv/block/isa-ide

Files:

• isa-ide.c (modified) (5 diffs)
• isa-ide.h (modified) (2 diffs)
• main.c (modified) (3 diffs)

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

@@ -101 +101 @@
         ata_params_t params;
 
-        ddf_msg(LVL_DEBUG, "isa_ide_ctrl_init()");
+        ddf_msg(LVL_DEBUG, "isa_ide_channel_init()");
 
         memset(&params, 0, sizeof(params));
@@ -135 +135 @@
         irq_inited = true;
 
-        ddf_msg(LVL_DEBUG, "isa_ide_ctrl_init(): Initialize IDE channel");
+        ddf_msg(LVL_DEBUG, "isa_ide_channel_init(): Initialize IDE channel");
 
         params.arg = (void *)chan;
@@ -163 +163 @@
                 goto error;
 
-        ddf_msg(LVL_DEBUG, "isa_ide_ctrl_init: DONE");
+        ddf_msg(LVL_DEBUG, "isa_ide_channel_init: DONE");
         return EOK;
 error:
@@ -181 +181 @@
         errno_t rc;
 
-        ddf_msg(LVL_DEBUG, ": isa_ide_ctrl_remove()");
+        ddf_msg(LVL_DEBUG, ": isa_ide_channel_fini()");
 
         fibril_mutex_lock(&chan->lock);
@@ -196 +196 @@
 
         return EOK;
+}
+
+/** Quiesce ISA IDE channel. */
+void isa_ide_channel_quiesce(isa_ide_channel_t *chan)
+{
+        ddf_msg(LVL_DEBUG, ": isa_ide_channel_quiesce()");
+
+        fibril_mutex_lock(&chan->lock);
+        ata_channel_quiesce(chan->channel);
+        fibril_mutex_unlock(&chan->lock);
 }
 

uspace/drv/block/isa-ide/isa-ide.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -104 +104 @@
     unsigned, isa_ide_hwres_t *);
 extern errno_t isa_ide_channel_fini(isa_ide_channel_t *);
+extern void isa_ide_channel_quiesce(isa_ide_channel_t *);
 
 #endif

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

@@ -49 +49 @@
 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);
@@ -55 +56 @@
 
 static driver_ops_t driver_ops = {
-        .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
+        .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
 };
 
@@ -379 +381 @@
 }
 
+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)
 {