Chameleon

Chameleon Commit Details

Date:2010-01-15 23:54:18 (14 years 3 months ago)
Author:Rekursor
Commit:6
Parents: 5
Message:Fixed smbios.plist was not loaded, checked that smbios.plist overrides work. added missing new files to svn from asere patch.
Changes:
A/branches/rekursor/i386/libsaio/mem.h
A/branches/rekursor/i386/libsaio/allocate.c
A/branches/rekursor/i386/libsaio/cpu.c
A/branches/rekursor/i386/libsaio/cpu.h
A/branches/rekursor/i386/libsaio/mem.c
M/branches/rekursor/i386/libsaio/fake_efi.c
M/branches/rekursor/CHANGES

File differences

branches/rekursor/CHANGES
33
44
55
6
- Added automatic "system-id" injection from dmi bios, also compatible with SystemID boot option and former SMUUID from smbios,plist␊
- Added "system-type' automatic injection (1=Desktop) plus override possibility with the new system-type option in bootConfig␊
- Added SMserial and SMproductname new options for smbios.plist␊
- Merged with asere patch, while keeping my fake_efi.c changes, and adding a new stringForKey() API, also changed the DT__XXXX() set of functions to handle const char * values instead of char*.␊
branches/rekursor/i386/libsaio/allocate.c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
/*␊
* Copyright (c) 2003 Apple Computer, Inc. All rights reserved.␊
*␊
* @APPLE_LICENSE_HEADER_START@␊
* ␊
* Portions Copyright (c) 2003 Apple Computer, Inc. All Rights␊
* Reserved. This file contains Original Code and/or Modifications of␊
* Original Code as defined in and that are subject to the Apple Public␊
* Source License Version 2.0 (the "License"). You may not use this file␊
* except in compliance with the License. Please obtain a copy of the␊
* License at http://www.apple.com/publicsource and read it before using␊
* this file.␊
* ␊
* The Original Code and all software distributed under the License are␊
* distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER␊
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,␊
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,␊
* FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT. Please see the␊
* License for the specific language governing rights and limitations␊
* under the License.␊
* ␊
* @APPLE_LICENSE_HEADER_END@␊
*/␊
␊
#include "sl.h"␊
#include "saio_internal.h"␊
#include "bootstruct.h"␊
#include "device_tree.h"␊
␊
static long gImageLastKernelAddr;␊
␊
#define kPageSize 4096␊
#define RoundPage(x) ((((unsigned)(x)) + kPageSize - 1) & ~(kPageSize - 1))␊
␊
␊
long␊
AllocateMemoryRange(char * rangeName, long start, long length, long type)␊
{␊
char *nameBuf;␊
uint32_t *buffer;␊
␊
nameBuf = MALLOC(strlen(rangeName) + 1);␊
if (nameBuf == 0) return -1;␊
strcpy(nameBuf, rangeName);␊
␊
buffer = MALLOC(2 * sizeof(uint32_t));␊
if (buffer == 0) return -1;␊
␊
buffer[0] = start;␊
buffer[1] = length;␊
␊
DT__AddProperty(gMemoryMapNode, nameBuf, 2 * sizeof(uint32_t), (char *)buffer);␊
␊
return 0;␊
}␊
␊
long␊
AllocateKernelMemory( long inSize )␊
{␊
long addr;␊
␊
if (gImageLastKernelAddr == 0) {␊
gImageLastKernelAddr = RoundPage( bootArgs->kaddr +␊
bootArgs->ksize );␊
}␊
addr = gImageLastKernelAddr;␊
gImageLastKernelAddr += RoundPage(inSize);␊
␊
if ( gImageLastKernelAddr >= (KERNEL_ADDR + KERNEL_LEN) ) {␊
stop ("AllocateKernelMemory error");␊
}␊
␊
bootArgs->ksize = gImageLastKernelAddr - bootArgs->kaddr;␊
␊
return addr;␊
}␊
branches/rekursor/i386/libsaio/mem.c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
/*␊
* Copyright 2010 AsereBLN. All rights reserved. <aserebln@googlemail.com>␊
*␊
* mem.c - obtain system memory information␊
*/␊
␊
#include "libsaio.h"␊
#include "pci.h"␊
#include "platform.h"␊
#include "cpu.h"␊
#include "mem.h"␊
␊
#ifndef DEBUG_MEM␊
#define DEBUG_MEM 0␊
#endif␊
␊
#if DEBUG_MEM␊
#define DBG(x...)␉␉printf(x)␊
#else␊
#define DBG(x...)␊
#endif␊
␊
void scan_memory(PlatformInfo_t *p)␊
{␊
␉/* NYI */␊
}␊
branches/rekursor/i386/libsaio/mem.h
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
/*␊
* Copyright 2010 AsereBLN. All rights reserved. <aserebln@googlemail.com>␊
*␊
* mem.h␊
*/␊
␊
#ifndef __LIBSAIO_MEM_H␊
#define __LIBSAIO_MEM_H␊
␊
#include "platform.h"␊
␊
extern void scan_memory(PlatformInfo_t *);␊
␊
␊
#endif␉/* __LIBSAIO_MEM_H */␊
branches/rekursor/i386/libsaio/cpu.c
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
/*␊
* Copyright 2008 Islam Ahmed Zaid. All rights reserved. <azismed@gmail.com>␊
* AsereBLN: 2009: cleanup and bugfix␊
*/␊
␊
#include "libsaio.h"␊
#include "platform.h"␊
#include "cpu.h"␊
␊
#ifndef DEBUG_CPU␊
#define DEBUG_CPU 0␊
#endif␊
␊
#if DEBUG_CPU␊
#define DBG(x...)␉␉printf(x)␊
#else␊
#define DBG(x...)␊
#endif␊
␊
␊
static inline uint64_t rdtsc64(void)␊
{␊
␉uint64_t ret;␊
␉__asm__ volatile("rdtsc" : "=A" (ret));␊
␉return ret;␊
}␊
␊
static inline uint64_t rdmsr64(uint32_t msr)␊
{␊
uint64_t ret;␊
__asm__ volatile("rdmsr" : "=A" (ret) : "c" (msr));␊
return ret;␊
}␊
␊
static inline void do_cpuid(uint32_t selector, uint32_t *data)␊
{␊
␉asm volatile ("cpuid"␊
␉ : "=a" (data[0]),␊
␉ "=b" (data[1]),␊
␉ "=c" (data[2]),␊
␉ "=d" (data[3])␊
␉ : "a" (selector));␊
}␊
␊
static inline void do_cpuid2(uint32_t selector, uint32_t selector2, uint32_t *data)␊
{␊
␉asm volatile ("cpuid"␊
␉ : "=a" (data[0]),␊
␉ "=b" (data[1]),␊
␉ "=c" (data[2]),␊
␉ "=d" (data[3])␊
␉ : "a" (selector), "c" (selector2));␊
}␊
␊
// DFE: enable_PIT2 and disable_PIT2 come from older xnu␊
␊
/*␊
* Enable or disable timer 2.␊
* Port 0x61 controls timer 2:␊
* bit 0 gates the clock,␊
* bit 1 gates output to speaker.␊
*/␊
static inline void enable_PIT2(void)␊
{␊
/* Enable gate, disable speaker */␊
__asm__ volatile(␊
" inb $0x61,%%al \n\t"␊
" and $0xFC,%%al \n\t" /* & ~0x03 */␊
" or $1,%%al \n\t"␊
" outb %%al,$0x61 \n\t"␊
: : : "%al" );␊
}␊
␊
static inline void disable_PIT2(void)␊
{␊
/* Disable gate and output to speaker */␊
__asm__ volatile(␊
" inb $0x61,%%al \n\t"␊
" and $0xFC,%%al \n\t"␉/* & ~0x03 */␊
" outb %%al,$0x61 \n\t"␊
: : : "%al" );␊
}␊
␊
// DFE: set_PIT2_mode0, poll_PIT2_gate, and measure_tsc_frequency are␊
// roughly based on Linux code␊
␊
/* Set the 8254 channel 2 to mode 0 with the specified value.␊
In mode 0, the counter will initially set its gate low when the␊
timer expires. For this to be useful, you ought to set it high␊
before calling this function. The enable_PIT2 function does this.␊
*/␊
static inline void set_PIT2_mode0(uint16_t value)␊
{␊
__asm__ volatile(␊
" movb $0xB0,%%al \n\t"␊
" outb␉%%al,$0x43␉\n\t"␊
" movb␉%%dl,%%al␉\n\t"␊
" outb␉%%al,$0x42␉\n\t"␊
" movb␉%%dh,%%al␉\n\t"␊
" outb␉%%al,$0x42"␊
: : "d"(value) /*: no clobber */ );␊
}␊
␊
/* Returns the number of times the loop ran before the PIT2 signaled */␊
static inline unsigned long poll_PIT2_gate(void)␊
{␊
unsigned long count = 0;␊
unsigned char nmi_sc_val;␊
do {␊
++count;␊
__asm__ volatile(␊
"inb␉$0x61,%0"␊
: "=q"(nmi_sc_val) /*:*/ /* no input */ /*:*/ /* no clobber */);␊
} while( (nmi_sc_val & 0x20) == 0);␊
return count;␊
}␊
␊
/*␊
* DFE: Measures the TSC frequency in Hz (64-bit) using the ACPI PM timer␊
*/␊
static uint64_t measure_tsc_frequency(void)␊
{␊
uint64_t tscStart;␊
uint64_t tscEnd;␊
uint64_t tscDelta = 0xffffffffffffffffULL;␊
unsigned long pollCount;␊
uint64_t retval = 0;␊
int i;␊
␊
/* Time how many TSC ticks elapse in 30 msec using the 8254 PIT␊
* counter 2. We run this loop 3 times to make sure the cache␊
* is hot and we take the minimum delta from all of the runs.␊
* That is to say that we're biased towards measuring the minimum␊
* number of TSC ticks that occur while waiting for the timer to␊
* expire. That theoretically helps avoid inconsistencies when␊
* running under a VM if the TSC is not virtualized and the host␊
* steals time. The TSC is normally virtualized for VMware.␊
*/␊
for(i = 0; i < 10; ++i)␊
{␊
enable_PIT2();␊
set_PIT2_mode0(CALIBRATE_LATCH);␊
tscStart = rdtsc64();␊
pollCount = poll_PIT2_gate();␊
tscEnd = rdtsc64();␊
/* The poll loop must have run at least a few times for accuracy */␊
if(pollCount <= 1)␊
continue;␊
/* The TSC must increment at LEAST once every millisecond. We␊
* should have waited exactly 30 msec so the TSC delta should␊
* be >= 30. Anything less and the processor is way too slow.␊
*/␊
if((tscEnd - tscStart) <= CALIBRATE_TIME_MSEC)␊
continue;␊
// tscDelta = min(tscDelta, (tscEnd - tscStart))␊
if( (tscEnd - tscStart) < tscDelta )␊
tscDelta = tscEnd - tscStart;␊
}␊
/* tscDelta is now the least number of TSC ticks the processor made in␊
* a timespan of 0.03 s (e.g. 30 milliseconds)␊
* Linux thus divides by 30 which gives the answer in kiloHertz because␊
* 1 / ms = kHz. But we're xnu and most of the rest of the code uses␊
* Hz so we need to convert our milliseconds to seconds. Since we're␊
* dividing by the milliseconds, we simply multiply by 1000.␊
*/␊
␊
/* Unlike linux, we're not limited to 32-bit, but we do need to take care␊
* that we're going to multiply by 1000 first so we do need at least some␊
* arithmetic headroom. For now, 32-bit should be enough.␊
* Also unlike Linux, our compiler can do 64-bit integer arithmetic.␊
*/␊
if(tscDelta > (1ULL<<32))␊
retval = 0;␊
else␊
{␊
retval = tscDelta * 1000 / 30;␊
}␊
disable_PIT2();␊
return retval;␊
}␊
␊
/*␊
* Calculates the FSB and CPU frequencies using specific MSRs for each CPU␊
* - multi. is read from a specific MSR. In the case of Intel, there is:␊
* a max multi. (used to calculate the FSB freq.),␊
* and a current multi. (used to calculate the CPU freq.)␊
* - fsbFrequency = tscFrequency / multi␊
* - cpuFrequency = fsbFrequency * multi␊
*/␊
␊
void scan_cpu(PlatformInfo_t *p)␊
{␊
␉uint64_t␉tscFrequency, fsbFrequency, cpuFrequency;␊
␉uint64_t␉msr, flex_ratio;␊
␉uint8_t␉␉maxcoef, maxdiv, currcoef, currdiv;␊
␊
␉maxcoef = maxdiv = currcoef = currdiv = 0;␊
␊
␉/* get cpuid values */␊
␉do_cpuid(0x00000000, p->CPU.CPUID[CPUID_0]);␊
␉do_cpuid(0x00000001, p->CPU.CPUID[CPUID_1]);␊
␉do_cpuid(0x00000002, p->CPU.CPUID[CPUID_2]);␊
␉do_cpuid(0x00000003, p->CPU.CPUID[CPUID_3]);␊
␉do_cpuid2(0x00000004, 0, p->CPU.CPUID[CPUID_4]);␊
␉do_cpuid(0x80000000, p->CPU.CPUID[CPUID_80]);␊
␉if ((p->CPU.CPUID[CPUID_80][0] & 0x0000000f) >= 1) {␊
␉␉do_cpuid(0x80000001, p->CPU.CPUID[CPUID_81]);␊
␉}␊
#if DEBUG_CPU␊
␉{␊
␉␉int␉␉i;␊
␉␉printf("CPUID Raw Values:\n");␊
␉␉for (i=0; i<CPUID_MAX; i++) {␊
␉␉␉printf("%02d: %08x-%08x-%08x-%08x\n", i,␊
␉␉␉␉p->CPU.CPUID[i][0], p->CPU.CPUID[i][1],␊
␉␉␉␉p->CPU.CPUID[i][2], p->CPU.CPUID[i][3]);␊
␉␉}␊
␉}␊
#endif␊
␉p->CPU.Vendor␉␉= p->CPU.CPUID[CPUID_0][1];␊
␉p->CPU.Model␉␉= bitfield(p->CPU.CPUID[CPUID_1][0], 7, 4);␊
␉p->CPU.Family␉␉= bitfield(p->CPU.CPUID[CPUID_1][0], 11, 8);␊
␉p->CPU.ExtModel␉␉= bitfield(p->CPU.CPUID[CPUID_1][0], 19, 16);␊
␉p->CPU.ExtFamily␉= bitfield(p->CPU.CPUID[CPUID_1][0], 27, 20);␊
␉p->CPU.NoThreads␉= bitfield(p->CPU.CPUID[CPUID_1][1], 23, 16);␊
␉p->CPU.NoCores␉␉= bitfield(p->CPU.CPUID[CPUID_4][0], 31, 26) + 1;␊
␊
␉p->CPU.Model += (p->CPU.ExtModel << 4);␊
␊
␉/* setup features */␊
␉if ((bit(23) & p->CPU.CPUID[CPUID_1][3]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_MMX;␊
␉}␊
␉if ((bit(25) & p->CPU.CPUID[CPUID_1][3]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_SSE;␊
␉}␊
␉if ((bit(26) & p->CPU.CPUID[CPUID_1][3]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_SSE2;␊
␉}␊
␉if ((bit(0) & p->CPU.CPUID[CPUID_1][2]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_SSE3;␊
␉}␊
␉if ((bit(19) & p->CPU.CPUID[CPUID_1][2]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_SSE41;␊
␉}␊
␉if ((bit(20) & p->CPU.CPUID[CPUID_1][2]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_SSE42;␊
␉}␊
␉if ((bit(29) & p->CPU.CPUID[CPUID_81][3]) != 0) {␊
␉␉p->CPU.Features |= CPU_FEATURE_EM64T;␊
␉}␊
␉//if ((bit(28) & p->CPU.CPUID[CPUID_1][3]) != 0) {␊
␉if (p->CPU.NoThreads > p->CPU.NoCores) {␊
␉␉p->CPU.Features |= CPU_FEATURE_HTT;␊
␉}␊
␊
␉tscFrequency = measure_tsc_frequency();␊
␉fsbFrequency = 0;␊
␉cpuFrequency = 0;␊
␊
␉if ((p->CPU.Vendor == 0x756E6547 /* Intel */) && ((p->CPU.Family == 0x06) || (p->CPU.Family == 0x0f))) {␊
␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0c) || (p->CPU.Family == 0x0f && p->CPU.Model >= 0x03)) {␊
␉␉␉/* Nehalem CPU model */␊
␉␉␉if (p->CPU.Family == 0x06 && (p->CPU.Model == 0x1a || p->CPU.Model == 0x1e)) {␊
␉␉␉␉msr = rdmsr64(MSR_PLATFORM_INFO);␊
␉␉␉␉DBG("msr(%d): platform_info %08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉currcoef = (msr >> 8) & 0xff;␊
␉␉␉␉msr = rdmsr64(MSR_FLEX_RATIO);␊
␉␉␉␉DBG("msr(%d): flex_ratio %08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉if ((msr >> 16) & 0x01) {␊
␉␉␉␉␉flex_ratio = (msr >> 8) & 0xff;␊
␉␉␉␉␉if (currcoef > flex_ratio) {␊
␉␉␉␉␉␉currcoef = flex_ratio;␊
␉␉␉␉␉}␊
␉␉␉␉}␊
␊
␉␉␉␉if (currcoef) {␊
␉␉␉␉␉fsbFrequency = (tscFrequency / currcoef);␊
␉␉␉␉}␊
␉␉␉␉cpuFrequency = tscFrequency;␊
␉␉␉} else {␊
␉␉␉␉msr = rdmsr64(IA32_PERF_STATUS);␊
␉␉␉␉DBG("msr(%d): ia32_perf_stat 0x%08x\n", __LINE__, msr & 0xffffffff);␊
␉␉␉␉currcoef = (msr >> 8) & 0x1f;␊
␉␉␉␉/* Non-integer bus ratio for the max-multi*/␊
␉␉␉␉maxdiv = (msr >> 46) & 0x01;␊
␉␉␉␉/* Non-integer bus ratio for the current-multi (undocumented)*/␊
␉␉␉␉currdiv = (msr >> 14) & 0x01;␊
␊
␉␉␉␉if ((p->CPU.Family == 0x06 && p->CPU.Model >= 0x0e) || (p->CPU.Family == 0x0f)) // This will always be model >= 3␊
␉␉␉␉{␊
␉␉␉␉␉/* On these models, maxcoef defines TSC freq */␊
␉␉␉␉␉maxcoef = (msr >> 40) & 0x1f;␊
␉␉␉␉} else {␊
␉␉␉␉␉/* On lower models, currcoef defines TSC freq */␊
␉␉␉␉␉/* XXX */␊
␉␉␉␉␉maxcoef = currcoef;␊
␉␉␉␉}␊
␊
␉␉␉␉if (maxcoef) {␊
␉␉␉␉␉if (maxdiv) {␊
␉␉␉␉␉␉fsbFrequency = ((tscFrequency * 2) / ((maxcoef * 2) + 1));␊
␉␉␉␉␉} else {␊
␉␉␉␉␉␉fsbFrequency = (tscFrequency / maxcoef);␊
␉␉␉␉␉}␊
␉␉␉␉␉if (currdiv) {␊
␉␉␉␉␉␉cpuFrequency = (fsbFrequency * ((currcoef * 2) + 1) / 2);␊
␉␉␉␉␉} else {␊
␉␉␉␉␉␉cpuFrequency = (fsbFrequency * currcoef);␊
␉␉␉␉␉}␊
␉␉␉␉␉DBG("max: %d%s current: %d%s\n", maxcoef, maxdiv ? ".5" : "",currcoef, currdiv ? ".5" : "");␊
␉␉␉␉}␊
␉␉␉}␊
␉␉}␊
␉␉/* Mobile CPU ? */␊
␉␉if (rdmsr64(0x17) & (1<<28)) {␊
␉␉␉p->CPU.Features |= CPU_FEATURE_MOBILE;␊
␉␉}␊
␉}␊
#if 0␊
␉else if((p->CPU.Vendor == 0x68747541 /* AMD */) && (p->CPU.Family == 0x0f)) {␊
␉␉if(p->CPU.ExtFamily == 0x00 /* K8 */) {␊
␉␉␉msr = rdmsr64(K8_FIDVID_STATUS);␊
␉␉␉currcoef = (msr & 0x3f) / 2 + 4;␊
␉␉␉currdiv = (msr & 0x01) * 2;␊
␉␉} else if(p->CPU.ExtFamily >= 0x01 /* K10+ */) {␊
␉␉␉msr = rdmsr64(K10_COFVID_STATUS);␊
␉␉␉if(p->CPU.ExtFamily == 0x01 /* K10 */)␊
␉␉␉␉currcoef = (msr & 0x3f) + 0x10;␊
␉␉␉else /* K11+ */␊
␉␉␉␉currcoef = (msr & 0x3f) + 0x08;␊
␉␉␉currdiv = (2 << ((msr >> 6) & 0x07));␊
␉␉}␊
␊
␉␉if (currcoef) {␊
␉␉␉if (currdiv) {␊
␉␉␉␉fsbFrequency = ((tscFrequency * currdiv) / currcoef);␊
␉␉␉␉DBG("%d.%d\n", currcoef / currdiv, ((currcoef % currdiv) * 100) / currdiv);␊
␉␉␉} else {␊
␉␉␉␉fsbFrequency = (tscFrequency / currcoef);␊
␉␉␉␉DBG("%d\n", currcoef);␊
␉␉␉}␊
␉␉␉fsbFrequency = (tscFrequency / currcoef);␊
␉␉␉cpuFrequency = tscFrequency;␊
␉␉}␊
␉}␊
␊
␉if (!fsbFrequency) {␊
␉␉fsbFrequency = (DEFAULT_FSB * 1000);␊
␉␉cpuFrequency = tscFrequency;␊
␉␉DBG("0 ! using the default value for FSB !\n");␊
␉}␊
#endif␊
␊
␉p->CPU.MaxCoef = maxcoef;␊
␉p->CPU.MaxDiv = maxdiv;␊
␉p->CPU.CurrCoef = currcoef;␊
␉p->CPU.CurrDiv = currdiv;␊
␉p->CPU.TSCFrequency = tscFrequency;␊
␉p->CPU.FSBFrequency = fsbFrequency;␊
␉p->CPU.CPUFrequency = cpuFrequency;␊
#if DEBUG_CPU␊
␉DBG("CPU: Vendor/Model/ExtModel: 0x%x/0x%x/0x%x\n", p->CPU.Vendor, p->CPU.Model, p->CPU.ExtModel);␊
␉DBG("CPU: Family/ExtFamily: 0x%x/0x%x\n", p->CPU.Family, p->CPU.ExtFamily);␊
␉DBG("CPU: MaxCoef/CurrCoef: 0x%x/0x%x\n", p->CPU.MaxCoef, p->CPU.CurrCoef);␊
␉DBG("CPU: MaxDiv/CurrDiv: 0x%x/0x%x\n", p->CPU.MaxDiv, p->CPU.CurrDiv);␊
␉DBG("CPU: TSCFreq: %dMHz\n", p->CPU.TSCFrequency / 1000000);␊
␉DBG("CPU: FSBFreq: %dMHz\n", p->CPU.FSBFrequency / 1000000);␊
␉DBG("CPU: CPUFreq: %dMHz\n", p->CPU.CPUFrequency / 1000000);␊
␉DBG("CPU: NoCores/NoThreads: %d/%d\n", p->CPU.NoCores, p->CPU.NoThreads);␊
␉DBG("CPU: Features: 0x%08x\n", p->CPU.Features);␊
␉printf("(Press a key to continue...)\n");␊
␉getc();␊
#endif␊
}␊
branches/rekursor/i386/libsaio/cpu.h
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
/*␊
* Copyright 2008 Islam Ahmed Zaid. All rights reserved. <azismed@gmail.com>␊
* AsereBLN: 2009: cleanup and bugfix␊
*/␊
␊
#ifndef __LIBSAIO_CPU_H␊
#define __LIBSAIO_CPU_H␊
␊
#include "libsaio.h"␊
␊
extern void scan_cpu(PlatformInfo_t *);␊
␊
#define bit(n)␉␉␉(1UL << (n))␊
#define bitmask(h,l)␉␉((bit(h)|(bit(h)-1)) & ~(bit(l)-1))␊
#define bitfield(x,h,l)␉␉(((x) & bitmask(h,l)) >> l)␊
␊
#define␉IA32_PERF_STATUS␉0x198␊
#define MSR_FLEX_RATIO␉␉0x194␊
#define␉MSR_PLATFORM_INFO␉0xCE␊
#define K8_FIDVID_STATUS␉0xC0010042␊
#define K10_COFVID_STATUS␉0xC0010071␊
␊
#define DEFAULT_FSB␉␉100000 /* for now, hardcoding 100MHz for old CPUs */␊
␊
// DFE: This constant comes from older xnu:␊
#define CLKNUM␉␉␉1193182␉␉/* formerly 1193167 */␊
␊
// DFE: These two constants come from Linux except CLOCK_TICK_RATE replaced with CLKNUM␊
#define CALIBRATE_TIME_MSEC␉30␉␉/* 30 msecs */␊
#define CALIBRATE_LATCH␉␉((CLKNUM * CALIBRATE_TIME_MSEC + 1000/2)/1000)␊
␊
#endif /* !__LIBSAIO_CPU_H */␊
branches/rekursor/i386/libsaio/fake_efi.c
332332
333333
334334
335
335
336336
337
337
338338
339
340
339
341340
342341
343342
344
343
345344
346345
347346
......
457456
458457
459458
460
459
461460
462461
463462
......
488487
489488
490489
491
492
493
490
494491
495
496
497
492
493
494
498495
499496
500497
......
522519
523520
524521
525
522
526523
527524
528525
......
542539
543540
544541
545
542
546543
547544
548545
......
563560
564561
565562
563
564
565
566
567
568
569
570
571
572
566573
567574
568575
......
584591
585592
586593
587
594
595
596
597
588598
589599
590600
/* Get an smbios option string option to convert to EFI_CHAR16 string */␊
static EFI_CHAR16* getSmbiosChar16(const char * key, size_t* len)␊
{␊
const char * src=0;␊
const char * src= getStringForKey(key, &bootInfo->smbiosConfig);␊
EFI_CHAR16* dst = 0;␊
size_t i;␊
size_t i=0;␊
␊
if (!key || !(*key) || !len || !(src = getStringForKey(key, &bootInfo->smbiosConfig)))␊
return 0;␊
if (!key || !(*key) || !len || !src) return 0;␊
␊
*len = strlen(src);␊
dst = (EFI_CHAR16*) MALLOC(((*len)+1)*2);␊
for (i=0; i<*len; i++) dst[i] = src[i];␊
for (; i<*len; i++) dst[i] = src[i];␊
dst[*len] = '\0';␊
␊
return dst;␊
}␊
*/␊
␊
/* return a binary UUID value from the overriden SystemID and SMUUID if ound, ␊
/* return a binary UUID value from the overriden SystemID and SMUUID if found, ␊
* or from the bios if not, or from a fixed value if no bios value is found ␊
*/␊
static EFI_CHAR8* getSystemID()␊
␊
node = DT__FindNode("/", false);␊
␊
if (node == 0) {␊
stop("Couldn't get root node");␊
}␊
if (node == 0) stop("Couldn't get root node");␊
␊
/* We could also just do DT__FindNode("/efi/platform", true)␊
* But I think eventually we want to fill stuff in the efi node␊
* too so we might as well create it so we have a pointer for it too.␊
/* We could also just do DT__FindNode("/efi/platform", true)␊
* But I think eventually we want to fill stuff in the efi node␊
* too so we might as well create it so we have a pointer for it too.␊
*/␊
node = DT__AddChild(node, "efi");␊
␊
␊
/* Now fill in the /efi/platform Node */␊
Node *efiPlatformNode = DT__AddChild(node, "platform");␊
␊
␊
/* NOTE WELL: If you do add FSB Frequency detection, make sure to store␊
* the value in the fsbFrequency global and not an malloc'd pointer␊
* because the DT_AddProperty function does not copy its args.␊
DT__AddProperty(efiPlatformNode, SYSTEM_ID_PROP, UUID_LEN, (EFI_UINT32*) ret);␊
␊
/* Export system-type. Allowed values are: 0x01 for desktop computer (default), 0x02 for portable computers */␊
if (getValueForKey("system-type", &value, (int*) &len, &bootInfo->bootConfig) && value != NULL) {␊
if ((value=getStringForKey("system-type", &bootInfo->bootConfig))) {␊
if (*value != '1' && *value != '2') ␊
␉verbose("Error: system-type must be 1 (desktop) or 2 (portable). Defaulting to 1!\n");␊
else␊
setupDeviceProperties(node);␊
}␊
␊
/* Load the smbios.plist override config file if any */␊
static void setupSmbiosConfigFile()␊
{␊
const char * value = getStringForKey(kSMBIOS, &bootInfo->bootConfig);␊
if (!value) value = "/Extra/smbios.plist";␊
if (loadConfigFile(value, &bootInfo->smbiosConfig) == -1) {␊
verbose("No SMBIOS replacement found\n");␊
}␊
}␊
␊
/* Installs all the needed configuration table entries */␊
void setupEfiConfigurationTable()␊
{␊
/* Entrypoint from boot.c */␊
void setupFakeEfi(void)␊
{␊
␉// Generate efi device strings ␊
// load smbios.plist file if any␊
setupSmbiosConfigFile();␊
␉␊
// Generate efi device strings ␊
␉setupEfiDevices();␊
␉␊
␉// Initialize the base table␊

Archive Download the corresponding diff file

Revision: 6