Rev 3022 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 3022 | Rev 4055 | ||
---|---|---|---|
Line 40... | Line 40... | ||
40 | #include <arch/types.h> |
40 | #include <arch/types.h> |
41 | #include <print.h> |
41 | #include <print.h> |
42 | #include <fpu_context.h> |
42 | #include <fpu_context.h> |
43 | 43 | ||
44 | #include <arch/smp/apic.h> |
44 | #include <arch/smp/apic.h> |
- | 45 | #include <arch/syscall.h> |
|
45 | 46 | ||
46 | /* |
47 | /* |
47 | * Identification of CPUs. |
48 | * Identification of CPUs. |
48 | * Contains only non-MP-Specification specific SMP code. |
49 | * Contains only non-MP-Specification specific SMP code. |
49 | */ |
50 | */ |
50 | #define AMD_CPUID_EBX 0x68747541 |
51 | #define AMD_CPUID_EBX 0x68747541 |
51 | #define AMD_CPUID_ECX 0x444d4163 |
52 | #define AMD_CPUID_ECX 0x444d4163 |
52 | #define AMD_CPUID_EDX 0x69746e65 |
53 | #define AMD_CPUID_EDX 0x69746e65 |
53 | 54 | ||
54 | #define INTEL_CPUID_EBX 0x756e6547 |
55 | #define INTEL_CPUID_EBX 0x756e6547 |
55 | #define INTEL_CPUID_ECX 0x6c65746e |
56 | #define INTEL_CPUID_ECX 0x6c65746e |
56 | #define INTEL_CPUID_EDX 0x49656e69 |
57 | #define INTEL_CPUID_EDX 0x49656e69 |
57 | 58 | ||
58 | 59 | ||
59 | enum vendor { |
60 | enum vendor { |
60 | VendorUnknown=0, |
61 | VendorUnknown = 0, |
61 | VendorAMD, |
62 | VendorAMD, |
62 | VendorIntel |
63 | VendorIntel |
63 | }; |
64 | }; |
64 | 65 | ||
65 | static char *vendor_str[] = { |
66 | static char *vendor_str[] = { |
66 | "Unknown Vendor", |
67 | "Unknown Vendor", |
67 | "AuthenticAMD", |
68 | "AMD", |
68 | "GenuineIntel" |
69 | "Intel" |
69 | }; |
70 | }; |
70 | 71 | ||
71 | void fpu_disable(void) |
72 | void fpu_disable(void) |
72 | { |
73 | { |
73 | asm volatile ( |
74 | asm volatile ( |
74 | "mov %%cr0,%%eax;" |
75 | "mov %%cr0, %%eax\n" |
75 | "or $8,%%eax;" |
76 | "or $8, %%eax\n" |
76 | "mov %%eax,%%cr0;" |
77 | "mov %%eax, %%cr0\n" |
77 | : |
- | |
78 | : |
- | |
79 | :"%eax" |
78 | ::: "%eax" |
80 | ); |
79 | ); |
81 | } |
80 | } |
82 | 81 | ||
83 | void fpu_enable(void) |
82 | void fpu_enable(void) |
84 | { |
83 | { |
85 | asm volatile ( |
84 | asm volatile ( |
86 | "mov %%cr0,%%eax;" |
85 | "mov %%cr0, %%eax\n" |
87 | "and $0xffFFffF7,%%eax;" |
86 | "and $0xffFFffF7, %%eax\n" |
88 | "mov %%eax,%%cr0;" |
87 | "mov %%eax,%%cr0\n" |
89 | : |
- | |
90 | : |
- | |
91 | :"%eax" |
88 | ::: "%eax" |
92 | ); |
89 | ); |
93 | } |
90 | } |
94 | 91 | ||
95 | void cpu_arch_init(void) |
92 | void cpu_arch_init(void) |
96 | { |
93 | { |
97 | cpuid_feature_info fi; |
94 | cpuid_feature_info fi; |
Line 99... | Line 96... | ||
99 | cpu_info_t info; |
96 | cpu_info_t info; |
100 | uint32_t help = 0; |
97 | uint32_t help = 0; |
101 | 98 | ||
102 | CPU->arch.tss = tss_p; |
99 | CPU->arch.tss = tss_p; |
103 | CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((uint8_t *) CPU->arch.tss); |
100 | CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((uint8_t *) CPU->arch.tss); |
104 | 101 | ||
105 | CPU->fpu_owner = NULL; |
102 | CPU->fpu_owner = NULL; |
106 | 103 | ||
107 | cpuid(1, &info); |
104 | cpuid(1, &info); |
108 | 105 | ||
109 | fi.word = info.cpuid_edx; |
106 | fi.word = info.cpuid_edx; |
110 | efi.word = info.cpuid_ecx; |
107 | efi.word = info.cpuid_ecx; |
111 | 108 | ||
112 | if (fi.bits.fxsr) |
109 | if (fi.bits.fxsr) |
113 | fpu_fxsr(); |
110 | fpu_fxsr(); |
114 | else |
111 | else |
115 | fpu_fsr(); |
112 | fpu_fsr(); |
116 | 113 | ||
117 | if (fi.bits.sse) { |
114 | if (fi.bits.sse) { |
118 | asm volatile ( |
115 | asm volatile ( |
119 | "mov %%cr4,%0\n" |
116 | "mov %%cr4, %[help]\n" |
120 | "or %1,%0\n" |
117 | "or %[mask], %[help]\n" |
121 | "mov %0,%%cr4\n" |
118 | "mov %[help], %%cr4\n" |
122 | : "+r" (help) |
119 | : [help] "+r" (help) |
123 | : "i" (CR4_OSFXSR_MASK|(1<<10)) |
120 | : [mask] "i" (CR4_OSFXSR_MASK | (1 << 10)) |
124 | ); |
121 | ); |
125 | } |
122 | } |
- | 123 | ||
- | 124 | /* Setup fast SYSENTER/SYSEXIT syscalls */ |
|
- | 125 | syscall_setup_cpu(); |
|
126 | } |
126 | } |
127 | 127 | ||
128 | void cpu_identify(void) |
128 | void cpu_identify(void) |
129 | { |
129 | { |
130 | cpu_info_t info; |
130 | cpu_info_t info; |
Line 134... | Line 134... | ||
134 | cpuid(0, &info); |
134 | cpuid(0, &info); |
135 | 135 | ||
136 | /* |
136 | /* |
137 | * Check for AMD processor. |
137 | * Check for AMD processor. |
138 | */ |
138 | */ |
- | 139 | if ((info.cpuid_ebx == AMD_CPUID_EBX) |
|
139 | if (info.cpuid_ebx==AMD_CPUID_EBX && info.cpuid_ecx==AMD_CPUID_ECX && info.cpuid_edx==AMD_CPUID_EDX) { |
140 | && (info.cpuid_ecx == AMD_CPUID_ECX) |
- | 141 | && (info.cpuid_edx == AMD_CPUID_EDX)) |
|
140 | CPU->arch.vendor = VendorAMD; |
142 | CPU->arch.vendor = VendorAMD; |
141 | } |
143 | |
142 | - | ||
143 | /* |
144 | /* |
144 | * Check for Intel processor. |
145 | * Check for Intel processor. |
145 | */ |
146 | */ |
- | 147 | if ((info.cpuid_ebx == INTEL_CPUID_EBX) |
|
146 | if (info.cpuid_ebx==INTEL_CPUID_EBX && info.cpuid_ecx==INTEL_CPUID_ECX && info.cpuid_edx==INTEL_CPUID_EDX) { |
148 | && (info.cpuid_ecx == INTEL_CPUID_ECX) |
- | 149 | && (info.cpuid_edx == INTEL_CPUID_EDX)) |
|
147 | CPU->arch.vendor = VendorIntel; |
150 | CPU->arch.vendor = VendorIntel; |
148 | } |
151 | |
149 | - | ||
150 | cpuid(1, &info); |
152 | cpuid(1, &info); |
151 | CPU->arch.family = (info.cpuid_eax>>8)&0xf; |
153 | CPU->arch.family = (info.cpuid_eax >> 8) & 0x0f; |
152 | CPU->arch.model = (info.cpuid_eax>>4)&0xf; |
154 | CPU->arch.model = (info.cpuid_eax >> 4) & 0x0f; |
153 | CPU->arch.stepping = (info.cpuid_eax>>0)&0xf; |
155 | CPU->arch.stepping = (info.cpuid_eax >> 0) & 0x0f; |
154 | } |
156 | } |
155 | } |
157 | } |
156 | 158 | ||
157 | void cpu_print_report(cpu_t* m) |
159 | void cpu_print_report(cpu_t* cpu) |
158 | { |
160 | { |
159 | printf("cpu%d: (%s family=%d model=%d stepping=%d) %dMHz\n", |
161 | printf("cpu%u: (%s family=%u model=%u stepping=%u) %" PRIu16 " MHz\n", |
160 | m->id, vendor_str[m->arch.vendor], m->arch.family, m->arch.model, m->arch.stepping, |
162 | cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family, |
161 | m->frequency_mhz); |
163 | cpu->arch.model, cpu->arch.stepping, cpu->frequency_mhz); |
162 | } |
164 | } |
163 | 165 | ||
164 | /** @} |
166 | /** @} |
165 | */ |
167 | */ |