From 4a42718d8a4f83b0a340f798a06a60dd85173255 Mon Sep 17 00:00:00 2001
From: Leo Chen <yinchiuan@google.com>
Date: Thu, 23 May 2024 06:40:35 +0000
Subject: [PATCH 1/3] Update IDisplay to V12

Test: trigger test build
Bug: 309897479
Change-Id: I338c9d05cd7b202e015288c4bd8e136d30304161
Signed-off-by: Leo Chen <yinchiuan@google.com>
---
 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 @@
     </hal>
     <hal format="aidl" optional="true">
       <name>com.google.hardware.pixel.display</name>
-        <version>11-12</version>
+        <version>12</version>
         <interface>
             <name>IDisplay</name>
             <instance>default</instance>

From 6f6ad28270d93d31e6722324bcdfd920f1247a38 Mon Sep 17 00:00:00 2001
From: chenkris <chenkris@google.com>
Date: Mon, 10 Jun 2024 17:24:28 +0000
Subject: [PATCH 2/3] 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 <keirf@google.com>
Date: Wed, 12 Jun 2024 12:18:48 +0000
Subject: [PATCH 3/3] 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 <log/log.h>
 
-#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