Chameleon

Chameleon Commit Details

Date:2011-05-11 05:28:31 (12 years 11 months ago)
Author:Cosmosis Jones
Commit:781
Parents: 780
Message:merged from Kabyl's branch teh SMBIOS patcher
Changes:
M/trunk/i386/libsaio/SMBIOS.h
M/trunk/i386/libsaio/platform.c
M/trunk/i386/libsaio/spd.c
M/trunk/i386/libsaio/fake_efi.c
M/trunk/i386/libsaio/platform.h
M/trunk/i386/libsaio/Makefile

File differences

trunk/i386/libsaio/spd.c
1010
1111
1212
13
1314
1415
1516
......
2122
2223
2324
24
25
2526
2627
2728
......
7778
7879
7980
80
81
82
83
84
85
86
87
88
8189
8290
8391
......
247255
248256
249257
250
258
251259
252260
253261
262
263
264
265
266
254267
255
268
269
270
256271
257272
258
259
260
261
273
274
262275
276
277
263278
264279
265280
281
266282
267
283
284
268285
269286
270287
......
275292
276293
277294
278
295
279296
280297
281298
......
316333
317334
318335
319
336
320337
321338
322339
......
326343
327344
328345
329
330
346
347
348
331349
332
350
333351
334352
335353
336354
337
355
338356
339357
340358
......
392410
393411
394412
413
#include "pci.h"␊
#include "platform.h"␊
#include "spd.h"␊
#include "cpu.h"␊
#include "saio_internal.h"␊
#include "bootstruct.h"␊
#include "memvendors.h"␊
#if DEBUG_SPD␊
#define DBG(x...)␉printf(x)␊
#else␊
#define DBG(x...)␊
#define DBG(x...)␉msglog(x)␊
#endif␊
␊
static const char *spd_memory_types[] =␊
outb(base + SMBHSTSTS, 0x1f);␉␉␉␉␉// reset SMBus Controller␊
outb(base + SMBHSTDAT, 0xff);␊
␉␊
while( inb(base + SMBHSTSTS) & 0x01);␉␉␉// wait until ready␊
rdtsc(l1, h1);␊
while ( inb(base + SMBHSTSTS) & 0x01) // wait until read␊
{ ␊
rdtsc(l2, h2);␊
t = ((h2 - h1) * 0xffffffff + (l2 - l1)) / (Platform.CPU.TSCFrequency / 100);␊
if (t > 5)␊
return 0xFF; // break␊
}␊
␉␊
outb(base + SMBHSTCMD, cmd);␊
outb(base + SMBHSTADD, (adr << 1) | 0x01 );␊
{ ␊
int i, speed;␊
uint8_t spd_size, spd_type;␊
uint32_t base;␊
uint32_t base, mmio, hostc;␊
bool dump = false;␊
RamSlotInfo_t* slot;␊
␊
␉uint16_t cmd = pci_config_read16(smbus_dev->dev.addr, 0x04);␊
␉DBG("SMBus CmdReg: 0x%x\n", cmd);␊
␉pci_config_write16(smbus_dev->dev.addr, 0x04, cmd | 1);␊
␊
␉mmio = pci_config_read32(smbus_dev->dev.addr, 0x10);// & ~0x0f;␊
base = pci_config_read16(smbus_dev->dev.addr, 0x20) & 0xFFFE;␊
DBG("Scanning smbus_dev <%04x, %04x> ...\n",smbus_dev->vendor_id, smbus_dev->device_id);␊
␉hostc = pci_config_read8(smbus_dev->dev.addr, 0x40);␊
verbose("Scanning SMBus [%04x:%04x], mmio: 0x%x, ioport: 0x%x, hostc: 0x%x\n", ␊
␉␉smbus_dev->vendor_id, smbus_dev->device_id, mmio, base, hostc);␊
␊
getBoolForKey("DumpSPD", &dump, &bootInfo->bootConfig);␊
bool fullBanks = // needed at least for laptops␊
Platform.DMI.MemoryModules == Platform.DMI.MaxMemorySlots;␊
// Search MAX_RAM_SLOTS slots␊
␉char spdbuf[256];␊
␉// needed at least for laptops␊
bool fullBanks = Platform.DMI.MemoryModules == Platform.DMI.CntMemorySlots;␊
␊
␉char spdbuf[MAX_SPD_SIZE];␊
// Search MAX_RAM_SLOTS slots␊
for (i = 0; i < MAX_RAM_SLOTS; i++){␊
slot = &Platform.RAM.DIMM[i];␊
spd_size = smb_read_byte_intel(base, 0x50 + i, 0);␊
␉␉DBG("SPD[0] (size): %d @0x%x\n", spd_size, 0x50 + i);␊
// Check spd is present␊
if (spd_size && (spd_size != 0xff) ) {␊
if (spd_size && (spd_size != 0xff))␊
{␊
␊
␉␉␉slot->spd = spdbuf;␊
slot->InUse = true;␊
␊
␉␉␉//for (x = 0; x < spd_size; x++) slot->spd[x] = smb_read_byte_intel(base, 0x50 + i, x);␊
init_spd(slot->spd, base, i);␊
␉␉␉␊
␉␉␊
switch (slot->spd[SPD_MEMORY_TYPE]) {␊
case SPD_MEMORY_TYPE_SDRAM_DDR2:␊
␊
␉␉␉␉}␊
␉␉␉␉slot->Frequency = freq;␊
␉␉␉}␊
␉␉␉␊
␊
␉␉␉verbose("Slot: %d Type %d %dMB (%s) %dMHz Vendor=%s\n PartNo=%s SerialNo=%s\n", ␊
i, ␊
(int)slot->Type,␊
slot->Vendor,␊
slot->PartNo,␊
slot->SerialNo); ␊
␉␉␉if(DEBUG_SPD) {␊
dumpPhysAddr("spd content: ",slot->spd, spd_size);␊
␊
#if DEBUG_SPD␊
dumpPhysAddr("spd content: ", slot->spd, spd_size);␊
getc();␊
}␊
#endif␊
}␊
␊
// laptops sometimes show slot 0 and 2 with slot 1 empty when only 2 slots are presents so:␊
Platform.DMI.DIMM[i]= ␊
i>0 && Platform.RAM.DIMM[1].InUse==false && fullBanks && Platform.DMI.MaxMemorySlots==2 ? ␊
i>0 && Platform.RAM.DIMM[1].InUse==false && fullBanks && Platform.DMI.CntMemorySlots == 2 ? ␊
mapping[i] : i; // for laptops case, mapping setup would need to be more generic than this␊
␊
␉␉slot->spd = NULL;␊
{␊
find_and_read_smbus_controller(root_pci_dev);␊
}␊
␊
trunk/i386/libsaio/Makefile
4040
4141
4242
43
43
44
4445
4546
46
47
4748
4849
4950
␉vbe.o nbp.o hfs.o hfs_compare.o \␊
␉xml.o ntfs.o msdos.o md5c.o device_tree.o \␊
␉cpu.o platform.o acpi_patcher.o \␊
␉smbios_patcher.o fake_efi.o ext2fs.o \␊
␉smbios.o smbios_getters.o smbios_decode.o \␊
␉fake_efi.o ext2fs.o \␊
␉hpet.o dram_controllers.o spd.o usb.o pci_setup.o \␊
␉device_inject.o nvidia.o ati.o pci_root.o \␊
␉convert.o mem.o aml_generator.o␊
␉convert.o aml_generator.o␊
␊
␊
SAIO_EXTERN_OBJS = console.o␊
trunk/i386/libsaio/SMBIOS.h
11
2
2
33
44
55
......
2020
2121
2222
23
24
25
26
23
24
2725
28
29
26
27
28
3029
31
32
33
30
31
32
33
34
3435
35
36
37
38
39
4036
41
42
43
44
45
37
38
39
40
41
42
43
44
4645
47
48
49
50
51
52
53
54
46
47
48
49
50
51
52
53
54
55
56
5557
56
57
58
59
60
61
62
63
64
65
66
58
59
60
6761
68
69
70
71
72
73
74
75
76
77
78
79
62
63
64
65
66
8067
81
82
83
84
85
86
87
88
89
90
68
9169
92
93
94
95
96
97
98
99
100
70
71
72
73
74
75
10176
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
77
78
11779
118
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
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
/*␊
* Copyright (c) 1998-2006 Apple Computer, Inc. All rights reserved.␊
* Copyright (c) 1998-2009 Apple Computer, Inc. All rights reserved.␊
*␊
* @APPLE_LICENSE_HEADER_START@␊
* ␊
* @APPLE_LICENSE_HEADER_END@␊
*/␊
␊
/* This file is a stripped-down version of the one found in the AppleSMBIOS project.␊
* Changes:␊
* - Don't use pragma pack but instead use GCC's packed attribute␊
*/␊
#ifndef __LIBSAIO_SMBIOS_H␊
#define __LIBSAIO_SMBIOS_H␊
␊
#ifndef _LIBSAIO_SMBIOS_H␊
#define _LIBSAIO_SMBIOS_H␊
//␊
// Based on System Management BIOS Reference Specification v2.5␊
//␊
␊
/*␊
* Based on System Management BIOS Reference Specification v2.5␊
*/␊
typedef uint8_t SMBString;␊
typedef uint8_t SMBByte;␊
typedef uint16_t SMBWord;␊
typedef uint32_t SMBDWord;␊
typedef uint64_t SMBQWord;␊
␊
typedef uint8_t␉␉SMBString;␊
typedef uint8_t␉␉SMBByte;␊
typedef uint16_t␉SMBWord;␊
typedef uint32_t␉SMBDWord;␊
typedef uint64_t␉SMBQWord;␊
␊
struct DMIHeader {␊
␉SMBByte␉␉␉type;␊
␉SMBByte␉␉␉length;␊
␉SMBWord␉␉␉handle;␊
} __attribute__((packed));␊
typedef struct DMIEntryPoint {␊
SMBByte anchor[5];␊
SMBByte checksum;␊
SMBWord tableLength;␊
SMBDWord tableAddress;␊
SMBWord structureCount;␊
SMBByte bcdRevision;␊
} __attribute__((packed)) DMIEntryPoint;␊
␊
struct DMIEntryPoint {␊
␉SMBByte␉␉␉anchor[5];␊
␉SMBByte␉␉␉checksum;␊
␉SMBWord␉␉␉tableLength;␊
␉SMBDWord␉␉tableAddress;␊
␉SMBWord␉␉␉structureCount;␊
␉SMBByte␉␉␉bcdRevision;␊
} __attribute__((packed));␊
typedef struct SMBEntryPoint {␊
SMBByte anchor[4];␊
SMBByte checksum;␊
SMBByte entryPointLength;␊
SMBByte majorVersion;␊
SMBByte minorVersion;␊
SMBWord maxStructureSize;␊
SMBByte entryPointRevision;␊
SMBByte formattedArea[5];␊
DMIEntryPoint dmi;␊
} __attribute__((packed)) SMBEntryPoint;␊
␊
struct SMBEntryPoint {␊
␉SMBByte␉␉␉anchor[4];␊
␉SMBByte␉␉␉checksum;␊
␉SMBByte␉␉␉entryPointLength;␊
␉SMBByte␉␉␉majorVersion;␊
␉SMBByte␉␉␉minorVersion;␊
␉SMBWord␉␉␉maxStructureSize;␊
␉SMBByte␉␉␉entryPointRevision;␊
␉SMBByte␉␉␉formattedArea[5];␊
␉struct DMIEntryPoint␉dmi;␊
} __attribute__((packed));␊
//␊
// Header common to all SMBIOS structures␊
//␊
␊
struct DMIMemoryControllerInfo {/* 3.3.6 Memory Controller Information (Type 5) */␊
␉struct DMIHeader␉dmiHeader;␊
␉SMBByte␉␉␉errorDetectingMethod;␊
␉SMBByte␉␉␉errorCorrectingCapability;␊
␉SMBByte␉␉␉supportedInterleave;␊
␉SMBByte␉␉␉currentInterleave;␊
␉SMBByte␉␉␉maxMemoryModuleSize;␊
␉SMBWord␉␉␉supportedSpeeds;␊
␉SMBWord␉␉␉supportedMemoryTypes;␊
␉SMBByte␉␉␉memoryModuleVoltage;␊
␉SMBByte␉␉␉numberOfMemorySlots;␊
} __attribute__((packed));␊
typedef struct SMBStructHeader {␊
SMBByte type;␊
SMBByte length;␊
SMBWord handle;␊
} __attribute__((packed)) SMBStructHeader;␊
␊
struct DMIMemoryModuleInfo {␉/* 3.3.7 Memory Module Information (Type 6) */␊
␉struct DMIHeader␉dmiHeader;␊
␉SMBByte␉␉␉socketDesignation;␊
␉SMBByte␉␉␉bankConnections;␊
␉SMBByte␉␉␉currentSpeed;␊
␉SMBWord␉␉␉currentMemoryType;␊
␉SMBByte␉␉␉installedSize;␊
␉SMBByte␉␉␉enabledSize;␊
␉SMBByte␉␉␉errorStatus;␊
} __attribute__((packed));␊
#define SMB_STRUCT_HEADER SMBStructHeader header;␊
␊
struct DMIPhysicalMemoryArray {␉/* 3.3.17 Physical Memory Array (Type 16) */␊
␉struct DMIHeader␉dmiHeader;␊
␉SMBByte␉␉␉location;␊
␉SMBByte␉␉␉use;␊
␉SMBByte␉␉␉memoryCorrectionError;␊
␉SMBDWord␉␉maximumCapacity;␊
␉SMBWord␉␉␉memoryErrorInformationHandle;␊
␉SMBWord␉␉␉numberOfMemoryDevices;␊
} __attribute__((packed));␊
typedef struct SMBAnchor␊
{␊
␉const SMBStructHeader *␉header;␊
␉const uint8_t *␉␉␉next;␊
␉const uint8_t *␉␉␉end;␊
} SMBAnchor;␊
␊
struct DMIMemoryDevice {␉/* 3.3.18 Memory Device (Type 17) */␊
␉struct DMIHeader␉dmiHeader;␊
␉SMBWord␉␉␉physicalMemoryArrayHandle;␊
␉SMBWord␉␉␉memoryErrorInformationHandle;␊
␉SMBWord␉␉␉totalWidth;␊
␉SMBWord␉␉␉dataWidth;␊
␉SMBWord␉␉␉size;␊
␉SMBByte␉␉␉formFactor;␊
␉SMBByte␉␉␉deviceSet;␊
␉SMBByte␉␉␉deviceLocator;␊
␉SMBByte␉␉␉bankLocator;␊
␉SMBByte␉␉␉memoryType;␊
␉SMBWord␉␉␉typeDetail;␊
SMBWord speed;␊
} __attribute__((packed));␊
#define SMB_ANCHOR_IS_VALID(x)␉\␊
␉((x) && ((x)->header) && ((x)->next) && ((x)->end))␊
␊
#endif /* !_LIBSAIO_SMBIOS_H */␊
#define SMB_ANCHOR_RESET(x)␉␉\␊
␉bzero(x, sizeof(typedef struct SMBAnchor));␊
␊
//␊
// SMBIOS structure types.␊
//␊
␊
enum {␊
kSMBTypeBIOSInformation = 0,␊
kSMBTypeSystemInformation = 1,␊
kSMBTypeBaseBoard␉␉␉␉␉= 2,␊
kSMBTypeSystemEnclosure = 3,␊
kSMBTypeProcessorInformation = 4,␊
kSMBTypeMemoryModule = 6,␊
kSMBTypeCacheInformation = 7,␊
kSMBTypeSystemSlot = 9,␊
kSMBTypePhysicalMemoryArray = 16,␊
kSMBTypeMemoryDevice = 17,␊
kSMBType32BitMemoryErrorInfo = 18,␊
kSMBType64BitMemoryErrorInfo = 33,␊
␊
kSMBTypeEndOfTable = 127,␊
␊
/* Apple Specific Structures */␊
kSMBTypeFirmwareVolume = 128,␊
kSMBTypeMemorySPD = 130,␊
kSMBTypeOemProcessorType = 131,␊
kSMBTypeOemProcessorBusSpeed = 132␊
};␊
␊
//␊
// BIOS Information (Type 0)␊
//␊
typedef struct SMBBIOSInformation {␊
SMB_STRUCT_HEADER // Type 0␊
SMBString vendor; // BIOS vendor name␊
SMBString version; // BIOS version␊
SMBWord startSegment; // BIOS segment start␊
SMBString releaseDate; // BIOS release date␊
SMBByte romSize; // (n); 64K * (n+1) bytes␊
SMBQWord characteristics; // supported BIOS functions␊
} __attribute__((packed)) SMBBIOSInformation;␊
␊
//␊
// System Information (Type 1)␊
//␊
␊
typedef struct SMBSystemInformation {␊
// 2.0+ spec (8 bytes)␊
SMB_STRUCT_HEADER // Type 1␊
SMBString manufacturer;␊
SMBString productName;␊
SMBString version;␊
SMBString serialNumber;␊
// 2.1+ spec (25 bytes)␊
SMBByte uuid[16]; // can be all 0 or all 1's␊
SMBByte wakeupReason; // reason for system wakeup␊
// 2.4+ spec (27 bytes)␊
SMBString skuNumber;␊
SMBString family;␊
} __attribute__((packed)) SMBSystemInformation;␊
␊
//␊
// Base Board (Type 2)␊
//␊
␊
typedef struct SMBBaseBoard {␊
SMB_STRUCT_HEADER // Type 2␊
SMBString␉manufacturer;␊
SMBString␉product;␊
SMBString␉version;␊
SMBString␉serialNumber;␊
SMBString␉assetTagNumber;␊
SMBByte␉␉featureFlags;␊
SMBString␉locationInChassis;␊
SMBWord␉␉chassisHandle;␊
SMBByte␉␉boardType;␊
SMBByte␉␉numberOfContainedHandles;␊
␉// 0 - 255 contained handles go here but we do not include␊
␉// them in our structure. Be careful to use numberOfContainedHandles␊
␉// times sizeof(SMBWord) when computing the actual record size,␊
␉// if you need it.␊
} __attribute__((packed)) SMBBaseBoard;␊
␊
// Values for boardType in Type 2 records␊
enum {␊
kSMBBaseBoardUnknown␉␉␉␉= 0x01,␊
kSMBBaseBoardOther␉␉␉␉␉= 0x02,␊
kSMBBaseBoardServerBlade␉␉␉= 0x03,␊
kSMBBaseBoardConnectivitySwitch␉␉= 0x04,␊
kSMBBaseBoardSystemMgmtModule␉␉= 0x05,␊
kSMBBaseBoardProcessorModule␉␉= 0x06,␊
kSMBBaseBoardIOModule␉␉␉␉= 0x07,␊
kSMBBaseBoardMemoryModule␉␉␉= 0x08,␊
kSMBBaseBoardDaughter␉␉␉␉= 0x09,␊
kSMBBaseBoardMotherboard␉␉␉= 0x0A,␊
kSMBBaseBoardProcessorMemoryModule␉= 0x0B,␊
kSMBBaseBoardProcessorIOModule␉␉= 0x0C,␊
kSMBBaseBoardInterconnect␉␉␉= 0x0D,␊
};␊
␊
␊
//␊
// System Enclosure (Type 3)␊
//␊
␊
typedef struct SMBSystemEnclosure {␊
SMB_STRUCT_HEADER // Type 3␊
SMBString manufacturer;␊
SMBByte type;␊
SMBString version;␊
SMBString serialNumber;␊
SMBString assetTagNumber;␊
SMBByte bootupState;␊
SMBByte powerSupplyState;␊
SMBByte thermalState;␊
SMBByte securityStatus;␊
SMBDWord oemDefined;␊
} __attribute__((packed)) SMBSystemEnclosure;␊
␊
//␊
// Processor Information (Type 4)␊
//␊
␊
typedef struct SMBProcessorInformation {␊
// 2.0+ spec (26 bytes)␊
SMB_STRUCT_HEADER // Type 4␊
SMBString socketDesignation;␊
SMBByte processorType; // CPU = 3␊
SMBByte processorFamily; // processor family enum␊
SMBString manufacturer;␊
SMBQWord processorID; // based on CPUID␊
SMBString processorVersion;␊
SMBByte voltage; // bit7 cleared indicate legacy mode␊
SMBWord externalClock; // external clock in MHz␊
SMBWord maximumClock; // max internal clock in MHz␊
SMBWord currentClock; // current internal clock in MHz␊
SMBByte status;␊
SMBByte processorUpgrade; // processor upgrade enum␊
// 2.1+ spec (32 bytes)␊
SMBWord L1CacheHandle;␊
SMBWord L2CacheHandle;␊
SMBWord L3CacheHandle;␊
// 2.3+ spec (35 bytes)␊
SMBString serialNumber;␊
SMBString assetTag;␊
SMBString partNumber;␊
} __attribute__((packed)) SMBProcessorInformation;␊
␊
#define kSMBProcessorInformationMinSize 26␊
␊
//␊
// Memory Module Information (Type 6)␊
// Obsoleted since SMBIOS version 2.1␊
//␊
␊
typedef struct SMBMemoryModule {␊
SMB_STRUCT_HEADER // Type 6␊
SMBString socketDesignation;␊
SMBByte bankConnections;␊
SMBByte currentSpeed;␊
SMBWord currentMemoryType;␊
SMBByte installedSize;␊
SMBByte enabledSize;␊
SMBByte errorStatus;␊
} __attribute__((packed)) SMBMemoryModule;␊
␊
#define kSMBMemoryModuleSizeNotDeterminable 0x7D␊
#define kSMBMemoryModuleSizeNotEnabled 0x7E␊
#define kSMBMemoryModuleSizeNotInstalled 0x7F␊
␊
//␊
// Cache Information (Type 7)␊
//␊
␊
typedef struct SMBCacheInformation {␊
SMB_STRUCT_HEADER // Type 7␊
SMBString socketDesignation;␊
SMBWord cacheConfiguration;␊
SMBWord maximumCacheSize;␊
SMBWord installedSize;␊
SMBWord supportedSRAMType;␊
SMBWord currentSRAMType;␊
SMBByte cacheSpeed;␊
SMBByte errorCorrectionType;␊
SMBByte systemCacheType;␊
SMBByte associativity;␊
} __attribute__((packed)) SMBCacheInformation;␊
␊
typedef struct SMBSystemSlot {␊
// 2.0+ spec (12 bytes)␊
SMB_STRUCT_HEADER // Type 9␊
SMBString slotDesignation;␊
SMBByte slotType;␊
SMBByte slotDataBusWidth;␊
SMBByte currentUsage;␊
SMBByte slotLength;␊
SMBWord slotID;␊
SMBByte slotCharacteristics1;␊
// 2.1+ spec (13 bytes)␊
SMBByte slotCharacteristics2;␊
} __attribute__((packed)) SMBSystemSlot;␊
␊
//␊
// Physical Memory Array (Type 16)␊
//␊
␊
typedef struct SMBPhysicalMemoryArray {␊
// 2.1+ spec (15 bytes)␊
SMB_STRUCT_HEADER // Type 16␊
SMBByte physicalLocation; // physical location␊
SMBByte arrayUse; // the use for the memory array␊
SMBByte errorCorrection; // error correction/detection method␊
SMBDWord maximumCapacity; // maximum memory capacity in kilobytes␊
SMBWord errorHandle; // handle of a previously detected error␊
SMBWord numMemoryDevices; // number of memory slots or sockets␊
} __attribute__((packed)) SMBPhysicalMemoryArray;␊
␊
// Memory Array - Use␊
enum {␊
kSMBMemoryArrayUseOther = 0x01,␊
kSMBMemoryArrayUseUnknown = 0x02,␊
kSMBMemoryArrayUseSystemMemory = 0x03,␊
kSMBMemoryArrayUseVideoMemory = 0x04,␊
kSMBMemoryArrayUseFlashMemory = 0x05,␊
kSMBMemoryArrayUseNonVolatileMemory = 0x06,␊
kSMBMemoryArrayUseCacheMemory = 0x07␊
};␊
␊
// Memory Array - Error Correction Types␊
enum {␊
kSMBMemoryArrayErrorCorrectionTypeOther = 0x01,␊
kSMBMemoryArrayErrorCorrectionTypeUnknown = 0x02,␊
kSMBMemoryArrayErrorCorrectionTypeNone = 0x03,␊
kSMBMemoryArrayErrorCorrectionTypeParity = 0x04,␊
kSMBMemoryArrayErrorCorrectionTypeSingleBitECC = 0x05,␊
kSMBMemoryArrayErrorCorrectionTypeMultiBitECC = 0x06,␊
kSMBMemoryArrayErrorCorrectionTypeCRC = 0x07␊
};␊
␊
//␊
// Memory Device (Type 17)␊
//␊
␊
typedef struct SMBMemoryDevice {␊
// 2.1+ spec (21 bytes)␊
SMB_STRUCT_HEADER // Type 17␊
SMBWord arrayHandle; // handle of the parent memory array␊
SMBWord errorHandle; // handle of a previously detected error␊
SMBWord totalWidth; // total width in bits; including ECC bits␊
SMBWord dataWidth; // data width in bits␊
SMBWord memorySize; // bit15 is scale, 0 = MB, 1 = KB␊
SMBByte formFactor; // memory device form factor␊
SMBByte deviceSet; // parent set of identical memory devices␊
SMBString deviceLocator; // labeled socket; e.g. "SIMM 3"␊
SMBString bankLocator; // labeled bank; e.g. "Bank 0" or "A"␊
SMBByte memoryType; // type of memory␊
SMBWord memoryTypeDetail; // additional detail on memory type␊
// 2.3+ spec (27 bytes)␊
SMBWord memorySpeed; // speed of device in MHz (0 for unknown)␊
SMBString manufacturer;␊
SMBString serialNumber;␊
SMBString assetTag;␊
SMBString partNumber;␊
} __attribute__((packed)) SMBMemoryDevice;␊
␊
//␊
// Firmware Volume Description (Apple Specific - Type 128)␊
//␊
␊
enum {␊
FW_REGION_RESERVED = 0,␊
FW_REGION_RECOVERY = 1,␊
FW_REGION_MAIN = 2,␊
FW_REGION_NVRAM = 3,␊
FW_REGION_CONFIG = 4,␊
FW_REGION_DIAGVAULT = 5,␊
␊
NUM_FLASHMAP_ENTRIES = 8␊
};␊
␊
typedef struct FW_REGION_INFO␊
{␊
SMBDWord StartAddress;␊
SMBDWord EndAddress;␊
} __attribute__((packed)) FW_REGION_INFO;␊
␊
typedef struct SMBFirmwareVolume {␊
SMB_STRUCT_HEADER // Type 128␊
SMBByte RegionCount;␊
SMBByte Reserved[3];␊
SMBDWord FirmwareFeatures;␊
SMBDWord FirmwareFeaturesMask;␊
SMBByte RegionType[ NUM_FLASHMAP_ENTRIES ];␊
FW_REGION_INFO FlashMap[ NUM_FLASHMAP_ENTRIES ];␊
} __attribute__((packed)) SMBFirmwareVolume;␊
␊
//␊
// Memory SPD Data (Apple Specific - Type 130)␊
//␊
␊
typedef struct SMBMemorySPD {␊
␉SMB_STRUCT_HEADER // Type 130␊
␉SMBWord Type17Handle;␊
␉SMBWord Offset;␊
␉SMBWord Size;␊
␉SMBWord Data[];␊
} __attribute__((packed)) SMBMemorySPD;␊
␊
static const char *␊
SMBMemoryDeviceTypes[] =␊
{␊
"RAM", /* 00h Undefined */␊
"RAM", /* 01h Other */␊
"RAM", /* 02h Unknown */␊
"DRAM", /* 03h DRAM */␊
"EDRAM", /* 04h EDRAM */␊
"VRAM", /* 05h VRAM */␊
"SRAM", /* 06h SRAM */␊
"RAM", /* 07h RAM */␊
"ROM", /* 08h ROM */␊
"FLASH", /* 09h FLASH */␊
"EEPROM", /* 0Ah EEPROM */␊
"FEPROM", /* 0Bh FEPROM */␊
"EPROM", /* 0Ch EPROM */␊
"CDRAM", /* 0Dh CDRAM */␊
"3DRAM", /* 0Eh 3DRAM */␊
"SDRAM", /* 0Fh SDRAM */␊
"SGRAM", /* 10h SGRAM */␊
"RDRAM", /* 11h RDRAM */␊
"DDR SDRAM", /* 12h DDR */␊
"DDR2 SDRAM", /* 13h DDR2 */␊
"DDR2 FB-DIMM", /* 14h DDR2 FB-DIMM */␊
"RAM",␉␉␉/* 15h unused */␊
"RAM",␉␉␉/* 16h unused */␊
"RAM",␉␉␉/* 17h unused */␊
"DDR3",␉␉␉/* 18h DDR3, chosen in [5776134] */␊
};␊
␊
static const int␊
kSMBMemoryDeviceTypeCount = sizeof(SMBMemoryDeviceTypes) /␊
sizeof(SMBMemoryDeviceTypes[0]);␊
␊
//␊
// OEM Processor Type (Apple Specific - Type 131)␊
//␊
␊
typedef struct SMBOemProcessorType {␊
␉SMB_STRUCT_HEADER␊
␉SMBWord ProcessorType;␊
} __attribute__((packed)) SMBOemProcessorType;␊
␊
//␊
// OEM Processor Bus Speed (Apple Specific - Type 132)␊
//␊
typedef struct SMBOemProcessorBusSpeed {␊
␉SMB_STRUCT_HEADER␊
␉SMBWord ProcessorBusSpeed; // MT/s unit␊
} __attribute__((packed)) SMBOemProcessorBusSpeed;␊
␊
//----------------------------------------------------------------------------------------------------------␊
␊
/* From Foundation/Efi/Guid/Smbios/SmBios.h */␊
/* Modified to wrap Data4 array init with {} */␊
#define EFI_SMBIOS_TABLE_GUID {0xeb9d2d31, 0x2d88, 0x11d3, {0x9a, 0x16, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d}}␊
␊
#define SMBIOS_ORIGINAL␉␉0␊
#define SMBIOS_PATCHED␉␉1␊
␊
extern void *getSmbios(int which);␊
extern void readSMBIOSInfo(SMBEntryPoint *eps);␊
extern void setupSMBIOSTable(void);␊
␊
extern void decodeSMBIOSTable(SMBEntryPoint *eps);␊
␊
␊
#endif /* !__LIBSAIO_SMBIOS_H */␊
trunk/i386/libsaio/platform.c
1010
1111
1212
13
1413
1514
1615
......
4948
5049
5150
52
5351
54
5552
5653
5754
#include "pci.h"␊
#include "platform.h"␊
#include "cpu.h"␊
#include "mem.h"␊
#include "spd.h"␊
#include "dram_controllers.h"␊
␊
␉␉if (dram_controller_dev!=NULL) {␊
␉␉␉scan_dram_controller(dram_controller_dev); // Rek: pci dev ram controller direct and fully informative scan ...␊
␉␉}␊
scan_memory(&Platform); // unfortunately still necesary for some comp where spd cant read correct speed␊
scan_spd(&Platform);␊
␉␉//getc();␊
}␊
done = true;␊
}␊
trunk/i386/libsaio/platform.h
144144
145145
146146
147
147148
148149
149150
␉␉int␉␉␉DIMM[MAX_RAM_SLOTS];␉// Information and SPD mapping for each slot␊
␉} DMI;␊
␉uint8_t␉␉␉␉Type;␉␉␉// System Type: 1=Desktop, 2=Portable... according ACPI2.0 (FACP: PM_Profile)␊
␉uint8_t␉␉␉␉*UUID;␊
} PlatformInfo_t;␊
␊
extern PlatformInfo_t Platform;␊
trunk/i386/libsaio/fake_efi.c
1212
1313
1414
15
15
1616
1717
1818
1919
2020
21
2221
2322
2423
......
7675
7776
7877
79
80
81
82
78
79
8380
8481
8582
......
439436
440437
441438
442
443439
440
444441
445442
446443
......
469466
470467
471468
472
473469
474470
475
476
471
477472
478
479
480
481
482
483
484473
485474
486475
......
617606
618607
619608
620
609
621610
622611
623612
624613
625614
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642615
643616
644617
......
676649
677650
678651
679
652
680653
681
682654
683655
684656
......
690662
691663
692664
693
694
695665
696666
697667
......
717687
718688
719689
690
691
720692
721
693
722694
695
696
723697
724698
725699
#include "efi_tables.h"␊
#include "platform.h"␊
#include "acpi_patcher.h"␊
#include "smbios_patcher.h"␊
#include "smbios.h"␊
#include "device_inject.h"␊
#include "convert.h"␊
#include "pci.h"␊
#include "sl.h"␊
␊
extern struct SMBEntryPoint * getSmbios(int which); // now cached␊
extern void setup_pci_devs(pci_dt_t *pci_dt);␊
␊
/*␊
*/␊
␊
/* Identify ourselves as the EFI firmware vendor */␊
static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'A','p','p','l','e'};␊
static EFI_UINT32 const FIRMWARE_REVISION = 0x0001000a;␊
//static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'C','h','a','m','e','l','e','o','n','_','2','.','0', 0};␊
//static EFI_UINT32 const FIRMWARE_REVISION = 132; /* FIXME: Find a constant for this. */␊
static EFI_CHAR16 const FIRMWARE_VENDOR[] = {'C','h','a','m','e','l','e','o','n','_','2','.','0', 0};␊
static EFI_UINT32 const FIRMWARE_REVISION = 132; /* FIXME: Find a constant for this. */␊
␊
/* Default platform system_id (fix by IntVar) */␊
static EFI_CHAR8 const SYSTEM_ID[] = "0123456789ABCDEF"; //random value gen by uuidgen␊
static const char const SYSTEM_SERIAL_PROP[] = "SystemSerialNumber";␊
static const char const SYSTEM_TYPE_PROP[] = "system-type";␊
static const char const MODEL_PROP[] = "Model";␊
static const char const BOARDID_PROP[] = "board-id";␊
␊
␊
/*␊
* Get an smbios option string option to convert to EFI_CHAR16 string␊
*/␊
{␊
␉static EFI_CHAR8␉␉ uuid[UUID_LEN];␊
␉int␉␉␉␉␉␉ i, isZero, isOnes;␊
␉struct SMBEntryPoint␉*smbios;␊
␉SMBByte␉␉␉␉␉*p;␊
␉␊
␉smbios = getSmbios(SMBIOS_PATCHED); // checks for _SM_ anchor and table header checksum␊
␉if (smbios==NULL) return 0; // getSmbios() return a non null value if smbios is found␊
␉p = (SMBByte*)Platform.UUID;␊
␉␊
␉p = (SMBByte*) FindFirstDmiTableOfType(1, 0x19); // Type 1: (3.3.2) System Information␊
␉if (p==NULL) return NULL;␊
␉␊
␉verbose("Found SMBIOS System Information Table 1\n");␊
␉p += 8;␊
␉␊
␉for (i=0, isZero=1, isOnes=1; i<UUID_LEN; i++)␊
␉{␊
␉␉if (p[i] != 0x00) isZero = 0;␊
␉// Export Model if present␊
␉if ((ret16=getSmbiosChar16("SMproductname", &len)))␊
␉␉DT__AddProperty(efiPlatformNode, MODEL_PROP, len, ret16);␊
␉␉␊
␉␊
␉// Fill /efi/device-properties node.␊
␉setupDeviceProperties(node);␊
}␊
␊
/*␊
* Must be called AFTER getSmbios␊
*/␊
␊
void setupBoardId()␊
{␊
Node *node;␊
node = DT__FindNode("/", false);␊
if (node == 0) {␊
stop("Couldn't get root node");␊
}␊
const char *boardid = getStringForKey("SMboardproduct", &bootInfo->smbiosConfig);␊
if (boardid)␊
DT__AddProperty(node, BOARDID_PROP, strlen(boardid)+1, (EFI_CHAR16*)boardid);␊
}␊
␊
/*␊
* Load the smbios.plist override config file if any␊
*/␊
␊
␉// get a chance to scan mem dynamically if user asks for it while having the config options loaded as well,␊
␉// as opposed to when it was in scan_platform(); also load the orig. smbios so that we can access dmi info without␊
␉// patching the smbios yet␊
␉getSmbios(SMBIOS_ORIGINAL);␊
␊
␉scan_mem(); ␊
␉smbios_p = (EFI_PTR32)getSmbios(SMBIOS_PATCHED);␉// process smbios asap␊
}␊
␊
/*␊
␉smbios_p = (EFI_PTR32)getSmbios(SMBIOS_PATCHED);␊
␉addConfigurationTable(&gEfiSmbiosTableGuid, &smbios_p, NULL);␊
␉␊
␉setupBoardId(); //need to be called after getSmbios␊
␉␊
␉// Setup ACPI with DSDT overrides (mackerintel's patch)␊
␉setupAcpi();␊
␉␊
␉// Generate efi device strings ␊
␉setup_pci_devs(root_pci_dev);␊
␊
␉readSMBIOSInfo(getSmbios(SMBIOS_ORIGINAL));␊
␊
␉// load smbios.plist file if any␊
␉setupSmbiosConfigFile("SMBIOS.plist");␊
␉setupSmbiosConfigFile("smbios.plist");␊
␉␊
␉setupSMBIOSTable();␊
␊
␉// Initialize the base table␊
␉if (archCpuType == CPU_TYPE_I386)␊
␉{␊

Archive Download the corresponding diff file

Revision: 781