From cad8c5c0a349bf474623c85cdd8fbf3d41614a1a Mon Sep 17 00:00:00 2001 From: George Lee Date: Tue, 30 Aug 2022 17:54:03 -0700 Subject: [PATCH 1/5] health: Remove SOC based throttling Bug: 244359848 Test: Confirm SOC based throttling removed Signed-off-by: George Lee Change-Id: Ideac2224be741b8bb1cc179f27fea0f634a03921 --- health/Health.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/health/Health.cpp b/health/Health.cpp index b69b7845..7d320582 100644 --- a/health/Health.cpp +++ b/health/Health.cpp @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -55,7 +54,6 @@ using aidl::android::hardware::health::charger::ChargerCallback; using aidl::android::hardware::health::charger::ChargerModeMain; using hardware::google::pixel::health::BatteryDefender; using hardware::google::pixel::health::BatteryMetricsLogger; -using hardware::google::pixel::health::BatteryThermalControl; using hardware::google::pixel::health::DeviceHealth; using hardware::google::pixel::health::LowBatteryShutdownMetrics; using hardware::google::pixel::health::ChargerDetect; @@ -70,8 +68,6 @@ constexpr char kVoltageAvg[] {FG_DIR "/voltage_now"}; static BatteryDefender battDefender(WLC_DIR "/present", "/sys/devices/platform/google,charger/charge_start_level", "/sys/devices/platform/google,charger/charge_stop_level"); -static BatteryThermalControl battThermalControl( - "dev/thermal/tz-by-name/soc/mode"); static BatteryMetricsLogger battMetricsLogger(kBatteryResistance, kBatteryOCV); static LowBatteryShutdownMetrics shutdownMetrics(kVoltageAvg); static DeviceHealth deviceHealth; @@ -147,7 +143,6 @@ void private_healthd_board_init(struct healthd_config *hc) { int private_healthd_board_battery_update(HealthInfo *health_info) { int batt_level; deviceHealth.update(health_info); - battThermalControl.updateThermalState(*health_info); battMetricsLogger.logBatteryProperties(*health_info); shutdownMetrics.logShutdownVoltage(*health_info); // Allow BatteryDefender to override online properties From 4c21d020296a59e8586240694d8a643f3efa8f1f Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 30 Aug 2022 11:31:06 +0800 Subject: [PATCH 2/5] Move dauntless settings to gs-common Bug: 242479757 Test: build pass on all Gchip devices Change-Id: I152d906ee9b2e3c2adfcadf53405fc782ca4b079 --- device.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/device.mk b/device.mk index 8105d606..7f59b69d 100644 --- a/device.mk +++ b/device.mk @@ -570,7 +570,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) # Titan-M ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) -include hardware/google/pixel/dauntless/dauntless.mk include device/google/gs-common/dauntless/gsc.mk endif From 0421f939a00cf07344fc32552a384f755a7eb4be Mon Sep 17 00:00:00 2001 From: eddiepeng Date: Thu, 25 Aug 2022 17:31:39 +0800 Subject: [PATCH 3/5] [Camera 3A] Update LOCAL_TARGET_PRODUCT for F10 Update LOCAL_TARGET_PRODUCT for F10. Bug: 242961953 Test: buid pass. Change-Id: Id13d1b47fe3642062defc673656167f9538732ef --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 7f59b69d..0635f923 100644 --- a/device.mk +++ b/device.mk @@ -502,6 +502,7 @@ PRODUCT_PACKAGES += \ PANTHER_PRODUCT := %panther CHEETAH_PRODUCT := %cheetah LYNX_PRODUCT := %lynx +FELIX_PRODUCT := %felix CLOUDRIPPER_PRODUCT := %cloudripper ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := panther @@ -509,6 +510,8 @@ else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cheetah else ifneq (,$(filter $(LYNX_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := lynx +else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := felix else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cloudripper else From e631aba3e6250672d5969c6da4fcf80dff84a1ad Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Wed, 31 Aug 2022 10:41:37 +0800 Subject: [PATCH 4/5] Move lhd.conf, scd.conf to device folder Move lhd.conf, scd.conf to device folder and maintain them separately by project requirement Bug: 244258007 Test: confirm the configurations are correct Change-Id: I8cd14eea3d805c77dfe863285548f090d5fed538 --- gnss/47765/config/lhd.conf | 33 --------------------------------- gnss/47765/config/lhd_user.conf | 31 ------------------------------- gnss/47765/config/scd.conf | 6 ------ gnss/47765/config/scd_user.conf | 5 ----- gnss/device-gnss.mk | 10 ---------- 5 files changed, 85 deletions(-) delete mode 100644 gnss/47765/config/lhd.conf delete mode 100644 gnss/47765/config/lhd_user.conf delete mode 100644 gnss/47765/config/scd.conf delete mode 100644 gnss/47765/config/scd_user.conf diff --git a/gnss/47765/config/lhd.conf b/gnss/47765/config/lhd.conf deleted file mode 100644 index efde25ba..00000000 --- a/gnss/47765/config/lhd.conf +++ /dev/null @@ -1,33 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -LheFailSafe=/data/vendor/gps/logs/esw-crash-dump.txt -LogLevel=*:I - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false -SecondaryConfigPath=/data/vendor/gps/overlay/lhd_overlay.conf - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/gnss/47765/config/lhd_user.conf b/gnss/47765/config/lhd_user.conf deleted file mode 100644 index 0216ace9..00000000 --- a/gnss/47765/config/lhd_user.conf +++ /dev/null @@ -1,31 +0,0 @@ -LheName=bbd - -LheRsmResetTimeoutMS=10000 -GpioNStdbyPath=/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby - -LhePatch=/vendor/firmware/SensorHub.patch -Lhe477xDebugFlags=RPC:FACILITY=65535-dKP+CUST+LHE:STDOUT_PUTS:STDOUT_LOG -# LheConsole=/data/vendor/gps/LheConsole - -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage - -LheBbdPacket=/dev/ttyBCM - -LheBbdControl=/dev/bbd_control - -# LheBbdSensor=/dev/bbd_sensor - -# LheFailSafe=/data/vendor/gps/esw-crash-dump.txt - -NvStorageDir=/data/vendor/gps/ - -# Enable BBD debugging at these stages: -# LheDriverDebugFlags=PATCH_BBD:LHE_BBD:FSC_BBD - -LheAutoBaudDelayMS=10 -TrafficLogEnabled=false - -SkipSensorWakeLock=true -LoggerWakeLockEnable=false diff --git a/gnss/47765/config/scd.conf b/gnss/47765/config/scd.conf deleted file mode 100644 index 43f9cd27..00000000 --- a/gnss/47765/config/scd.conf +++ /dev/null @@ -1,6 +0,0 @@ -LogEnabled=true -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 -SecondaryConfigPath=/data/vendor/gps/overlay/scd_overlay.conf diff --git a/gnss/47765/config/scd_user.conf b/gnss/47765/config/scd_user.conf deleted file mode 100644 index e75f209b..00000000 --- a/gnss/47765/config/scd_user.conf +++ /dev/null @@ -1,5 +0,0 @@ -LogEnabled=false -Log=JAVA -LogDirectory=/sdcard/gps/broadcom/storage -NvStorageDir=/data/vendor/gps/ -TcpConnectionTimeout=20 diff --git a/gnss/device-gnss.mk b/gnss/device-gnss.mk index 08afe191..5c5c2606 100644 --- a/gnss/device-gnss.mk +++ b/gnss/device-gnss.mk @@ -3,16 +3,6 @@ PRODUCT_COPY_FILES += \ device/google/gs201/gnss/47765/config/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \ device/google/gs201/gnss/47765/firmware/SensorHub.patch:$(TARGET_COPY_OUT_VENDOR)/firmware/SensorHub.patch -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) - PRODUCT_COPY_FILES += \ - device/google/gs201/gnss/47765/config/lhd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs201/gnss/47765/config/scd.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf -else - PRODUCT_COPY_FILES += \ - device/google/gs201/gnss/47765/config/lhd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/lhd.conf \ - device/google/gs201/gnss/47765/config/scd_user.conf:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/scd.conf -endif - PRODUCT_SOONG_NAMESPACES += \ device/google/gs201/gnss/47765 From fd96acefeff8bbbedb0e1b8ffc2864b637d37888 Mon Sep 17 00:00:00 2001 From: eddiepeng Date: Thu, 25 Aug 2022 17:31:39 +0800 Subject: [PATCH 5/5] [Camera 3A] Update LOCAL_TARGET_PRODUCT for F10 Update LOCAL_TARGET_PRODUCT for F10. Bug: 242961953 Test: buid pass. Change-Id: Id13d1b47fe3642062defc673656167f9538732ef Merged-In: Id13d1b47fe3642062defc673656167f9538732ef --- device.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device.mk b/device.mk index 11358aae..83a997cd 100644 --- a/device.mk +++ b/device.mk @@ -489,6 +489,7 @@ PRODUCT_PACKAGES += \ PANTHER_PRODUCT := %panther CHEETAH_PRODUCT := %cheetah LYNX_PRODUCT := %lynx +FELIX_PRODUCT := %felix CLOUDRIPPER_PRODUCT := %cloudripper ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := panther @@ -496,6 +497,8 @@ else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cheetah else ifneq (,$(filter $(LYNX_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := lynx +else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := felix else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT))) LOCAL_TARGET_PRODUCT := cloudripper else