Changeset 91b60499 in mainline for uspace/drv/nic/rtl8169/driver.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/nic/rtl8169/driver.c (modified) (3 diffs)

uspace/drv/nic/rtl8169/driver.c

@@ -371 +371 @@
         rtl8169_irq_code.cmds[2].addr = rtl8169->regs + ISR;
         rtl8169_irq_code.cmds[3].addr = rtl8169->regs + IMR;
-        int rc = register_interrupt_handler(nic_get_ddf_dev(nic_data),
+        int irq_cap = register_interrupt_handler(nic_get_ddf_dev(nic_data),
             rtl8169->irq, rtl8169_irq_handler, &rtl8169_irq_code);
 
-        return rc;
+        return irq_cap;
 }
 
@@ -426 +426 @@
                 goto err_pio;
 
-        rc = rtl8169_register_int_handler(nic_data);
-        if (rc != EOK) {
+        int irq_cap = rtl8169_register_int_handler(nic_data);
+        if (irq_cap < 0) {
+                rc = irq_cap;
                 ddf_msg(LVL_ERROR, "Failed to register IRQ handler (%d)", rc);
                 goto err_irq;
-
         }
 
@@ -469 +469 @@
 err_srv:
         /* XXX Disconnect from services */
+        unregister_interrupt_handler(dev, irq_cap);
 err_irq:
-        //unregister_interrupt_handler(dev, rtl8169->irq);
 err_pio:
 err_destroy: