firmware.py: Fix MacPro6,1 boot support in Sonoma

This commit is contained in:
Mykola Grymalyuk
2023-06-05 19:36:32 -06:00
parent 4d970cd6f2
commit adcceb0c10
2 changed files with 36 additions and 3 deletions

View File

@@ -1967,7 +1967,7 @@
<key>Base</key> <key>Base</key>
<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string> <string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
<key>Comment</key> <key>Comment</key>
<string>CaseySJ - Fix PCI bus enumeration</string> <string>CaseySJ - Fix PCI bus enumeration (Ventura)</string>
<key>Count</key> <key>Count</key>
<integer>1</integer> <integer>1</integer>
<key>Enabled</key> <key>Enabled</key>
@@ -1981,7 +1981,7 @@
<key>Mask</key> <key>Mask</key>
<data></data> <data></data>
<key>MaxKernel</key> <key>MaxKernel</key>
<string></string> <string>22.99.99</string>
<key>MinKernel</key> <key>MinKernel</key>
<string>22.0.0</string> <string>22.0.0</string>
<key>Replace</key> <key>Replace</key>
@@ -1991,6 +1991,36 @@
<key>Skip</key> <key>Skip</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<dict>
<key>Arch</key>
<string>x86_64</string>
<key>Base</key>
<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
<key>Comment</key>
<string>Fix PCI bus enumeration (Sonoma)</string>
<key>Count</key>
<integer>1</integer>
<key>Enabled</key>
<false/>
<key>Find</key>
<data>RYTkdUs=</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>23.0.0</string>
<key>Replace</key>
<data>RYTk60s=</data>
<key>ReplaceMask</key>
<data></data>
<key>Skip</key>
<integer>0</integer>
</dict>
</array> </array>
<key>Quirks</key> <key>Quirks</key>
<dict> <dict>

View File

@@ -236,7 +236,10 @@ class BuildFirmware:
) )
): ):
logging.info("- Adding PCI Bus Enumeration Patch") 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 support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "CaseySJ - Fix PCI bus enumeration (Ventura)")["Enabled"] = True
# Sonoma slightly adjusted this line specifically
# - https://github.com/apple-oss-distributions/IOPCIFamily/blob/main/IOPCIConfigurator.cpp#L1009
support.BuildSupport(self.model, self.constants, self.config).get_item_by_kv(self.config["Kernel"]["Patch"], "Comment", "Fix PCI bus enumeration (Sonoma)")["Enabled"] = True
if self.constants.set_vmm_cpuid is True: if self.constants.set_vmm_cpuid is True:
logging.info("- Enabling VMM patch") logging.info("- Enabling VMM patch")