Add CPU_MODEL_ALDERLAKE_ULT & CPU_MODEL_RAPTORLAKE_B

CloverHackyColor · Jan 2, 2024 · faf88fc · faf88fc
1 parent d4c41a0
commit faf88fc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Include/Intel/IndustryStandard/ProcessorInfo.h b/Include/Intel/IndustryStandard/ProcessorInfo.h
@@ -245,11 +245,15 @@ typedef enum {
 #define CPU_MODEL_COMETLAKE_S     0xA5 /* desktop CometLake */
 #define CPU_MODEL_COMETLAKE_Y     0xA5 /* aka 10th generation Amber Lake Y */
 #define CPU_MODEL_COMETLAKE_U     0xA6
-#define CPU_MODEL_ROCKETLAKE_S    0xA7/* desktop RocketLake */
+#define CPU_MODEL_ROCKETLAKE_S    0xA7/* 11h desktop RocketLake */
 #define CPU_MODEL_TIGERLAKE_U     0x8C
 #define CPU_MODEL_ALDERLAKE_S     0x97
+//from Clover
+#define CPU_MODEL_ALDERLAKE_ULT   0x9A  /* 12h generation Alder Lake, i5-12500h */
 #define CPU_MODEL_RAPTORLAKE      0xB7  /* 13h Raptor Lake */
-#define CPU_MODEL_METEORLAKE      0xAA
+#define CPU_MODEL_RAPTORLAKE_B    0xBF  /* 13h Raptor Lake, i5-13400h */
+#define CPU_MODEL_METEORLAKE      0xAA  /* 14h Meteor Lake */
+
 
 #define AMD_CPU_FAMILY          0xF
 #define AMD_CPU_EXT_FAMILY_15H  0x6

diff --git a/Library/OcCpuLib/AppleCpuSupport.c b/Library/OcCpuLib/AppleCpuSupport.c
@@ -611,6 +611,8 @@ InternalDetectAppleProcessorType (
     case CPU_MODEL_ICELAKE_SP:     // 0x9F FIXME - unknown, for now
     case CPU_MODEL_TIGERLAKE_U:    // 0x8C FIXME - unknown, for now
     case CPU_MODEL_ALDERLAKE_S:    // 0x97 FIXME - unknown, for now
+    case CPU_MODEL_ALDERLAKE_ULT:
+    case CPU_MODEL_RAPTORLAKE_B:
     case CPU_MODEL_RAPTORLAKE:
     case CPU_MODEL_METEORLAKE:
       if (AppleMajorType == AppleProcessorMajorM3) {

diff --git a/Library/OcCpuLib/OcCpuLib.c b/Library/OcCpuLib/OcCpuLib.c
@@ -1447,6 +1447,9 @@ InternalDetectIntelProcessorGeneration (
       case CPU_MODEL_ALDERLAKE_S:
       case CPU_MODEL_RAPTORLAKE:
       case CPU_MODEL_METEORLAKE:
+      case CPU_MODEL_ALDERLAKE_ULT:
+      case CPU_MODEL_RAPTORLAKE_B:
+
         CpuGeneration = OcCpuGenerationAlderLake;
         break;
       default: