From b97e826b28156c1519fcc8a9f3e72e178fee9ec5 Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Tue, 28 Mar 2023 11:13:55 +0900 Subject: [PATCH 01/11] Add BOARD_WLAN_CHIP to soong config wcn6740 uses a new implementation for libwifi-hal-qcom. We need a soong config variable for BOARD_WLAN_CHIP to switch the implementation. Bug: 273376293 Test: m libwifi-hal (with gs201 target) Merged-In: Iddeb4e76be213fde2d1bb4dbd614a1213bc35e89 Change-Id: Iddeb4e76be213fde2d1bb4dbd614a1213bc35e89 --- wifi/qcom/BoardConfig-wifi.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/wifi/qcom/BoardConfig-wifi.mk b/wifi/qcom/BoardConfig-wifi.mk index dcc75a9c..6546ce44 100644 --- a/wifi/qcom/BoardConfig-wifi.mk +++ b/wifi/qcom/BoardConfig-wifi.mk @@ -46,3 +46,6 @@ BOARD_HOSTAPD_CONFIG_80211W_MFP_OPTIONAL := true PRODUCT_COPY_FILES += \ $(LOCAL_WIFI_PATH)/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf \ $(LOCAL_WIFI_PATH)/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf + +# Add BOARD_WLAN_CHIP to soong_config +$(call soong_config_set,qcom_wifi,board_wlan_chip,wcn6740) \ No newline at end of file From bad22b4210c910fdd4a54b3200e9badc86c408ff Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Thu, 13 Apr 2023 06:41:32 +0000 Subject: [PATCH 02/11] Update same maximum resolution capability for hevc Bug: 275024348 Test: atest android.videocodec.cts.VideoEncoderMinMaxTest Change-Id: Ic3a1a31ebced2ede8e377494f3fc64e721a9a864 --- media_codecs_aosp_c2.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml index bae71e61..6846cbe3 100644 --- a/media_codecs_aosp_c2.xml +++ b/media_codecs_aosp_c2.xml @@ -49,11 +49,11 @@ - + - - + + From 6c5bec678a67b3fadcf9b0ae4093918dd6cf4b62 Mon Sep 17 00:00:00 2001 From: Ken Chen Date: Fri, 14 Apr 2023 05:31:23 +0000 Subject: [PATCH 03/11] Increases socket buffer for 5G FR2 throughput The existing socket buffer size is unable to sustain 4.2Gbits/s. Enlarge buffer size based on LAB test result. Bug: 274709266 Test: $ iperf3 -u -c 10.174.105.148 -i1 -b450M -P10 -t60 -p 5029 --bidir DL: 4.17 Gbits/sec UL: 310 Mbits/sec Change-Id: I50fe3d43ee3db48dc2d1a0abac75a0b390c17d18 --- conf/init.gs201.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc index f3fdfb05..b1221130 100644 --- a/conf/init.gs201.rc +++ b/conf/init.gs201.rc @@ -132,7 +132,7 @@ on init symlink /data/app /factory # Apply network parameters for high data performance. - write /proc/sys/net/core/rmem_default 327680 + write /proc/sys/net/core/rmem_default 1310720 write /proc/sys/net/core/rmem_max 8388608 write /proc/sys/net/core/wmem_default 327680 write /proc/sys/net/core/wmem_max 8388608 From ed45a23aaa00fde19b606429007be5f5f7e81e50 Mon Sep 17 00:00:00 2001 From: wenchangliu Date: Fri, 14 Apr 2023 09:16:21 +0000 Subject: [PATCH 04/11] Update media_codecs_performance_c2.xml base on UP1A.230412 - add sw av1 encoder performance measure result from DVT device Bug: 271510425 Test: run cts -m CtsVideoTestCases -t android.video.cts.VideoEncoderDecoderTest Change-Id: I826ad204c323c1d22a151f04ee7e8cf64b30d882 --- media_codecs_performance_c2.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 08dfd5d1..574033e9 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -251,5 +251,13 @@ + + + + + + + + From 8329190a5c07bcb4934461805f766a458d6c943d Mon Sep 17 00:00:00 2001 From: Leo Liou Date: Tue, 14 Mar 2023 15:37:19 +0800 Subject: [PATCH 05/11] gs201: conf: run ufs ffu script after boot complete The ufs script is to work for ffu preparing. If device's ufs has an old firmware, the script will copy the valid firmware into disk and wait for ffu update on bootloader. Bug: 273305212 Test: full build and test ffu update Change-Id: Ic5069561b67e2773cd87edb31bfa3d682867b838 Signed-off-by: Leo Liou --- device.mk | 3 +++ storage/Android.bp | 27 +++++++++++++++++++++++++++ storage/storage.gs201.rc | 7 +++++++ storage/ufs_firmware_update.sh | 19 +++++++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 storage/Android.bp create mode 100644 storage/storage.gs201.rc create mode 100755 storage/ufs_firmware_update.sh diff --git a/device.mk b/device.mk index ceeabd59..63d9ba3d 100644 --- a/device.mk +++ b/device.mk @@ -1176,3 +1176,6 @@ PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=tr # Hardware Info include hardware/google/pixel/HardwareInfo/HardwareInfo.mk + +# UFS: the script is used to select the corresponding firmware to run FFU. +PRODUCT_PACKAGES += ufs_firmware_update.sh diff --git a/storage/Android.bp b/storage/Android.bp new file mode 100644 index 00000000..90a919b8 --- /dev/null +++ b/storage/Android.bp @@ -0,0 +1,27 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package { + default_applicable_licenses: [ + "//device/google/gs201:device_google_gs201_license", + ], +} + +sh_binary { + name: "ufs_firmware_update.sh", + src: "ufs_firmware_update.sh", + init_rc: ["storage.gs201.rc"], + vendor: true, +} diff --git a/storage/storage.gs201.rc b/storage/storage.gs201.rc new file mode 100644 index 00000000..9873325d --- /dev/null +++ b/storage/storage.gs201.rc @@ -0,0 +1,7 @@ +on property:sys.boot_completed=1 + # Copy ufs firmware to disk + start ufs_firmware_update + +service ufs_firmware_update /vendor/bin/ufs_firmware_update.sh + disabled + oneshot diff --git a/storage/ufs_firmware_update.sh b/storage/ufs_firmware_update.sh new file mode 100755 index 00000000..d118115f --- /dev/null +++ b/storage/ufs_firmware_update.sh @@ -0,0 +1,19 @@ +#!/vendor/bin/sh +# +# The script belongs to the feature of UFS FFU via OTA: go/p23-ffu-ota +# Its purpose is to copy the corresponding firmware into partition for UFS FFU. + +ufs_dev="/dev/sys/block/bootdevice" +fw_dir="/vendor/firmware" +blk_dev="/dev/block/by-name/fips" + +vendor=$(cat ${ufs_dev}/vendor | tr -d "[:space:]") +model=$(cat ${ufs_dev}/model | tr -d "[:space:]") +rev=$(cat ${ufs_dev}/rev | tr -d "[:space:]") + +file=$(find ${fw_dir} -name "*${vendor}${model}${rev}*" | head -n 1) +if [ -n "$file" ]; then + # The first 4KB block at fips partition has been occupied, and unused space begins from 4 KB + # Refer to: go/pixel-mp-ffu-ota-1p + dd if="$file" of=$blk_dev bs=4k seek=1 +fi From 8a6e7a8dfb4b8f2fa04a64f0a2f1755467251faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= Date: Tue, 28 Mar 2023 17:15:08 +0100 Subject: [PATCH 06/11] gs201: Cover pvmfw.img in vbmeta_system.img The pvmfw partition is expected to be kept in sync with the system partition so, instead of having it as a standalone partition (covered by vbmeta.img), add it to vbmeta_system. Bug: 275497314 Test: TH Change-Id: I2ff0fc14b9c9f8cf09907369a82f16d22a8c8297 --- BoardConfig-common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index c599bf68..35cc0e50 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -151,6 +151,10 @@ BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 1 +ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) +BOARD_AVB_VBMETA_SYSTEM += pvmfw +endif + # Enable chained vbmeta for boot images BOARD_AVB_BOOT_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem BOARD_AVB_BOOT_ALGORITHM := SHA256_RSA2048 From fefb1abd94867d1a4673d27869be728a4af71afc Mon Sep 17 00:00:00 2001 From: Ian Elliott Date: Tue, 18 Apr 2023 09:46:12 -0600 Subject: [PATCH 07/11] gs201: Use SkiaGL as RenderEngine backend Test: none needed--reverting to previous RenderEngine backend Bug: 236390072 Change-Id: I38a99a971b614fd508754d1da81f22d18dc0fae4 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 63d9ba3d..e71b9951 100644 --- a/device.mk +++ b/device.mk @@ -282,7 +282,7 @@ PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ ro.opengles.version=196610 \ graphics.gpu.profiler.support=true \ - debug.renderengine.backend=skiavkthreaded + debug.renderengine.backend=skiaglthreaded # GRAPHICS - GPU (end) # #################### From af1977bcd7cd4e04c19fd851fdb3e760afebfba9 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 18 Apr 2023 20:23:13 +0800 Subject: [PATCH 08/11] gs201: update media_codecs_performance_c2.xml based on UP1A.230417.001 - add sw decoder performance measure result from DVT device Bug: 275148623 Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: I8154f186144ca31ada5205a5753d13d447987a7e --- media_codecs_performance_c2.xml | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 574033e9..8af8ad1e 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -155,16 +155,11 @@ - - - - - - - - - - + + + + + @@ -178,6 +173,12 @@ + + + + + + From 55082ca17e93d95b8c06cc32893eb39ac13bb120 Mon Sep 17 00:00:00 2001 From: Kyle Tso Date: Sat, 22 Apr 2023 14:38:13 +0800 Subject: [PATCH 09/11] usb: Temporarily disable compliance warning Revert me once the issue is fixed. Bug: 278018111 Change-Id: I198c4a42aa8b64fef90817474710295d68497dda Signed-off-by: Kyle Tso --- usb/usb/Usb.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usb/usb/Usb.cpp b/usb/usb/Usb.cpp index d5a9ced5..270a2227 100644 --- a/usb/usb/Usb.cpp +++ b/usb/usb/Usb.cpp @@ -902,7 +902,9 @@ void queryVersionHelper(android::hardware::usb::Usb *usb, status = getPortStatusHelper(usb, currentPortStatus); queryMoistureDetectionStatus(currentPortStatus); queryPowerTransferStatus(currentPortStatus); +#if 0 /* b/278018111 disable compliance warning; revert it after fixing the issue */ queryNonCompliantChargerStatus(currentPortStatus); +#endif if (usb->mCallback != NULL) { ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, status); From 060e11883f90899866df8ea8a3adfd6f8719791a Mon Sep 17 00:00:00 2001 From: Cyan_Hsieh Date: Thu, 20 Apr 2023 18:43:34 +0800 Subject: [PATCH 10/11] Add device mk OWNERS Bug: 278167548 Change-Id: I0ec91d8e1347e7dd46dbbfddfb33e3c92aac6c0a --- OWNERS | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 00000000..1cbf9196 --- /dev/null +++ b/OWNERS @@ -0,0 +1,2 @@ +# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. +per-file *.mk=file:device/google/gs-common:master:/OWNERS From b7f7117728e721a03090ac1d260aee89943f2ae6 Mon Sep 17 00:00:00 2001 From: Jerry Huang Date: Tue, 25 Apr 2023 14:56:21 +0800 Subject: [PATCH 11/11] gs201: update media_codecs_performance_c2.xml secure codec performance point of non-secure codec should be the same as secure codec. Bug: 275148623 Test: run cts -m CtsMediaDecoderTestCases -a arm64-v8a -t android.media.decoder.cts.VideoDecoderPerfTest Change-Id: I799c6f28d375efb1a3c09a5242a6ff3e9b6159f7 --- media_codecs_performance_c2.xml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/media_codecs_performance_c2.xml b/media_codecs_performance_c2.xml index 8af8ad1e..21381a94 100644 --- a/media_codecs_performance_c2.xml +++ b/media_codecs_performance_c2.xml @@ -162,16 +162,11 @@ - - - - - - - - - - + + + + +