[pull] master from acidanthera:master

.github/workflows/main.yml

@@ -18,8 +18,8 @@ jobs:
     env:
       JOB_TYPE: BUILD
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           repository: acidanthera/MacKernelSDK
           path: MacKernelSDK
@@ -31,13 +31,13 @@ jobs:
       - run: xcodebuild -jobs 1 -arch x86_64 -arch ACID32 -configuration Release
 
       - name: Upload to Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/*/*.zip
       - name: Upload to Release
         if: github.event_name == 'release'
-        uses: svenstaro/upload-release-action@e74ff71f7d8a4c4745b560a485cc5fdb9b5b999d
+        uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: build/*/*.zip
@@ -50,8 +50,8 @@ jobs:
     env:
       JOB_TYPE: ANALYZE
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           repository: acidanthera/MacKernelSDK
           path: MacKernelSDK
@@ -69,8 +69,8 @@ jobs:
       JOB_TYPE: COVERITY
     if: github.repository_owner == 'acidanthera' && github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
         with:
           repository: acidanthera/MacKernelSDK
           path: MacKernelSDK

Changelog.md

@@ -1,5 +1,43 @@
 Lilu Changelog
 ==============
+#### v1.7.0
+- Added Arrow Lake CPU definitions
+- Improved AMD IGPU detection via device-id, thanks @Zormeister
+
+#### v1.6.9
+- Fixed loading on macOS 10.10 and older due to a MacKernelSDK regression
+- Added AMD IGPU detection via device-id, thanks @Zormeister
+
+#### v1.6.8
+- Allow loading on macOS 15 without `-lilubetaall`
+
+#### v1.6.7
+- Added Broadwell-EP CPU model
+- Added Raptor Lake C0 stepping model
+
+#### v1.6.6
+- Fixed macOS 13+ installer detection regression in 1.6.5
+- Allow loading on macOS 14 without `-lilubetaall`
+
+#### v1.6.5
+- Fixed macOS 13+ recovery and installer detection
+
+#### v1.6.4
+- Added AMD IGPU detection
+
+#### v1.6.3
+- Added Raptor Lake CPU definitions
+
+#### v1.6.2
+- Fixed KC segment name, which also fixed kernel panic on macOS 13 b3
+- Disable EFI64 runtime APIs when `-legacy` is used on 32-bit kernels
+
+#### v1.6.1
+- Allow loading on macOS 13 without `-lilubetaall`
+- Added Ventura dyld shared cache pathing
+- Changed SKL default ig-platform-id to KBL on macOS 13+
+- Added patch with masking support
+
 #### v1.6.0
 - Dropped internal shared patcher instance grabbing API
 

KnownPlugins.md

@@ -12,13 +12,15 @@ Please note that improperly written immature plugins will not be listed there.
 [ATH9KFixup](https://github.com/chunnann/ATH9KFixup) | Various patches for unsupported Atheros Wi-Fi cards
 [BrightnessKeys](https://github.com/acidanthera/BrightnessKeys) | Automatic handling of brightness keys based on ACPI Specification
 [BlueToolFixup](https://github.com/acidanthera/BrcmPatchRAM) | Forces BlueTool to skip attempting a firmware update, allowing for some Broadcom chipsets to work on Monterey. It also properly sets the transport
-[CPUFriend](https://github.com/PMheart/CPUFriend) | Dynamic power management data injection
-[CpuTscSync](https://github.com/lvs1974/CpuTscSync) | Сombining functionality of VoodooTSCSync and disabling xcpm_urgency if TSC is not in sync
+[CPUFriend](https://github.com/acidanthera/CPUFriend) | Dynamic power management data injection
+[CpuTscSync](https://github.com/acidanthera/CpuTscSync) | Сombining functionality of VoodooTSCSync and disabling xcpm_urgency if TSC is not in sync
+[CryptexFixup](https://github.com/acidanthera/CryptexFixup) | Kernel extension for installing Rosetta Cryptex in macOS Ventura
 [DebugEnhancer](https://github.com/acidanthera/DebugEnhancer) | Enable debug output in the macOS kernel
 [DiskArbitrationFixup](https://github.com/Goldfish64/DiskArbitrationFixup) | Disable the uninitialised disk message at disk insertion
 [ECEnabler](https://github.com/1Revenger1/ECEnabler) | Allows reading Embedded Controller fields over 1 byte long, vastly reducing the amount of ACPI modification needed (if any) for working battery status
 [HibernationFixup](https://github.com/acidanthera/HibernationFixup) | Enable 3 & 25 mode hibernation on certain hardware
 [Innie](https://github.com/cdf/Innie) | Making PCIe drives appear as internal
+[IntelBTPatcher](https://github.com/OpenIntelWireless/IntelBluetoothFirmware) | Fix Intel Bluetooth on Big Sur, Catalina, Mojave, High Sierra etc, tested with Big Sur and Catalina all working good.
 [Kryptonite](https://github.com/mayankk2308/kryptonite) | Various patches for Thunderbolt-based eGPUs
 [MacHyperVSupport](https://github.com/acidanthera/MacHyperVSupport) | Hyper-V integration services for macOS
 [NoTouchID](https://github.com/al3xtjames/NoTouchID) | Disables Touch ID checks causing hangs

Lilu.xcodeproj/project.pbxproj

@@ -829,7 +829,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.6.1;
+				MODULE_VERSION = 1.7.1;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -935,7 +935,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.6.1;
+				MODULE_VERSION = 1.7.1;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",
@@ -1100,7 +1100,7 @@
 				MODULE_NAME = as.vit9696.Lilu;
 				MODULE_START = "$(PRODUCT_NAME)_kern_start";
 				MODULE_STOP = "$(PRODUCT_NAME)_kern_stop";
-				MODULE_VERSION = 1.6.1;
+				MODULE_VERSION = 1.7.1;
 				OTHER_CFLAGS = (
 					"-mmmx",
 					"-msse",

Lilu/Headers/kern_cpu.hpp

@@ -77,6 +77,7 @@ namespace CPUInfo {
 		CPU_MODEL_SKYLAKE        =  0x4E,
 		CPU_MODEL_SKYLAKE_ULT    =  0x4E,
 		CPU_MODEL_SKYLAKE_ULX    =  0x4E,
+		CPU_MODEL_BROADWELL_EP   =  0x4F,
 		CPU_MODEL_SKYLAKE_DT     =  0x5E,
 		CPU_MODEL_SKYLAKE_W      =  0x55,
 		CPU_MODEL_KABYLAKE       =  0x8E,
@@ -93,6 +94,11 @@ namespace CPUInfo {
 		CPU_MODEL_ROCKETLAKE_S   =  0xA7, /* desktop RocketLake */
 		CPU_MODEL_TIGERLAKE_U    =  0x8C,
 		CPU_MODEL_ALDERLAKE_S    =  0x97,
+		CPU_MODEL_RAPTORLAKE_S   =  0xB7, /* Raptor Lake B0 stepping */
+		CPU_MODEL_RAPTORLAKE_HX  =  0xBF, /* Raptor Lake C0 stepping */
+		CPU_MODEL_ARROWLAKE_HX   =  0xC5,
+		CPU_MODEL_ARROWLAKE_S    =  0xC6, /* desktop ArrowLake */
+		CPU_MODEL_ARROWLAKE_U    =  0xB5,
 	};
 
 	/**
@@ -126,6 +132,8 @@ namespace CPUInfo {
 		RocketLake,
 		TigerLake,
 		AlderLake,
+		RaptorLake,
+		ArrowLake,
 		MaxGeneration
 	};
 

Lilu/Headers/kern_devinfo.hpp

@@ -42,6 +42,13 @@ class DeviceInfo {
 	 *  @param obj  wait for (PCI) object publishing
 	 */
 	void awaitPublishing(IORegistryEntry *obj);
+
+	/**
+	 *  Checks if an ATIAMD object is an AMD iGPU
+	 *
+	 *  @param obj  Object to run the check on.
+	 */
+	bool checkForAndSetAMDiGPU(IORegistryEntry *obj);
 
 public:
 	/**
@@ -246,6 +253,46 @@ class DeviceInfo {
 	static constexpr uint32_t ConnectorLessCoffeeLakePlatformId5 {0x9BC50003};
 	static constexpr uint32_t ConnectorLessCoffeeLakePlatformId6 {0x9BC40003};
 
+	/**
+	 * Kaveri, and also catches the new Granite Ridge rDNA 2 iGPU.
+	 */
+	static constexpr uint32_t GenericAMDKvGr = 0x1300;
+
+	/**
+	 * Kabini, Mullins, Carrizo, Stoney Ridge, Wrestler.
+	 */
+	static constexpr uint32_t GenericAMDKbMlCzStnWr = 0x9800;
+
+	/**
+	 * Van Gogh's other Device ID, specifically: 0x1435 rev 0xAE.
+	 */
+	static constexpr uint32_t GenericAMDVanGogh2 = 0x1400;
+
+	/**
+	 * Raven/Raven2, Picasso, Barcelo, Phoenix, Phoenix 2 (possibly Hawk Point)  & Strix (0x150E)
+	 */
+	static constexpr uint32_t GenericAMDRvPcBcPhn = 0x1500;
+
+	/**
+	 * Renoir, Cezanne, Lucienne, Van Gogh, Rembrandt, Raphael.
+	 */
+	static constexpr uint32_t GenericAMDRnCznLcVghRmbRph = 0x1600;
+
+	/**
+	 * Trinity
+	 */
+	static constexpr uint32_t GenericAMDTrinity = 0x9900;
+
+	/**
+	 * Sumo & Sumo2?
+	 */
+	static constexpr uint32_t GenericAMDSumo = 0x9600;
+
+	/**
+	 * Phoenix.
+	 */
+	static constexpr uint32_t GenericAMDPhoenix2 = 0x1900;
+
 public:
 	/**
 	 *  Vesa framebuffer identifier

Lilu/Headers/kern_patcher.hpp

@@ -592,28 +592,31 @@ class KernelPatcher {
 	}
 
 	/**
-	 *  Simple find and replace in kernel memory.
+	 *  Find one pattern with optional masking within a block of memory
+	 *
+	 *  @param pattern           pattern to search
+	 *  @param patternMask           pattern mask
+	 *  @param patternSize           size of pattern
+	 *  @param data           a block of memory
+	 *  @param dataSize           size of memory
+	 *  @param dataOffset           data offset, to be set by this function
+	 *
+	 *  @return true if pattern is found in data
 	 */
-	static inline bool findAndReplace(void *data, size_t dataSize, const void *find, size_t findSize, const void *replace, size_t replaceSize) {
-		void *res;
-		if (UNLIKELY((res = lilu_os_memmem(data, dataSize, find, findSize)) != nullptr)) {
-			if (UNLIKELY(MachInfo::setKernelWriting(true, KernelPatcher::kernelWriteLock) != KERN_SUCCESS)) {
-				SYSLOG("patcher", "failed to obtain write permissions for f/r");
-				return false;
-			}
-
-			lilu_os_memcpy(res, replace, replaceSize);
+	EXPORT static bool findPattern(const void *pattern, const void *patternMask, size_t patternSize, const void *data, size_t dataSize, size_t *dataOffset);
 
-			if (UNLIKELY(MachInfo::setKernelWriting(false, KernelPatcher::kernelWriteLock) != KERN_SUCCESS)) {
-				SYSLOG("patcher", "failed to restore write permissions for f/r");
-			}
-
-			return true;
-		}
+	/**
+	 *  Simple find and replace with masking in kernel memory.
+	 */
+	EXPORT static bool findAndReplaceWithMask(void *data, size_t dataSize, const void *find, size_t findSize, const void *findMask, size_t findMaskSize, const void *replace, size_t replaceSize, const void *replaceMask, size_t replaceMaskSize, size_t count=0, size_t skip=0);
 
-		return false;
+	/**
+	 *  Simple find and replace in kernel memory.
+	 */
+	static inline bool findAndReplace(void *data, size_t dataSize, const void *find, size_t findSize, const void *replace, size_t replaceSize) {
+		return findAndReplaceWithMask(data, dataSize, find, findSize, nullptr, 0, replace, replaceSize, nullptr, 0, 0, 0);
 	}
-	
+
 	/**
 	 *  Simple find and replace in kernel memory but require both `find` and `replace` buffers to have the same length
 	 */
@@ -622,6 +625,14 @@ class KernelPatcher {
 		return findAndReplace(data, dataSize, find, N, replace, N);
 	}
 
+	/**
+	 *  Simple find and replace with masking in kernel memory but require both `find` and `replace` buffers and masking buffers to have the same length
+	 */
+	template <size_t N>
+	static inline bool findAndReplaceWithMask(void *data, size_t dataSize, const uint8_t (&find)[N], const uint8_t (&findMask)[N], const uint8_t (&replace)[N], const uint8_t (&replaceMask)[N], size_t count, size_t skip) {
+		return findAndReplaceWithMask(data, dataSize, find, N, findMask, N, replace, N, replaceMask, N, count, skip);
+	}
+
 private:
 	/**
 	 *  Jump type for routing

Lilu/Headers/kern_user.hpp

@@ -610,6 +610,26 @@ class UserPatcher {
 	 */
 	static constexpr const char *bigSurSharedCacheLegacy {"/System/Library/dyld/dyld_shared_cache_x86_64"};
 
+	/**
+	 *  DYLD shared cache map path on Haswell+ on Ventura
+	 */
+	static constexpr const char *venturaSharedCacheMapHaswell {"/System/Volumes/Preboot/Cryptexes/OS/System/Library/dyld/dyld_shared_cache_x86_64h.map"};
+
+	/**
+	 *  DYLD shared cache map path on older systems on Ventura
+	 */
+	static constexpr const char *venturaSharedCacheMapLegacy {"/System/Volumes/Preboot/Cryptexes/OS/System/Library/dyld/dyld_shared_cache_x86_64.map"};
+
+	/**
+	 *  DYLD shared cache path on Haswell+ on Ventura
+	 */
+	static constexpr const char *venturaSharedCacheHaswell {"/System/Volumes/Preboot/Cryptexes/OS/System/Library/dyld/dyld_shared_cache_x86_64h"};
+
+	/**
+	 *  DYLD shared cache path on older systems on Ventura
+	 */
+	static constexpr const char *venturaSharedCacheLegacy {"/System/Volumes/Preboot/Cryptexes/OS/System/Library/dyld/dyld_shared_cache_x86_64"};
+
 };
 
 #endif /* kern_user_hpp */

Lilu/Headers/kern_util.hpp

@@ -263,7 +263,7 @@ extern proc_t kernproc;
  *
  *  @param format  formatted string
  */
-EXPORT extern "C" void lilu_os_log(const char *format, ...);
+EXPORT extern "C" void lilu_os_log(const char *format, ...) __printflike(1, 2);
 
 /**
  *  Two-way substring search
@@ -393,6 +393,9 @@ enum KernelVersion {
 	Catalina      = 19,
 	BigSur        = 20,
 	Monterey      = 21,
+	Ventura       = 22,
+	Sonoma        = 23,
+	Sequoia       = 24,
 };
 
 /**
@@ -707,7 +710,7 @@ class ThreadLocal {
 		for (size_t i = 0; ptr == nullptr && i < N; i++) {
 			thread_t nullThread = nullptr;
 			if (atomic_compare_exchange_strong_explicit(&threads[i], &nullThread, currThread,
-				memory_order_acq_rel, memory_order_acq_rel))
+				memory_order_acq_rel, memory_order_acquire))
 				ptr = &values[i];
 		}
 

Lilu/PrivateHeaders/kern_config.hpp

@@ -58,7 +58,7 @@ class Configuration {
 	/**
 	 * Maxmimum supported kernel version
 	 */
-	static constexpr KernelVersion maxKernel {KernelVersion::Monterey};
+	static constexpr KernelVersion maxKernel {KernelVersion::Sequoia};
 
 	/**
 	 *  Set once the arguments are parsed

Lilu/Sources/kern_compression.cpp

@@ -417,7 +417,7 @@ static uint8_t *decompressInternal(uint32_t compression, uint32_t *dstlen, const
 
 		if (!buffer) Buffer::deleter(decompressedBuf);
 	} else {
-		SYSLOG("comp", "failed to allocate memory for decompression buffer of %u", dstlen);
+		SYSLOG("comp", "failed to allocate memory for decompression buffer of %u", *dstlen);
 	}
 
 	return 0;

Lilu/Sources/kern_cpu.cpp

@@ -97,6 +97,7 @@ void CPUInfo::init() {
 				bdi.cpuGeneration = CpuGeneration::Haswell;
 				break;
 			case CPU_MODEL_BROADWELL:
+			case CPU_MODEL_BROADWELL_EP:
 			case CPU_MODEL_BRYSTALWELL:
 				bdi.cpuGeneration = CpuGeneration::Broadwell;
 				break;
@@ -134,6 +135,15 @@ void CPUInfo::init() {
 			case CPU_MODEL_ALDERLAKE_S:
 				bdi.cpuGeneration = CpuGeneration::AlderLake;
 				break;
+			case CPU_MODEL_RAPTORLAKE_S:
+			case CPU_MODEL_RAPTORLAKE_HX:
+				bdi.cpuGeneration = CpuGeneration::RaptorLake;
+				break;
+			case CPU_MODEL_ARROWLAKE_S:
+			case CPU_MODEL_ARROWLAKE_HX:
+			case CPU_MODEL_ARROWLAKE_U:
+				bdi.cpuGeneration = CpuGeneration::ArrowLake;
+				break;
 			default:
 				bdi.cpuGeneration = CpuGeneration::Unknown;
 				break;