From 4c74d00f9811436024c6c0d452d3e487a227e086 Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Fri, 12 May 2023 02:02:13 +0000 Subject: [PATCH 1/3] Revert "usb: Temporarily disable compliance warning" This reverts commit f178319b4a867eb9b1e0fe898ef8933bd3c55303. Bug: 279251052 Change-Id: Ic67b94da213357af05a5c6e14e15946a02af7fba --- usb/usb/Usb.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 7378fc11..74f6868c 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -819,9 +819,7 @@ void queryVersionHelper(android::hardware::usb::Usb *usb, status = getPortStatusHelper(usb, currentPortStatus); queryMoistureDetectionStatus(currentPortStatus); queryPowerTransferStatus(currentPortStatus); -#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */ queryNonCompliantChargerStatus(currentPortStatus); -#endif if (usb->mCallback != NULL) { ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, status); From cac33c008f80e309ceaeef399e2ca4b46e2c0e2f Mon Sep 17 00:00:00 2001 From: Badhri Jagan Sridharan Date: Tue, 16 May 2023 03:52:41 +0000 Subject: [PATCH 2/3] Usb: Populate UsbDataStatus only when not populated Do not override UsbDataStatus when already populated. Compliance warnings such as missing Rp do not populate UsbDataStatus and the port partner is detected. Populate UsbDataStatus only when not populated. Bug: 279251052 Change-Id: Ibe71bdd5c521ba90c124d89bd56af90087c0df18 (cherry picked from commit 47e1400c8fef8af1aea985795d7adfe3ff16871b) --- usb/usb/Usb.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 74f6868c..6993275a 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -312,7 +312,8 @@ Status queryNonCompliantChargerStatus(std::vector *currentPortStatus continue; } } - if ((*currentPortStatus)[i].complianceWarnings.size() > 0) { + if ((*currentPortStatus)[i].complianceWarnings.size() > 0 && + (*currentPortStatus)[i].currentPowerRole == PortPowerRole::NONE) { (*currentPortStatus)[i].currentMode = PortMode::UFP; (*currentPortStatus)[i].currentPowerRole = PortPowerRole::SINK; (*currentPortStatus)[i].currentDataRole = PortDataRole::NONE; From 08de96d5a1b1f3690230078de6aeb291ad2d2c2d Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 18 May 2023 10:02:04 +0000 Subject: [PATCH 3/3] Modify utilization group setting We should set sysbg_ug to UG_BG but not sys_ug. Bug: 282718756 Test: build pass Change-Id: I739d9379b321ef6cf3f4edebb530269bb859002c --- conf/init.gs101.rc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index a0ed69ee..3ffaad9b 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -749,15 +749,13 @@ on property:sys.boot_completed=1 # Set ug group write /proc/vendor_sched/bg_ug 0 - write /proc/vendor_sched/sys_ug 0 + write /proc/vendor_sched/sysbg_ug 0 write /proc/vendor_sched/ota_ug 0 write /proc/vendor_sched/dex2oat_ug 1 write /proc/vendor_sched/ta_ug 1 # Set bg group throttle write /proc/vendor_sched/ug_bg_group_throttle 308 - # TODO: remove this one after all kernel prebuilts are merged - write /proc/vendor_sched/vug_bg_group_throttle 308 # Set PMU freq limit parameters write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2