Changeset b2d06fa in mainline for kernel

Timestamp:

2010-12-25T17:14:36Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

092e4f1

Parents:

59e9398b (diff), 3ac66f69 (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 mainline changes.

Location:

kernel

Files:

• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/arm32/include/mach/integratorcp/integratorcp.h (modified) (1 diff)
• arch/arm32/include/mach/testarm/testarm.h (modified) (1 diff)
• arch/arm32/include/machine_func.h (modified) (1 diff)
• arch/arm32/src/mach/gta02/gta02.c (modified) (3 diffs)
• arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (2 diffs)
• arch/arm32/src/mach/testarm/testarm.c (modified) (2 diffs)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (1 diff)
• arch/mips32/src/mips32.c (modified) (1 diff)
• arch/ppc32/src/ppc32.c (modified) (1 diff)
• arch/sparc64/src/sun4u/sparc64.c (modified) (2 diffs)
• arch/sparc64/src/sun4v/sparc64.c (modified) (2 diffs)
• generic/include/ddi/irq.h (modified) (1 diff)
• generic/src/ddi/irq.c (modified) (2 diffs)
• generic/src/ipc/irq.c (modified) (4 diffs)

kernel/arch/amd64/src/amd64.c

@@ -199 +199 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for amd64 is 'pc'. */
+        static const char *platform = "pc";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef CONFIG_PC_KBD
         /*

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -106 +106 @@
 extern void icp_frame_init(void);
 extern size_t icp_get_irq_count(void);
+extern const char *icp_get_platform_name(void);
 
 extern struct arm_machine_ops icp_machine_ops;

kernel/arch/arm32/include/mach/testarm/testarm.h

@@ -74 +74 @@
 extern void gxemul_frame_init(void);
 extern size_t gxemul_get_irq_count(void);
+extern const char *gxemul_get_platform_name(void);
 
 extern struct arm_machine_ops gxemul_machine_ops;

kernel/arch/arm32/include/machine_func.h

@@ -56 +56 @@
         void (*machine_input_init)(void);
         size_t (*machine_get_irq_count)(void);
+        const char *(*machine_get_platform_name)(void);
 };
 

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -71 +71 @@
 static void gta02_input_init(void);
 static size_t gta02_get_irq_count(void);
+static const char *gta02_get_platform_name(void);
 
 static void gta02_timer_irq_init(void);
@@ -92 +93 @@
         gta02_output_init,
         gta02_input_init,
-        gta02_get_irq_count
+        gta02_get_irq_count,
+        gta02_get_platform_name
 };
 
@@ -235 +237 @@
 }
 
+const char *gta02_get_platform_name(void)
+{
+        return "gta02";
+}
+
 static void gta02_timer_irq_init(void)
 {

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -65 +65 @@
         icp_output_init,
         icp_input_init,
-        icp_get_irq_count
+        icp_get_irq_count,
+        icp_get_platform_name
 };
 
@@ -342 +343 @@
 }
 
+const char *icp_get_platform_name(void)
+{
+        return "integratorcp";
+}
+
 /** @}
  */

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -65 +65 @@
         gxemul_output_init,
         gxemul_input_init,
-        gxemul_get_irq_count
+        gxemul_get_irq_count,
+        gxemul_get_platform_name
 };
 
@@ -132 +133 @@
 }
 
+const char *gxemul_get_platform_name(void)
+{
+        return "gxemul";
+}
+
 /** Starts gxemul Real Time Clock device, which asserts regular interrupts.
  *

kernel/arch/ia32/src/ia32.c

@@ -157 +157 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for ia32 is 'pc'. */
+        static const char *platform = "pc";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef CONFIG_PC_KBD
         /*

kernel/arch/ia64/src/ia64.c

@@ -147 +147 @@
 void arch_post_smp_init(void)
 {
+        static const char *platform;
+
+        /* Set platform name. */
+#ifdef MACHINE_ski
+        platform = "pc";
+#endif
+#ifdef MACHINE_i460GX
+        platform = "i460GX";
+#endif
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef MACHINE_ski
         ski_instance_t *ski_instance = skiin_init();

kernel/arch/mips32/src/mips32.c

@@ -168 +168 @@
 void arch_post_smp_init(void)
 {
+        static const char *platform;
+
+        /* Set platform name. */
+#ifdef MACHINE_msim
+        platform = "msim";
+#endif
+#ifdef MACHINE_bgxemul
+        platform = "gxemul";
+#endif
+#ifdef MACHINE_lgxemul
+        platform = "gxemul";
+#endif
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
 #ifdef CONFIG_MIPS_KBD
         /*

kernel/arch/ppc32/src/ppc32.c

@@ -249 +249 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for ppc32 is 'mac'. */
+        static const char *platform = "mac";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
         ofw_tree_walk_by_device_type("mac-io", macio_register, NULL);
 }

kernel/arch/sparc64/src/sun4u/sparc64.c

@@ -50 +50 @@
 #include <ddi/irq.h>
 #include <str.h>
+#include <sysinfo/sysinfo.h>
 
 memmap_t memmap;
@@ -111 +112 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for sparc64/sun4u is 'sun4u'. */
+        static const char *platform = "sun4u";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
         standalone_sparc64_console_init();
 }

kernel/arch/sparc64/src/sun4v/sparc64.c

@@ -52 +52 @@
 #include <str.h>
 #include <arch/drivers/niagara.h>
+#include <sysinfo/sysinfo.h>
 
 memmap_t memmap;
@@ -109 +110 @@
 void arch_post_smp_init(void)
 {
+        /* Currently the only supported platform for sparc64/sun4v is 'sun4v'. */
+        static const char *platform = "sun4v";
+
+        sysinfo_set_item_data("platform", NULL, (void *) platform,
+            str_size(platform));
+
         niagarain_init();
 }

kernel/generic/include/ddi/irq.h

@@ -189 +189 @@
 extern hash_table_t irq_uspace_hash_table;
 
+extern inr_t last_inr;
+
 extern void irq_init(size_t, size_t);
 extern void irq_initialize(irq_t *);

kernel/generic/src/ddi/irq.c

@@ -136 +136 @@
 static size_t buckets;
 
+/** Last valid INR. */
+inr_t last_inr = 0;
+
 /** Initialize IRQ subsystem.
  *
@@ -145 +148 @@
 {
         buckets = chains;
+        last_inr = inrs - 1;
+
         /*
          * Be smart about the choice of the hash table operations.

kernel/generic/src/ipc/irq.c

@@ -131 +131 @@
 /** Register an answerbox as a receiving end for IRQ notifications.
  *
- * @param box     Receiving answerbox.
- * @param inr     IRQ number.
- * @param devno   Device number.
- * @param imethod Interface and method to be associated
- *                with the notification.
- * @param ucode   Uspace pointer to top-half pseudocode.
- *
- * @return EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
+ * @param box           Receiving answerbox.
+ * @param inr           IRQ number.
+ * @param devno         Device number.
+ * @param imethod       Interface and method to be associated with the
+ *                      notification.
+ * @param ucode         Uspace pointer to top-half pseudocode.
+ * @return              EOK on success or a negative error code.
  *
  */
@@ -148 +147 @@
                 (sysarg_t) devno
         };
+
+        if ((inr < 0) || (inr > last_inr))
+                return ELIMIT;
         
         irq_code_t *code;
@@ -208 +210 @@
 /** Unregister task from IRQ notification.
  *
- * @param box   Answerbox associated with the notification.
- * @param inr   IRQ number.
- * @param devno Device number.
- *
+ * @param box           Answerbox associated with the notification.
+ * @param inr           IRQ number.
+ * @param devno         Device number.
+ * @return              EOK on success or a negative error code.
  */
 int ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno)
@@ -219 +221 @@
                 (sysarg_t) devno
         };
+
+        if ((inr < 0) || (inr > last_inr))
+                return ELIMIT;
         
         irq_spinlock_lock(&irq_uspace_hash_table_lock, true);