Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2025-02-01 22:41:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

more processors

Browse Source 
Signed-off-by: Slice <sergey.slice@gmail.com>
This commit is contained in:
Slice 2024-12-06 20:03:25 +03:00
parent 788654cdc6
commit 286a4f32c3
5 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Include/IndustryStandard/ProcessorInfo.h
View File

@ -204,7 +204,9 @@ enum {
#define CPU_MODEL_RAPTORLAKE 0xB7 /* 13h Raptor Lake */
#define CPU_MODEL_RAPTORLAKE_B 0xBF /* 13h Raptor Lake, i5-13400h */
#define CPU_MODEL_METEORLAKE 0xAA /* 14h Meteor Lake */
#define CPU_MODEL_ARROWLAKE 0xC6
#define CPU_MODEL_ARROWLAKE 0xC6 /* 15h Arrow Lake */
#define CPU_MODEL_ARROWLAKE_X 0xC5 /* 15h Arrow Lake */
#define CPU_MODEL_ARROWLAKE_U 0xB5 /* 15h Arrow Lake */
#define CPU_SOCKET_UNKNOWN 0x02
#define CPU_SOCKET_PGA478 0x0F

2
OpenCorePkg

@ -1 +1 @@
Subproject commit cd0baeb4243bac18f0a8959e389ea5e74a92f126
Subproject commit e21feb5907444256f4ff4c9b2be33be59e5a13cd

6
rEFIt_UEFI/Platform/StateGenerator.cpp
View File

@ -283,6 +283,8 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number)
case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
case CPU_MODEL_ARROWLAKE:
case CPU_MODEL_ARROWLAKE_X:
case CPU_MODEL_ARROWLAKE_U:
{
maximum.Control.Control = RShiftU64(AsmReadMsr64(MSR_PLATFORM_INFO), 8) & 0xff;
if (gSettings.ACPI.SSDT.MaxMultiplier) {
@ -358,6 +360,8 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number)
(gCPUStructure.Model == CPU_MODEL_RAPTORLAKE_B) ||
(gCPUStructure.Model == CPU_MODEL_METEORLAKE) ||
(gCPUStructure.Model == CPU_MODEL_ARROWLAKE ) ||
(gCPUStructure.Model == CPU_MODEL_ARROWLAKE_X ) ||
(gCPUStructure.Model == CPU_MODEL_ARROWLAKE_U ) ||
(gCPUStructure.Model == CPU_MODEL_COMETLAKE_S) ||
(gCPUStructure.Model == CPU_MODEL_COMETLAKE_Y) ||
(gCPUStructure.Model == CPU_MODEL_COMETLAKE_U)) {
@ -379,7 +383,7 @@ SSDT_TABLE *generate_pss_ssdt(UINTN Number)
p_states_count++;
}
}
break;//case CPU_MODEL_ARROWLAKE:
break;
}
default:
MsgLog ("Unsupported CPU (0x%X): P-States not generated !!!\n", gCPUStructure.Family);

21
rEFIt_UEFI/Platform/cpu.cpp
View File

@ -336,12 +336,19 @@ void GetCPUProperties (void)
case CPU_MODEL_ALDERLAKE_ULT:
case CPU_MODEL_RAPTORLAKE_B:
case CPU_MODEL_METEORLAKE:
case CPU_MODEL_ARROWLAKE:
msr = AsmReadMsr64(MSR_CORE_THREAD_COUNT); //0x35
DBG("MSR 0x35 %16llX\n", msr);
gCPUStructure.Cores = (UINT8)bitfield((UINT32)msr, 31, 16);
gCPUStructure.Threads = (UINT8)bitfield((UINT32)msr, 15, 0);
break;
case CPU_MODEL_ARROWLAKE:
case CPU_MODEL_ARROWLAKE_X:
case CPU_MODEL_ARROWLAKE_U:
msr = AsmReadMsr64(MSR_CORE_THREAD_COUNT); //0x35
DBG("MSR 0x35 %16llX\n", msr);
gCPUStructure.Cores = (UINT8)bitfield((UINT32)msr, 31, 16);
gCPUStructure.Threads = gCPUStructure.Cores; // no hyperthreading
break;
case CPU_MODEL_DALES:
case CPU_MODEL_WESTMERE: // Intel Core i7 LGA1366 (32nm) 6 Core
@ -421,7 +428,7 @@ void GetCPUProperties (void)
gCPUStructure.Threads = 4;
}
//New for SkyLake 0x4E, 0x5E
//New for SkyLake 0x4E, 0x5E and up
if(gCPUStructure.CPUID[CPUID_0][EAX] >= 0x15) {
UINT32 Num, Denom;
DoCpuid(0x15, gCPUStructure.CPUID[CPUID_15]);
@ -540,6 +547,8 @@ void GetCPUProperties (void)
case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
case CPU_MODEL_ARROWLAKE:
case CPU_MODEL_ARROWLAKE_X:
case CPU_MODEL_ARROWLAKE_U:
gCPUStructure.TSCFrequency = MultU64x32(gCPUStructure.CurrentSpeed, Mega); //MHz -> Hz
gCPUStructure.CPUFrequency = gCPUStructure.TSCFrequency;
@ -1428,6 +1437,8 @@ UINT16 GetAdvancedCpuType()
case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
case CPU_MODEL_ARROWLAKE:
case CPU_MODEL_ARROWLAKE_X:
case CPU_MODEL_ARROWLAKE_U:
if ( gCPUStructure.BrandString.contains("Core(TM) i3") )
return 0x905; // Core i3 - Apple doesn't use it
if ( gCPUStructure.BrandString.contains("Core(TM) i5-1") )
@ -1566,6 +1577,8 @@ MacModel GetDefaultModel()
case CPU_MODEL_ICELAKE_A:
case CPU_MODEL_ICELAKE_C:
case CPU_MODEL_ICELAKE_D:
case CPU_MODEL_ALDERLAKE_ULT: //???
case CPU_MODEL_ARROWLAKE_U:
DefaultType = MacBookPro161;
break;
default:
@ -1678,13 +1691,15 @@ MacModel GetDefaultModel()
DefaultType = MacPro61;
break;
case CPU_MODEL_ALDERLAKE:
case CPU_MODEL_ALDERLAKE_ULT: //???
case CPU_MODEL_RAPTORLAKE_B:
case CPU_MODEL_COMETLAKE_S:
case CPU_MODEL_ROCKETLAKE:
case CPU_MODEL_RAPTORLAKE:
case CPU_MODEL_METEORLAKE:
case CPU_MODEL_ARROWLAKE:
case CPU_MODEL_ARROWLAKE_X:
DefaultType = MacPro71;
break;
default:

2
rEFIt_UEFI/Platform/cpu.h
View File

@ -83,6 +83,8 @@
#define CPU_MODEL_RAPTORLAKE 0xB7 /* 13h Raptor Lake */
#define CPU_MODEL_RAPTORLAKE_B 0xBF /* 13h Raptor Lake, i5-13400h */
#define CPU_MODEL_ARROWLAKE 0xC6
#define CPU_MODEL_ARROWLAKE_X 0xC5 /* 15h Arrow Lake */
#define CPU_MODEL_ARROWLAKE_U 0xB5 /* 15h Arrow Lake */
#define CPU_VENDOR_INTEL 0x756E6547
#define CPU_VENDOR_AMD 0x68747541