From 6dcabf08e9147094d81ab1335b9db305899c183b Mon Sep 17 00:00:00 2001
From: Goldfish64 <goldfishnet@aol.com>
Date: Sun, 4 Apr 2021 13:09:31 -0500
Subject: [PATCH] OcCpuLib: Fix incorrect identification of Xeon E5 and W CPUs

---
 Changelog.md                       | 1 +
 Library/OcCpuLib/AppleCpuSupport.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b7caacfe..9d6b639d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -57,6 +57,7 @@ OpenCore Changelog
 - Added dynamic keyboard protocol installation on CrScreenshotDxe
 - Support starting UEFI tools with argument support (e.g. `ControlMsrE2`) without arguments from picker
 - Fixed OpenCanopy font height calculation, may reject previously working fonts and mitigate memory corruption
+- Fixed incorrect identification of Xeon E5XXX/E5-XXXX and Xeon WXXXX/W-XXXX CPUs
 
 #### v0.6.7
 - Fixed ocvalidate return code to be non-zero when issues are found
diff --git a/Library/OcCpuLib/AppleCpuSupport.c b/Library/OcCpuLib/AppleCpuSupport.c
index 3ee55f6a..e20a08b5 100644
--- a/Library/OcCpuLib/AppleCpuSupport.c
+++ b/Library/OcCpuLib/AppleCpuSupport.c
@@ -103,10 +103,10 @@ InternalDetectAppleMajorType (
       }
     }
 
-    if (AsciiStrnCmp (BrandInfix, "E5", L_STR_LEN ("E5")) == 0) {
+    if (AsciiStrnCmp (BrandInfix, "E5-", L_STR_LEN ("E5-")) == 0) {
       return AppleProcessorMajorXeonE5;
     }
-    if (AsciiStrnCmp (BrandInfix, "W", L_STR_LEN ("W")) == 0) {
+    if (AsciiStrnCmp (BrandInfix, "W-", L_STR_LEN ("W-")) == 0) {
       return AppleProcessorMajorXeonW;
     }
     return AppleProcessorMajorXeonNehalem;
-- 
GitLab