[UNRESOLVED CONFLICT] don't auto-enable USB port during normal boot on Tensor Pixel devices

USB port is now enabled only after checking USB port security policy, which is done later in USB HAL
and in system_server.

Requires corresponding patches to tcpci_max77759 kernel module.

This change doesn't apply to recovery and charger boot modes.

Author: muhomorr

init/first_stage_init.cpp

@@ -208,9 +208,18 @@ std::string GetModuleLoadList(BootMode boot_mode, const std::string& dir_path) {
 }
 
 #define MODULE_BASE_DIR "/lib/modules"
+<<<<<<< HEAD
 bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel,
                        int& modules_loaded) {
     struct utsname uts {};
+||||||| parent of d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
+bool LoadKernelModules(bool recovery, bool want_console, bool want_parallel, int& modules_loaded) {
+    struct utsname uts;
+=======
+bool LoadKernelModules(bool recovery, bool want_console, bool want_parallel, bool disable_usb_port,
+                       int& modules_loaded) {
+    struct utsname uts;
+>>>>>>> d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
     if (uname(&uts)) {
         LOG(FATAL) << "Failed to get kernel version.";
     }
@@ -266,7 +275,13 @@ bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel
     for (const auto& module_dir : module_dirs) {
         std::string dir_path = MODULE_BASE_DIR "/";
         dir_path.append(module_dir);
+<<<<<<< HEAD
         Modprobe m({dir_path}, GetModuleLoadList(boot_mode, dir_path));
+||||||| parent of d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
+        Modprobe m({dir_path}, GetModuleLoadList(recovery, dir_path));
+=======
+        Modprobe m({dir_path}, GetModuleLoadList(recovery, dir_path), true, disable_usb_port);
+>>>>>>> d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
         bool retval = m.LoadListedModules(!want_console);
         modules_loaded = m.GetModuleCount();
         if (modules_loaded > 0) {
@@ -275,7 +290,13 @@ bool LoadKernelModules(BootMode boot_mode, bool want_console, bool want_parallel
         }
     }
 
+<<<<<<< HEAD
     Modprobe m({MODULE_BASE_DIR}, GetModuleLoadList(boot_mode, MODULE_BASE_DIR));
+||||||| parent of d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
+    Modprobe m({MODULE_BASE_DIR}, GetModuleLoadList(recovery, MODULE_BASE_DIR));
+=======
+    Modprobe m({MODULE_BASE_DIR}, GetModuleLoadList(recovery, MODULE_BASE_DIR), true, disable_usb_port);
+>>>>>>> d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
     bool retval = (want_parallel) ? m.LoadModulesParallel(std::thread::hardware_concurrency())
                                   : m.LoadListedModules(!want_console);
     modules_loaded = m.GetModuleCount();
@@ -430,9 +451,25 @@ int FirstStageMain(int argc, char** argv) {
 
     boot_clock::time_point module_start_time = boot_clock::now();
     int module_count = 0;
+<<<<<<< HEAD
     BootMode boot_mode = GetBootMode(cmdline, bootconfig);
     if (!LoadKernelModules(boot_mode, want_console,
                            want_parallel, module_count)) {
+||||||| parent of d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
+    if (!LoadKernelModules(IsRecoveryMode() && !ForceNormalBoot(cmdline, bootconfig), want_console,
+                           want_parallel, module_count)) {
+=======
+
+    const bool recovery = IsRecoveryMode() && !ForceNormalBoot(cmdline, bootconfig);
+    bool disable_usb_port = false;
+    if (!recovery) {
+        bool is_charger = bootconfig.find("androidboot.mode = \"charger\"") != std::string::npos ||
+           cmdline.find("androidboot.mode=charger") != std::string::npos;
+        disable_usb_port = !is_charger;
+    }
+
+    if (!LoadKernelModules(recovery, want_console, want_parallel, disable_usb_port, module_count)) {
+>>>>>>> d05f06828 (don't auto-enable USB port during normal boot on Tensor Pixel devices)
         if (want_console != FirstStageConsoleParam::DISABLED) {
             LOG(ERROR) << "Failed to load kernel modules, starting console";
         } else {

libmodprobe/include/modprobe/modprobe.h

@@ -28,7 +28,7 @@
 class Modprobe {
   public:
     Modprobe(const std::vector<std::string>&, const std::string load_file = "modules.load",
-             bool use_blocklist = true);
+             bool use_blocklist = true, bool disable_usb_port = false);
 
     bool LoadModulesParallel(int num_threads);
     bool LoadListedModules(bool strict = true);

libmodprobe/libmodprobe.cpp

@@ -316,7 +316,7 @@ void Modprobe::ParseKernelCmdlineOptions(void) {
 }
 
 Modprobe::Modprobe(const std::vector<std::string>& base_paths, const std::string load_file,
-                   bool use_blocklist)
+                   bool use_blocklist, bool disable_usb_port)
     : blocklist_enabled(use_blocklist) {
     using namespace std::placeholders;
 
@@ -341,6 +341,10 @@ Modprobe::Modprobe(const std::vector<std::string>& base_paths, const std::string
     }
 
     ParseKernelCmdlineOptions();
+
+    if (disable_usb_port) {
+        AddOption("tcpci_max77759", "disable_cc_toggling_by_default", "1");
+    }
 }
 
 std::vector<std::string> Modprobe::GetDependencies(const std::string& module) {