From 898b10f932fe6434becb71fbd763f10512b87712 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk <48863253+khronokernel@users.noreply.github.com> Date: Wed, 31 Mar 2021 08:11:18 -0600 Subject: [PATCH] Fix MacPro5,1 wifi logic --- Resources/ModelArray.py | 2 +- docs/MODELS.md | 4 ++-- docs/PATCHEXPLAIN.md | 22 +++++++++++++------ payloads/Kexts/Plists/AppleUSBMaps/Info.plist | 8 +++---- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/Resources/ModelArray.py b/Resources/ModelArray.py index 48a6d17bc..fc1611223 100644 --- a/Resources/ModelArray.py +++ b/Resources/ModelArray.py @@ -202,6 +202,7 @@ WifiBCM94322 = [ "MacBookPro7,1", "Macmini3,1", "iMac9,1", + "MacPro5,1", "Dortania1,1" ] @@ -230,7 +231,6 @@ WifiBCM94331 = [ "iMac13,1", # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0) "iMac13,2", # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0) "iMac13,3", # PciRoot(0x0)/Pci(0x1C,0x3)/Pci(0x0,0x0) - "MacPro5,1", # PciRoot(0x0)/Pci(0x1C,0x5)/Pci(0x0,0x0) "Dortania1,1" ] diff --git a/docs/MODELS.md b/docs/MODELS.md index aa0f2e368..0ba8bd40d 100644 --- a/docs/MODELS.md +++ b/docs/MODELS.md @@ -25,8 +25,8 @@ Note: In this patcher, Brightness Control is tied to GPU acceleration | MacBook1,1 | Mid-2006 | NO | 32-Bit CPU limitation | | MacBook2,1 | Late 2006 | ^^ | 32-Bit Firmware limitation | | MacBook3,1 | Late 2007 | ^^ | ^^ | -| MacBook4,1 | Early 2008 | ^^ | YES | - No GPU Acceleration in Mavericks and newer
- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))
- Trackpad Issues
- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) | -| MacBook5,1 | Late 2008 | YES | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))
- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))
- Trackpad Issues | +| MacBook4,1 | Early 2008 | YES | - No GPU Acceleration in Mavericks and newer
- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))
- Trackpad Issues
- No Wifi Patches implemented([#102](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/102)) | +| MacBook5,1 | Late 2008 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))
- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))
- Trackpad Issues | | MacBook5,2 | Early 2009 | ^^ | ^^ | | MacBook6,1 | Late 2009 | ^^ | - No GPU Acceleration in Big Sur([#108](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/108))
- No [DELTA](./TERMS.md) updates when AppleHDA is patched([#76](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/76))
| | MacBook7,1 | Mid-2010 | ^^ | ^^ | diff --git a/docs/PATCHEXPLAIN.md b/docs/PATCHEXPLAIN.md index a108e41fb..90b029d54 100644 --- a/docs/PATCHEXPLAIN.md +++ b/docs/PATCHEXPLAIN.md @@ -2,6 +2,8 @@ In our patcher, there are numerous patches used to ensure a stable system. Here we're going to go over what patches are used and why we recommend or even require them. +* [OpenCore Settings](#opencore-settings) + ## OpenCore Settings ### ACPI -> Patch @@ -27,7 +29,7 @@ In our patcher, there are numerous patches used to ensure a stable system. Here * `PciRoot(0x0)/Pci(0x1C,0x1)/Pci(0x0,0x0)` * Reason: Required to ensure Wifi works with full, native support * Logic: Tricks AirPortBrcmNIC.kext into thinking our device is a BCM94360 (`14e4,43ba`) - * Models: [Machines with BCM943224 and BCM94331 chipsets](https://github.com/dortania/OpenCore-Legacy-Patcher/blob/79ab028b0a039e97a528e0b99c876d95d9c2d41d/Resources/ModelArray.py#L199-L225) + * Models: Machines with BCM943224 and BCM94331 chipsets * `PciRoot(0x0)/Pci(0x3,0x0)/Pci(0x0,0x0)` * `PciRoot(0x0)/Pci(0x1,0x0)/Pci(0x0,0x0)` * Reason: Required to ensure Brightness Control works on upgraded iMacs @@ -95,7 +97,7 @@ In our patcher, there are numerous patches used to ensure a stable system. Here * GopPassThrough * Reason: Used for proper output on machines with UGA firmware but GOP GPU * Logic: Provide GOP protocol instances on top of UGA protocol instances - * Models: MacPro3,1 + * Models: MacPro3,1, MacBook4,1 iMac7,1-8,1 ## Injected Kext @@ -122,11 +124,19 @@ In our patcher, there are numerous patches used to ensure a stable system. Here * VoodooHDA * Reason: Attempts to add audio support for pre-2012 hardware * Models: 2011 and older + ### Ethernet * nForceEthernet + * Reason: Inject old Nvidia Ethernet kext to resolve networking in Catalina and newer + * Models: 2010 and older Nvidia Ethernet require * MarvelYukonEthernet + * Reason: Inject old Marvel Ethernet kext to resolve networking in Catalina and newer + * Models: 2008 and older Marvel Ethernet require * CatalinaBCM5701Ethernet + * Reason: Inject old Broadcom Ethernet kext to resolve networking in Big Sur + * Logic: Patch out conflicting symbols to not colide existing BCM5701Ethernet + * Models: 2011 and older Broadcom Ethernet require ### Maps @@ -147,10 +157,12 @@ In our patcher, there are numerous patches used to ensure a stable system. Here * IO80211HighSierra * Reason: Re-inject Atheros wifi drivers from High Sierra + * Logic: Patch out conflicting symbols to not colide existing IO80211Family * Models: Atheros cards * IO80211Mojave * Reason: Re-inject Broadcom wifi drivers from Mojave - * Models: BCm94322 + * Logic: Patch out conflicting symbols to not colide existing IO80211Family + * Models: BCM94322 ### Misc @@ -169,7 +181,3 @@ In our patcher, there are numerous patches used to ensure a stable system. Here * SMC-Spoof * Reason: Spoofs SMC version to 9.9999 * Models: All models require - - - - diff --git a/payloads/Kexts/Plists/AppleUSBMaps/Info.plist b/payloads/Kexts/Plists/AppleUSBMaps/Info.plist index 20b378687..be66eec56 100644 --- a/payloads/Kexts/Plists/AppleUSBMaps/Info.plist +++ b/payloads/Kexts/Plists/AppleUSBMaps/Info.plist @@ -7850,8 +7850,8 @@ - board-id - Mac-F60DEB81FF30ACF6 + model + XacPro6,1 locationID 487587840 @@ -10467,8 +10467,8 @@ - board-id - Mac-7BA5B2D9E42DDD94 + model + iXacPro1,1 Dortania1,1