Changeset 7e195e66 in rtems

Timestamp:

09/28/17 07:29:38 (5 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

ce28d601

Parents:

4cfce5c

git-author:

Sebastian Huber <sebastian.huber@…> (09/28/17 07:29:38)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/02/17 11:40:56)

Message:

bsp/imx: Add imx_get_irq_of_node()

Update #3090.

Location:

c/src/lib/libbsp

Files:

• arm/imx/console/console-config.c (modified) (1 diff)
• arm/imx/include/bsp.h (modified) (1 diff)
• arm/imx/startup/bspstart.c (modified) (2 diffs)
• shared/include/fatal.h (modified) (1 diff)

c/src/lib/libbsp/arm/imx/console/console-config.c

@@ -85 +85 @@
 
 #ifdef CONSOLE_USE_INTERRUPTS
-  val = fdt_getprop(fdt, node, "interrupts", &len);
-  if (val != NULL && len >= 8) {
-    uint32_t cpu_val[2];
-    cpu_val[1] = fdt32_to_cpu(val[1]);
-    ctx->irq = bsp_fdt_map_intr(cpu_val, 2);
-  }
+  ctx->irq = imx_get_irq_of_node(fdt, node, 0);
 #endif
 }

c/src/lib/libbsp/arm/imx/include/bsp.h

@@ -42 +42 @@
 void arm_generic_timer_get_config(uint32_t *frequency, uint32_t *irq);
 
+rtems_vector_number imx_get_irq_of_node(
+  const void *fdt,
+  int node,
+  size_t index
+);
+
 #ifdef __cplusplus
 }

c/src/lib/libbsp/arm/imx/startup/bspstart.c

@@ -22 +22 @@
 #include <libfdt.h>
 
+#define MAGIC_IRQ_OFFSET 32
+
+rtems_vector_number imx_get_irq_of_node(
+  const void *fdt,
+  int node,
+  size_t index
+)
+{
+  int len;
+  const uint32_t *val;
+
+  val = fdt_getprop(fdt, node, "interrupts", &len);
+  if (val == NULL || len < (int) ((index + 1) * 12)) {
+    return UINT32_MAX;
+  }
+
+  return fdt32_to_cpu(val[index * 3 + 1]) + MAGIC_IRQ_OFFSET;
+}
+
 uint32_t bsp_fdt_map_intr(const uint32_t *intr, size_t icells)
 {
-  return intr[1] + 32;
+  return intr[1] + MAGIC_IRQ_OFFSET;
 }
 
@@ -47 +66 @@
   }
 
-  val = fdt_getprop(fdt, node, "interrupts", &len);
-  if (val != NULL && len >= 8) {
-    /* FIXME: Figure out how Linux gets a proper IRQ number */
-    *irq = 16 + fdt32_to_cpu(val[1]);
-  } else {
-    bsp_fatal(IMX_FATAL_GENERIC_TIMER_IRQ);
-  }
+  /* FIXME: Figure out how Linux gets a proper IRQ number */
+  *irq = imx_get_irq_of_node(fdt, node, 0) - 16;
 }
 

c/src/lib/libbsp/shared/include/fatal.h

@@ -138 +138 @@
 
   /* i.MX fatal codes */
-  IMX_FATAL_GENERIC_TIMER_FREQUENCY = BSP_FATAL_CODE_BLOCK(12),
-  IMX_FATAL_GENERIC_TIMER_IRQ
+  IMX_FATAL_GENERIC_TIMER_FREQUENCY = BSP_FATAL_CODE_BLOCK(12)
 } bsp_fatal_code;