Changeset 91b60499 in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2017-09-30T06:29:42Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

300f4c4

Parents:

d076f16 (diff), 6636fb19 (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 support for capabilities from lp:~jakub/helenos/caps

This commit introduces capabilities as task-local names for references to kernel
objects. Kernel objects are reference-counted wrappers for a select group of
objects allocated in and by the kernel that can be made accessible to userspace
in a controlled way via integer handles.

So far, a kernel object encapsulates either an irq_t or a phone_t.

Support for the former lead to the removal of kernel-assigned devnos and
unsecure deregistration of IRQs in which a random task was able to unregister
some other task's IRQ.

File:

• uspace/drv/block/ahci/ahci.c (modified) (2 diffs)

uspace/drv/block/ahci/ahci.c

@@ -1185 +1185 @@
         ct.ranges = ahci_ranges;
         
-        int rc = register_interrupt_handler(dev, hw_res_parsed.irqs.irqs[0],
-            ahci_interrupt, &ct);
-        if (rc != EOK) {
+        int irq_cap = register_interrupt_handler(dev,
+            hw_res_parsed.irqs.irqs[0], ahci_interrupt, &ct);
+        if (irq_cap < 0) {
                 ddf_msg(LVL_ERROR, "Failed registering interrupt handler.");
                 goto error_register_interrupt_handler;
         }
         
-        rc = irc_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
+        int rc = irc_enable_interrupt(hw_res_parsed.irqs.irqs[0]);
         if (rc != EOK) {
                 ddf_msg(LVL_ERROR, "Failed enable interupt.");
@@ -1202 +1202 @@
         
 error_enable_interrupt:
-        unregister_interrupt_handler(dev, hw_res_parsed.irqs.irqs[0]);
+        unregister_interrupt_handler(dev, irq_cap);
         
 error_register_interrupt_handler: