From 11f2c8879565cd891881726d1f754072541ed28e Mon Sep 17 00:00:00 2001
From: Jimmy Hu <hhhuuu@google.com>
Date: Mon, 23 May 2022 04:29:06 +0000
Subject: [PATCH 1/2] Write the pullup value only if new value applied

Bug: 226018845
Test: build, boot
Signed-off-by: Jimmy Hu <hhhuuu@google.com>
Change-Id: I64a964753fc89a29d278f1c426b2746abc2a2b12
---
 usb/usb/Usb.cpp | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp
index b8ad7c5f..6cff2f26 100644
--- a/usb/usb/Usb.cpp
+++ b/usb/usb/Usb.cpp
@@ -83,23 +83,39 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
         int64_t in_transactionId) {
     bool result = true;
     std::vector<PortStatus> currentPortStatus;
+    string pullup;
 
     ALOGI("Userspace turn %s USB data signaling. opID:%ld", in_enable ? "on" : "off",
             in_transactionId);
 
     if (in_enable) {
         if (!mUsbDataEnabled) {
+            if (ReadFileToString(PULLUP_PATH, &pullup)) {
+                pullup = Trim(pullup);
+                if (pullup != kGadgetName) {
+                    if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
+                        ALOGE("Gadget cannot be pulled up");
+                        result = false;
+                    }
+                }
+            }
+
             if (!WriteStringToFile("1", USB_DATA_PATH)) {
                 ALOGE("Not able to turn on usb connection notification");
                 result = false;
             }
-
-            if (!WriteStringToFile(kGadgetName, PULLUP_PATH)) {
-                ALOGE("Gadget cannot be pulled up");
-                result = false;
-            }
         }
     } else {
+        if (ReadFileToString(PULLUP_PATH, &pullup)) {
+            pullup = Trim(pullup);
+            if (pullup == kGadgetName) {
+                if (!WriteStringToFile("none", PULLUP_PATH)) {
+                    ALOGE("Gadget cannot be pulled down");
+                    result = false;
+                }
+            }
+        }
+
         if (!WriteStringToFile("1", ID_PATH)) {
             ALOGE("Not able to turn off host mode");
             result = false;
@@ -114,11 +130,6 @@ ScopedAStatus Usb::enableUsbData(const string& in_portName, bool in_enable,
             ALOGE("Not able to turn on usb connection notification");
             result = false;
         }
-
-        if (!WriteStringToFile("none", PULLUP_PATH)) {
-            ALOGE("Gadget cannot be pulled down");
-            result = false;
-        }
     }
 
     if (result) {

From 38d2997f6aac530fa8810d41d3094af65264bb10 Mon Sep 17 00:00:00 2001
From: David Chao <davidchao@google.com>
Date: Thu, 26 May 2022 17:52:47 +0800
Subject: [PATCH 2/2] Revert "gs101: move charger thermal HAL setup into common
 code"

This reverts commit 980650080a59cc85ea0165a276c7deb36bf21835.

Reason for revert: Since the vendor.thermal.symlinks is init early than google-module init
such as gpu cooling, the gpu cooling is not ready while creating thermal.symlinks.
Thermal-hal GPU thermal throttling will fail because there is no thermal-gpufreq-0 in thermal.symlinks.

Bug: 200615564
Test: thermal symlinks can be created in dev folder
Change-Id: Ia3b0999c7a8038f7be5e2390926ff74473c0c339
---
 conf/init.gs101.rc | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc
index 7b241f3f..bf63c26f 100644
--- a/conf/init.gs101.rc
+++ b/conf/init.gs101.rc
@@ -985,10 +985,19 @@ on property:vendor.thermal.link_ready=1
     chown system system /dev/thermal/cdev-by-name/wlc_fcc/cur_state
     chown system system /dev/thermal/cdev-by-name/usbc-port/cur_state
 
+# Create thermal symlink in off charging mode
 on charger
+    mkdir /dev/thermal 0750 system system
+    mkdir /dev/thermal/tz-by-name 0750 system system
+    mkdir /dev/thermal/cdev-by-name 0750 system system
+    start vendor.thermal.symlinks
     write /proc/vendor_sched/sys_uclamp_min 0
     write /proc/vendor_sched/sys_prefer_idle 0
 
+# Launch thermal hal in off charging mode
+on charger && property:vendor.thermal.link_ready=1
+    start vendor.thermal-hal-2-0
+
 on property:vendor.disable.bcl.control=1
     write /sys/devices/virtual/pmic/mitigation/instruction/enable_mitigation 0