Changeset 45b26dad in mainline for kernel/arch/sparc64/include

Timestamp:

2006-09-26T12:59:28Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b44939b

Parents:

6ff1f1e

Message:

sparc64 work:

• Loader now starts all processors.
• Kernel halts all but the bootstrup processor for now.
• Read clock-frequency from the respective processor node in the device tree

Location:

kernel/arch/sparc64/include

Files:

• arch.h (modified) (1 diff)
• asm.h (modified) (1 diff)
• boot/boot.h (modified) (2 diffs)
• register.h (modified) (1 diff)

kernel/arch/sparc64/include/arch.h

@@ -38 +38 @@
 #define KERN_sparc64_ARCH_H_
 
-#define ASI_AIUP        0x10            /** Access to primary context with user privileges. */
-#define ASI_AIUS        0x11            /** Access to secondary context with user privileges. */
-
+#define ASI_AIUP                0x10    /** Access to primary context with user privileges. */
+#define ASI_AIUS                0x11    /** Access to secondary context with user privileges. */
 #define ASI_NUCLEUS_QUAD_LDD    0x24    /** ASI for 16-byte atomic loads. */
+#define ASI_UPA_CONFIG          0x4a    /** ASI of the UPA_CONFIG register. */
 
 #define NWINDOW         8               /** Number of register window sets. */

kernel/arch/sparc64/include/asm.h

@@ -359 +359 @@
 }
 
+/** Read UPA_CONFIG register.
+ *
+ * @return Value of the UPA_CONFIG register.
+ */
+static inline uint64_t upa_config_read(void)
+{
+        return asi_u64_read(ASI_UPA_CONFIG, 0);
+}
+
 extern void cpu_halt(void);
 extern void cpu_sleep(void);

kernel/arch/sparc64/include/boot/boot.h

@@ -71 +71 @@
 } memmap_t;
 
-typedef struct {
-        uint32_t clock_frequency;
-} processor_t;
-
 /** Bootinfo structure.
  *
@@ -82 +78 @@
         taskmap_t taskmap;
         memmap_t memmap;
-        processor_t processor;
         ballocs_t ballocs;
         ofw_tree_node_t *ofw_root;

kernel/arch/sparc64/include/register.h

@@ -118 +118 @@
 typedef union fprs_reg fprs_reg_t;
 
+/** UPA_CONFIG register.
+ *
+ * Note that format of this register differs significantly from
+ * processor version to version. The format defined here
+ * is the common subset for all supported processor versions.
+ */
+union upa_config {
+        uint64_t value;
+        struct {
+                uint64_t : 34;
+                unsigned pcon : 8;      /**< Processor configuration. */
+                unsigned mid : 5;       /**< Module (processor) ID register. */
+                unsigned pcap : 17;     /**< Processor capabilities. */
+        } __attribute__ ((packed));
+};
+typedef union upa_config upa_config_t;
+
 #endif