From 156d28682b141404bc09500c6506bd1b66363900 Mon Sep 17 00:00:00 2001
From: Michael Eastwood <mweastwood@google.com>
Date: Thu, 21 Oct 2021 11:47:48 -0700
Subject: [PATCH 1/4] Save .cpa files generated when camera HAL is killed by
 the watchdog thread.

Bug: 197979923
Test: m -j
Change-Id: I357828a2b13185cc605fe60b0d3647ad94509ffa
---
 dumpstate/DumpstateDevice.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dumpstate/DumpstateDevice.cpp b/dumpstate/DumpstateDevice.cpp
index 2d13031e..4a4def45 100644
--- a/dumpstate/DumpstateDevice.cpp
+++ b/dumpstate/DumpstateDevice.cpp
@@ -214,6 +214,7 @@ void dumpCameraLogs(int fd, const std::string &destDir) {
     // sessions or starts a new session after the one with performance issues).
     dumpLogs(fd, kCameraLogDir, cameraDestDir, 10, "session-ended-");
     dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "high-drop-rate-");
+    dumpLogs(fd, kCameraLogDir, cameraDestDir, 5, "watchdog-");
 }
 
 timepoint_t startSection(int fd, const std::string &sectionName) {

From 0b13fa4150667a0643a3515e1d7e816d8c7e5d0b Mon Sep 17 00:00:00 2001
From: Siddharth Kapoor <ksiddharth@google.com>
Date: Thu, 21 Oct 2021 14:14:15 +0800
Subject: [PATCH 2/4] Add GPU Power-on hint for LAUNCH

Bug: 201718421
Test: trace while App launch
Change-Id: I5f994cf87a1696f843a2419d52133ccc5951d23c
Signed-off-by: Siddharth Kapoor <ksiddharth@google.com>
---
 powerhint.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/powerhint.json b/powerhint.json
index be96c782..fc09d0c3 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -287,6 +287,15 @@
         "67000"
       ],
       "ResetOnInit": true
+    },
+    {
+      "Name": "GPUPowerPolicy",
+      "Path": "/sys/devices/platform/1c500000.mali/power_policy",
+      "Values": [
+        "always_on",
+        "adaptive"
+      ],
+      "ResetOnInit": true
     }
   ],
   "Actions": [
@@ -343,6 +352,12 @@
       "Duration": 5000,
       "Value": "3172000"
     },
+    {
+      "PowerHint": "LAUNCH",
+      "Node": "GPUPowerPolicy",
+      "Duration": 5000,
+      "Value": "always_on"
+    },
     {
       "PowerHint": "DISPLAY_INACTIVE",
       "Node": "F2fsRecessModeEnable",

From f8d1b3f0cb273e79b33f27faba49157cba79e990 Mon Sep 17 00:00:00 2001
From: Les Lee <lesl@google.com>
Date: Wed, 27 Oct 2021 16:55:48 +0800
Subject: [PATCH 3/4] GS101: Correct overlay configuration

The P21 series didn't support the NL80211 Reg event.
The vendor is working to support it in T. (b/183916225)
The fix corrects the overlay configuration, which introduced
from android T.

PS: The impact of the configuration is two cases.
1. Configuration should be false but it configures to true:
It will cause no CC(country code) changed event to notify listener.
It might cause any function fail which relies on CC.
(It is happening on P21 series)

2. Configuration should be true but it configures to false:
Minor impact than #1 because it just update CC before the Wifi subsystem
apply it.5. It might cause the data to be incorrect because of the
timing issue.

Bug: 183916225
Test: Manuel Test to check that configuration is correct.
Change-Id: Ica764e4a22def6dea0613882b3ae403852a03a83
---
 rro_overlays/WifiOverlay/res/values/config.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml
index 4e5d4bfc..090df9e7 100644
--- a/rro_overlays/WifiOverlay/res/values/config.xml
+++ b/rro_overlays/WifiOverlay/res/values/config.xml
@@ -132,4 +132,7 @@
     <bool translatable="false" name="config_wifiDefaultCoexAlgorithmEnabled">true</bool>
     <!-- Whether to use the explicit vendor HAL API: IWifiStaIface.setRoamingState for disabling fw roaming. -->
     <bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool>
+
+    <!-- Indicate the driver doesn't support NL80211 Reg changed event -->
+    <bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">false</bool>
 </resources>

From 4e18aa73ea1e44758731b6c113438833e05d36bd Mon Sep 17 00:00:00 2001
From: Andrew Scull <ascull@google.com>
Date: Mon, 1 Nov 2021 11:24:07 +0000
Subject: [PATCH 4/4] Start the pKVM experiment

Reflect the pKVM experiment status from the property into the misc
partition so the bootloader can apply it next boot. This is only done on
builds that don't have pKVM enabled by default by pkvm_enabler.

Bug: 192819132
Test: set property and observe change in pKVM state at reboot
Change-Id: Ief85fa196f630867d0a0ced7fa4744f0241d41ea
---
 device.mk               |  3 +++
 pkvm/pkvm_experiment.rc | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkvm/pkvm_experiment.rc

diff --git a/device.mk b/device.mk
index 57456d2d..964f9a42 100644
--- a/device.mk
+++ b/device.mk
@@ -1072,6 +1072,9 @@ $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk
 PRODUCT_BUILD_PVMFW_IMAGE := true
 ifeq ($(TARGET_PKVM_ENABLED),true)
     PRODUCT_PACKAGES += pkvm_enabler
+else
+    PRODUCT_COPY_FILES += \
+	    device/google/gs101/pkvm/pkvm_experiment.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pkvm_experiment.rc
 endif
 
 # Enable watchdog timeout loop breaker.
diff --git a/pkvm/pkvm_experiment.rc b/pkvm/pkvm_experiment.rc
new file mode 100644
index 00000000..148f0841
--- /dev/null
+++ b/pkvm/pkvm_experiment.rc
@@ -0,0 +1,13 @@
+service vendor.pkvm_enable /vendor/bin/misc_writer --set-enable-pkvm
+    disabled
+    oneshot
+
+service vendor.pkvm_disable /vendor/bin/misc_writer --set-disable-pkvm
+    disabled
+    oneshot
+
+on property:persist.device_config.virtualization_framework_native.isolated_compilation_enabled=true
+    start vendor.pkvm_enable
+
+on property:persist.device_config.virtualization_framework_native.isolated_compilation_enabled=false
+    start vendor.pkvm_disable