Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-29 12:35:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

take into account MeteorLake CPU

Browse Source 
Signed-off-by: Slice <sergey.slice@gmail.com>
This commit is contained in:
Slice 2023-10-24 19:12:53 +03:00
parent 06e0d72e40
commit 5fb1f0b048
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Include/IndustryStandard/ProcessorInfo.h
View File

@ -201,6 +201,7 @@ enum {
#define CPU_MODEL_ALDERLAKE 0x97 /* 12h generation Alder Lake */ #define CPU_MODEL_ALDERLAKE 0x97 /* 12h generation Alder Lake */
#define CPU_MODEL_ROCKETLAKE 0xA7 /* 11h Rocket Lake */ #define CPU_MODEL_ROCKETLAKE 0xA7 /* 11h Rocket Lake */
#define CPU_MODEL_RAPTORLAKE 0xB7 /* 13h Raptor Lake */ #define CPU_MODEL_RAPTORLAKE 0xB7 /* 13h Raptor Lake */
#define CPU_MODEL_METEORLAKE 0xAA /* 14h Meteor Lake */
#define CPU_SOCKET_UNKNOWN 0x02 #define CPU_SOCKET_UNKNOWN 0x02
#define CPU_SOCKET_PGA478 0x0F #define CPU_SOCKET_PGA478 0x0F

2
rEFIt_UEFI/Platform/StateGenerator.cpp
View File

@ -278,6 +278,7 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number)
case CPU_MODEL_ALDERLAKE: case CPU_MODEL_ALDERLAKE:
case CPU_MODEL_ROCKETLAKE: case CPU_MODEL_ROCKETLAKE:
case CPU_MODEL_RAPTORLAKE: case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
{ {
maximum.Control.Control = RShiftU64(AsmReadMsr64(MSR_PLATFORM_INFO), 8) & 0xff; maximum.Control.Control = RShiftU64(AsmReadMsr64(MSR_PLATFORM_INFO), 8) & 0xff;
if (gSettings.ACPI.SSDT.MaxMultiplier) { if (gSettings.ACPI.SSDT.MaxMultiplier) {
@ -349,6 +350,7 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number)
(gCPUStructure.Model == CPU_MODEL_ROCKETLAKE) || (gCPUStructure.Model == CPU_MODEL_ROCKETLAKE) ||
(gCPUStructure.Model == CPU_MODEL_ALDERLAKE) || (gCPUStructure.Model == CPU_MODEL_ALDERLAKE) ||
(gCPUStructure.Model == CPU_MODEL_RAPTORLAKE) || (gCPUStructure.Model == CPU_MODEL_RAPTORLAKE) ||
(gCPUStructure.Model == CPU_MODEL_METEORLAKE) ||
(gCPUStructure.Model == CPU_MODEL_COMETLAKE_S) || (gCPUStructure.Model == CPU_MODEL_COMETLAKE_S) ||
(gCPUStructure.Model == CPU_MODEL_COMETLAKE_Y) || (gCPUStructure.Model == CPU_MODEL_COMETLAKE_Y) ||
(gCPUStructure.Model == CPU_MODEL_COMETLAKE_U)) { (gCPUStructure.Model == CPU_MODEL_COMETLAKE_U)) {

4
rEFIt_UEFI/Platform/cpu.cpp
View File

@ -329,6 +329,7 @@ void GetCPUProperties (void)
case CPU_MODEL_ALDERLAKE: case CPU_MODEL_ALDERLAKE:
case CPU_MODEL_ROCKETLAKE: case CPU_MODEL_ROCKETLAKE:
case CPU_MODEL_RAPTORLAKE: case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
msr = AsmReadMsr64(MSR_CORE_THREAD_COUNT); //0x35 msr = AsmReadMsr64(MSR_CORE_THREAD_COUNT); //0x35
DBG("MSR 0x35 %16llX\n", msr); DBG("MSR 0x35 %16llX\n", msr);
gCPUStructure.Cores = (UINT8)bitfield((UINT32)msr, 31, 16); gCPUStructure.Cores = (UINT8)bitfield((UINT32)msr, 31, 16);
@ -525,6 +526,7 @@ void GetCPUProperties (void)
case CPU_MODEL_ALDERLAKE: case CPU_MODEL_ALDERLAKE:
case CPU_MODEL_ROCKETLAKE: case CPU_MODEL_ROCKETLAKE:
case CPU_MODEL_RAPTORLAKE: case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
gCPUStructure.TSCFrequency = MultU64x32(gCPUStructure.CurrentSpeed, Mega); //MHz -> Hz gCPUStructure.TSCFrequency = MultU64x32(gCPUStructure.CurrentSpeed, Mega); //MHz -> Hz
gCPUStructure.CPUFrequency = gCPUStructure.TSCFrequency; gCPUStructure.CPUFrequency = gCPUStructure.TSCFrequency;
@ -1405,6 +1407,7 @@ UINT16 GetAdvancedCpuType()
case CPU_MODEL_ALDERLAKE: case CPU_MODEL_ALDERLAKE:
case CPU_MODEL_ROCKETLAKE: case CPU_MODEL_ROCKETLAKE:
case CPU_MODEL_RAPTORLAKE: case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
if ( gCPUStructure.BrandString.contains("Core(TM) i3") ) if ( gCPUStructure.BrandString.contains("Core(TM) i3") )
return 0x905; // Core i3 - Apple doesn't use it return 0x905; // Core i3 - Apple doesn't use it
if ( gCPUStructure.BrandString.contains("Core(TM) i5-1") ) if ( gCPUStructure.BrandString.contains("Core(TM) i5-1") )
@ -1655,6 +1658,7 @@ MacModel GetDefaultModel()
case CPU_MODEL_ALDERLAKE: case CPU_MODEL_ALDERLAKE:
case CPU_MODEL_COMETLAKE_S: case CPU_MODEL_COMETLAKE_S:
case CPU_MODEL_RAPTORLAKE: case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
DefaultType = MacPro71; DefaultType = MacPro71;
break; break;
default: default:

1
rEFIt_UEFI/Platform/cpu.h
View File

@ -79,6 +79,7 @@
#define CPU_MODEL_COMETLAKE_U 0xA6 /* 10h Comet Lake */ #define CPU_MODEL_COMETLAKE_U 0xA6 /* 10h Comet Lake */
#define CPU_MODEL_ROCKETLAKE 0xA7 /* 11h Rocket Lake */ #define CPU_MODEL_ROCKETLAKE 0xA7 /* 11h Rocket Lake */
#define CPU_MODEL_RAPTORLAKE 0xB7 /* 13h Raptor Lake */ #define CPU_MODEL_RAPTORLAKE 0xB7 /* 13h Raptor Lake */
#define CPU_MODEL_METEORLAKE 0xAA
#define CPU_VENDOR_INTEL 0x756E6547 #define CPU_VENDOR_INTEL 0x756E6547
#define CPU_VENDOR_AMD 0x68747541 #define CPU_VENDOR_AMD 0x68747541