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

device/community/linux-postmarketos-omap/APKBUILD

@@ -4,7 +4,7 @@
 
 pkgname=linux-postmarketos-omap
 pkgver=6.10.6
-pkgrel=2
+pkgrel=1
 pkgdesc="Mainline kernel fork for OMAP devices"
 arch="armv7"
 url="https://kernel.org/"
@@ -41,9 +41,6 @@ source="
 	0007-hsi-ssi_port-force-pio-path.patch
 	0008-n900-dts-volume-keys.patch
 	0009-ARM-dts-disable-twl-off-idle-configuration-for-N900.patch
-	bq27k-ENODATA-2.patch
-	bq27k-VOLTAGE_MIN.patch
-	bq24-CHANGED.patch
 "
 builddir="$srcdir/linux-$_kernver"
 replaces="linux-samsung-espresso3g linux-nokia-n900"
@@ -84,7 +81,4 @@ f7d1a87088c65278a114125e732d5bebebb560a6245afb34e003083d808ef3f8c5f49ff231319535
 c3af9715b3559c2d593f4fcfa078730722c7deeec132c5b83e085ff4d9815d85ef349384097c580efe1bbc37c60f42e18ef559f0abccfe236080670e4403fa77  0007-hsi-ssi_port-force-pio-path.patch
 b98ce806b3d5a0122086e4c9670639174470ff6d29851c60258cc5d699ce9a479dbf4996b24299fc075d25e9fe8f6b1250fafdff742deea0ddeaf53d342a9d72  0008-n900-dts-volume-keys.patch
 66abb5548910ad369608b08200f5835d5a8526c04cc3617221ef546f3e3d22cd944db91dc6727a5c26a102b24d8ef1306ea01254c9c382759afced91b31747ef  0009-ARM-dts-disable-twl-off-idle-configuration-for-N900.patch
-9cba2e6b88e650a06576fd4f3f99ad0334e4938e970e1198eba78195280ec5f5315d8883960f062daee06e71cdcef3ff003de661c8b2afa0500695c2419d8808  bq27k-ENODATA-2.patch
-0014534b6a43c3f79900bd29662de515b5a9407f7b4ca8493a96a34fa9167cca3e89cf76517dbd85770c0f43a86c7399bf6e0c07d54f4889288ccb2570348bbe  bq27k-VOLTAGE_MIN.patch
-b5e0ffad98155507c9be56a36190cb3959505909e3f41322a51d2caff9a1ae5d8311e395bdbdbdad66eaf4868e8c12201dd8a91f4d0fe96f3734d78b1a8b80c1  bq24-CHANGED.patch
 "

device/community/linux-postmarketos-omap/bq24-CHANGED.patch

@@ -1,13 +0,0 @@
-diff --git a/drivers/power/supply/bq2415x_charger.c b/drivers/power/supply/bq2415x_charger.c
-index 25e28dac900d..a9dc9b0abc03 100644
---- a/drivers/power/supply/bq2415x_charger.c
-+++ b/drivers/power/supply/bq2415x_charger.c
-@@ -835,6 +835,8 @@ static int bq2415x_notifier_call(struct notifier_block *nb,
- 	if (!bq2415x_update_reported_mode(bq, prop.intval))
- 		return NOTIFY_OK;
- 
-+	power_supply_changed(bq->charger);
-+
- 	/* if automode is not enabled do not tell about reported_mode */
- 	if (bq->automode < 1)
- 		return NOTIFY_OK;

device/community/linux-postmarketos-omap/bq27k-ENODATA-2.patch

@@ -1,90 +0,0 @@
-diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
-index 750fda543308..2560104c85a9 100644
---- a/drivers/power/supply/bq27xxx_battery.c
-+++ b/drivers/power/supply/bq27xxx_battery.c
-@@ -1522,6 +1522,18 @@ static void bq27xxx_battery_settings(struct bq27xxx_device_info *di)
- 		bq27xxx_battery_set_config(di, info);
- }
- 
-+/*
-+ * Returns true if reported battery capacity is inaccurate
-+ */
-+static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
-+						 u16 flags)
-+{
-+	if (di->opts & BQ27XXX_O_HAS_CI)
-+		return (flags & BQ27000_FLAG_CI);
-+	else
-+		return false;
-+}
-+
- /*
-  * Return the battery State-of-Charge
-  * Or < 0 if something fails.
-@@ -1538,6 +1550,12 @@ static int bq27xxx_battery_read_soc(struct bq27xxx_device_info *di)
- 	if (soc < 0)
- 		dev_dbg(di->dev, "error reading State-of-Charge\n");
- 
-+	/* If CI flag is set, SoC value always reports zero, therefore hide it
-+	 * from userspace.
-+	 */
-+	if (soc == 0 && bq27xxx_battery_capacity_inaccurate(di, di->cache.flags))
-+		return -ENODATA;
-+
- 	return soc;
- }
- 
-@@ -1562,6 +1580,12 @@ static int bq27xxx_battery_read_charge(struct bq27xxx_device_info *di, u8 reg,
- 	else
- 		charge *= 1000;
- 
-+	/* If CI flag is set, reported charge will always be zero since the chip
-+	 * calculates it from the value of SoC. Therefore hide it from userspace.
-+	 */
-+	if (charge == 0 && bq27xxx_battery_capacity_inaccurate(di, di->cache.flags))
-+		return -ENODATA;
-+
- 	val->intval = charge;
- 
- 	return 0;
-@@ -1655,6 +1679,12 @@ static int bq27xxx_battery_read_energy(struct bq27xxx_device_info *di,
- 	else
- 		ae *= 1000;
- 
-+	/* If CI flag is set, reported energy will always be zero since the chip
-+	 * calculates it from the value of SoC. Therefore hide it from userspace.
-+	 */
-+	if (ae == 0 && bq27xxx_battery_capacity_inaccurate(di, di->cache.flags))
-+		return -ENODATA;
-+
- 	val->intval = ae;
- 
- 	return 0;
-@@ -1720,7 +1750,7 @@ static int bq27xxx_battery_read_time(struct bq27xxx_device_info *di, u8 reg,
- 		return tval;
- 	}
- 
--	if (tval == 65535)
-+	if (tval == 65535 || (tval == 0 && bq27xxx_battery_capacity_inaccurate(di, di->cache.flags)))
- 		return -ENODATA;
- 
- 	val->intval = tval * 60;
-@@ -1765,18 +1795,6 @@ static bool bq27xxx_battery_dead(struct bq27xxx_device_info *di, u16 flags)
- 		return flags & (BQ27XXX_FLAG_SOC1 | BQ27XXX_FLAG_SOCF);
- }
- 
--/*
-- * Returns true if reported battery capacity is inaccurate
-- */
--static bool bq27xxx_battery_capacity_inaccurate(struct bq27xxx_device_info *di,
--						 u16 flags)
--{
--	if (di->opts & BQ27XXX_O_HAS_CI)
--		return (flags & BQ27000_FLAG_CI);
--	else
--		return false;
--}
--
- static int bq27xxx_battery_read_health(struct bq27xxx_device_info *di,
- 				       union power_supply_propval *val)
- {

device/community/linux-postmarketos-omap/bq27k-VOLTAGE_MIN.patch

@@ -1,84 +0,0 @@
-diff --git a/drivers/power/supply/bq27xxx_battery.c b/drivers/power/supply/bq27xxx_battery.c
-index 750fda543308..c7d06ef877b3 100644
---- a/drivers/power/supply/bq27xxx_battery.c
-+++ b/drivers/power/supply/bq27xxx_battery.c
-@@ -123,6 +123,7 @@ enum bq27xxx_reg_index {
- 	BQ27XXX_DM_BLOCK,	/* Data Block */
- 	BQ27XXX_DM_DATA,	/* Block Data */
- 	BQ27XXX_DM_CKSUM,	/* Block Data Checksum */
-+	BQ27XXX_REG_SEDVF,	/* End-of-discharge Voltage */
- 	BQ27XXX_REG_MAX,	/* sentinel */
- };
- 
-@@ -159,6 +160,7 @@ static u8
- 		[BQ27XXX_DM_BLOCK] = INVALID_REG_ADDR,
- 		[BQ27XXX_DM_DATA] = INVALID_REG_ADDR,
- 		[BQ27XXX_DM_CKSUM] = INVALID_REG_ADDR,
-+		[BQ27XXX_REG_SEDVF] = 0x77,
- 	},
- 	bq27010_regs[BQ27XXX_REG_MAX] = {
- 		[BQ27XXX_REG_CTRL] = 0x00,
-@@ -184,6 +186,7 @@ static u8
- 		[BQ27XXX_DM_BLOCK] = INVALID_REG_ADDR,
- 		[BQ27XXX_DM_DATA] = INVALID_REG_ADDR,
- 		[BQ27XXX_DM_CKSUM] = INVALID_REG_ADDR,
-+		[BQ27XXX_REG_SEDVF] = 0x77,
- 	},
- 	bq2750x_regs[BQ27XXX_REG_MAX] = {
- 		[BQ27XXX_REG_CTRL] = 0x00,
-@@ -559,6 +562,7 @@ static enum power_supply_property bq27000_props[] = {
- 	POWER_SUPPLY_PROP_POWER_AVG,
- 	POWER_SUPPLY_PROP_HEALTH,
- 	POWER_SUPPLY_PROP_MANUFACTURER,
-+	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
- };
- 
- static enum power_supply_property bq27010_props[] = {
-@@ -579,6 +583,7 @@ static enum power_supply_property bq27010_props[] = {
- 	POWER_SUPPLY_PROP_CYCLE_COUNT,
- 	POWER_SUPPLY_PROP_HEALTH,
- 	POWER_SUPPLY_PROP_MANUFACTURER,
-+	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
- };
- 
- #define bq2750x_props bq27510g3_props
-@@ -2006,6 +2011,27 @@ static int bq27xxx_battery_voltage(struct bq27xxx_device_info *di,
- 	return 0;
- }
- 
-+/*
-+ * Return the design minimum battery Voltage in millivolts
-+ * Or < 0 if something fails.
-+ */
-+static int bq27xxx_battery_read_dmin_volt(struct bq27xxx_device_info *di,
-+					  union power_supply_propval *val)
-+{
-+	int volt;
-+
-+	volt = bq27xxx_read(di, BQ27XXX_REG_SEDVF, false);
-+	if (volt < 0) {
-+		dev_err(di->dev, "error reading design min voltage\n");
-+		return volt;
-+	}
-+
-+	/* SEDVF = Design EDVF / 8 - 256 */
-+	val->intval = volt * 8000 + 2048000;
-+
-+	return 0;
-+}
-+
- static int bq27xxx_simple_value(int value,
- 				union power_supply_propval *val)
- {
-@@ -2086,8 +2112,10 @@ static int bq27xxx_battery_get_property(struct power_supply *psy,
- 	 * power_supply_battery_info visible in sysfs.
- 	 */
- 	case POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN:
--	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
- 		return -EINVAL;
-+	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
-+		ret = bq27xxx_battery_read_dmin_volt(di, val);
-+		break;
- 	case POWER_SUPPLY_PROP_CYCLE_COUNT:
- 		ret = bq27xxx_battery_read_cyct(di, val);
- 		break;

device/testing/device-google-bonito/81-libssc-google-sargo.rules

@@ -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"

device/testing/device-google-bonito/APKBUILD

@@ -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
 "

device/testing/device-google-bonito/device-google-sargo-nonfree-firmware.post-install

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+rc-update add hexagonrpcd-adsp-sensorspd

device/testing/device-google-bonito/hexagonrpcd-adsp-sensorspd.confd

@@ -0,0 +1,2 @@
+# HexagonFS root directory for served files.
+hexagonrpcd_fw_dir="/usr/share/qcom/sdm670/Google/sargo"

device/testing/device-google-bonito/modules-initfs

@@ -1,3 +1,4 @@
+gpi
 i2c_qcom_geni
 rmi_core
 rmi_i2c

device/testing/device-google-bonito/no-hexagonrpcd-on-suspend.sh

@@ -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