Changeset 10caad0 in mainline

Timestamp:

2005-08-30T17:37:50Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7ce9284

Parents:

db5e25f

Message:

PPC memory size detection

Location:

arch/ppc

Files:

• Makefile.inc (modified) (2 diffs)
• include/asm.h (modified) (2 diffs)
• include/asm/macro.h (modified) (1 diff)
• include/drivers/ofw.h (modified) (2 diffs)
• src/asm.s (modified) (1 diff)
• src/drivers/ofw.c (modified) (3 diffs)
• src/dummy.s (modified) (4 diffs)
• src/mm/memory_init.c (added)
• src/start.S (modified) (1 diff)

arch/ppc/Makefile.inc

@@ -17 +17 @@
 arch_sources= \
         arch/ppc.c \
+        arch/debug/panic.s \
         arch/fpu_context.c \
         arch/dummy.s \
@@ -22 +23 @@
         arch/asm.s \
         arch/mm/frame.c \
+        arch/mm/memory_init.c \
         arch/mm/page.c \
         arch/drivers/ofw.c

arch/ppc/include/asm.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2005 Jakub Jermar
+ * Copyright (C) 2005 Martin Decky
  * All rights reserved.
  *
@@ -33 +33 @@
 #include <config.h>
 
+/** Set priority level low
+ *
+ * Enable interrupts and return previous
+ * value of EE.
+ */
+static inline pri_t cpu_priority_low(void) {
+        pri_t v;
+        __asm__ volatile (
+                "\n"
+                : "=r" (v)
+        );
+        return v;
+}
+
+/** Set priority level high
+ *
+ * Disable interrupts and return previous
+ * value of EE.
+ */
+static inline pri_t cpu_priority_high(void) {
+        pri_t v;
+        __asm__ volatile (
+                "\n"
+                : "=r" (v)
+        );
+        return v;
+}
+
+/** Restore priority level
+ *
+ * Restore EE.
+ */
+static inline void cpu_priority_restore(pri_t pri) {
+        __asm__ volatile (
+                "\n"
+                : : "r" (pri)
+        );
+}
+
 /* TODO: implement the real stuff */
 static inline __address get_stack_base(void)

arch/ppc/include/asm/macro.h

@@ -74 +74 @@
 #define r30     30
 #define r31     31
+
+/* GPR Aliases */
+#define sp      1
 
 /* Floating Point Registers (FPRs) */

arch/ppc/include/drivers/ofw.h

@@ -36 +36 @@
 typedef __u32 ofw_arg_t;
 typedef __u32 ihandle;
+typedef __u32 phandle;
 
-struct ofw_args_t {
-        const char *service;
-        int nargs;
-        int nret;
-        ofw_arg_t args[MAX_OFW_ARGS];
-};
+/** OpenFirmware command structure
+ *
+ */
+typedef struct {
+        const char *service;          /**< Command name */
+        __u32 nargs;                  /**< Number of in arguments */
+        __u32 nret;                   /**< Number of out arguments */
+        ofw_arg_t args[MAX_OFW_ARGS]; /**< List of arguments */
+} ofw_args_t;
 
-typedef void (*ofw_entry)(struct ofw_args_t *);
+/** OpenFirmware device address range structure
+ *
+ */
+typedef struct {
+        __u32 space;
+        __u32 address;
+        __u32 size;
+} address_range_t;
+
+/** OpenFirmware device interrupt structure
+ *
+ */
+typedef struct {
+        __u32 line;  /**< Interrupt number */
+        __u32 flags; /**< Interrupt flags/logic */
+} interrupt_info_t;
+
+/** OpenFirmware property structure
+ *
+ */
+typedef struct property_t {
+        char *name;              /**< Property name */
+        __u32 length;            /**< Value length */
+        char *value;             /**< Property value */
+        struct property_t *next; /**< Next property in list */
+} property_t;
+
+/** OpenFirmware device descritor
+ *
+ */
+typedef struct device_node_t {
+        char *name;                     /**< Device name */
+        char *type;                     /**< Device type */
+        phandle node;                   /**< Device handle */
+        
+        __u32 n_addrs;                  /**< Number of address ranges */
+        address_range_t *addrs;         /**< Address ranges list */
+        
+        __u32 n_intrs;                  /**< Number of interrupts */
+        interrupt_info_t *intrs;        /**< Interrupts list */
+        
+        char *full_name;                /**< Device full name */
+        
+        property_t *properties;         /**< Device properties */
+        
+        struct device_node_t *parent;   /**< Parent device */
+        struct device_node_t *child;    /**< First child in tree */
+        struct device_node_t *sibling;  /**< Next device on tree level */
+        struct device_node_t *next;     /**< Next device of the same type */
+        struct device_node_t *next_all; /**< Next device in list of all nodes */
+} device_node_t;
+
+typedef void (*ofw_entry)(ofw_args_t *);
 
 extern ofw_entry ofw;
@@ -52 +108 @@
 extern int ofw_call(const char *service, const int nargs, const int nret, ...);
 extern void ofw_putchar(const char ch);
+extern phandle ofw_find_device(const char *name);
+extern int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen);
 extern void putchar(const char ch);
 

arch/ppc/src/asm.s

@@ -27 +27 @@
 #
 
+#include <arch/asm/macro.h>
+
 .text
 

arch/ppc/src/drivers/ofw.c

@@ -30 +30 @@
 #include <stdarg.h>
 
-ihandle ofw_chosen;
+ofw_entry ofw;
+
+phandle ofw_chosen;
 ihandle ofw_stdout;
-ofw_entry ofw;
 
 void ofw_init(void)
 {
-        ofw_chosen = ofw_call("finddevice", 1, 1, "/chosen");
+        ofw_chosen = ofw_find_device("/chosen");
         if (ofw_chosen == -1)
                 ofw_done();
@@ -53 +54 @@
 {
         va_list list;
-        struct ofw_args_t args;
+        ofw_args_t args;
         int i;
         
@@ -78 +79 @@
                 return;
         
-        ofw_call("write", 3, 1, ofw_stdout, ch, 1);
+        ofw_call("write", 3, 1, ofw_stdout, &ch, 1);
+}
+
+phandle ofw_find_device(const char *name)
+{
+        return ofw_call("finddevice", 1, 1, name);
+}
+
+int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
+{
+        return ofw_call("getprop", 4, 1, device, name, buf, buflen);
 }
 

arch/ppc/src/dummy.s

@@ -30 +30 @@
 
 .global memcopy
-.global cpu_priority_high
-.global cpu_priority_low
 .global cpu_priority_read
-.global cpu_priority_restore
 .global memsetb
 .global context_save
@@ -39 +36 @@
 .global userspace
 .global before_thread_runs_arch
-.global panic_printf
 .global cpu_identify
 .global cpu_arch_init
 .global cpu_print_report
-.global get_memory_size
 .global arch_pre_mm_init
 .global arch_post_mm_init
@@ -52 +47 @@
 
 memcopy:
-cpu_priority_high:
-cpu_priority_low:
-cpu_priority_restore:
 cpu_priority_read:
 memsetb:
@@ -63 +55 @@
 calibrate_delay_loop:
 asm_delay_loop:
-panic_printf:
 cpu_identify:
 cpu_arch_init:
 cpu_print_report:
-get_memory_size:
 arch_pre_mm_init:
 arch_post_mm_init:

arch/ppc/src/start.S

@@ -27 +27 @@
 #
 
+#include <arch/asm/macro.h>
+
 .section K_TEXT_START