From adcceb0c10ed8eaa26b474b5f29bb324707431cc Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Mon, 5 Jun 2023 19:36:32 -0600
Subject: [PATCH] firmware.py: Fix MacPro6,1 boot support in Sonoma

---
 payloads/Config/config.plist | 34 ++++++++++++++++++++++++++++++++--
 resources/build/firmware.py  |  5 ++++-
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 2b2b25c15..56553b87c 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -1967,7 +1967,7 @@
 				<key>Base</key>
 				<string>__ZN17IOPCIConfigurator18IOPCIIsHotplugPortEP16IOPCIConfigEntry</string>
 				<key>Comment</key>
-				<string>CaseySJ - Fix PCI bus enumeration</string>
+				<string>CaseySJ - Fix PCI bus enumeration (Ventura)</string>
 				<key>Count</key>
 				<integer>1</integer>
 				<key>Enabled</key>
@@ -1981,7 +1981,7 @@
 				<key>Mask</key>
 				<data></data>
 				<key>MaxKernel</key>
-				<string></string>
+				<string>22.99.99</string>
 				<key>MinKernel</key>
 				<string>22.0.0</string>
 				<key>Replace</key>
@@ -1991,6 +1991,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>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>
 		<key>Quirks</key>
 		<dict>
diff --git a/resources/build/firmware.py b/resources/build/firmware.py
index 87a0c2003..1f3f1e8b4 100644
--- a/resources/build/firmware.py
+++ b/resources/build/firmware.py
@@ -236,7 +236,10 @@ class BuildFirmware:
             )
         ):
             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:
             logging.info("- Enabling VMM patch")