summaryrefslogtreecommitdiff
path: root/Core/CPU/CpuSmbios.c
blob: aa0c42ae04b6575f2c60d2b35e1aaee78a4912bd (plain)
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
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
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
//*************************************************************************
//*************************************************************************
//**                                                                     **
//**        (C)Copyright 1987-2013, American Megatrends, Inc.            **
//**                                                                     **
//**                       All Rights Reserved.                          **
//**                                                                     **
//**      5555 Oakbrook Parkway, Suite 200, Norcross, GA 30093           **
//**                                                                     **
//**                       Phone: (770)-246-8600                         **
//**                                                                     **
//*************************************************************************
//*************************************************************************

//**********************************************************************
// $Header: /Alaska/SOURCE/Modules/SharkBayRefCodes/Haswell/AMI Cpu PKG/CPU Core/CpuSmbios.c 6     6/16/14 4:52a Davidhsieh $
//
// $Revision: 6 $
//
// $Date: 6/16/14 4:52a $
//**********************************************************************
// Revision History
// ----------------
// $Log: /Alaska/SOURCE/Modules/SharkBayRefCodes/Haswell/AMI Cpu PKG/CPU Core/CpuSmbios.c $
// 
// 6     6/16/14 4:52a Davidhsieh
// [TAG]  		None
// [Category]  	Improvement
// [Description]  	Support the cache size which bigger than 0x8000MB
// [Files]  		AmiCpuInfo.h, CpuSmbios.c
// 
// 5     8/14/13 4:53a Davidhsieh
// [TAG]  		None
// [Category]  	Improvement
// [Description]  	Smbios CpuMaxSpeed value is from Cpu when token
// SMBIOS_TYPE_4_MAX_SPEED is zero
// 
// 4     2/27/13 5:00a Crystallee
// [TAG]  		EIP115822
// [Category]  	Improvement
// [Description]  	Add SMBIOS type7 information for L4 cache if CPU
// supported
// And create a token to control this.
// 
// 3     3/21/12 4:33a Davidhsieh
// 
// 2     3/20/12 3:23a Davidhsieh
// Create SMBIOS type4 and type7 in AMI CPU module part
// 
// 1     2/07/12 3:58a Davidhsieh
//
// 
//**********************************************************************

//<AMI_FHDR_START>
//---------------------------------------------------------------------------
//
// Name:        CpuSmbios.c
//
// Description:
//  Installs TYPE 4 and TYPE 7 SMBIOS tables.
//
//---------------------------------------------------------------------------
//<AMI_FHDR_END>


#include <Efi.h>
#include <AmiLib.h>
#include <Protocol\SmBios.h>
#include <Protocol\AmiCpuInfo.h>
#include <Protocol\AmiCpuInfo2.h>
#include <AmiCspLibInc.h>
#include <Token.h>
#include "Cpu.h"
#include "CpuDxe.h"

extern AMI_CPU_INFO_PROTOCOL  gAmiCpuInfoProtocol;
extern PRIVATE_AMI_CPU_INFO_2_PROTOCOL *gPrivateAmiCpuInfo2;
AMI_CPU_INFO                  *gGetCpuInfo = NULL;
EFI_SMBIOS_PROTOCOL           *gSmbiosProtocol;

UINT32 GetCpuNumByPkgCoreThrd(
    IN UINT32 Package,
    IN UINT32 Core,
    IN UINT32 Thread
);

UINT32 gType4Instance = 1;
UINT32 gType7Instance = 1;

EFI_GUID    gEfiSmbiosProtocolGuid = EFI_SMBIOS_PROTOCOL_GUID;

EFI_EVENT 	gSmbiosEvent;
VOID		*gSmbiosRegistration = 0;

UINT32 GetBoardSocketNumber(IN UINT32 ApicId);
UINT8 GetCacheSharedThreads(IN UINT8 Level);

CACHE_DESCRIPTOR_INFO *gCacheDescInfo;
UINT8 gCacheTypeTable[] = {4, 3, 0, 5};
UINT8 gAssociativityTable[] = {2, 6 ,4 ,1 ,5 ,1 ,1 ,1 ,7 ,1 ,1 ,1 ,9 ,1 ,1, 1, 8, 1, 1, 1, 0xe,
    1, 1, 1, 0xa, 1, 1, 1, 1, 1, 1, 1, 0xb
};

typedef struct {
    UINT32 Size;
    UINT8 Type;
    UINT8 Assoc;
} CACHE_INFO;

#if !CPU_CACHE_L4_DISPLAY_IN_SMBIOS
CACHE_INFO gCacheInfo[3]; //[0] = L1, [1] = L2, [2] = L3
#else
CACHE_INFO gCacheInfo[4]; //[0] = L1, [1] = L2, [2] = L3, [3] = L4
#endif

#define SMBIOS_CACHE_ECC_PARITY 4
#define SMBIOS_CACHE_ECC_SINGLE_BIT 5

#define SMBIOS_MAX_NUM_SOCKETS 8

CHAR8 *gSocketDesgination[8] = {
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_0),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_1),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_2),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_3),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_4),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_5),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_6),
	CONVERT_TO_STRING(SMBIOS_TYPE_4_SOCKET_DESIGINTATION_SOCKET_7)
};


typedef struct {
    //Private Data
    UINT8 *StrBuf;
    INT32 StrBufSize;
    INT32 StrBufAvail;
    UINT8 Tok;
} SMBIOS_TABLE_STR_BUFFER;

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:   EstablishStringBuffer
//
// Description: Initialize string buffer variables
//
// Input:
//  IN VOID *Buffer - Buffer address
//  IN UINT32 Size - Buffer Size
//  OUT SMBIOS_TABLE_STR_BUFFER **StrBuffer - String Buffer structure
//
// Output: VOID
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

VOID EstablishStringBuffer(
    IN  VOID   *Buffer,
    IN  UINT32  Size,
    OUT SMBIOS_TABLE_STR_BUFFER **StrBuffer
)
{
    EFI_STATUS Status;
    SMBIOS_TABLE_STR_BUFFER *Buf;

    Status = pBS->AllocatePool(EfiBootServicesData, sizeof(SMBIOS_TABLE_STR_BUFFER), &Buf);
    ASSERT_EFI_ERROR(Status);
  
    Buf->StrBuf = Buffer;
    Buf->StrBufSize = Size;
    Buf->StrBufAvail = Size;
    Buf->Tok = 0;

    *StrBuffer = Buf;

}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:   AddStrGetTok
//
// Description: Add string to buffer and return token value.
//
// Input:
//  IN SMBIOS_TABLE_STR_BUFFER *StrBuffer - String Buffer structure
//  IN UINT8 *Str - Pointer to string.
//
// Output: UINT8 - token of string
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

UINT8 AddStrGetTok(
    IN SMBIOS_TABLE_STR_BUFFER *StrBuffer,
    IN UINT8 *Str
)
{
    INT32 Len = (INT32)Strlen(Str);

    if (Len == 0) return 0;                 //No string

    //For string buffer, 2 bytes at end reserved for double 0, so that is why
    //gStrBufAvail - 2
    if (Len > (StrBuffer->StrBufAvail - 2)) return 0; //Not enough space left.

    Strcpy(StrBuffer->StrBuf, Str);
    StrBuffer->StrBuf += Len + 1;
    StrBuffer->StrBufAvail -= Len + 1;
    ++StrBuffer->Tok;
    return StrBuffer->Tok;
}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  GetBufferSizeUsed
//
// Description: Get amount storage space used by strings.
//
// Input:
//  IN SMBIOS_TABLE_STR_BUFFER *StrBuffer - String Buffer structure
//
// Output: UINT32 - Size needed for strings.
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

UINT32 GetBufferSizeUsed(IN SMBIOS_TABLE_STR_BUFFER *StrBuffer)
{
    return StrBuffer->StrBufSize - StrBuffer->StrBufAvail;
}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  RemoveStringBuffer
//
// Description: Remove String Buffer structure.
//
// Input:
//  IN SMBIOS_TABLE_STR_BUFFER *StrBuffer - String Buffer structure
//
// Output: VOID
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

VOID RemoveStringBuffer(IN SMBIOS_TABLE_STR_BUFFER *StrBuffer)
{
    pBS->FreePool(StrBuffer);
}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:   GetMaxSpeedFromBrandString
//
// Description: Get the max speed from the brand string.
//
// Input:
//  IN CHAR8    *CpuBrandString - Pointer to CPU brand string.
//
// Output:  UINT32 - frequency found in MHz.
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

UINT32 GetMaxSpeedFromBrandString(IN CHAR8 *CpuBrandString)
{
    UINT32  i;
    UINT8   CharCount;
    BOOLEAN TransToMHz = FALSE;
    BOOLEAN FreqStringFound = FALSE;
    CHAR8   FrequencyString[] = "0000";

    while (*CpuBrandString != 0) {
        if (*CpuBrandString == 'G' && *(CpuBrandString + 1) == 'H' && *(CpuBrandString + 2) == 'z') {
            FreqStringFound = TRUE;
            TransToMHz = TRUE;
            break;
        } else if (*CpuBrandString == 'M' && *(CpuBrandString+1) == 'H' && *(CpuBrandString + 2) == 'z') {
            FreqStringFound = TRUE;
            break;
        } else ++CpuBrandString;
    }

    --CpuBrandString;   //first numeric char

    //search numeric char
    CharCount = 0;
    for(i = 0 ; i < 4; ++i) {
        if (*CpuBrandString >= '0' && *CpuBrandString <= '9') {
            --CpuBrandString;
            ++CharCount;
        } else if (*CpuBrandString == '.') {
            --CpuBrandString;
            ++CharCount;
        } else break;
    }

    ++CpuBrandString;   //first numeric char

    if (FreqStringFound && CharCount > 0) {
        for(i = 0; i < CharCount; ++i) {
            if (TransToMHz && *CpuBrandString == '.') CpuBrandString++;

            FrequencyString[i] = *CpuBrandString;
            ++CpuBrandString;
        }
        if (TransToMHz) FrequencyString[3] = '0';
    } else FreqStringFound = FALSE;

    return FreqStringFound ? Atoi(FrequencyString) : 0;
}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  CollectCacheInfo
//
// Description: Store cache information in variables.
//
// Input:  VOID
//
// Output: VOID
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

VOID CollectCacheInfo()
{
    INT32 i;
    UINT8 Type;
    UINT8 Assoc;
    UINT32 NumCores = NumSupportedCpuCores();

    MemSet(gCacheInfo, sizeof(gCacheInfo), 0);

    gCacheDescInfo = gGetCpuInfo->CacheInfo;
    for(i = 0; gCacheDescInfo[i].Desc; ++i) {  // End of descriptors, Desc = 0.
        UINT8 Level = gGetCpuInfo->CacheInfo[i].Level;
        switch(Level) {
#if !CPU_CACHE_L4_DISPLAY_IN_SMBIOS
        case 1: case 2: case 3:
#else
		case 1: case 2: case 3: case 4:
#endif
            Type = gCacheTypeTable[gCacheDescInfo[i].Type];

            if (gCacheDescInfo[i].Associativity < sizeof(gAssociativityTable)/sizeof(UINT8))
                Assoc = gAssociativityTable[gCacheDescInfo[i].Associativity];
            else Assoc = 1;
            
            //If multiple caches of same level, add sizes.
            gCacheInfo[Level - 1].Size  += gCacheDescInfo[i].Size;

            //If multiple caches of same level have different types report as other.
            if (gCacheInfo[Level - 1].Type == 0) gCacheInfo[Level - 1].Type = Type;
            else if (gCacheInfo[Level - 1].Type != Type) gCacheInfo[Level - 1].Type = 1;

            if (gCacheInfo[Level - 1].Assoc == 0) gCacheInfo[Level - 1].Assoc = Assoc;
            else if (gCacheInfo[Level - 1].Assoc != Assoc) gCacheInfo[Level - 1].Assoc = 1;
        }
    }

    if (GetCacheSharedThreads(1) <= 2) gCacheInfo[0].Size *= NumCores;
    if (GetCacheSharedThreads(2) <= 2) gCacheInfo[1].Size *= NumCores;
    if (GetCacheSharedThreads(3) <= 2) gCacheInfo[2].Size *= NumCores;
#if CPU_CACHE_L4_DISPLAY_IN_SMBIOS
	if (GetCacheSharedThreads(4) <= 2) gCacheInfo[3].Size *= NumCores;
#endif
}

#define TYPE7_STRING_BUFFER_SIZE 100
//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  CreateSmbiosTable7
//
// Description: Create SMBIOS Table 7
//
// Input:  IN UINT8 CacheLevel (L1, L2, L3)
//
// Output: UINT16 - Handle for table.
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

UINT16 CreateSmbiosTable7(IN UINT8 CacheLevel)
{
    SMBIOS_CACHE_INFO *CacheInfo;
    UINT16 Handle;
    EFI_STATUS  Status;
    UINT32  Type7ActStrBufSize;
    SMBIOS_TABLE_STR_BUFFER *StrBuffer;
    
    if (gCacheInfo[CacheLevel-1].Size == 0) return 0xffff;

    Status = pBS->AllocatePool(EfiBootServicesData, sizeof(SMBIOS_CACHE_INFO) + TYPE7_STRING_BUFFER_SIZE, &CacheInfo);
    ASSERT_EFI_ERROR(Status);

    EstablishStringBuffer((UINT8*)CacheInfo + sizeof(SMBIOS_CACHE_INFO), TYPE7_STRING_BUFFER_SIZE, &StrBuffer);

    Handle = gSmbiosProtocol->SmbiosGetFreeHandle();

    CacheInfo->StructureType.Type = 7;
    CacheInfo->StructureType.Length = 0x13;
    CacheInfo->StructureType.Handle = Handle;
    CacheInfo->SocketDesignation = 0;

    if(gCacheInfo[CacheLevel-1].Size > 0x07FFF){
        CacheInfo->MaxCacheSize = 0x8000 | (gCacheInfo[CacheLevel-1].Size / 64);
        CacheInfo->InstalledSize = 0x8000 | (gCacheInfo[CacheLevel-1].Size / 64);
    } else {    
        CacheInfo->MaxCacheSize = gCacheInfo[CacheLevel-1].Size;
        CacheInfo->InstalledSize = gCacheInfo[CacheLevel-1].Size;    
    }
    
    CacheInfo->SystemCacheType = gCacheInfo[CacheLevel-1].Type;
    CacheInfo->Associativity  = gCacheInfo[CacheLevel-1].Assoc;

    switch (CacheLevel) {
    case 1:
        CacheInfo->CacheConfig = 0x180;
#ifdef SMBIOS_TYPE_7_L1_SOCKET_DESIGNATION    
        CacheInfo->SocketDesignation = AddStrGetTok(StrBuffer, CONVERT_TO_STRING(SMBIOS_TYPE_7_L1_SOCKET_DESIGNATION));
#endif
        break;
    case 2:
        CacheInfo->CacheConfig = 0x181;
#ifdef SMBIOS_TYPE_7_L2_SOCKET_DESIGNATION    
        CacheInfo->SocketDesignation = AddStrGetTok(StrBuffer, CONVERT_TO_STRING(SMBIOS_TYPE_7_L2_SOCKET_DESIGNATION));
#endif
        break;
    case 3:
        CacheInfo->CacheConfig = 0x182;
#ifdef SMBIOS_TYPE_7_L3_SOCKET_DESIGNATION    
        CacheInfo->SocketDesignation = AddStrGetTok(StrBuffer, CONVERT_TO_STRING(SMBIOS_TYPE_7_L3_SOCKET_DESIGNATION));
#endif
        break;
#if CPU_CACHE_L4_DISPLAY_IN_SMBIOS
	case 4:
		CacheInfo->CacheConfig = 0x183;
#ifdef SMBIOS_TYPE_7_L4_SOCKET_DESIGNATION
		CacheInfo->SocketDesignation = AddStrGetTok(StrBuffer, CONVERT_TO_STRING(SMBIOS_TYPE_7_L4_SOCKET_DESIGNATION));
#endif
		break;
#endif
    }

    CacheInfo->SupportSRAM = 2;
    CacheInfo->CurrentSRAM = 2;
    CacheInfo->CacheSpeed = 0;    
    CacheInfo->ErrorCorrectionType = 0x05;  //ECC
    Type7ActStrBufSize = GetBufferSizeUsed(StrBuffer);
    
    if (Type7ActStrBufSize == 0) {
        *(UINT16*)(CacheInfo + 1) = 0;    //Double NULL.
    } else {
        *((UINT8*)(CacheInfo + 1) + Type7ActStrBufSize) = 0; //End structure of NULL.
    }
    
    Status = gSmbiosProtocol->SmbiosAddStrucByHandle(
        Handle,
        (VOID*)CacheInfo,
        (UINT16)(sizeof(SMBIOS_CACHE_INFO) + (Type7ActStrBufSize == 0 ? 2 : Type7ActStrBufSize + 1))
    );
    
    pBS->FreePool(CacheInfo);
    RemoveStringBuffer(StrBuffer);

    return !EFI_ERROR(Status) ? Handle : 0xffff;
}


//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  AutodetectFamily
//
// Description: Return family type from Brand String.
//
// Input:  IN CHAR8 *BrandString
//
// Output: UINT8 - Family
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

UINT8 AutodetectFamily(IN CHAR8 *BrandString)
{
    CHAR8 *p = BrandString;

    while(*p) {
        if (MemCmp(p, "Xeon", 4) == 0) return 0xb3;
        if (MemCmp(p, "i7", 2) == 0) return 0xc6;
        if (MemCmp(p, "i5", 2) == 0) return 0xcd;
        if (MemCmp(p, "i3", 2) == 0) return 0xce;
        if (MemCmp(p, "Pentiu", 6) == 0) return 0x0b;
        if (MemCmp(p, "Celero", 6) == 0) return 0x0f;
        ++p;
    }

    return 0xcd;    //default as i5 family
}

#define TYPE4_STRING_BUFFER_SIZE 200

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  CreateSmbiosTable4
//
// Description: Create SMBIOS Table 4
//
// Input:  IN UINT32 PhysSocket
//
// Output: VOID
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

VOID CreateSmbiosTable4(IN UINT32 PhysSocket)
{
    SMBIOS_PROCESSOR_INFO * ProcInfo;
    EFI_STATUS Status;
    UINT32  ActStrBufSize;
    UINT32  MaxFreqBrandStr;
    SMBIOS_TABLE_STR_BUFFER *StrBuffer;
    SMBIOS_STRUCTURE_HEADER *Hdr;
    UINT16 Size;
    BOOLEAN HandleExists = FALSE;

    Status = pBS->AllocatePool(
        EfiBootServicesData, sizeof(SMBIOS_PROCESSOR_INFO) + TYPE4_STRING_BUFFER_SIZE, &ProcInfo
    );
    
    EstablishStringBuffer((UINT8*)ProcInfo + sizeof(SMBIOS_PROCESSOR_INFO), TYPE4_STRING_BUFFER_SIZE, &StrBuffer);

    ProcInfo->StructureType.Type = 4;
    ProcInfo->StructureType.Length = 0x2a;
    ProcInfo->StructureType.Handle = 0xffff;    //To be updated by SMBIOS driver.   
 
    if (PhysSocket >= SMBIOS_MAX_NUM_SOCKETS) ProcInfo->SocketDesignation = 0;
    else ProcInfo->SocketDesignation = AddStrGetTok(StrBuffer, gSocketDesgination[PhysSocket]);

    ProcInfo->ProcessotType = 3;    //Central processor

    if (SMBIOS_TYPE_4_PROC_FAMILY != 0) ProcInfo->Family = SMBIOS_TYPE_4_PROC_FAMILY;
    else ProcInfo->Family = AutodetectFamily(gGetCpuInfo->BrandString);

    ProcInfo->ProcessorManufacturer = AddStrGetTok(StrBuffer, "Intel");

    ProcInfo->ProcessorID_1 = (UINT32)(gGetCpuInfo->Version);
    ProcInfo->ProcessorID_2 = (UINT32)(gGetCpuInfo->Features);
    ProcInfo->ProcessorVersion = AddStrGetTok(StrBuffer, gGetCpuInfo->BrandString);    
    ProcInfo->Voltage = (UINT8)(12) + BIT7; // 1.2 volts
    //ProcInfo->Voltage = BIT7; // 1.2 volts
    ProcInfo->MaxSpeed = SMBIOS_TYPE_4_MAX_SPEED;

    MaxFreqBrandStr = GetMaxSpeedFromBrandString(gGetCpuInfo->BrandString);
    if (MaxFreqBrandStr) ProcInfo->CurrentSpeed = MaxFreqBrandStr;
    else ProcInfo->CurrentSpeed = gGetCpuInfo->IntendedFreq;
    
#if !SMBIOS_TYPE_4_MAX_SPEED
    ProcInfo->MaxSpeed = ProcInfo->CurrentSpeed;
#endif
    ProcInfo->ExtClockFreq = (UINT16)(gGetCpuInfo->FSBFreq);
    ProcInfo->Status = 0x41;    //Populated and enabled.
    ProcInfo->Upgrade = SMBIOS_TYPE_4_PROC_UPGRADE;    
    ProcInfo->SerialNumber = 0;

#ifdef SMBIOS_TYPE_4_ASSET_TAG
    ProcInfo->AssetTag = AddStrGetTok(StrBuffer, CONVERT_TO_STRING(SMBIOS_TYPE_4_ASSET_TAG));
#else
    ProcInfo->AssetTag = 0;
#endif
#ifdef SMBIOS_TYPE_4_PART_NUMBER
    ProcInfo->PartNumber = AddStrGetTok(StrBuffer, CONVERT_TO_STRING(SMBIOS_TYPE_4_PART_NUMBER));
#else
    ProcInfo->PartNumber = 0;
#endif
    ProcInfo->CoreCount = NumSupportedCpuCores();   //This must be the same across sockets.
    ProcInfo->CoreEnabled = gGetCpuInfo->NumCores;
    ProcInfo->ThreadCount = NumSupportedCpuCores() * NumSupportedThreadsPerCore(); //This must be the same across sockets.
    ProcInfo->ProcessorChar = 4; //X64 Support
    ProcInfo->Family2 = ProcInfo->Family;

    ActStrBufSize = GetBufferSizeUsed(StrBuffer);
    if (ActStrBufSize == 0) {
        *(UINT16*)(ProcInfo + 1) = 0;    //Double NULL.
    } else {
        *((UINT8*)(ProcInfo + 1) + ActStrBufSize) = 0; //End structure of NULL.
    }
       
    Status = gSmbiosProtocol->SmbiosAddStructure(
        (VOID*)ProcInfo,
        (UINT16)(sizeof(SMBIOS_PROCESSOR_INFO) + (ActStrBufSize == 0 ? 2 : ActStrBufSize + 1))
    );
    
    ASSERT_EFI_ERROR(Status);
    
    Status = gSmbiosProtocol->SmbiosReadStrucByType(4, 1, (UINT8**)&Hdr, &Size);
    ProcInfo->StructureType.Handle = Hdr->Handle;    
    ProcInfo->L1CacheHandle = CreateSmbiosTable7(1);
    ProcInfo->L2CacheHandle = CreateSmbiosTable7(2);
    ProcInfo->L3CacheHandle = CreateSmbiosTable7(3);
#if CPU_CACHE_L4_DISPLAY_IN_SMBIOS
	CreateSmbiosTable7(4);
#endif
    Status = gSmbiosProtocol->SmbiosWriteStructure(    
        ProcInfo->StructureType.Handle,
        (VOID*)ProcInfo,
        (UINT16)(sizeof(SMBIOS_PROCESSOR_INFO) + (ActStrBufSize == 0 ? 2 : ActStrBufSize + 1))
    );
    
    pBS->FreePool(ProcInfo);
    RemoveStringBuffer(StrBuffer);
}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  CreateCpuSmbiosTables
//
// Description: Create CPU SMBIOS Tables 4 and 7.
//
// Input:
//  IN EFI_EVENT Event - Not used
//  IN VOID *Context - Note Used
//
// Output: VOID
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

VOID CreateCpuSmbiosTables(IN EFI_EVENT Event, IN VOID *Context)
{
    EFI_STATUS Status;
    UINT8 i;
    UINT32 NumSocketsPop = NumberOfCpuSocketsPopulated();
    UINT32 SocketPopBitmap = 0;
    SMBIOS_STRUCTURE_HEADER *Hdr;
    UINT16 Size;
    UINT32 Cpu;

    ASSERT(NUMBER_CPU_SOCKETS <= SMBIOS_MAX_NUM_SOCKETS);

    Status = pBS->LocateProtocol(&gEfiSmbiosProtocolGuid, NULL, &gSmbiosProtocol);
    if (EFI_ERROR(Status)) return;  //First call, error, because protocol not installed yet.

//Delete existing CPU SBIOS structures type 4 and type 7.
    while (!EFI_ERROR(gSmbiosProtocol->SmbiosReadStrucByType(4, 1, (UINT8**)&Hdr, &Size))) {
        gSmbiosProtocol->SmbiosDeleteStructure(Hdr->Handle);
        pBS->FreePool(Hdr);
    }

    while (!EFI_ERROR(gSmbiosProtocol->SmbiosReadStrucByType(7, 1, (UINT8**)&Hdr, &Size))) {
        gSmbiosProtocol->SmbiosDeleteStructure(Hdr->Handle);
        pBS->FreePool(Hdr);
    }

//Add CPU SMBIOS structures for populated sockets.
    Cpu = 0;
    for (i = 0; i < NumSocketsPop; ++i) {
        UINT32 ApicId;
        UINT32 PhysSocket;

        Status = gAmiCpuInfoProtocol.GetCpuInfo(&gAmiCpuInfoProtocol, Cpu, &gGetCpuInfo);
        ASSERT_EFI_ERROR(Status);

        CollectCacheInfo(); //For one thread.

        Status = ((AMI_CPU_INFO_2_PROTOCOL*)gPrivateAmiCpuInfo2)->GetApicInfo(
            (AMI_CPU_INFO_2_PROTOCOL*)gPrivateAmiCpuInfo2, i, 0, 0, &ApicId, NULL
        );
        ASSERT_EFI_ERROR(Status);
        if (EFI_ERROR(Status)) ApicId = 0;
        PhysSocket = GetBoardSocketNumber(ApicId);

        CreateSmbiosTable4(PhysSocket);
        if (PhysSocket < SMBIOS_MAX_NUM_SOCKETS) SocketPopBitmap |= 1 << PhysSocket;

        //Update Cpu from gGetCpuInfo
        Cpu += gGetCpuInfo->NumCores * (gGetCpuInfo->NumHts == 0 ? 1 : 2);
    }
}

//<AMI_PHDR_START>
//---------------------------------------------------------------------------
//
// Procedure:  CpuSmbios
//
// Description: Create CPU SMBIOS Tables. Installs notification on SMBIOS handlers.
//
// Input: VOID
//
// Output: VOID
//
//---------------------------------------------------------------------------
//<AMI_PHDR_END>

VOID CpuSmbios()
{
    EFI_STATUS Status;

    Status = RegisterProtocolCallback(
    	&gEfiSmbiosProtocolGuid,
        CreateCpuSmbiosTables,
        NULL,
        &gSmbiosEvent,
        &gSmbiosRegistration
    );
    ASSERT_EFI_ERROR(Status);

   CreateCpuSmbiosTables(gSmbiosEvent, NULL);
}

//*************************************************************************
//*************************************************************************
//**                                                                     **
//**        (C)Copyright 1987-2013, American Megatrends, Inc.            **
//**                                                                     **
//**                       All Rights Reserved.                          **
//**                                                                     **
//**      5555 Oakbrook Parkway, Suite 200, Norcross, GA 30093           **
//**                                                                     **
//**                       Phone: (770)-246-8600                         **
//**                                                                     **
//*************************************************************************
//*************************************************************************