Changeset aedff4f in rtems-libbsd

Timestamp:

07/25/19 08:20:19 (4 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5-freebsd-12, 6-freebsd-12

Children:

017b09f

Parents:

bd6b20c

git-author:

Sebastian Huber <sebastian.huber@…> (07/25/19 08:20:19)

git-committer:

Sebastian Huber <sebastian.huber@…> (09/23/19 08:26:34)

Message:

CONFIG_INTRHOOK(9): Call handlers after boot

This enables adding drivers on demand which use this service after
initialization.

Files:

• freebsd/sys/kern/subr_autoconf.c (modified) (5 diffs)
• testsuite/swi01/swi_test.c (modified) (4 diffs)

freebsd/sys/kern/subr_autoconf.c

@@ -64 +64 @@
 static struct mtx intr_config_hook_lock;
 MTX_SYSINIT(intr_config_hook, &intr_config_hook_lock, "intr config", MTX_DEF);
+#ifdef __rtems__
+static bool intr_boot_done;
+#endif /* __rtems__ */
 
 /* ARGSUSED */
@@ -175 +178 @@
                 }
         }
+#ifdef __rtems__
+        intr_boot_done = true;
+#endif /* __rtems__ */
         mtx_unlock(&intr_config_hook_lock);
         TSUNWAIT("config hooks");
@@ -191 +197 @@
 {
         struct intr_config_hook *hook_entry;
+#ifdef __rtems__
+        bool run;
+#endif /* __rtems__ */
 
         TSHOLD("config hooks");
@@ -206 +215 @@
         if (next_to_notify == NULL)
                 next_to_notify = hook;
+#ifdef __rtems__
+        run = intr_boot_done;
+#endif /* __rtems__ */
         mtx_unlock(&intr_config_hook_lock);
 #ifndef __rtems__
         if (cold == 0)
+#else /* __rtems__ */
+        if (run)
+#endif /* __rtems__ */
                 /*
                  * XXX Call from a task since not all drivers expect
@@ -215 +230 @@
                 /* XXX Sufficient for modules loaded after initial config??? */
                 run_interrupt_driven_config_hooks();    
-#endif /* __rtems__ */
         return (0);
 }

testsuite/swi01/swi_test.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2012, 2019 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
- *  Obere Lagerstr. 30
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -38 +38 @@
 
 #include <sys/types.h>
-#include <sys/systm.h>
-
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/interrupt.h>
+#include <sys/kernel.h>
+#include <sys/systm.h>
 
 #define SWI_TEST_THREAD_PRIO (0)
@@ -193 +193 @@
         
         assert(argument == HANDLER_NOT_VISITED);
+}
+
+static void
+ich_func(void *arg)
+{
+        int *invocations;
+
+        invocations = arg;
+        ++(*invocations);
+}
+
+static void
+test_config_intrhook_establish(void)
+{
+        int invocations;
+        struct intr_config_hook hook = {
+                .ich_func = ich_func,
+                .ich_arg = &invocations
+        };
+
+        printf("== Test config_intrhook_establish().\n");
+
+        invocations = 0;
+        config_intrhook_establish(&hook);
+        assert(invocations == 1);
 }
 
@@ -205 +230 @@
         swi_test_error_handler_null();
         swi_test_error_has_allready_exclusive();
-}
-
+        test_config_intrhook_establish();
+}
+