From 1da93b1ca0d2238bbc698370bb3ef5e6b1b04f5f Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com>
Date: Thu, 16 Sep 2021 10:06:59 -0600
Subject: [PATCH] Fix Monterey Bluetooth

---
 Resources/Build.py                            |   8 +++
 Resources/Constants.py                        |  15 +++++-
 Resources/ModelArray.py                       |  47 ++++++++++++++++++
 Resources/Utilities.py                        |   8 +--
 payloads/Config/config.plist                  |  20 +++++++-
 .../Bluetooth/BlueToolFixup-2046-v2.6.1.zip   | Bin 0 -> 10702 bytes
 .../Kexts/Bluetooth/BlueToolFixup-2046.patch  |  26 ++++++++++
 .../Bluetooth/BlueToolFixup-2070-v2.6.1.zip   | Bin 0 -> 10698 bytes
 .../Kexts/Bluetooth/BlueToolFixup-2070.patch  |  26 ++++++++++
 9 files changed, 145 insertions(+), 5 deletions(-)
 create mode 100644 payloads/Kexts/Bluetooth/BlueToolFixup-2046-v2.6.1.zip
 create mode 100644 payloads/Kexts/Bluetooth/BlueToolFixup-2046.patch
 create mode 100644 payloads/Kexts/Bluetooth/BlueToolFixup-2070-v2.6.1.zip
 create mode 100644 payloads/Kexts/Bluetooth/BlueToolFixup-2070.patch

diff --git a/Resources/Build.py b/Resources/Build.py
index f61a45564..d8daed90b 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -692,6 +692,14 @@ class BuildOpenCore:
             # Note this function was added in 11.3 (20E232, 20.4), older builds do not support this (ie. 11.2.3)
             print("- Allowing FileVault on Root Patched systems")
             self.get_item_by_kv(self.config["Kernel"]["Patch"], "Identifier", "com.apple.filesystems.apfs")["Enabled"] = True
+        
+        if self.model in ModelArray.Bluetooth_BRCM2070:
+            print("- Enabling Bluetooth BRCM2070 for macOS Monterey")
+            self.enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.brcm2070_path)
+        elif self.model in ModelArray.Bluetooth_BRCM2046:
+            print("- Enabling Bluetooth BRCM2046 for macOS Monterey")
+            self.enable_kext("BlueToolFixup.kext", self.constants.bluetool_version, self.constants.brcm2046_path)
+
 
 
     def set_smbios(self):
diff --git a/Resources/Constants.py b/Resources/Constants.py
index a45f8f6a2..4a21e5cea 100644
--- a/Resources/Constants.py
+++ b/Resources/Constants.py
@@ -34,6 +34,7 @@ class Constants:
         self.featureunlock_version = "1.0.3"  #      FeatureUnlock
         self.debugenhancer_version = "1.0.4"  #      DebugEnhancer
         self.cpufriend_version = "1.2.4"  #          CPUFriend
+        self.bluetool_version = "2.6.1"  #           BlueToolFixup
 
         ## Apple
         ## https://www.apple.com
@@ -341,6 +342,18 @@ class Constants:
     def plist_folder_path(self):
         return self.payload_kexts_path / Path("Plists")
 
+    @property
+    def bluetooth_folder_path(self):
+        return self.payload_kexts_path / Path("Bluetooth")
+
+    @property
+    def brcm2046_path(self):
+        return self.bluetooth_folder_path / Path(f"BlueToolFixup-2046-v{self.bluetool_version}.zip")
+
+    @property
+    def brcm2070_path(self):
+        return self.bluetooth_folder_path / Path(f"BlueToolFixup-2070-v{self.bluetool_version}.zip")
+
     @property
     def platform_plugin_plist_path(self):
         return self.plist_folder_path / Path("PlatformPlugin")
@@ -633,7 +646,7 @@ class Constants:
         "j215ap",  #  MacBookPro16,4
         "j185ap",  #  iMac20,1
         "j185fap",  # iMac20,2
-        #"x86legacy",  # non-T2 Macs/VMs, Monterey's boot.efi enforces this on all Macs
+        # "x86legacy",  # non-T2 Macs/VMs, Monterey's boot.efi enforces this on all Macs
     ]
 
     sandy_board_id = [
diff --git a/Resources/ModelArray.py b/Resources/ModelArray.py
index 688990bd1..4c1c0be42 100644
--- a/Resources/ModelArray.py
+++ b/Resources/ModelArray.py
@@ -1165,3 +1165,50 @@ dGPU_switch = [
     "MacBookPro16,1",
     "MacBookPro16,4",
 ]
+
+Bluetooth_BRCM2046 = [
+    "MacBook4,1",
+    "MacBook5,1",
+    "MacBook5,2",
+    "MacBookAir2,1",
+    "MacBookAir3,1",
+    "MacBookAir3,2",
+    "MacBookPro4,1",
+    "MacBookPro5,1",
+    "MacBookPro5,2",
+    "MacBookPro5,3",
+    "MacBookPro5,4",
+    "MacBookPro5,5",
+    "MacBookPro7,1",
+    "Macmini3,1",
+    "iMac7,1",
+    "iMac8,1",
+    "iMac9,1",
+    "iMac10,1",
+    "iMac11,1",
+    "iMac11,2",
+    "iMac11,3",
+    "iMac12,1",
+    "iMac12,2",
+    "MacPro3,1",
+    "MacPro4,1",
+    "MacPro5,1",
+    "XServer2,1",
+    "XServer3,1",
+]
+
+Bluetooth_BRCM2070 = [
+    "MacBook6,1",
+    "MacBook7,1",
+    "MacBookAir4,1",
+    "MacBookAir4,2",
+    "MacBookPro6,1",
+    "MacBookPro6,2",
+    "MacBookPro8,1",
+    "MacBookPro8,2",
+    "MacBookPro8,3",
+    "Macmini4,1",
+    "Macmini5,1",
+    "Macmini5,2",
+    "Macmini5,3",
+]
diff --git a/Resources/Utilities.py b/Resources/Utilities.py
index ab5776fe1..6b15e0b9d 100644
--- a/Resources/Utilities.py
+++ b/Resources/Utilities.py
@@ -135,6 +135,7 @@ def amfi_status():
         return False
     return True
 
+
 def check_oclp_boot():
     if get_nvram("OCLP-Version", "4D1FDA02-38C7-4A6A-9CC6-4BCCA8B30102", decode=False):
         return True
@@ -244,10 +245,11 @@ def download_file(link, location):
             chunk = file.read(1024 * 1024 * 16)
     return checksum
 
-def enable_apfs(fw_feature, fw_mask):
-    fw_feature |= 2**19
-    fw_mask |= 2**19
 
+def enable_apfs(fw_feature, fw_mask):
+    fw_feature |= 2 ** 19
+    fw_mask |= 2 ** 19
+    return fw_feature, fw_mask
 
 
 # def menu(title, prompt, menu_options, add_quit=True, auto_number=False, in_between=[], top_level=False):
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 3c03d2685..1a29c5a78 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -948,7 +948,25 @@
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
-				<string>20.4.0</string>
+				<string>16.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>BlueToolFixup.kext</string>
+				<key>Comment</key>
+				<string>Fix Monterey Bluetooth</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/BlueToolFixup</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>21.0.0</string>
 				<key>PlistPath</key>
 				<string>Contents/Info.plist</string>
 			</dict>
diff --git a/payloads/Kexts/Bluetooth/BlueToolFixup-2046-v2.6.1.zip b/payloads/Kexts/Bluetooth/BlueToolFixup-2046-v2.6.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..355f0c70af3e4876554174cee90ee7d64bd8090d
GIT binary patch
literal 10702
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
BEm!~m

literal 0
HcmV?d00001

diff --git a/payloads/Kexts/Bluetooth/BlueToolFixup-2046.patch b/payloads/Kexts/Bluetooth/BlueToolFixup-2046.patch
new file mode 100644
index 000000000..36c38df92
--- /dev/null
+++ b/payloads/Kexts/Bluetooth/BlueToolFixup-2046.patch
@@ -0,0 +1,26 @@
+diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp
+index 0fa891a..e68f28e 100644
+--- a/BrcmPatchRAM/BlueToolFixup.cpp
++++ b/BrcmPatchRAM/BlueToolFixup.cpp
+@@ -50,7 +50,11 @@ bool BlueToolFixup::start(IOService *provider) {
+ static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate";
+ static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi";
+ 
++static const uint8_t kBluetoothUSBNameOriginal[] = "Bluetooth USB Host Controller";
++static const uint8_t kBluetoothUSBNamePatched[] = "BRCM2046 Hub Host Controller";
++
+ static const char *blueToolPath = "/usr/sbin/BlueTool";
++static const char *bluetoothdPath = "/usr/sbin/bluetoothd";
+ 
+ static mach_vm_address_t orig_cs_validate {};
+ 
+@@ -74,6 +78,9 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o
+     if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) {
+         searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+     }
++    if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, bluetoothdPath) == 0)) {
++        searchAndPatch(data, PAGE_SIZE, path, kBluetoothUSBNameOriginal, kBluetoothUSBNamePatched);
++    }
+ }
+ 
+ 
diff --git a/payloads/Kexts/Bluetooth/BlueToolFixup-2070-v2.6.1.zip b/payloads/Kexts/Bluetooth/BlueToolFixup-2070-v2.6.1.zip
new file mode 100644
index 0000000000000000000000000000000000000000..fd0215ae10fb1fc7816c909bffb60a4542a60ed5
GIT binary patch
literal 10698
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
boBt1@BMoH&!ao5Bv7aQY>WP{2&+7jGxGN-B

literal 0
HcmV?d00001

diff --git a/payloads/Kexts/Bluetooth/BlueToolFixup-2070.patch b/payloads/Kexts/Bluetooth/BlueToolFixup-2070.patch
new file mode 100644
index 000000000..cd0dd1970
--- /dev/null
+++ b/payloads/Kexts/Bluetooth/BlueToolFixup-2070.patch
@@ -0,0 +1,26 @@
+diff --git a/BrcmPatchRAM/BlueToolFixup.cpp b/BrcmPatchRAM/BlueToolFixup.cpp
+index 0fa891a..6a9d2f3 100644
+--- a/BrcmPatchRAM/BlueToolFixup.cpp
++++ b/BrcmPatchRAM/BlueToolFixup.cpp
+@@ -50,7 +50,11 @@ bool BlueToolFixup::start(IOService *provider) {
+ static const uint8_t kSkipUpdateFilePathOriginal[] = "/etc/bluetool/SkipBluetoothAutomaticFirmwareUpdate";
+ static const uint8_t kSkipUpdateFilePathPatched[] = "/System/Library/CoreServices/boot.efi";
+ 
++static const uint8_t kBluetoothUSBNameOriginal[] = "Bluetooth USB Host Controller";
++static const uint8_t kBluetoothUSBNamePatched[] = "BRCM2070 Hub Host Controller";
++
+ static const char *blueToolPath = "/usr/sbin/BlueTool";
++static const char *bluetoothdPath = "/usr/sbin/bluetoothd";
+ 
+ static mach_vm_address_t orig_cs_validate {};
+ 
+@@ -74,6 +78,9 @@ static void patched_cs_validate_page(vnode_t vp, memory_object_t pager, memory_o
+     if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, blueToolPath) == 0)) {
+         searchAndPatch(data, PAGE_SIZE, path, kSkipUpdateFilePathOriginal, kSkipUpdateFilePathPatched);
+     }
++    if (vn_getpath(vp, path, &pathlen) == 0 && UNLIKELY(strcmp(path, bluetoothdPath) == 0)) {
++        searchAndPatch(data, PAGE_SIZE, path, kBluetoothUSBNameOriginal, kBluetoothUSBNamePatched);
++    }
+ }
+ 
+