google-bonito: mirror sargo changes

Mirror the following changes to the Pixel 3a: device-google-sargo: add sensors support (MR 5329) google-sargo: add gpi to modules-initfs to fix fde (MR 5347) google-sargo: do not enable HexagonRPCD on every upgrade (MR 5400) google-sargo: stop HexagonRPCD on suspend (MR 5400) google-sargo: make necessary userspace changes for kernel v6.10.2
2024-09-30 18:43:55 -04:00
11 changed files with 50 additions and 159 deletions
@@ -1,52 +0,0 @@
-# Maintainer: Antony Kurniawan S. <postmarketos@smankusors.com>
-pkgname=device-asus-zenfone3
-pkgdesc="Asus Zenfone 3"
-pkgver=1
-pkgrel=0
-url="https://postmarketos.org"
-license="MIT"
-arch="aarch64"
-options="!check !archcheck"
-depends="
-	firmware-asus-zenfone3
-	lk2nd-msm8953
-	mkbootimg
-	msm-firmware-loader
-	postmarketos-base
-	soc-qcom-msm8953
-	soc-qcom-msm8953-modem
-"
-makedepends="devicepkg-dev"
-subpackages="
-	$pkgname-kernel-ze520kl:kernel_ze520kl
-	$pkgname-kernel-ze552kl:kernel_ze552kl
-"
-source="
-	deviceinfo
-	modules-initfs
-"
-
-build() {
-	devicepkg_build $startdir $pkgname
-}
-
-package() {
-	devicepkg_package $startdir $pkgname
-}
-
-kernel_ze520kl() {
-	depends="linux-postmarketos-qcom-msm8953"
-	pkgdesc="Asus Zenfone 3 (ZE520KL)"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-kernel_ze552kl() {
-	depends="linux-postmarketos-qcom-msm8953"
-	pkgdesc="Asus Zenfone 3 (ZE552KL)"
-	devicepkg_subpackage_kernel $startdir $pkgname $subpkgname
-}
-
-sha512sums="
-7070801470fe2e7ba2ea5cee79ec52d65ad7ff6bdc995283061aeb4967102082602bacb342d38bfa6589bb2e0140cbd71063803039b1e4eb861867c05232f588  deviceinfo
-a4c56173941e88434073d9980a687a82956fbcaaaf15068fd2b4fd9351011a934c82f67e62ce87440876d673784938cfdaedc70ae03e1943c95baef6205567b1  modules-initfs
-"
@@ -1,34 +0,0 @@
-# Reference: <https://postmarketos.org/deviceinfo>
-# Please use double quotes only. You can source this file in shell
-# scripts.
-
-deviceinfo_format_version="0"
-deviceinfo_name="Asus Zenfone 3"
-deviceinfo_manufacturer="Asus"
-deviceinfo_codename="asus-zenfone3"
-deviceinfo_year="2016"
-deviceinfo_dtb_ze520kl="qcom/msm8953-asus-ze520kl"
-deviceinfo_dtb_ze552kl="qcom/msm8953-asus-ze552kl"
-deviceinfo_append_dtb="true"
-deviceinfo_arch="aarch64"
-
-# Device related
-deviceinfo_gpu_accelerated="true"
-deviceinfo_chassis="handset"
-deviceinfo_keyboard="false"
-deviceinfo_external_storage="true"
-deviceinfo_getty="ttyMSM0;115200"
-
-# Bootloader related
-deviceinfo_flash_method="fastboot"
-deviceinfo_generate_extlinux_config="true"
-deviceinfo_generate_bootimg="true"
-deviceinfo_bootimg_qcdt="false"
-deviceinfo_bootimg_dtb_second="false"
-deviceinfo_flash_pagesize="2048"
-deviceinfo_header_version="0"
-deviceinfo_flash_offset_base="0x80000000"
-deviceinfo_flash_offset_kernel="0x00008000"
-deviceinfo_flash_offset_ramdisk="0x01000000"
-deviceinfo_flash_offset_second="0x00f00000"
-deviceinfo_flash_offset_tags="0x00000100"
@@ -1,7 +0,0 @@
-msm
-panel_asus_ze520kl_ili7807b_boe
-panel_asus_ze520kl_r63350_tm
-panel_asus_ze552kl_ili7807b_ctc
-panel_asus_ze552kl_nt35596_txd
-panel_asus_ze552kl_otm1901a_lce
-panel_asus_ze552kl_r63350_tm
@@ -0,0 +1,8 @@
+# Invert the acceleration so it is directed downwards, at rest on a planet.
+# This is for compatibility with iio-sensor-proxy.
+#
+# https://gitlab.freedesktop.org/hadess/iio-sensor-proxy/-/issues/375
+SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp*", ENV{ACCEL_MOUNT_MATRIX}="-1, 0, 0; 0, -1, 0; 0, 0, -1"
+
+# Be compatible with the fix to CVE 2024-41024.
+SUBSYSTEM=="misc", KERNEL=="fastrpc-adsp-secure", SYMLINK="fastrpc-adsp"
@@ -1,7 +1,7 @@
 # Reference: <https://postmarketos.org/devicepkg>
 pkgname=device-google-bonito
 pkgdesc="Google Pixel 3a XL"
-pkgver=2
+pkgver=3
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -17,9 +17,12 @@ depends="
 "
 makedepends="devicepkg-dev"
 source="
+	81-libssc-google-sargo.rules
 	90-feedbackd-drv2624.rules
 	deviceinfo
+	hexagonrpcd-adsp-sensorspd.confd
 	modules-initfs
+	no-hexagonrpcd-on-suspend.sh
 	q6voiced.conf
 "
 subpackages="
@@ -47,23 +50,45 @@ kernel_sdc() {

 nonfree_firmware() {
 	pkgdesc="Proprietary firmware blobs for the Google Pixel 3a XL"
+	replaces="hexagonrpcd-openrc"
 	depends="
 		firmware-google-sargo
+		hexagonrpcd
 		linux-firmware-ath10k
 		linux-firmware-qca
 		linux-firmware-qcom
 		soc-qcom-sdm845-modem
 		soc-qcom-sdm845-nonfree-firmware
 	"
+	# Enable HexagonRPCD by default, but not if the user installed this
+	# package then disabled it.
+	install="
+		device-google-sargo-nonfree-firmware.post-install
+	"

 	# The q6voiced configuration can only be used if the ADSP is brought up
 	# via non-free firmware.
 	install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
+
+	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
+	install -Dm644 "$srcdir"/hexagonrpcd-adsp-sensorspd.confd \
+		"$subpkgdir"/etc/conf.d/hexagonrpcd-adsp-sensorspd
+
+	# Sensors depend on ADSP firmware and the sensors registry served over FastRPC.
+	install -Dm644 "$srcdir"/81-libssc-google-sargo.rules \
+		"$subpkgdir"/usr/lib/udev/rules.d/81-libssc-google-sargo.rules
+
+	# The FastRPC service is only enabled when non-free firmware is installed.
+	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
+		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh
 }

 sha512sums="
+089ce0acba4e1d789e337bedfca7570796a6416e7230ae9b8fc6b625747a40dbb064b1a707877cd6b7bdc73844c6571316e2ec0746a77060f13d98c52fdbfc00  81-libssc-google-sargo.rules
 016d398155f2344417f5e5649a361719ba6e53e593c501b5df39114cdd284302b9bf8686a39817aee0c08fec95b3ab613c181d6cc9596299aaf7fd05dbe0c3dd  90-feedbackd-drv2624.rules
 a6860945d4c75b698a9fadfd0f42355a601c064f62bcf197061ba97be46d23727cac1df355a238042ce9c9017e0ddf458f23a858aad60bebe672ba495cc6c4ad  deviceinfo
-1eb5f138619f499fab31ea64f63ee9f8984f195528708ec6a01ddc533c74cfb71d1442b97905ae15db24b8faac259fa3e89db357ca9c747ce3ee598c2d681639  modules-initfs
+b6208c254b6e44ac4f6d748a38cc6b05da0db2c90235ada2011b138b82ccc3372687df2f5ad97e885e9eea135216a3c52266a08a7f4eb323e62e799f6f82ec7b  hexagonrpcd-adsp-sensorspd.confd
+0253ff4688b789aa7cdbffb22e7ff9497aabe083adc44bf33fa52617215a1f48fc722bd61aa13a35d109eff1e69202eb599dccff029e39c0a390dcab11dd9b76  modules-initfs
+2972005a9cf6ca57061965075593dddfa8ee479bc6c21cd41851b1a14768cb1cddbd31a17975ae17adc36d40d294ccbc6bf83defbd69fc7b363f638d8564fbbc  no-hexagonrpcd-on-suspend.sh
 3a4a9322839d4b3ef9d79668a37840a9f444954759ae3c512e694051d2f9a2573db42ad6c4c1a5c75eeb861232a27ba1a8cef9b503decd54ead25a96e3dd6f98  q6voiced.conf
 "
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add hexagonrpcd-adsp-sensorspd
@@ -0,0 +1,2 @@
+# HexagonFS root directory for served files.
+hexagonrpcd_fw_dir="/usr/share/qcom/sdm670/Google/sargo"
@@ -1,3 +1,4 @@
+gpi
 i2c_qcom_geni
 rmi_core
 rmi_i2c
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$1" = "pre" ]
+then
+	# If HexagonRPCD listens for a remote method call while the device is
+	# waking up, the DSP may crash. Assume that HexagonRPCD has fulfilled
+	# all incoming remote method invocations, and stop it.
+	rc-service hexagonrpcd-adsp-sensorspd stop
+fi
@@ -1,27 +0,0 @@
-# Maintainer: Antony Kurniawan S. <postmarketos@smankusors.com>
-pkgname=firmware-asus-zenfone3
-pkgver=1
-pkgrel=0
-pkgdesc="Firmware for Asus Zenfone 3 ZE520KL/ZE552KL"
-url="https://gitlab.com/Smankusors/firmware-asus-zenfone3"
-arch="aarch64"
-license="proprietary"
-options="!check !strip !archcheck !tracedeps pmb:cross-native"
-_commit="f1439210719b2a1597f6390f34ae93cb1470ddf4"
-builddir="$srcdir/$pkgname-$_commit/"
-source="
-	$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-	firmware.files
-"
-_fwdir="/lib/firmware/postmarketos"
-
-package() {
-	while IFS="" read -r fw; do
-		install -Dm644 "$fw" "$pkgdir/$_fwdir/$fw"
-	done < "$srcdir"/firmware.files
-}
-
-sha512sums="
-a9980ae2ab0868d7e8e2d054e72525c030fe75d66aec6eebd2e17619d5d24455de2a158ea7ed0eb0db2f7a2f4bc07701672de217f8c7274599cd92c00cb2d04e  firmware-asus-zenfone3-f1439210719b2a1597f6390f34ae93cb1470ddf4.tar.gz
-2b5ba92ec40e84294e0c1feae167274d49990545cf28a1a916440a4604d03f5a213187d753fe02f98918f7283707e353e309a7169c44d4f69464a87afb67d2b8  firmware.files
-"
@@ -1,37 +0,0 @@
-qcom/a530_pfp.fw
-qcom/a530_pm4.fw
-wlan/prima/WCNSS_qcom_wlan_nv.bin
-a506_zap.b02
-a506_zap.mdt
-adsp.b00
-adsp.b01
-adsp.b02
-adsp.b03
-adsp.b04
-adsp.b05
-adsp.b06
-adsp.b07
-adsp.b08
-adsp.b09
-adsp.b10
-adsp.b11
-adsp.b12
-adsp.b13
-adsp.b14
-adsp.mdt
-venus.b00
-venus.b01
-venus.b02
-venus.b03
-venus.b04
-venus.mdt
-wcnss.b00
-wcnss.b01
-wcnss.b02
-wcnss.b04
-wcnss.b06
-wcnss.b09
-wcnss.b10
-wcnss.b11
-wcnss.b12
-wcnss.mdt