From 4840160703bea4565b0d9fd6761831a352c990e3 Mon Sep 17 00:00:00 2001 From: Tyler Nguyen Date: Mon, 6 Apr 2020 05:20:18 -0500 Subject: [PATCH] Fixed rare shutdown=restart issue and patched out legacy IRQ conflicts --- .../EFI/OC/ACPI/SSDT-EXT1-FixShutdown.aml | Bin 0 -> 118 bytes EFI-OpenCore/EFI/OC/ACPI/SSDT-HPET.aml | Bin 0 -> 102 bytes EFI-OpenCore/EFI/OC/config.plist | 150 +++++++- README.md | 18 +- docs/4_README-ACPIpatching.md | 42 ++- docs/5_README-other.md | 15 +- docs/CHANGELOG.md | 12 + ...h Changed Its Name To.plist => HPET.plist} | 71 ++-- patches/OpenCore Patches/PTSWAK.plist | 74 ++++ .../TP Battery Basic Rename.plist | 139 -------- ...to 0 and renamed.plist => TPbattery.plist} | 127 +++++++ patches/OpenCore Patches/x1c6-keyboard.plist | 329 ++++++++++++++++++ patches/SSDT-EXT1-FixShutdown.dsl | 14 + patches/SSDT-HPET.dsl | 17 + 14 files changed, 789 insertions(+), 219 deletions(-) create mode 100755 EFI-OpenCore/EFI/OC/ACPI/SSDT-EXT1-FixShutdown.aml create mode 100755 EFI-OpenCore/EFI/OC/ACPI/SSDT-HPET.aml rename patches/OpenCore Patches/{Comprehensive Patch Changed Its Name To.plist => HPET.plist} (75%) create mode 100644 patches/OpenCore Patches/PTSWAK.plist delete mode 100755 patches/OpenCore Patches/TP Battery Basic Rename.plist rename patches/OpenCore Patches/{TP battery Mutex is set to 0 and renamed.plist => TPbattery.plist} (66%) create mode 100644 patches/OpenCore Patches/x1c6-keyboard.plist create mode 100644 patches/SSDT-EXT1-FixShutdown.dsl create mode 100644 patches/SSDT-HPET.dsl diff --git a/EFI-OpenCore/EFI/OC/ACPI/SSDT-EXT1-FixShutdown.aml b/EFI-OpenCore/EFI/OC/ACPI/SSDT-EXT1-FixShutdown.aml new file mode 100755 index 0000000000000000000000000000000000000000..a9048b16ce6178849844b0789bd4fb0f24852222 GIT binary patch literal 118 zcmWFzb_pqCU|?Xn>+kFn!oc7f5n=-5f`O-Bh>rlHg2Dm`2GJOOmiS<&_yA{5g9s1j i_yAv5S5^iQ3!rjC#s!8GCUdc7Ltppgu((52GJOO=J;Tz_yA{51D^nA oCpHF-7=2b`5s=1s=b&Ig5iUU`M$R@)21W*k3;!5c7#J!U04)|30RR91 literal 0 HcmV?d00001 diff --git a/EFI-OpenCore/EFI/OC/config.plist b/EFI-OpenCore/EFI/OC/config.plist index 2bc1d48..fb854b9 100755 --- a/EFI-OpenCore/EFI/OC/config.plist +++ b/EFI-OpenCore/EFI/OC/config.plist @@ -8,7 +8,7 @@ Comment - Battery Status + Battery (Needs TPbattery.plist) Enabled Path @@ -16,7 +16,7 @@ Comment - plugin-type=1 + Intel Power Management Enabled Path @@ -24,7 +24,7 @@ Comment - brightness + Brightness Adjustment Enabled Path @@ -32,7 +32,7 @@ Comment - fake als + Fake ALS0 (Brightness Preservation, starting with Catalina) Enabled Path @@ -48,7 +48,7 @@ Comment - Thinkpad Keyboard + Thinkpad Keyboard (Need x1c6-keyboard.plist) Enabled Path @@ -56,7 +56,7 @@ Comment - Comprehensive Sleep/ Wake Patch + Comprehensive Sleep/ Wake Patch (Needs PTSWAK.plist) Enabled Path @@ -64,7 +64,15 @@ Comment - PTSWAK EXT3 + Fix Reboot after Shutdown + Enabled + + Path + SSDT-EXT1-FixShutdown.aml + + + Comment + TP Light Sleep/Wake Fix Enabled Path @@ -80,7 +88,7 @@ Comment - DMAC + Fake DMAC (Completeness) Enabled Path @@ -88,7 +96,7 @@ Comment - MCHC + Fake MCHC (Completeness) Enabled Path @@ -96,7 +104,7 @@ Comment - PMCR + Fake PMCR (Completeness) Enabled Path @@ -112,7 +120,7 @@ Comment - GPRW 0D/6D Patch + Fix Instant Wake (Need GPRW.plist) Enabled Path @@ -120,7 +128,7 @@ Comment - DTPG + TB3 Hotplug Support Enabled Path @@ -128,17 +136,133 @@ Comment - TB3HP + TB3 Hotplug Enabled Path SSDT-Z390-TB3HP.aml + + Comment + HPET _CRS (Needs HPET.plist) + Enabled + + Path + SSDT-HPET.aml + Block Patch + + Comment + HPET _CRS to XCRS Rename + Count + 0 + Enabled + + Find + + X0NSUwig + + Limit + 0 + Mask + + + OemTableId + + AAAAAA== + + Replace + + WENSUwig + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + AAAAAA== + + + + Comment + RTC IRQ 8 Patch + Count + 0 + Enabled + + Find + + IgABeQA= + + Limit + 0 + Mask + + + OemTableId + + AAAAAA== + + Replace + + IgAAeQA= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + AAAAAA== + + + + Comment + TIMR IRQ 0 Patch + Count + 0 + Enabled + + Find + + IgEAeQA= + + Limit + 0 + Mask + + + OemTableId + + AAAAAA== + + Replace + + IgAAeQA= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + AAAAAA== + + Comment Name6D-03 to 00 diff --git a/README.md b/README.md index e1c227a..7e375f9 100644 --- a/README.md +++ b/README.md @@ -20,20 +20,23 @@ `Lastly, if my work here helped you. Please consider donating, it would mean a lot to me.` +**`In short, x1c6-hackintosh is very stable and is currently my daily driver. I fully recommend this project to anyone looking for a MacBook alternative.`** + + > ## Update ##### Recent | [Changelog Archive](https://github.com/tylernguyen/x1c6-hackintosh/docs/CHANGELOG.md) -> ### 2020-4-1 +> ### 2020-4-6 #### Added -- ALCPlugFix to automatically change output to headphones after being plugged in, and to change it back to speakers after being unplugged. -- ALCPlugFix to fix the rare condition that audio is messed up after waking from sleep. +- SSDT-EXT1-FixShutdown to fix the rare issue that sometimes a shutdown would result in a restart instead. +- SSDT-HPET to patch out legacy IRQ conflicts. #### Changed - -- More documentation about recommended macOS settings. +- Better notes and documentation with `config.plist` +- Modularized each needed OpenCore config patches. > ## SUMMARY: @@ -42,7 +45,7 @@ | WiFi, Bluetooth, Apple Continuity ✅ \*need card replacement | Fingerprint Reader (not needed, DISABLED at BIOS) ❌ | HDMI, currently only outputs at 1080p.Though capable of 4K 4096x2150. ⚠️ | | USB A, USB C, Webcam, Audio Playback/Recording Sleep, Ethernet, Intel Graphics, TrackPoint and Trackpad ✅ | Wireless WAN (DISABLED at BIOS) \*ENABLED if you have a 2nd drive connected❌ | Thunderbolt 3 Hotplug: partially working [More details](https://github.com/tylernguyen/x1c6-hackintosh/issues/24#issuecomment-603183002) ⚠️ | | iCloud suite: App Store, iMessage, FaceTime, iCloud Drive, etc... ✅ | Hibernation ❌ | Power management and optimizations. See [Issue #28](https://github.com/tylernguyen/x1c6-hackintosh/issues/28) ⚠️ | -| Multimedia Fn keys ✅ \*need [Karabiner Elements](https://ke-complex-modifications.pqrs.org/) and [BetterTouchTool](https://folivora.ai/) | | USB power property injection - unsure of real values. ⚠️ | +| Multimedia Fn keys ✅ \*need [Karabiner Elements](https://ke-complex-modifications.pqrs.org/) and [BetterTouchTool](https://folivora.ai/) | | | | MicroSD card reader ✅ | | | > ## NEEDED: @@ -94,11 +97,12 @@ TrackPad: PS/2 **Thunderbolt:** `Intel JHL6540 (Alpine Ridge 4C) Thunderbolt 3 Bridge` -> ## REFERENCES: +> ## Read These (References): - [The Vanilla Laptop Guide](https://fewtarius.gitbook.io/laptopguide/) - Daliansky's [Hackintool tutorial](https://translate.google.com/translate?js=n&sl=auto&tl=en&u=https://blog.daliansky.net/Intel-FB-Patcher-tutorial-and-insertion-pose.html). - [An iDiot's Guide To Lilu and its Plug-ins](https://www.tonymacx86.com/threads/an-idiots-guide-to-lilu-and-its-plug-ins.260063/) +- [Getting Started with ACPI](https://khronokernel.github.io/Getting-Started-With-ACPI/) - [General Framebuffer Patching Guide (HDMI Black Screen Problem)](https://www.tonymacx86.com/threads/guide-general-framebuffer-patching-guide-hdmi-black-screen-problem.269149/) - [Intel Framebuffer patching using WhateverGreen](https://www.tonymacx86.com/threads/guide-intel-framebuffer-patching-using-whatevergreen.256490/) diff --git a/docs/4_README-ACPIpatching.md b/docs/4_README-ACPIpatching.md index 8e1cb83..e2de102 100644 --- a/docs/4_README-ACPIpatching.md +++ b/docs/4_README-ACPIpatching.md @@ -1,17 +1,19 @@ > ## ACPI Patching: 1. Download and install [MaciASL](https://github.com/acidanthera/MaciASL/releases) if you do not have it already. -2. Dump your original ACPI tables. There are a number of ways to do this, using Clover, Hackintool, Linux. +2. Dump your original ACPI tables. There are a number of ways to do this, using Clover, Hackintool, Linux. See [here](https://khronokernel.github.io/Getting-Started-With-ACPI/Manual/dump.html). 3. In Terminal, disassemble the copied ACPI tables with "iasl-stable -dl DSDT.aml". For our purpose, the only file that really matters is DSDT.dsl - Your DSDT file will be used as a reference table in determining that needs to be patched and what patches need to be added. 4. Source SSDT\*.dsl patch files are located in `patches` folder. 5. Refer to my `EFI-OpenCore` folder to see which patches are currently being used by me. -6. Refer to `PATCHES.md` for hotpatching documentation, most of my compiled hotpatches and can be copied straight to your setup. However, some patches may require certain directories or variables to be changed depending on your hardware (examine your own disasemebled DSDT). For these, edit the .dsl patch files. Also, note that some SSDT patches also require accompanying OpenCore/ Clover ACPI patches to work. +6. If your x1c6's model is 20KH*, most of my compiled hotpatches and can likely be copied straight to your setup. However, some patches may require certain directories or variables to be changed depending on your hardware (examine your own disasemebled DSDT). For these, edit the .dsl patch files. Also, note that some SSDT patches also require accompanying OpenCore/ Clover ACPI patches to work. A good way to see if you need to edit and compile your own SSDT patches is to compare your DSDT.dsl with mine of the same BIOS version. You can find my disasemebled DSDT file in `ACPI/Disassembled ACPI/BIOS-v*`. +Should your source DSDT be similar enough (in regards to certain items in these ACPI patches)to mine. Congrats! You can simply try my compiled patches. Should it differ however, please carefully examine these notes and create your own SSDT patches. + 7. Once you have the compiled ACPI patches, place them in `EFI/OC/ACPI/` and make sure to create matching entries within OpenCore's `config.plist`'s `ACPI/Add/` section. # Hotpatching Notes @@ -69,17 +71,14 @@ Why?: `Processor` search in DSDT, rename `PR` to other variables as needed. Why?: `Skylake/ KabyLake/ KabyLake-R` CPU. Used in conjuction with `WhateverGreen.kext` -> ### SSDT-HPET_RTC_TIMR-fix +> ### SSDT-HPET -- This patch cannot be used with the following patches: -    - **_SSDT-RTC_Y-AWAC_N_** of the "Preset Variable Method" -    - OC official **_SSDT-AWAC_** -    - "Counterfeit Device" or OC official **_SSDT-RTC0_** -    - **_SSDT-RTC0-NoFlags for CMOS Reset Patch_** +- Patch out IRQ conflicts. Credits to [corpnewt/SSDTTime](https://github.com/corpnewt/SSDTTime). +**Needs `OpenCore Patches/ HPET.plist`** > ### SSDT-Keyboard - Remapping Fn and PrtSc Keys -Keyboard path is `\ _SB.PCI0.LPCB.KBD`.   + Keyboard path is `\ _SB.PCI0.LPCB.KBD`.   For multimedia functions: - Remap 1: F4 (Network) to F4 @@ -97,22 +96,28 @@ For multimedia functions: For Fn 1-12 functions, check the following option within `Preferences/Keyboard`: ![Fn keys](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/fnkeys.png) +**Needs `OpenCore Patches/ x1c6-keyboard.plist`** + > ### SSDT-PTSWAK -### SSDT-EXT3-LedReset-TP +- Comprehensive sleep/wake patch. +**Needs `OpenCore Patches/ PTSWAK.plist`** -### SSDT-EXT4-WakeScreen - -**Need `OpenCore Patches/ Comprehensive Patch Changed Its Name To.plist`** -Look up `_PTS` and `_WAK` and only apply the corresponding patches: +Look up `_PTS` and `_WAK` in source DSDT and confirm the following, modify if different: `_PTS` is `NotSerialized` in my DSDT `_WAK` is `Serialized` in my DSDT -- **_SSDT-PTSWAK_** —— Comprehensive Patch。 +### SSDT-EXT1-FixShutdown -- **_SSDT-EXT3-LedReset-TP_** — `EXT3` extension patch. Solve the problem that the breathing light does not return to normal after the TP machine wakes up。 +- PTSWAK extension patch. Fixes reboot after shutdown. -- **_SSDT-EXT4-WakeScreen_** — `EXT4` extension patch. Solve the problem that some machines need to press any key to light up the screen after waking up. When using, you should inquire whether the `PNP0C0D` device name and path already exist in the patch file, such as`_SB.PCI0.LPCB.LID0`. If not, add it yourself. +### SSDT-EXT3-LedReset-TP + +- PTSWAK extension patch. Solve the problem that the breathing light does not return to normal after the TP machine wakes up. + +### SSDT-EXT4-WakeScreen + +- PTSWAK extension patch. Solve the problem that some machines need to press any key to light up the screen after waking up. When using, you should inquire whether the `PNP0C0D` device name and path already exist in the patch file, such as`_SB.PCI0.LPCB.LID0`. If not, add it yourself. > ### SSDT-SBUS @@ -136,6 +141,7 @@ Why?: `PNP0C0C` missing in DSDT. > ### SSDT-ALS0 +Starting with Catalina, an ambient light sensor device is required for brightness preservation. This patch fakes an ambient light sensor device `ALS0` since the x1c6 does not have one. Why?: `ACPI0008` missing in DSDT. > ### SSDT-GPRW @@ -143,5 +149,5 @@ Why?: `ACPI0008` missing in DSDT. Why?: Fix instant wake by hooking GPRW (0D/6D Patch) ``` -Special thanks to [daliansky](https://github.com/daliansky) and [jsassu20](https://github.com/jsassu20) for their work. +Special thanks to [daliansky](https://github.com/daliansky). ``` diff --git a/docs/5_README-other.md b/docs/5_README-other.md index d53b82f..ba7d40f 100644 --- a/docs/5_README-other.md +++ b/docs/5_README-other.md @@ -1,14 +1,21 @@ +> ## Upgrading and other Major Changes: + +- macOS minor version upgrade works just as any Mac would. +- It is generally a good idea to hold off on new major macOS releases until kexts and other dependencies have been tested. +- Upon upgrading macOS, even minor releases, it is recommended to clear NVRAM to reduce problems. +- Upon changing SSDT patches and/or changing BIOS settings, it is also recommended to clear NVRAM variables. + > ## Dual Booting: - I recommend that you dual boot using another drive in the WAN slot. - I've found that dual booting with OpenCore can be quite troulesome. Instead, what I recommend is to use rEFInd Boot Manager should you need to dual boot Windows or Linux. -## Modifier Key Patching: +> ## Modifier Key Patching: By default, Windows, Left Alt, and Right Alt are mismapped. An easy fix for this is to install [Karabiner-Elements](https://karabiner-elements.pqrs.org/) and configure it as: ![karabiner_modifier](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/karabiner_modifier.png) -## Multimedia Fn Key Patching: +> ## Multimedia Fn Key Patching: Since macOS doesn't not natively support some multimedia Fn key actions. BetterTouchTool is required to program these actions. Keyboard Mastero is also an alternative but I've found that BetterTouchTool is a simpler and easier option. Simply import `patches/BetterTouchTool/x1c6-functions.bttpreset`. My settings are as followed: @@ -21,14 +28,14 @@ Simply import `patches/BetterTouchTool/x1c6-functions.bttpreset`. My settings ar - PrtSc = Window Screen Capture Of course, feel free to change this to your preference in BetterTouchTool. -## Touchpad Settings in macOS: +> ## Touchpad Settings in macOS: - Force Click is enabled by default, which turns any click on the trackpad into a force touch. I suggest you turn this off. - In addition, I prefer to have tap to click on. See my touchpad settings: ![touchpad](https://github.com/tylernguyen/x1c6-hackintosh/blob/master/docs/assets/img/macOS%20Settings/touchpad.png) -## Headphone Patch: +> ## Headphone Patch: - Installing ALCPlugFix addresses the following: - Change output to headphones after being plugged in, and to change it back to speakers after being unplugged. diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index ba04ab1..05929e9 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +> ### 2020-4-6 + +#### Added + +- SSDT-EXT1-FixShutdown to fix the rare issue that sometimes a shutdown would result in a restart instead. +- SSDT-HPET to patch out legacy IRQ conflicts. + +#### Changed +- Better notes and documentation with `config.plist` +- Modularized each needed OpenCore config patches. + + > ### 2020-4-1 #### Added diff --git a/patches/OpenCore Patches/Comprehensive Patch Changed Its Name To.plist b/patches/OpenCore Patches/HPET.plist similarity index 75% rename from patches/OpenCore Patches/Comprehensive Patch Changed Its Name To.plist rename to patches/OpenCore Patches/HPET.plist index e0f9917..4c4d603 100644 --- a/patches/OpenCore Patches/Comprehensive Patch Changed Its Name To.plist +++ b/patches/OpenCore Patches/HPET.plist @@ -4,18 +4,29 @@ ACPI + Add + + + Comment + HPET _CRS (Needs _CRS to XCRS Rename) + Enabled + + Path + SSDT-HPET.aml + + Patch Comment - _PTS to ZPTS(1,N) + HPET _CRS to XCRS Rename Count 0 Enabled Find - X1BUUwE= + X0NSUwig Limit 0 @@ -24,10 +35,11 @@ OemTableId + AAAAAA== Replace - WlBUUwE= + WENSUwig ReplaceMask @@ -36,17 +48,21 @@ 0 TableLength 0 + TableSignature + + AAAAAA== + Comment - _PTS to ZPTS(1,S) + RTC IRQ 8 Patch Count 0 Enabled Find - X1BUUwk= + IgABeQA= Limit 0 @@ -55,10 +71,11 @@ OemTableId + AAAAAA== Replace - WlBUUwk= + IgAAeQA= ReplaceMask @@ -67,17 +84,21 @@ 0 TableLength 0 + TableSignature + + AAAAAA== + Comment - _WAK to ZWAK(1,N) + TIMR IRQ 0 Patch Count 0 Enabled Find - X1dBSwE= + IgEAeQA= Limit 0 @@ -86,10 +107,11 @@ OemTableId + AAAAAA== Replace - WldBSwE= + IgAAeQA= ReplaceMask @@ -98,37 +120,10 @@ 0 TableLength 0 - - - Comment - _WAK to ZWAK(1,S) - Count - 0 - Enabled - - Find + TableSignature - X1dBSwk= + AAAAAA== - Limit - 0 - Mask - - - OemTableId - - - Replace - - WldBSwk= - - ReplaceMask - - - Skip - 0 - TableLength - 0 diff --git a/patches/OpenCore Patches/PTSWAK.plist b/patches/OpenCore Patches/PTSWAK.plist new file mode 100644 index 0000000..0cf6bfc --- /dev/null +++ b/patches/OpenCore Patches/PTSWAK.plist @@ -0,0 +1,74 @@ + + + + + ACPI + + Patch + + + Comment + _PTS to ZPTS(1,N) + Count + 0 + Enabled + + Find + + X1BUUwE= + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WlBUUwE= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + + + Comment + _WAK to ZWAK(1,S) + Count + 0 + Enabled + + Find + + X1dBSwk= + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WldBSwk= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + + + + + diff --git a/patches/OpenCore Patches/TP Battery Basic Rename.plist b/patches/OpenCore Patches/TP Battery Basic Rename.plist deleted file mode 100755 index db31818..0000000 --- a/patches/OpenCore Patches/TP Battery Basic Rename.plist +++ /dev/null @@ -1,139 +0,0 @@ - - - - - ACPI - - Patch - - - Comment - TP-BAT:GBIF03 to XBIF03 - Count - 0 - Enabled - - Find - - R0JJRgM= - - Limit - 0 - Mask - - - OemTableId - - - Replace - - WEJJRgM= - - ReplaceMask - - - Skip - 0 - TableLength - 0 - - - Comment - TP-BAT:GBIX03 to XBIX03 - Count - 0 - Enabled - - Find - - R0JJWAM= - - Limit - 0 - Mask - - - OemTableId - - - Replace - - WEJJWAM= - - ReplaceMask - - - Skip - 0 - TableLength - 0 - - - Comment - TP-BAT:GBST04 to XBST04 - Count - 0 - Enabled - - Find - - R0JTVAQ= - - Limit - 0 - Mask - - - OemTableId - - - Replace - - WEJTVAQ= - - ReplaceMask - - - Skip - 0 - TableLength - 0 - - - Comment - TP-BAT:AJTP03 to XJTP03 - Count - 0 - Enabled - - Find - - QUpUUAM= - - Limit - 0 - Mask - - - OemTableId - - - Replace - - WEpUUAM= - - ReplaceMask - - - Skip - 0 - TableLength - 0 - TableSignature - - - - - - - diff --git a/patches/OpenCore Patches/TP battery Mutex is set to 0 and renamed.plist b/patches/OpenCore Patches/TPbattery.plist similarity index 66% rename from patches/OpenCore Patches/TP battery Mutex is set to 0 and renamed.plist rename to patches/OpenCore Patches/TPbattery.plist index 1501a9c..d84c144 100755 --- a/patches/OpenCore Patches/TP battery Mutex is set to 0 and renamed.plist +++ b/patches/OpenCore Patches/TPbattery.plist @@ -6,6 +6,133 @@ Patch + + Comment + TP-BAT:GBIF03 to XBIF03 + Count + 0 + Enabled + + Find + + R0JJRgM= + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WEJJRgM= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + + + Comment + TP-BAT:GBIX03 to XBIX03 + Count + 0 + Enabled + + Find + + R0JJWAM= + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WEJJWAM= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + + + Comment + TP-BAT:GBST04 to XBST04 + Count + 0 + Enabled + + Find + + R0JTVAQ= + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WEJTVAQ= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + + + Comment + TP-BAT:AJTP03 to XJTP03 + Count + 0 + Enabled + + Find + + QUpUUAM= + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WEpUUAM= + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + Comment Mutex:MDGS=0 diff --git a/patches/OpenCore Patches/x1c6-keyboard.plist b/patches/OpenCore Patches/x1c6-keyboard.plist new file mode 100644 index 0000000..6e27a8c --- /dev/null +++ b/patches/OpenCore Patches/x1c6-keyboard.plist @@ -0,0 +1,329 @@ + + + + + ACPI + + Add + + + Comment + Thinkpad Keyboard (Need x1c6-keyboard.plist) + Enabled + + Path + SSDT-Keyboard.aml + + + Patch + + + Comment + _Q6A to XQ6A (F4 - Microphone Mute) + Count + 1 + Enabled + + Find + + X1E2QQ== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFE2QQ== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q15 to XQ15 (F5 - Brightness Down) + Count + 1 + Enabled + + Find + + X1ExNQ== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFExNQ== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q14 to XQ14 (F6 - Brightness Up) + Count + 1 + Enabled + + Find + + X1ExNA== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFExNA== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q16 to XQ16 (F7 - Dual Display) + Count + 1 + Enabled + + Find + + X1ExNg== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFExNg== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q64 to XQ64 (F8 - Network) + Count + 1 + Enabled + + Find + + X1E2NA== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFE2NA== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q66 to XQ66 (F9 - Settings) + Count + 1 + Enabled + + Find + + X1E2Ng== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFE2Ng== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q60 to XQ60 (F10 - Bluetooth) + Count + 1 + Enabled + + Find + + X1E2MA== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFE2MA== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q61 to XQ61 (F11 - Keyboard) + Count + 1 + Enabled + + Find + + X1E2MQ== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFE2MQ== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + Comment + _Q62 to XQ62 (F12 - Star) + Count + 1 + Enabled + + Find + + X1E2Mg== + + Limit + 0 + Mask + + + OemTableId + + + Replace + + WFE2Mg== + + ReplaceMask + + + Skip + 0 + TableLength + 0 + TableSignature + + + + + + + diff --git a/patches/SSDT-EXT1-FixShutdown.dsl b/patches/SSDT-EXT1-FixShutdown.dsl new file mode 100644 index 0000000..fba5fa6 --- /dev/null +++ b/patches/SSDT-EXT1-FixShutdown.dsl @@ -0,0 +1,14 @@ +// Fix "restart after shutdown" +// Credit RehabMan (Laptop-DSDT-Patch) +DefinitionBlock("", "SSDT", 2, "OCLT", "EXT4", 0) +{ + External (_SB_.PCI0.XHC_.PMEE, FieldUnitObj) + + Method (EXT1, 1, NotSerialized) + { + If ((5 == Arg0) && CondRefOf (\_SB.PCI0.XHC.PMEE)) { + \_SB.PCI0.XHC.PMEE = 0 + } + } +} +//EOF diff --git a/patches/SSDT-HPET.dsl b/patches/SSDT-HPET.dsl new file mode 100644 index 0000000..0d0fc7f --- /dev/null +++ b/patches/SSDT-HPET.dsl @@ -0,0 +1,17 @@ +// +// Supplementary HPET _CRS from Goldfish64 +// Requires the HPET's _CRS to XCRS rename +// +DefinitionBlock ("", "SSDT", 2, "CORP", "HPET", 0x00000000) +{ + External (_SB.PCI0.LPCB, DeviceObj) // (from opcode) + Name (\_SB.PCI0.LPCB.HPET._CRS, ResourceTemplate () // _CRS: Current Resource Settings + { + IRQNoFlags () + {0,8,11} + Memory32Fixed (ReadWrite, + 0xFED00000, // Address Base + 0x00000400, // Address Length + ) + }) +}