Changeset 60744cb in mainline for uspace/drv/block

Timestamp:

2024-05-17T17:51:56Z (22 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

1801005

Parents:

646849b3

Message:

Let driver specify any argument to IRQ handler

This allows the driver to register a single handler for multiple
interrupts and still distinguish between them. It also removes
the extra step of having to get softstate from ddf_dev_t.

Location:

uspace/drv/block

Files:

• ahci/ahci.c (modified) (3 diffs)
• ddisk/ddisk.c (modified) (3 diffs)
• isa-ide/isa-ide.c (modified) (3 diffs)
• virtio-blk/virtio-blk.c (modified) (2 diffs)

uspace/drv/block/ahci/ahci.c

@@ -162 +162 @@
 }
 
-/** Get AHCI structure from DDF device. */
-static ahci_dev_t *dev_ahci_dev(ddf_dev_t *dev)
-{
-        return ddf_dev_data_get(dev);
-}
-
 /** Get SATA device name.
  *
@@ -891 +885 @@
  *
  * @param icall The IPC call structure.
- * @param dev   DDF device structure.
- *
- */
-static void ahci_interrupt(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        ahci_dev_t *ahci = dev_ahci_dev(dev);
+ * @param arg   Argument (ahci_dev_t *)
+ */
+static void ahci_interrupt(ipc_call_t *icall, void *arg)
+{
+        ahci_dev_t *ahci = (ahci_dev_t *)arg;
         unsigned int port = ipc_get_arg1(icall);
         ahci_port_is_t pxis = ipc_get_arg2(icall);
@@ -1186 +1179 @@
         cap_irq_handle_t irq_cap;
         errno_t rc = register_interrupt_handler(dev,
-            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct, &irq_cap);
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, (void *)ahci, &ct,
+            &irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");

uspace/drv/block/ddisk/ddisk.c

@@ -64 +64 @@
 static void ddisk_bd_connection(ipc_call_t *, void *);
 
-static void ddisk_irq_handler(ipc_call_t *, ddf_dev_t *);
+static void ddisk_irq_handler(ipc_call_t *, void *);
 
 static driver_ops_t driver_ops = {
@@ -176 +176 @@
 };
 
-void ddisk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
+/** Ddisk IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (ddisk_t *)
+ */
+void ddisk_irq_handler(ipc_call_t *icall, void *arg)
 {
         ddf_msg(LVL_DEBUG, "ddisk_irq_handler(), status=%" PRIx32,
             (uint32_t) ipc_get_arg1(icall));
 
-        ddisk_t *ddisk = (ddisk_t *) ddf_dev_data_get(dev);
+        ddisk_t *ddisk = (ddisk_t *)arg;
 
         fibril_mutex_lock(&ddisk->lock);
@@ -512 +517 @@
         ddisk_irq_commands[3].addr = (void *) &res_phys->command;
         rc = register_interrupt_handler(dev, ddisk->ddisk_res.irq,
-            ddisk_irq_handler, &ddisk_irq_code, &ddisk->irq_cap);
+            ddisk_irq_handler, (void *)ddisk, &ddisk_irq_code, &ddisk->irq_cap);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed to register interrupt handler.");

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

@@ -59 +59 @@
 static errno_t isa_ide_init_irq(isa_ide_channel_t *);
 static void isa_ide_fini_irq(isa_ide_channel_t *);
-static void isa_ide_irq_handler(ipc_call_t *, ddf_dev_t *);
+static void isa_ide_irq_handler(ipc_call_t *, void *);
 
 static void isa_ide_write_data_16(void *, uint16_t *, size_t);
@@ -256 +256 @@
 
         ddf_msg(LVL_NOTE, "IRQ %d", chan->irq);
-        rc = register_interrupt_handler_arg(chan->ctrl->dev, chan->irq,
+        rc = register_interrupt_handler(chan->ctrl->dev, chan->irq,
             isa_ide_irq_handler, (void *)chan, &irq_code, &chan->ihandle);
         if (rc != EOK) {
@@ -291 +291 @@
  *
  * @param call Call data
- * @param dev Device that caused the interrupt
- */
-static void isa_ide_irq_handler(ipc_call_t *call, ddf_dev_t *xdev)
-{
-        isa_ide_channel_t *chan = (isa_ide_channel_t *)(void *)xdev; // XXX
+ * @param arg Argument (isa_ide_channel_t *)
+ */
+static void isa_ide_irq_handler(ipc_call_t *call, void *arg)
+{
+        isa_ide_channel_t *chan = (isa_ide_channel_t *)arg;
         uint8_t status;
         async_sess_t *parent_sess;

uspace/drv/block/virtio-blk/virtio-blk.c

@@ -73 +73 @@
 };
 
-static void virtio_blk_irq_handler(ipc_call_t *icall, ddf_dev_t *dev)
-{
-        virtio_blk_t *virtio_blk = (virtio_blk_t *) ddf_dev_data_get(dev);
+/** VirtIO block IRQ handler.
+ *
+ * @param icall IRQ event notification
+ * @param arg Argument (virtio_blk_t *)
+ */
+static void virtio_blk_irq_handler(ipc_call_t *icall, void *arg)
+{
+        virtio_blk_t *virtio_blk = (virtio_blk_t *)arg;
         virtio_dev_t *vdev = &virtio_blk->virtio_dev;
 
@@ -145 +150 @@
 
         return register_interrupt_handler(dev, virtio_blk->irq,
-            virtio_blk_irq_handler, &irq_code, &virtio_blk->irq_handle);
+            virtio_blk_irq_handler, (void *)virtio_blk, &irq_code,
+            &virtio_blk->irq_handle);
 }