OcInputLib: Workaround timer resolution restoration

Changelog.md

@@ -7,6 +7,7 @@ OpenCore Changelog
 - Fixed macrecovery server protocol compatibility
 - Added basic audio assistant support in OpenCanopy
 - Added compiled ACPI samples to the package
+- Fixed timer resolution restoration at boot time
 
 #### v0.6.4
 - Added `BlacklistAppleUpdate` to fix macOS 11 broken update optout

Library/OcInputLib/Timer/AIT.c

@@ -70,17 +70,24 @@ OcAppleGenericInputTimerQuirkExit (
 
   if (mTimerProtocol != NULL) {
     //
-    // You are not allowed to call this on APTIO IV, as it results in an interrupt with 0x0 pointer
-    // handler during XNU boot.
+    // You are not allowed to call this after ExitBootServices (e.g. as an Event) on
+    // APTIO IV, as it results in an interrupt with 0x0 pointer handler during XNU boot.
     //
-    // Status = mTimerProtocol->SetTimerPeriod (mTimerProtocol, mOriginalTimerPeriod);
-    // if (!EFI_ERROR (Status)) {
-    //   DEBUG ((DEBUG_INFO, "AmiShimTimerBoostExit changed period %d to %d\n",
-    //     AIT_TIMER_PERIOD, mOriginalTimerPeriod));
-    // } else {
-    //   DEBUG ((DEBUG_INFO, "AmiShimTimerBoostExit failed to change period %d to %d, error - %r\n",
-    //     AIT_TIMER_PERIOD, mOriginalTimerPeriod, Status));
-    // }
+    Status = mTimerProtocol->SetTimerPeriod (mTimerProtocol, mOriginalTimerPeriod);
+    if (!EFI_ERROR (Status)) {
+      DEBUG ((
+        DEBUG_INFO,
+        "AmiShimTimerBoostExit changed current period to %Lu\n",
+        mOriginalTimerPeriod
+        ));
+    } else {
+       DEBUG ((
+        DEBUG_INFO,
+        "AmiShimTimerBoostExit failed to change current period to %Lu, error - %r\n",
+        mOriginalTimerPeriod,
+        Status
+        ));
+    }
     mTimerProtocol = NULL;
   }
 

Platform/OpenCore/OpenCoreUefiInOut.c

@@ -109,7 +109,6 @@ OcLoadUefiInputSupport (
   OC_INPUT_POINTER_MODE PointerMode;
   OC_INPUT_KEY_MODE     KeyMode;
   CONST CHAR8           *KeySupportStr;
-  EFI_EVENT             Event;
 
   ExitBs = FALSE;
 
@@ -174,13 +173,7 @@ OcLoadUefiInputSupport (
   }
 
   if (ExitBs) {
-    gBS->CreateEvent (
-      EVT_SIGNAL_EXIT_BOOT_SERVICES,
-      TPL_CALLBACK,
-      OcExitBootServicesInputHandler,
-      Config,
-      &Event
-      );
+    OcScheduleExitBootServices (OcExitBootServicesInputHandler, Config);
   }
 }