Merge branch 'main' into gui-refactor

CHANGELOG.md

@@ -11,6 +11,9 @@
   - Reduces both app size and root patching time
 - Resolve incorrect remote KDK matching for macOS betas
   - ex. Beta 4 KDK being recommended for Beta 3 install
+- Resolve low power mode on MacPro6,1
+  - Credit to CaseyJ's [PCI Bus Enumeration Patch](https://github.com/AMD-OSX/AMD_Vanilla/pull/196)
+- Resolve PCI eject menu appearing on unsupported hardware
 - Backend changes:
   - Rename OCLP-Helper to OpenCore-Patcher-Helper
     - Allows for better identification when displaying prompts

payloads/Config/config.plist

@@ -1943,6 +1943,36 @@
 				<key>Skip</key>
 				<integer>0</integer>
 			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>Base</key>
+				<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
+				<key>Comment</key>
+				<string>CaseySJ - Fix PCI bus enumeration</string>
+				<key>Count</key>
+				<integer>1</integer>
+				<key>Enabled</key>
+				<false/>
+				<key>Find</key>
+				<data>hNt1S0GLVzg=</data>
+				<key>Identifier</key>
+				<string>com.apple.iokit.IOPCIFamily</string>
+				<key>Limit</key>
+				<integer>0</integer>
+				<key>Mask</key>
+				<data></data>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>Replace</key>
+				<data>hNvrS0GLVzg=</data>
+				<key>ReplaceMask</key>
+				<data></data>
+				<key>Skip</key>
+				<integer>0</integer>
+			</dict>
 		</array>
 		<key>Quirks</key>
 		<dict>

resources/build/firmware.py

@@ -220,17 +220,28 @@ class BuildFirmware:
 
         self._dual_dp_handling()
 
-        # Force VMM as a temporary solution to getting the MacPro6,1 booting in Ventura
-        # With macOS Ventura, Apple removed AppleIntelCPUPowerManagement.kext and assumed XCPM support across all Macs
-        # This change resulted in broken OS booting as the machine had no power management support
-        # Currently the AICPUPM fix is not fully functional, thus forcing VMM is a temporary solution
-        # Waiting for XNU source to be released to fix this properly
-        # Ref: https://forums.macrumors.com/threads/opencore-on-the-mac-pro.2207814/
-        if self.model in ["MacPro6,1", "iMac7,1", "iMac8,1", "MacBookPro4,1"] or self.constants.set_vmm_cpuid is True:
+        # Patches IOPCIConfigurator.cpp's IOPCIIsHotplugPort to skip configRead16/32 calls
+        # Credit to CaseySJ for original discovery:
+        # - Patch: https://github.com/AMD-OSX/AMD_Vanilla/pull/196
+        # - Source: https://github.com/apple-oss-distributions/IOPCIFamily/blob/main/IOPCIConfigurator.cpp#L968-L1022
+        #
+        # Currently all pre-Sandy Bridge Macs lacking an iGPU benefit from this patch as well as MacPro6,1
+        # Otherwise some graphics hardware will fail to wake, macOS will misreport hardware as ExpressCard-based,
+        # prevents MacPro6,1 from both booting unaccelerated and breaks low power states.
+        if (
+            self.model in ["MacPro6,1", "MacBookPro4,1"] or
+            (
+                smbios_data.smbios_dictionary[self.model]["CPU Generation"] < cpu_data.cpu_data.sandy_bridge.value and \
+                not self.model.startswith("MacBook")
+            )
+        ):
+            logging.info("- Adding PCI Bus Enumeration Patch")
+            support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "CaseySJ - Fix PCI bus enumeration")["Enabled"] = True
+
+        if self.constants.set_vmm_cpuid is True:
             logging.info("- Enabling VMM patch")
             self.config["Kernel"]["Emulate"]["Cpuid1Data"] = binascii.unhexlify("00000000000000000000008000000000")
             self.config["Kernel"]["Emulate"]["Cpuid1Mask"] = binascii.unhexlify("00000000000000000000008000000000")
-            self.config["Kernel"]["Emulate"]["MinKernel"] =  "22.0.0"
 
         if (
             self.model.startswith("MacBook")