From 27bf251a820fea9449f43e55e877b0723d1169b1 Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Thu, 2 Feb 2023 01:56:33 +0800 Subject: [PATCH 1/5] [DO NOT MERGE] gs101: usb: provide extcon and gadget state to monitorffs Monitorffs needs to check the state of usb extcon and gadget state to pull up USB gadget. Therefore, this patch provide extcon and gadget state to monitorffs. Bug: 263435622 Test: verified pass Change-Id: Icbfe2a2839b3225b56de35ab949aa1758d27d9a6 (cherry picked from commit 5e713fa131dc314d423f17c774646a10c220c611) Merged-In: Icbfe2a2839b3225b56de35ab949aa1758d27d9a6 --- usb/gadget/UsbGadget.h | 4 +++- usb/gadget/android.hardware.usb.gadget-service.gs101.rc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/usb/gadget/UsbGadget.h b/usb/gadget/UsbGadget.h index 8a2f7fdd..96a356db 100644 --- a/usb/gadget/UsbGadget.h +++ b/usb/gadget/UsbGadget.h @@ -79,7 +79,9 @@ constexpr char kSmpAffinityList[] = "/smp_affinity_list"; #ifndef UDC_PATH #define UDC_PATH "/sys/class/udc/11110000.dwc3/" #endif -static MonitorFfs monitorFfs(kGadgetName); +constexpr char kExtconTypecState[] = "/sys/class/extcon/extcon0/cable.0/state"; +constexpr char kUsbGadgetState[] = "/sys/devices/platform/11110000.usb/dwc3_exynos_gadget_state"; +static MonitorFfs monitorFfs(kGadgetName, kExtconTypecState, kUsbGadgetState); #define SPEED_PATH UDC_PATH "current_speed" diff --git a/usb/gadget/android.hardware.usb.gadget-service.gs101.rc b/usb/gadget/android.hardware.usb.gadget-service.gs101.rc index 8fa88680..da1a3b41 100644 --- a/usb/gadget/android.hardware.usb.gadget-service.gs101.rc +++ b/usb/gadget/android.hardware.usb.gadget-service.gs101.rc @@ -15,6 +15,7 @@ on post-fs chown root system /sys/devices/platform/11110000.usb/dwc3_exynos_otg_b_sess chown root system /sys/devices/platform/11110000.usb/dwc3_exynos_otg_id chown root system /sys/devices/platform/11110000.usb/usb_data_enabled + chown root system /sys/devices/platform/11110000.usb/dwc3_exynos_gadget_state chmod 664 /sys/class/typec/port0/power_role chmod 664 /sys/class/typec/port0/data_role chmod 664 /sys/class/typec/port0/port_type From 92f354af175bf496901739100cfd0434e4add19b Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Thu, 2 Feb 2023 16:03:32 +0800 Subject: [PATCH 2/5] Set activelyPreferBadwifi config to 1 for different platforms This flag will not take effect if the system is configured to avoid bad wifis. Set it to 1 globally. Then it will sprint into effect for all mcc/mncs where config_networkAvoidBadWifi is 0. For carriers that don't need this behavior change but config_networkAvoidBadWifi is 0, set activelyPreferBadwifi to 0 for their mccmncs. Test: manual Bug: 270006176 Change-Id: I4b6fe4964e8fd5d61978f1433dcbbd9e9b10ffc3 (cherry picked from commit 3357b8cf949b9e632d10759ba8bc700b72ac2242) (cherry picked from commit f848c4d77f9a69d364091d5ca330f21156de1509) Merged-In: I4b6fe4964e8fd5d61978f1433dcbbd9e9b10ffc3 --- .../res/values-mcc204-mnc04/config.xml | 28 +++++++++++++++++++ .../ConnectivityOverlay/res/values/config.xml | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml new file mode 100644 index 00000000..2a6d2e5c --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc204-mnc04/config.xml @@ -0,0 +1,28 @@ + + + + + 0 + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values/config.xml b/rro_overlays/ConnectivityOverlay/res/values/config.xml index d9a29b07..d9e9b583 100644 --- a/rro_overlays/ConnectivityOverlay/res/values/config.xml +++ b/rro_overlays/ConnectivityOverlay/res/values/config.xml @@ -23,4 +23,8 @@ 0x80000000 + + + 1 From a4be3f8589ca88c43edcb996956324fee8a58408 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Thu, 2 Feb 2023 17:34:57 +0800 Subject: [PATCH 3/5] Set config_networkAvoidBadWifi overlay on different devices for Verizon Currently, config_networkAvoidBadWifi is customized in aosp for only 2 Verizon mccmncs: 310-004 and 311-480. However, from TAM feedback, there are few mccmncs which are not customized yet. Explicitly add them for different devices. Test: manual Bug: 270006176 Change-Id: I46ec45354ae72a6a758aba2c2a31af92f1da4038 (cherry picked from commit cc270214edfe849dc71314455aa28994a7939150) (cherry picked from commit ca61a1318a6e39810d11b8e612f9dce3a0ce3b7a) Merged-In: I46ec45354ae72a6a758aba2c2a31af92f1da4038 --- .../res/values-mcc310-mnc004/config.xml | 24 +++++++++++++++++++ .../res/values-mcc310-mnc590/config.xml | 24 +++++++++++++++++++ .../res/values-mcc310-mnc599/config.xml | 24 +++++++++++++++++++ .../res/values-mcc311-mnc270/config.xml | 24 +++++++++++++++++++ .../res/values-mcc311-mnc280/config.xml | 24 +++++++++++++++++++ .../res/values-mcc311-mnc480/config.xml | 24 +++++++++++++++++++ 6 files changed, 144 insertions(+) create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc004/config.xml create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc590/config.xml create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc599/config.xml create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc270/config.xml create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc280/config.xml create mode 100644 rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc480/config.xml diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc004/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc004/config.xml new file mode 100644 index 00000000..3cc7253a --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc004/config.xml @@ -0,0 +1,24 @@ + + + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc590/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc590/config.xml new file mode 100644 index 00000000..3cc7253a --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc590/config.xml @@ -0,0 +1,24 @@ + + + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc599/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc599/config.xml new file mode 100644 index 00000000..3cc7253a --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc310-mnc599/config.xml @@ -0,0 +1,24 @@ + + + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc270/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc270/config.xml new file mode 100644 index 00000000..3cc7253a --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc270/config.xml @@ -0,0 +1,24 @@ + + + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc280/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc280/config.xml new file mode 100644 index 00000000..3cc7253a --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc280/config.xml @@ -0,0 +1,24 @@ + + + + + 0 + diff --git a/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc480/config.xml b/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc480/config.xml new file mode 100644 index 00000000..3cc7253a --- /dev/null +++ b/rro_overlays/ConnectivityOverlay/res/values-mcc311-mnc480/config.xml @@ -0,0 +1,24 @@ + + + + + 0 + From 961a061811f172bd67dd446a5f6bf53af1a109bf Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 10 Apr 2023 20:48:08 +0000 Subject: [PATCH 4/5] Explicit init .rc user. Set the user explicitly. Bug: 276813155 Test: boot Change-Id: I26af31f806a52849483c62088bc68dc4cc4b3b95 --- pkvm/pkvm_enabler.gs101.rc | 3 ++- pkvm/pkvm_experiment.rc | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkvm/pkvm_enabler.gs101.rc b/pkvm/pkvm_enabler.gs101.rc index 6f329d30..6695d3a3 100644 --- a/pkvm/pkvm_enabler.gs101.rc +++ b/pkvm/pkvm_enabler.gs101.rc @@ -1,5 +1,6 @@ service pkvm_enabler /vendor/bin/pkvm_enabler reboot_on_failure reboot,pkvm-not-enabled + user root on early-init - exec_start pkvm_enabler \ No newline at end of file + exec_start pkvm_enabler diff --git a/pkvm/pkvm_experiment.rc b/pkvm/pkvm_experiment.rc index 148f0841..a2faaa73 100644 --- a/pkvm/pkvm_experiment.rc +++ b/pkvm/pkvm_experiment.rc @@ -1,8 +1,10 @@ service vendor.pkvm_enable /vendor/bin/misc_writer --set-enable-pkvm + user root disabled oneshot service vendor.pkvm_disable /vendor/bin/misc_writer --set-disable-pkvm + user root disabled oneshot From 07ee6dcf53689fa54e4b2e452dd1fa7d51679a9e Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Thu, 6 Apr 2023 10:31:49 -0700 Subject: [PATCH 5/5] move dump pixel vendor cma stat into gs-common Bug: 276901078 Test: dumpstate_board.txt on adb bugreport includes the info Change-Id: Ifaaeb635a62bfa189ee5440778f72087658a4614 Signed-off-by: Minchan Kim --- dumpstate/dump_gs101.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/dumpstate/dump_gs101.sh b/dumpstate/dump_gs101.sh index e86b1d51..c6bc9113 100644 --- a/dumpstate/dump_gs101.sh +++ b/dumpstate/dump_gs101.sh @@ -1,18 +1,3 @@ -#!/vendor/bin/sh -echo "------ Pixel CMA stat ------" -for d in $(ls -d /sys/kernel/pixel_stat/mm/cma/*); do - if [ -f $d ]; then - echo --- $d - cat $d - else - for f in $(ls $d); do - echo --- $d/$f - cat $d/$f - done - fi -done - - echo "------ Camera HAL Graph State Dump ------" for f in $(ls -t /data/vendor/camera/hal_graph_state*.txt |head -1); do echo $f