From 4a42718d8a4f83b0a340f798a06a60dd85173255 Mon Sep 17 00:00:00 2001 From: Leo Chen Date: Thu, 23 May 2024 06:40:35 +0000 Subject: [PATCH 1/7] Update IDisplay to V12 Test: trigger test build Bug: 309897479 Change-Id: I338c9d05cd7b202e015288c4bd8e136d30304161 Signed-off-by: Leo Chen --- device_framework_matrix_product.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index de5f3b4c..95c2113a 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -78,7 +78,7 @@ com.google.hardware.pixel.display - 11-12 + 12 IDisplay default From 6f6ad28270d93d31e6722324bcdfd920f1247a38 Mon Sep 17 00:00:00 2001 From: chenkris Date: Mon, 10 Jun 2024 17:24:28 +0000 Subject: [PATCH 2/7] gs101: build fingerprint dump Bug: 346450599 Test: adb bugreport Change-Id: I5a3d508592e9fed10e429d57c6c7068e0ce0d918 --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 3df64ff1..8df5b3fe 100644 --- a/device.mk +++ b/device.mk @@ -40,6 +40,7 @@ include device/google/gs-common/betterbug/betterbug.mk ifneq ($(filter oriole raven bluejay, $(TARGET_PRODUCT)),) include device/google/gs-common/bcmbt/dump/dumplog.mk endif +include device/google/gs-common/fingerprint/fingerprint.mk TARGET_BOARD_PLATFORM := gs101 DEVICE_IS_64BIT_ONLY ?= $(if $(filter %_64,$(TARGET_PRODUCT)),true,false) From 4ff69cacdffe20e3fa511020c6aa33102028d7b4 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 12 Jun 2024 12:18:48 +0000 Subject: [PATCH 3/7] Enable pkvm based on the relevant sysprop rather than /dev/kvm 1. This is simpler, as it can be triggered by logic in the init.rc 2. The old method of probing /dev/kvm fails if non-protected kvm is enabled: the device will exist, but pkvm is not enable Bug: 346525496 Test: observe that pkvm is enabled after double reboot Change-Id: I2f557ed56f13458a288ede34e672692b511b6bc9 --- pkvm/pkvm_enabler.c | 18 +----------------- pkvm/pkvm_enabler.gs101.rc | 7 ++++++- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/pkvm/pkvm_enabler.c b/pkvm/pkvm_enabler.c index cb14ba6f..b927318c 100644 --- a/pkvm/pkvm_enabler.c +++ b/pkvm/pkvm_enabler.c @@ -24,7 +24,6 @@ #include -#define KVM_DEVICE "/dev/kvm" #define MISC_WRITER "/vendor/bin/misc_writer" int main() { @@ -33,22 +32,7 @@ int main() { pid_t pid; int ret, wstatus; - /* Check whether KVM device exists. */ - ret = access(KVM_DEVICE, F_OK); - - /* If KVM device exists, return SUCCESS to continue booting. */ - if (ret == 0) { - exit(EXIT_SUCCESS); - } - - if (ret != -ENOENT) { - ALOGW("Unexpected error from access(): %d", ret); - } - - /* - * If KVM device does not exist, run misc_writer and return FAILURE - * to force a reboot. - */ + /* Run misc_writer and return FAILURE to force a reboot. */ pid = fork(); if (pid == -1) { ALOGE("Could not fork: %d", errno); diff --git a/pkvm/pkvm_enabler.gs101.rc b/pkvm/pkvm_enabler.gs101.rc index 6695d3a3..4e64d4ba 100644 --- a/pkvm/pkvm_enabler.gs101.rc +++ b/pkvm/pkvm_enabler.gs101.rc @@ -2,5 +2,10 @@ service pkvm_enabler /vendor/bin/pkvm_enabler reboot_on_failure reboot,pkvm-not-enabled user root -on early-init +# Old bootloaders do not set the protected_vm sysprop when pkvm is disabled +on early-init && property:ro.boot.hypervisor.protected_vm.supported= + exec_start pkvm_enabler + +# New bootloaders set the protected_vm sysprop to 0 when pkvm is disabled +on early-init && property:ro.boot.hypervisor.protected_vm.supported=0 exec_start pkvm_enabler From 744c86c49a9ff9e29e2193cdc5079b27d5e06ec3 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Wed, 12 Jun 2024 17:14:02 +0800 Subject: [PATCH 4/7] usb: Add retry on role switch Bug: 341996696 Change-Id: I8caa65288af1588d24fea4aa6c5768d45d69bbd5 Signed-off-by: Kyle Tso (cherry picked from commit ef5856a4474002cc35a51377adffddd4cb239796) --- usb/usb/Usb.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index b8c5c8ea..39cbceb5 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -593,6 +593,10 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role fp = fopen(filename.c_str(), "w"); if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); + if (ret == EAGAIN) { + std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ret = fputs(convertRoletoString(in_role).c_str(), fp); + } fclose(fp); if ((ret != EOF) && ReadFileToString(filename, &written)) { written = Trim(written); From c5a560160fd82e94870a2252037d394e1e1f9780 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Thu, 13 Jun 2024 16:54:37 +0800 Subject: [PATCH 5/7] usb: Log for retry on role switch Add a log for the retry. Also define the sleep time in the header file. Bug: 341996696 Change-Id: Ib3cc0c6ad576e7cda26b7f50cdc61d52e6349c78 Signed-off-by: Kyle Tso (cherry picked from commit d17fdff5f81cff76adaa75d50f26318be8048123) --- usb/usb/Usb.cpp | 3 ++- usb/usb/Usb.h | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index 39cbceb5..0736f4c4 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -594,7 +594,8 @@ ScopedAStatus Usb::switchRole(const string& in_portName, const PortRole& in_role if (fp != NULL) { int ret = fputs(convertRoletoString(in_role).c_str(), fp); if (ret == EAGAIN) { - std::this_thread::sleep_for(std::chrono::milliseconds(700)); + ALOGI("role switch busy, retry in %d ms", ROLE_SWAP_RETRY_MS); + std::this_thread::sleep_for(std::chrono::milliseconds(ROLE_SWAP_RETRY_MS)); ret = fputs(convertRoletoString(in_role).c_str(), fp); } fclose(fp); diff --git a/usb/usb/Usb.h b/usb/usb/Usb.h index facc328e..15348af0 100644 --- a/usb/usb/Usb.h +++ b/usb/usb/Usb.h @@ -55,6 +55,8 @@ constexpr char kGadgetName[] = "11110000.dwc3"; #define VBUS_PATH NEW_UDC_PATH "dwc3_exynos_otg_b_sess" #define USB_DATA_PATH NEW_UDC_PATH "usb_data_enabled" +#define ROLE_SWAP_RETRY_MS 700 + struct Usb : public BnUsb { Usb(); From 60bd04557fd1ae70ef3b547144625ddff4a07301 Mon Sep 17 00:00:00 2001 From: YiKai Peng Date: Thu, 20 Jun 2024 02:32:12 +0000 Subject: [PATCH 6/7] gs101: wlc: add authstart permission Bug: 348272247 Test: Build/Flash Flag: EXEMPT bugfix Change-Id: I8bbdce42984aa8da6abd000c06d6a5df37447914 Signed-off-by: YiKai Peng --- conf/init.gs101.rc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/init.gs101.rc b/conf/init.gs101.rc index 7185b2e1..c8913dc3 100644 --- a/conf/init.gs101.rc +++ b/conf/init.gs101.rc @@ -277,6 +277,7 @@ on init chown system system /sys/class/power_supply/wireless/device/version chown system system /sys/class/power_supply/wireless/device/features chown system system /sys/class/power_supply/wireless/device/authtype + chown system system /sys/class/power_supply/wireless/device/authtstart # Adaptive charge chown system system /sys/class/power_supply/battery/charge_deadline From 7b58898aee6694762f57077bac5626f7baa32a46 Mon Sep 17 00:00:00 2001 From: liangjlee Date: Thu, 27 Jun 2024 02:04:57 +0800 Subject: [PATCH 7/7] gs101: Include power/power.mk Bug: 331612600 Flag: EXEMPT (bug 337358613) Change-Id: Ibf7dda6c4c13d6513e2f08239c95c6b2778a98ec Signed-off-by: liangjlee --- device.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/device.mk b/device.mk index 8df5b3fe..20b0e3a8 100644 --- a/device.mk +++ b/device.mk @@ -25,6 +25,7 @@ include device/google/gs-common/thermal/dump/thermal.mk include device/google/gs-common/thermal/thermal_hal/device.mk include device/google/gs-common/pixel_metrics/pixel_metrics.mk include device/google/gs-common/performance/perf.mk +include device/google/gs-common/power/power.mk include device/google/gs-common/display/dump.mk include device/google/gs101/dumpstate/item.mk include device/google/gs-common/radio/dump.mk