Kext: Add back NVMeFix and HibernationFixup

* config: Delete reg-ltrovr property * OC: CML: Change HibernateMode back to Auto * Clover: CML: Enable HibernationFixup
daliansky · Dec 23, 2022 · b902144 · b902144
1 parent a2adb10
commit b902144
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 81 deletions.
diff --git a/CLOVER/config_cml.plist b/CLOVER/config_cml.plist
@@ -64,7 +64,7 @@
 		<key>DefaultVolume</key>
 		<string>LastBootedVolume</string>
 		<key>HibernationFixup</key>
-		<false/>
+		<true/>
 		<key>Legacy</key>
 		<string>PBR</string>
 		<key>NoEarlyProgress</key>
@@ -169,31 +169,16 @@
 				<key>model</key>
 				<string>Intel Comet Lake PCH-LP LPSS: I2C Controller #4</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Comet Lake PCH-LP PCIe Port #5</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1d,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Comet Lake PCH-LP PCIe Port #9</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1d,0x4)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1d,0x4)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>

diff --git a/CLOVER/config_kbl.plist b/CLOVER/config_kbl.plist
@@ -162,41 +162,21 @@
 				<key>model</key>
 				<string>Intel Sunrise Point-LP CSME HECI #1</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Sunrise Point-LP PCI Express Root Port #1</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x4)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x4)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Sunrise Point-LP PCI Express Root Port #5</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x7)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x7)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Wireless 8265</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1d,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>

diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,27 @@
 
 **English** | [中文](Docs/Changelog_CN.md)
 
+## XiaoMi NoteBook Pro EFI v1.7.4
+## 2023-01-03
+
+### Upgrade
+  - Update `OpenCore` v0.8.8
+  - Update `AppleALC` v1.7.8
+  - Update `VoodooInput` v1.1.3
+
+### Add
+  - Add back `NVMeFix` to enable APST on SSDs
+
+### OC
+  - OC: CML: Change `HibernateMode` back to `Auto`
+
+### Clover
+  - Clover: CML: Enable `HibernationFixup`
+
+### Change
+  - config: Delete `reg-ltrovr` property as the tolerance latency's effect is unknown for hackintosh
+
+
 ## [XiaoMi NoteBook Pro EFI v1.7.3](https://github.com/daliansky/XiaoMi-Pro-Hackintosh/releases/tag/v1.7.3)
 ## 2022-12-06
 

diff --git a/Docs/Changelog_CN.md b/Docs/Changelog_CN.md
@@ -2,6 +2,27 @@
 
 [English](../Changelog.md) | **中文**
 
+## XiaoMi NoteBook Pro EFI v1.7.4
+## 2023-01-03
+
+### 更新
+  - 更新 `OpenCore` v0.8.8
+  - 更新 `AppleALC` v1.7.8
+  - 更新 `VoodooInput` v1.1.3
+
+### 新增
+  - 新增回 `NVMeFix` 来开启固态硬盘的 APST
+
+### OC
+  - OC: CML: 修改 `HibernateMode` 回 `Auto`
+
+### Clover
+  - Clover: CML: 启用 `HibernationFixup`
+
+### 更改
+  - config: 移除 `reg-ltrovr` 属性因为 tolerance latency 对黑苹果的影响未知
+
+
 ## [XiaoMi NoteBook Pro EFI v1.7.3](https://github.com/daliansky/XiaoMi-Pro-Hackintosh/releases/tag/v1.7.3)
 ## 2022-12-06
 

diff --git a/Kexts/download_kexts.sh b/Kexts/download_kexts.sh
@@ -197,6 +197,7 @@ function download() {
     AppleALC
     HibernationFixup
     RestrictEvents
+    NVMeFix
     VoodooPS2
     BrcmPatchRAM
     Lilu
@@ -285,6 +286,7 @@ function install() {
     "Kexts/SMCProcessor.kext"
     "Kexts/VirtualSMC.kext"
     "Lilu.kext"
+    "NVMeFix.kext"
     "NoTouchID.kext"
   # "RealtekCardReader.kext"
   # "RealtekCardReaderFriend.kext"

diff --git a/OC/config_cml.plist b/OC/config_cml.plist
@@ -408,31 +408,16 @@
 				<key>model</key>
 				<string>Intel Comet Lake PCH-LP LPSS: I2C Controller #4</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Comet Lake PCH-LP PCIe Port #5</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1d,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Comet Lake PCH-LP PCIe Port #9</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1d,0x4)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1d,0x4)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
@@ -608,7 +593,7 @@
 				<key>Comment</key>
 				<string>Hibernation patches</string>
 				<key>Enabled</key>
-				<false/>
+				<true/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/HibernationFixup</string>
 				<key>MaxKernel</key>
@@ -626,7 +611,7 @@
 				<key>Comment</key>
 				<string>NVMe patches</string>
 				<key>Enabled</key>
-				<false/>
+				<true/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/NVMeFix</string>
 				<key>MaxKernel</key>
@@ -1136,7 +1121,7 @@
 			<key>ConsoleAttributes</key>
 			<integer>0</integer>
 			<key>HibernateMode</key>
-			<string>None</string>
+			<string>Auto</string>
 			<key>HibernateSkipsPicker</key>
 			<false/>
 			<key>HideAuxiliary</key>

diff --git a/OC/config_kbl.plist b/OC/config_kbl.plist
@@ -418,41 +418,21 @@
 				<key>model</key>
 				<string>Intel Sunrise Point-LP CSME HECI #1</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Sunrise Point-LP PCI Express Root Port #1</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x4)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x4)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Sunrise Point-LP PCI Express Root Port #5</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1c,0x7)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1c,0x7)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
 				<string>Intel Wireless 8265</string>
 			</dict>
-			<key>PciRoot(0x0)/Pci(0x1d,0x0)</key>
-			<dict>
-				<key>reg-ltrovr</key>
-				<data>AAQAAAAAAAA=</data>
-			</dict>
 			<key>PciRoot(0x0)/Pci(0x1d,0x0)/Pci(0x0,0x0)</key>
 			<dict>
 				<key>model</key>
@@ -664,7 +644,7 @@
 				<key>Comment</key>
 				<string>NVMe patches</string>
 				<key>Enabled</key>
-				<false/>
+				<true/>
 				<key>ExecutablePath</key>
 				<string>Contents/MacOS/NVMeFix</string>
 				<key>MaxKernel</key>

diff --git a/makefile.sh b/makefile.sh
@@ -144,6 +144,7 @@ acdtKexts=(
   AppleALC
   HibernationFixup
   RestrictEvents
+  NVMeFix
   VoodooPS2
   BrcmPatchRAM
 )
@@ -402,9 +403,9 @@ function bKextHelper() {
   local lineNum
 
   if [[ "${model_input}" =~ "CML" ]]; then
-    liluPlugins="AppleALC BrcmPatchRAM HibernationFixup RealtekCardReaderFriend VirtualSMC WhateverGreen RestrictEvents NoTouchID"
+    liluPlugins="AppleALC BrcmPatchRAM HibernationFixup NVMeFix RealtekCardReaderFriend VirtualSMC WhateverGreen RestrictEvents NoTouchID"
   elif [[ "${model_input}" =~ "KBL" ]]; then
-    liluPlugins="AppleALC BrcmPatchRAM HibernationFixup RealtekCardReaderFriend VirtualSMC WhateverGreen RestrictEvents"
+    liluPlugins="AppleALC BrcmPatchRAM HibernationFixup NVMeFix RealtekCardReaderFriend VirtualSMC WhateverGreen RestrictEvents"
   fi
 
   echo "${green}[${reset}${blue}${bold} Building $2 ${reset}${green}]${reset}"
@@ -718,6 +719,7 @@ function install() {
     "Kexts/SMCProcessor.kext"
     "Kexts/VirtualSMC.kext"
     "Lilu.kext"
+    "NVMeFix.kext"
     # "RealtekCardReader.kext"
     # "RealtekCardReaderFriend.kext"
     "Release/NullEthernet.kext"
@@ -753,7 +755,6 @@ function install() {
       "11"
       "12"
       "13"
-      "Off"
     )
     local cmlCloverIbtInjctrDirs=(
       "10.15"
@@ -821,9 +822,6 @@ function install() {
       for noTouchIDDir in "${!OUTDir_MODEL_CLOVER}/EFI/CLOVER/kexts/10.15" "${!OUTDir_MODEL_OC}/EFI/OC/Kexts/"; do
         cp -R "CML/NoTouchID.kext" "${noTouchIDDir}" || copyErr
       done
-
-      # CML: Move HibernationFixup.kext to Off folder for Clover due to Not booting after running out of battery issue (Ref: https://github.com/daliansky/XiaoMi-Pro-Hackintosh/issues/661)
-      mv "${!OUTDir_MODEL_CLOVER}/EFI/CLOVER/kexts/Other/HibernationFixup.kext" "${!OUTDir_MODEL_CLOVER}/EFI/CLOVER/kexts/Off/HibernationFixup.kext" || exit 1
     fi
 
     # Move AirportItlwm to corresponding Clover and OC Kext folders