Changes in uspace/drv/block/pci-ide/pci-ide.c [221daa5:07039850] in mainline

File:

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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -150 +150 @@
         ctrl->bmregs_physical = res->bmregs;
 
-        ddf_msg(LVL_NOTE, "Bus master IDE regs I/O address: 0x%lx",
+        ddf_msg(LVL_NOTE, "Bus master IDE regs I/O address: 0x%" PRIxPTR,
             ctrl->bmregs_physical);
 
@@ -186 +186 @@
         bool irq_inited = false;
         ata_params_t params;
-        void *buffer;
+        void *buffer = NULL;
 
         ddf_msg(LVL_DEBUG, "pci_ide_channel_init()");
+
+        memset(&params, 0, sizeof(params));
 
         chan->ctrl = ctrl;
@@ -294 +296 @@
         return EOK;
 error:
+        if (chan->channel != NULL) {
+                (void) ata_channel_destroy(chan->channel);
+                chan->channel = NULL;
+        }
+        if (buffer != NULL)
+                dmamem_unmap_anonymous(buffer);
         if (irq_inited)
                 pci_ide_fini_irq(chan);
@@ -315 +323 @@
         }
 
+        dmamem_unmap_anonymous(chan->dma_buf);
         pci_ide_fini_irq(chan);
         pci_ide_fini_io(chan);
@@ -320 +329 @@
 
         return EOK;
+}
+
+/** Quiesce PCI IDE channel. */
+void pci_ide_channel_quiesce(pci_ide_channel_t *chan)
+{
+        ddf_msg(LVL_DEBUG, ": pci_ide_channel_quiesce()");
+
+        fibril_mutex_lock(&chan->lock);
+        ata_channel_quiesce(chan->channel);
+        fibril_mutex_unlock(&chan->lock);
 }