Snap for 8429428 from 993b145fae to tm-release

Change-Id: I3eb77562a59a858d12f5229d51e81a56b5315f59

BoardConfig-common.mk

@@ -382,9 +382,6 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
 # Enable larger logbuf
 BOARD_KERNEL_CMDLINE += log_buf_len=1024K
 
-# Enable load module in parallel
-BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true
-
 # Protected VM firmware
 BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
 

conf/init.gs101.rc

@@ -44,6 +44,20 @@ on init
     chown system system /proc/vendor_sched/set_proc_group_ota
     chown system system /proc/vendor_sched/prefer_idle_set
     chown system system /proc/vendor_sched/prefer_idle_clear
+    chown system system /proc/vendor_sched/pmu_poll_enable
+    chown system system /proc/vendor_sched/pmu_poll_time
+    chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency
+    chown system system /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable
+    chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency
+    chown system system /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable
+    chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/lcpi_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/spc_threshold
+    chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/limit_frequency
+    chown system system /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/pmu_limit_enable
 
     chmod 0220 /proc/vendor_sched/set_task_group_bg
     chmod 0220 /proc/vendor_sched/set_task_group_cam
@@ -71,6 +85,8 @@ on init
     chmod 0220 /proc/vendor_sched/set_proc_group_ota
     chmod 0220 /proc/vendor_sched/prefer_idle_set
     chmod 0220 /proc/vendor_sched/prefer_idle_clear
+    chmod 0220 /proc/vendor_sched/pmu_poll_enable
+    chmod 0220 /proc/vendor_sched/pmu_poll_time
 
     wait /dev/block/platform/${ro.boot.boot_devices}
     symlink /dev/block/platform/${ro.boot.boot_devices} /dev/block/bootdevice
@@ -748,6 +764,24 @@ on property:sys.boot_completed=1
     write /proc/vendor_sched/ota_uclamp_max 410
     write /proc/vendor_sched/ota_group_throttle 410
 
+    # Set PMU freq limit parameters
+    write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/lcpi_threshold 2
+    write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/spc_threshold 59
+    write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/limit_frequency 1401000
+    write /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/lcpi_threshold 6
+    write /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/spc_threshold 64
+    write /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/limit_frequency 1826000
+    write /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/lcpi_threshold 5
+    write /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/spc_threshold 69
+    write /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/limit_frequency 2507000
+    write /proc/vendor_sched/pmu_poll_time 10
+
+    # Disable PMU freq limit
+    write /sys/devices/system/cpu/cpufreq/policy0/sched_pixel/pmu_limit_enable 1
+    write /sys/devices/system/cpu/cpufreq/policy4/sched_pixel/pmu_limit_enable 1
+    write /sys/devices/system/cpu/cpufreq/policy6/sched_pixel/pmu_limit_enable 1
+    write /proc/vendor_sched/pmu_poll_enable 0
+
     # Setup groups for SF (RT used for SF RE, SF used for SF main)
     write /proc/vendor_sched/rt_uclamp_min 125
     write /proc/vendor_sched/rt_prefer_idle 1

gnss/47765/Android.bp

@@ -42,7 +42,7 @@ cc_prebuilt_library_shared {
                 "android.hardware.gnss@2.1",
                 "android.hardware.gnss.measurement_corrections@1.0",
                 "android.hardware.gnss.visibility_control@1.0",
-                "android.hardware.gnss-V1-ndk",
+                "android.hardware.gnss-V2-ndk",
                 "libhardware",
                 "libc++",
                 "libc",
@@ -77,6 +77,7 @@ cc_prebuilt_binary {
                 "android.hardware.gnss@1.1",
                 "android.hardware.gnss@2.0",
                 "android.hardware.gnss@2.1",
+                "android.hardware.gnss-V2-ndk",
                 "libc++",
                 "libc",
                 "libm",

gnss/47765/android.hardware.gnss@2.1-service-brcm.xml

@@ -1,16 +1,7 @@
 <manifest version="1.0" type="device">
-    <hal format="hidl">
-        <name>android.hardware.gnss</name>
-        <transport>hwbinder</transport>
-        <version>2.1</version>
-        <version>1.1</version>
-        <interface>
-            <name>IGnss</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="aidl">
         <name>android.hardware.gnss</name>
+        <version>2</version>
         <fqname>IGnss/default</fqname>
     </hal>
 </manifest>