commit 8c52c873163185eb596589c4d0d79422a3d90571
author bigbiff <bigbiff@teamw.in> Sun Apr 10 17:34:46 2022 -0400
committer bigbiff <bigbiff@teamw.in> Tue Apr 12 18:38:23 2022 -0400
tree e8975ac4bf07a7351e864fb510e4d69462e63569
parent e4a84df75cfedc1c6d022baa7037845ece360ddc

vendor_dlkm: check vendor_dlkm for modules to load

Change-Id: I372683752673541480516937dfe61454ee8bb5b1

kernel_module_loader.cpp

diff --git a/kernel_module_loader.cpp b/kernel_module_loader.cpp
index 3990e9b..f62eda8 100644
--- a/kernel_module_loader.cpp
+++ b/kernel_module_loader.cpp
@@ -11,15 +11,18 @@
 	// check /vendor/lib/modules/1.1 (ramdisk prebuilt modules)
 	// check /vendor/lib/modules/N.N (vendor mounted)
 	// check /vendor/lib/modules/N.N-gki (vendor mounted)
+	// check /vendor_dlkm/lib/modules (vendor_dlkm mounted)
 	int modules_loaded = 0;
 
 	LOGINFO("Attempting to load modules\n");
 	std::string vendor_base_dir(VENDOR_MODULE_DIR);
 	std::string base_dir(VENDOR_BOOT_MODULE_DIR);
+	std::string vendor_dlkm_base_dir(VENDOR_DLKM_MODULE_DIR);
 	std::vector<std::string> module_dirs;
 	std::vector<std::string> vendor_module_dirs;
 
 	TWPartition* ven = PartitionManager.Find_Partition_By_Path("/vendor");
+	TWPartition* ven_dlkm = PartitionManager.Find_Partition_By_Path("/vendor_dlkm");
 	vendor_module_dirs.push_back(VENDOR_MODULE_DIR);
 	vendor_module_dirs.push_back(vendor_base_dir + "/1.1");
 
@@ -52,15 +55,24 @@
 		LOGINFO("Checking mounted /vendor\n");
 		ven->Mount(true);
 	}
+	if (ven_dlkm) {
+		LOGINFO("Checking mounted /vendor_dlkm\n");
+		ven_dlkm->Mount(true);
+	}
 
 	for (auto&& module_dir:vendor_module_dirs) {
 		modules_loaded += Try_And_Load_Modules(module_dir, true);
 		if (modules_loaded >= expected_module_count) goto exit;
 	}
 
+	modules_loaded += Try_And_Load_Modules(vendor_dlkm_base_dir, true);
+	if (modules_loaded >= expected_module_count) goto exit;
+
 exit:
 	if (ven)
 		ven->UnMount(false);
+	if (ven_dlkm)
+		ven_dlkm->UnMount(false);
 
 	android::base::SetProperty("twrp.modules.loaded", "true");
 

kernel_module_loader.hpp

diff --git a/kernel_module_loader.hpp b/kernel_module_loader.hpp
index de28bd2..afdfd8f 100644
--- a/kernel_module_loader.hpp
+++ b/kernel_module_loader.hpp
@@ -12,8 +12,9 @@
 #include "twcommon.h"
 #include "twrp-functions.hpp"
 
-#define VENDOR_MODULE_DIR "/vendor/lib/modules"    // Base path for vendor kernel modules to check by TWRP
-#define VENDOR_BOOT_MODULE_DIR "/lib/modules"      // vendor_boot ramdisk GKI modules to check by TWRP
+#define VENDOR_MODULE_DIR "/vendor/lib/modules"           // Base path for vendor kernel modules to check by TWRP
+#define VENDOR_BOOT_MODULE_DIR "/lib/modules"             // vendor_boot ramdisk GKI modules to check by TWRP
+#define VENDOR_DLKM_MODULE_DIR "/vendor_dlkm/lib/modules" // vendor_dlkm placed modules to check by TWRP
 typedef enum {
 	RECOVERY_FASTBOOT_MODE = 0,
 	RECOVERY_IN_BOOT_MODE,