Merge pull request #1147 from crystall1nedev/s3x-patch

Increase model range of S1X/S3X kext inclusion

CHANGELOG.md

@@ -12,6 +12,9 @@
 - Implement new Copy on Write detection mechanism for all file copying operations
   - Implemented using `getattrlist` and `VOL_CAP_INT_CLONE` flag
   - Helps improve performance on APFS volumes
+- Increase model range for S1X/S3X patching to include Haswell Macs and `MacPro6,1`
+  - Helps avoid an issue where older machines with newer, unsupported SSDs would fail to boot
+  - Only affects building EFI from another machine
 - Increment Binaries:
   - PatcherSupportPkg 1.6.3 - release
 

opencore_legacy_patcher/efi_builder/storage.py

@@ -150,9 +150,10 @@ class BuildStorage:
 
         # Restore S1X/S3X NVMe support removed in 14.0 Beta 2
         # Apple's usage of the S1X and S3X is quite sporadic and inconsistent, so we'll try a catch all for units with NVMe drives
+        # Additionally expanded to cover all Mac models with the 12+16 pin SSD layout, for older machines with newer drives
         if self.constants.custom_model and self.model in smbios_data.smbios_dictionary:
             if "CPU Generation" in smbios_data.smbios_dictionary[self.model]:
-                if cpu_data.CPUGen.broadwell <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake:
+                if (cpu_data.CPUGen.haswell <= smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.CPUGen.kaby_lake) or self.model in [ "MacPro6,1" ]:
                     support.BuildSupport(self.model, self.constants, self.config).enable_kext("IOS3XeFamily.kext", self.constants.s3x_nvme_version, self.constants.s3x_nvme_path)
 
         # Apple RAID Card check
@@ -193,4 +194,4 @@ class BuildStorage:
 
         if self.constants.apfs_trim_timeout is False:
             logging.info(f"- Disabling APFS TRIM timeout")
-            self.config["Kernel"]["Quirks"]["SetApfsTrimTimeout"] = 0
+            self.config["Kernel"]["Quirks"]["SetApfsTrimTimeout"] = 0