Changeset 965dc18 in mainline for kernel/arch/sparc64/include/cpu.h

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

File:

• kernel/arch/sparc64/include/cpu.h (modified) (3 diffs)

kernel/arch/sparc64/include/cpu.h

@@ -36 +36 @@
 #define KERN_sparc64_CPU_H_
 
-#include <arch/types.h>
-#include <typedefs.h>
-#include <arch/register.h>
-#include <arch/asm.h>
-
-#ifdef CONFIG_SMP
-#include <arch/mm/cache.h>
-#endif
-
 #define MANUF_FUJITSU           0x04
 #define MANUF_ULTRASPARC        0x17    /**< UltraSPARC I, UltraSPARC II */
@@ -53 +44 @@
 #define IMPL_ULTRASPARCII_I     0x12
 #define IMPL_ULTRASPARCII_E     0x13
-#define IMPL_ULTRASPARCIII      0x15
+#define IMPL_ULTRASPARCIII      0x14
+#define IMPL_ULTRASPARCIII_PLUS 0x15
+#define IMPL_ULTRASPARCIII_I    0x16
+#define IMPL_ULTRASPARCIV       0x18
 #define IMPL_ULTRASPARCIV_PLUS  0x19
 
 #define IMPL_SPARC64V           0x5
 
+#ifndef __ASM__
+
+#include <arch/types.h>
+#include <typedefs.h>
+#include <arch/register.h>
+#include <arch/regdef.h>
+#include <arch/asm.h>
+
+#ifdef CONFIG_SMP
+#include <arch/mm/cache.h>
+#endif
+
 typedef struct {
         uint32_t mid;                   /**< Processor ID as read from
-                                             UPA_CONFIG. */
+                                             UPA_CONFIG/FIREPLANE_CONFIG. */
         ver_reg_t ver;
         uint32_t clock_frequency;       /**< Processor frequency in Hz. */
@@ -67 +73 @@
                                              matches this value. */
 } cpu_arch_t;
-        
+
+
+/**
+ * Reads the module ID (agent ID/CPUID) of the current CPU.
+ */
+static inline uint32_t read_mid(void)
+{
+        uint64_t icbus_config = asi_u64_read(ASI_ICBUS_CONFIG, 0);
+        icbus_config = icbus_config >> ICBUS_CONFIG_MID_SHIFT;
+#if defined (US)
+        return icbus_config & 0x1f;
+#elif defined (US3)
+        if (((ver_reg_t) ver_read()).impl == IMPL_ULTRASPARCIII_I)
+                return icbus_config & 0x1f;
+        else
+                return icbus_config & 0x3ff;
+#endif
+}
+
+#endif  
+
 #endif