From ec17f2118c35fc7d800fee6dd6e479337e6fe669 Mon Sep 17 00:00:00 2001 From: Hugo Osvaldo Barrera Date: Wed, 3 Sep 2025 10:44:31 +0200 Subject: [PATCH] qemu-*: enable PSI PSI is necessary (but not sufficient) to run Waydroid on this device target: - linux-virt is built without binder and unusable for Waydroid. - linux-stable is build with CONFIG_PSI_DEFAULT_DISABLED. - linux-lts is build with CONFIG_PSI_DEFAULT_DISABLED. The performance difference is negligible for this device; less that 1%. Fixes: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/1884 See: https://gitlab.alpinelinux.org/alpine/aports/-/issues/17465 Part-of: --- device/main/device-qemu-aarch64/APKBUILD | 4 ++-- device/main/device-qemu-aarch64/deviceinfo | 2 +- device/main/device-qemu-amd64/APKBUILD | 4 ++-- device/main/device-qemu-amd64/deviceinfo | 2 +- device/main/device-qemu-riscv64/APKBUILD | 4 ++-- device/main/device-qemu-riscv64/deviceinfo | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD index ea2bc4579..9004773e4 100644 --- a/device/main/device-qemu-aarch64/APKBUILD +++ b/device/main/device-qemu-aarch64/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Minecrell # Co-Maintainer: Oliver Smith pkgname=device-qemu-aarch64 -pkgver=10 +pkgver=11 pkgrel=0 pkgdesc="Simulated device in QEMU (aarch64)" url="https://postmarketos.org" @@ -74,6 +74,6 @@ kernel_stable() { } sha512sums=" -5cb563f6774a9a3422146205b7df341e159fe8e2af28ad62f4c580d41bd9a888639fb120ad0c1b3c4ba8640efe0e223e8a9cb38d7085dd6dfdf17f9d45264fd3 deviceinfo +c516931e574ac5bc63a34597a2f948f0ac0914a0e4ed77a242fa41e9d04d6a5bf425d3050f7f616cbcc6c15898ce61375d2eeed81ab16d135834c6a8643f3ef2 deviceinfo 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992 modules-initfs " diff --git a/device/main/device-qemu-aarch64/deviceinfo b/device/main/device-qemu-aarch64/deviceinfo index e427bc135..5202608b0 100644 --- a/device/main/device-qemu-aarch64/deviceinfo +++ b/device/main/device-qemu-aarch64/deviceinfo @@ -18,7 +18,7 @@ deviceinfo_getty="ttyAMA0;115200" # Bootloader related deviceinfo_flash_method="none" -deviceinfo_kernel_cmdline="console=tty1 console=ttyAMA0,115200 PMOS_FORCE_PARTITION_RESIZE" +deviceinfo_kernel_cmdline="console=tty1 console=ttyAMA0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1" deviceinfo_disable_dhcpd="true" deviceinfo_partition_type="gpt" deviceinfo_boot_filesystem="fat32" diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index a83cbfb82..0ef91044e 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Minecrell # Co-Maintainer: Oliver Smith pkgname=device-qemu-amd64 -pkgver=11 +pkgver=12 pkgrel=0 pkgdesc="Simulated device in QEMU (x86_64)" url="https://postmarketos.org" @@ -61,6 +61,6 @@ kernel_stable() { } sha512sums=" -c0f57d66a16cfbe8654e73f83a3b07cdfbd10506cf2a79363e742f5b2bbe87344841dbb897acd9816ca3c481706288626bdf7bde1b31bfd957d075e3ed6e984a deviceinfo +b20a759253fc39d19bd2bebc36616e628b2bd1d7c879c60addfe5315b4b0174c8029aaf67c215ba253493a4c47e975c6dbb582f631e59fa4237fa4478eb92676 deviceinfo 29766094e64a7ce881c8e96433203ea538057b8fd1d577fc69b9add6bc1217af04ddf60cbcf82333811c627897eda7537b0b1f862899e1fdfd93403b3f6425d7 modules-initfs " diff --git a/device/main/device-qemu-amd64/deviceinfo b/device/main/device-qemu-amd64/deviceinfo index ef726b959..ba3c87649 100644 --- a/device/main/device-qemu-amd64/deviceinfo +++ b/device/main/device-qemu-amd64/deviceinfo @@ -20,7 +20,7 @@ deviceinfo_dev_internal_storage_repartition="true" # Bootloader related deviceinfo_flash_method="none" -deviceinfo_kernel_cmdline="console=tty1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE" +deviceinfo_kernel_cmdline="console=tty1 console=ttyS0,115200 PMOS_FORCE_PARTITION_RESIZE psi=1" deviceinfo_disable_dhcpd="true" deviceinfo_partition_type="gpt" deviceinfo_boot_filesystem="fat32" diff --git a/device/main/device-qemu-riscv64/APKBUILD b/device/main/device-qemu-riscv64/APKBUILD index 2c8c7142c..fadd667ec 100644 --- a/device/main/device-qemu-riscv64/APKBUILD +++ b/device/main/device-qemu-riscv64/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Minecrell # Co-Maintainer: Luca Weiss pkgname=device-qemu-riscv64 -pkgver=5 +pkgver=6 pkgrel=0 pkgdesc="Simulated device in QEMU (riscv64)" url="https://postmarketos.org" @@ -40,6 +40,6 @@ kernel_stable() { } sha512sums=" -4e2acace2d7a5b55302e9571eef3e57cbc14c2831a2e0797ef5ff87290aef581a0bf112816c2f113878b9ca57599b66d0e3f8a593e0c08819322ff8d5ea7f351 deviceinfo +ab6b26850d41bfd6cc6b3267048c20f866cd5dbdbf96be03e349324514e34bf073092d3944aa31a977c85cc18bc73f048dcd4f5180e6c73dd0da9645d60ba1c8 deviceinfo 8129439ec53e76e714b2d3dac97bbe702822d6f6642ea6b631aa26001fec85ca310fbe9eeb04c2bd849145a1137b7934c21b704524f3a98b96b7c6f71c2ca992 modules-initfs " diff --git a/device/main/device-qemu-riscv64/deviceinfo b/device/main/device-qemu-riscv64/deviceinfo index 341309de6..38a8c6d90 100644 --- a/device/main/device-qemu-riscv64/deviceinfo +++ b/device/main/device-qemu-riscv64/deviceinfo @@ -18,5 +18,5 @@ deviceinfo_getty="ttyS0;230400" # Bootloader related deviceinfo_flash_method="none" -deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_FORCE_PARTITION_RESIZE" +deviceinfo_kernel_cmdline="console=tty1 console=ttyS0 PMOS_FORCE_PARTITION_RESIZE psi=1" deviceinfo_disable_dhcpd="true"