| 35,22 → 35,6 |
|---|
| #ifndef KERN_sparc64_CPU_H_ |
| #define KERN_sparc64_CPU_H_ |
| |
| #define MANUF_FUJITSU 0x04 |
| #define MANUF_ULTRASPARC 0x17 /**< UltraSPARC I, UltraSPARC II */ |
| #define MANUF_SUN 0x3e |
| |
| #define IMPL_ULTRASPARCI 0x10 |
| #define IMPL_ULTRASPARCII 0x11 |
| #define IMPL_ULTRASPARCII_I 0x12 |
| #define IMPL_ULTRASPARCII_E 0x13 |
| #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> |
| 57,13 → 41,7 |
|---|
| #include <typedefs.h> |
| #include <arch/register.h> |
| #include <arch/sun4u/regdef.h> |
| #include <arch/asm.h> |
| #include <arch/sun4u/arch.h> |
| |
| #ifdef CONFIG_SMP |
| #include <arch/mm/cache.h> |
| #endif |
| |
| typedef struct { |
| uint32_t mid; /**< Processor ID as read from |
| UPA_CONFIG/FIREPLANE_CONFIG. */ |
| 74,27 → 52,6 |
|---|
| 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; |
| #else |
| panic("Not implemented for this architecture."); |
| return 0; |
| #endif |
| } |
| |
| #endif |
| |
| #endif |