Merge branch 'acidanthera:master' into yaming-network

wy414012 · Nov 21, 2024 · fc730f4 · fc730f4
2 parents 4efea04 + 42326bd
commit fc730f4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,8 @@
 Lilu Changelog
 ==============
+#### v1.7.0
+- Added Arrow Lake CPU definitions
+
 #### v1.6.9
 - Fixed loading on macOS 10.10 and older due to a MacKernelSDK regression
 - Added AMD IGPU detection via device-id, thanks @Zormeister

diff --git a/Lilu.xcodeproj/project.pbxproj b/Lilu.xcodeproj/project.pbxproj
@@ -829,7 +829,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.6.9;
+				MODULE_VERSION = 1.7.0;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -935,7 +935,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.6.9;
+				MODULE_VERSION = 1.7.0;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -1100,7 +1100,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.6.9;
+				MODULE_VERSION = 1.7.0;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",

diff --git a/Lilu/Headers/kern_cpu.hpp b/Lilu/Headers/kern_cpu.hpp
@@ -96,6 +96,9 @@ namespace CPUInfo {
 		CPU_MODEL_ALDERLAKE_S    =  0x97,
 		CPU_MODEL_RAPTORLAKE_S   =  0xB7, /* Raptor Lake B0 stepping */
 		CPU_MODEL_RAPTORLAKE_HX  =  0xBF, /* Raptor Lake C0 stepping */
+		CPU_MODEL_ARROWLAKE_HX   =  0xC5,
+		CPU_MODEL_ARROWLAKE_S    =  0xC6, /* desktop ArrowLake */
+		CPU_MODEL_ARROWLAKE_U    =  0xB5,
 	};
 
 	/**
@@ -130,6 +133,7 @@ namespace CPUInfo {
 		TigerLake,
 		AlderLake,
 		RaptorLake,
+		ArrowLake,
 		MaxGeneration
 	};
 

diff --git a/Lilu/Sources/kern_cpu.cpp b/Lilu/Sources/kern_cpu.cpp
@@ -139,6 +139,11 @@ void CPUInfo::init() {
 			case CPU_MODEL_RAPTORLAKE_HX:
 				bdi.cpuGeneration = CpuGeneration::RaptorLake;
 				break;
+			case CPU_MODEL_ARROWLAKE_S:
+			case CPU_MODEL_ARROWLAKE_HX:
+			case CPU_MODEL_ARROWLAKE_U:
+				bdi.cpuGeneration = CpuGeneration::ArrowLake;
+				break;
 			default:
 				bdi.cpuGeneration = CpuGeneration::Unknown;
 				break;