extend Xhci port limit patch to Tahoe

Signed-off-by: Slice <sergey.slice@gmail.com>

Author: SergeySlice

Include/Acidanthera/Library/OcAppleKernelLib.h

@@ -129,6 +129,9 @@ typedef enum KERNEL_CACHE_TYPE_ {
 #define KERNEL_VERSION_BIG_SUR        20
 #define KERNEL_VERSION_MONTEREY       21
 #define KERNEL_VERSION_VENTURA        22
+#define KERNEL_VERSION_SONOMA         23
+#define KERNEL_VERSION_SEQUOIA        24
+#define KERNEL_VERSION_TAHOE          25
 
 //
 // Minimum kernel versions for each release.
@@ -148,6 +151,10 @@ typedef enum KERNEL_CACHE_TYPE_ {
 #define KERNEL_VERSION_BIG_SUR_MIN        KERNEL_VERSION (KERNEL_VERSION_BIG_SUR, 0, 0)
 #define KERNEL_VERSION_MONTEREY_MIN       KERNEL_VERSION (KERNEL_VERSION_MONTEREY, 0, 0)
 #define KERNEL_VERSION_VENTURA_MIN        KERNEL_VERSION (KERNEL_VERSION_VENTURA, 0, 0)
+#define KERNEL_VERSION_SONOMA_MIN         KERNEL_VERSION (KERNEL_VERSION_SONOMA, 0, 0)
+#define KERNEL_VERSION_SEQUOIA_MIN        KERNEL_VERSION (KERNEL_VERSION_SEQUOIA, 0, 0)
+#define KERNEL_VERSION_TAHOE_MIN          KERNEL_VERSION (KERNEL_VERSION_TAHOE, 0, 0)
+
 
 //
 // Maximum kernel versions for each release.
@@ -166,6 +173,10 @@ typedef enum KERNEL_CACHE_TYPE_ {
 #define KERNEL_VERSION_CATALINA_MAX       (KERNEL_VERSION_BIG_SUR_MIN - 1)
 #define KERNEL_VERSION_BIG_SUR_MAX        (KERNEL_VERSION_MONTEREY_MIN - 1)
 #define KERNEL_VERSION_MONTEREY_MAX       (KERNEL_VERSION_VENTURA_MIN - 1)
+#define KERNEL_VERSION_VENTURA_MAX        (KERNEL_VERSION_SONOMA_MIN - 1)
+#define KERNEL_VERSION_SONOMA_MAX         (KERNEL_VERSION_SEQUOIA_MIN - 1)
+#define KERNEL_VERSION_SEQUOIA_MAX        (KERNEL_VERSION_TAHOE_MIN - 1)
+//#define KERNEL_VERSION_MONTEREY_MAX       (KERNEL_VERSION_VENTURA_MIN - 1)
 
 //
 // Prelinked context used for kernel modification.

Library/OcAppleKernelLib/CommonPatches.c

@@ -670,6 +670,22 @@ PATCHER_GENERIC_PATCH
   .Limit       = 4096
 };
 
+STATIC
+PATCHER_GENERIC_PATCH
+  mRemoveUsbLimitIoP1Patch1Tahoe = {
+  .Comment     = DEBUG_POINTER ("RemoveUsbLimitIoP1 part 1"),
+  .Base        = "__ZN16AppleUSBHostPort15setPortLocationEv",
+  .Find        = mRemoveUsbLimitIoP1Find1,
+  .Mask        = NULL,
+  .Replace     = mRemoveUsbLimitIoP1Replace1,
+  .ReplaceMask = NULL,
+  .Size        = sizeof (mRemoveUsbLimitIoP1Replace1),
+  .Count       = 1,
+  .Skip        = 0,
+  .Limit       = 4096
+};
+
+
 STATIC
 CONST UINT8
   mRemoveUsbLimitIoP1Find2[] = {
@@ -740,12 +756,35 @@ PatchUsbXhciPortLimit1 (
     return EFI_NOT_FOUND;
   }
 
-  Status = PatcherApplyGenericPatch (Patcher, &mRemoveUsbLimitIoP1Patch1);
-  if (EFI_ERROR (Status)) {
-    DEBUG ((DEBUG_INFO, "OCAK: [FAIL] Failed to apply port patch com.apple.iokit.IOUSBHostFamily part 1 - %r\n", Status));
-  } else {
-    DEBUG ((DEBUG_INFO, "OCAK: [OK] Patch success port com.apple.iokit.IOUSBHostFamily part 1\n"));
-  }
+//  Status = PatcherApplyGenericPatch (Patcher, &mRemoveUsbLimitIoP1Patch1);
+//  if (EFI_ERROR (Status)) {
+//    DEBUG ((DEBUG_INFO, "OCAK: [FAIL] Failed to apply port patch com.apple.iokit.IOUSBHostFamily part 1 - %r\n", Status));
+//  } else {
+//    DEBUG ((DEBUG_INFO, "OCAK: [OK] Patch success port com.apple.iokit.IOUSBHostFamily part 1\n"));
+//  }
+
+
+    // For macOS 26.0 (Darwin 25.0.0) and above use Tahoe-specific patch,
+    // otherwise use the original patch.
+    //
+    if (OcMatchDarwinVersion (KernelVersion, KERNEL_VERSION_TAHOE_MIN, 0)) {
+      Status = PatcherApplyGenericPatch (Patcher, &mRemoveUsbLimitIoP1Patch1Tahoe);
+      if (EFI_ERROR (Status)) {
+        DEBUG ((DEBUG_INFO, "OCAK: [FAIL] Failed to apply Tahoe port patch com.apple.iokit.IOUSBHostFamily part 1 - %r\n", Status));
+      } else {
+        DEBUG ((DEBUG_INFO, "OCAK: [OK] Patch success Tahoe port com.apple.iokit.IOUSBHostFamily part 1\n"));
+      }
+    } else {
+      DEBUG ((DEBUG_INFO, "OCAK: [OK] Patch success port com.apple.iokit.IOUSBHostFamily part 1\n"));
+      Status = PatcherApplyGenericPatch (Patcher, &mRemoveUsbLimitIoP1Patch1);
+      if (EFI_ERROR (Status)) {
+        DEBUG ((DEBUG_INFO, "OCAK: [FAIL] Failed to apply pre-Tahoe port patch com.apple.iokit.IOUSBHostFamily part 1 - %r\n", Status));
+      } else {
+        DEBUG ((DEBUG_INFO, "OCAK: [OK] Patch success pre-Tahoe port com.apple.iokit.IOUSBHostFamily part 1\n"));
+      }
+    }
+
+
 
   //
   // The following patch is only needed on macOS 11.1 (Darwin 20.2.0) and above; skip it otherwise.