Compare revisions

Sebastian Krzyszkowiak · Sebastian Krzyszkowiak · Sebastian Krzyszkowiak · Sebastian Krzyszkowiak · Angus Ainslie · Sebastian Krzyszkowiak
--- a/debian/changelog
+++ b/debian/changelog
+librem5-base (57pureos1) byzantium; urgency=medium
+
+  * default: gadget: Use CDC-NCM instead of CDC-ECM
+  * defaults: Add an initramfs script to reencrypt LUKS rootfs
+  * defaults: librem5-pm: Add rules for EM7565 and SIM7912G
+  * defaults: pulse: Reduce fragment size to 22 ms
+  * defaults: Switch USB PM timeouts back to 2s for devices and 0 for hub
+
+ -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Mon, 06 Mar 2023 19:21:14 +0100
+
+librem5-base (56pureos1) byzantium; urgency=medium
+
+  * defaults: Improve reliability of bluetooth-brcmfmac against system suspend
+  * default: ucm2: Move controls to BootSequence where applicable
+  * librem5-base-defaults: pulse: Bump fragment size up to 24ms
+  * defaults: librem5-pm: Set devices to suspend after 1.5s and hub after 0.5s
+  * defaults: librem5-pm: Set readahead based on USB vendor/product ID
+
+ -- Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>  Fri, 24 Feb 2023 13:13:37 +0100
+
 librem5-base (55pureos1) byzantium; urgency=medium

  * base: Move gthd to recommends.

--- a/debian/librem5-base-defaults.install
+++ b/debian/librem5-base-defaults.install
@@ -60,7 +60,7 @@ default/systemd/zram-generator.conf.d/*	lib/systemd/zram-generator.conf.d/
 default/systemd/system-sleep/*		lib/systemd/system-sleep/

 # initramfs modules
-default/initramfs-tools/modules.d/*	usr/share/initramfs-tools/modules.d/
+default/initramfs-tools/*		usr/share/initramfs-tools/

 # smartcard configuration
 default/smartcard/librem5               etc/reader.conf.d/

--- a/debian/librem5-base-defaults.librem5-pm.udev
+++ b/debian/librem5-base-defaults.librem5-pm.udev
@@ -10,22 +10,29 @@ DEVPATH=="/devices/platform/soc@0/38100000.usb", TEST=="power/control", ATTR{pow

 # Broadmobi BM818
 SUBSYSTEM=="usb", ATTR{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/control", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTR{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="1500"
+SUBSYSTEM=="usb", ATTR{idVendor}=="2020", ATTR{idProduct}=="2060", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="2000"

 # Cinterion PLS8
 SUBSYSTEM=="usb", ATTR{idVendor}=="1e2d", ATTR{idProduct}=="0061", TEST=="power/control", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTR{idVendor}=="1e2d", ATTR{idProduct}=="0061", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="1500"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1e2d", ATTR{idProduct}=="0061", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="2000"

+# Sierra Wireless EM7565
+SUBSYSTEM=="usb", ATTR{idVendor}=="1199", ATTR{idProduct}=="9091", TEST=="power/control", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1199", ATTR{idProduct}=="9091", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="2000"
+
+# SIMCom SIM7912G
+SUBSYSTEM=="usb", ATTR{idVendor}=="1e0e", ATTR{idProduct}=="9001", TEST=="power/control", ATTR{power/control}="auto"
+SUBSYSTEM=="usb", ATTR{idVendor}=="1e0e", ATTR{idProduct}=="9001", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="2000"

 # Microchip USB2642
 SUBSYSTEM=="usb", ATTR{idVendor}=="0424", ATTR{idProduct}=="2640", TEST=="power/control", ATTR{power/control}="auto"
-SUBSYSTEM=="usb", ATTR{idVendor}=="0424", ATTR{idProduct}=="2640", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="500"
+SUBSYSTEM=="usb", ATTR{idVendor}=="0424", ATTR{idProduct}=="2640", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="0"

 # SD card reader
 # enable runtime pm
 SUBSYSTEM=="module", KERNEL=="block", TEST=="parameters/events_dfl_poll_msecs", ATTR{parameters/events_dfl_poll_msecs}="0"
 SUBSYSTEM=="scsi", DRIVER=="sd", TEST=="power/control", ATTR{power/control}="auto"
-SUBSYSTEM=="scsi", DRIVER=="sd", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="1500"
+SUBSYSTEM=="scsi", DRIVER=="sd", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="2000"

 SUBSYSTEM=="usb", ATTR{idVendor}=="0424", ATTR{idProduct}=="4041", TEST=="power/control", ATTR{power/control}="auto"
 SUBSYSTEM=="usb", ATTR{idVendor}=="0424", ATTR{idProduct}=="4041", TEST=="power/autosuspend_delay_ms", ATTR{power/autosuspend_delay_ms}="0"

--- a/default/90-wifi-powersave.conf
+++ b/default/90-wifi-powersave.conf
 [connection]
 # Values are 0 (use default), 1 (ignore/don't touch), 2 (disable) or 3 (enable).
 wifi.powersave = 2
+
+[connection-brcmfmac]
+match-device=driver:brcmfmac
+wifi.powersave = 3
--- a/default/audio/pulse/daemon.conf.d/95-librem5.conf
+++ b/default/audio/pulse/daemon.conf.d/95-librem5.conf
@@ -3,4 +3,4 @@ default-script-file = /etc/pulse/librem5.pa
 default-sample-format=s16le
 default-sample-rate=48000
 default-fragments = 2
-default-fragment-size-msec = 24
+default-fragment-size-msec = 22
--- a/default/gadget/usb_gadget_start
+++ b/default/gadget/usb_gadget_start
@@ -20,16 +20,16 @@ mkdir -p strings/${ENGLISH}
 echo "0123456789" > strings/${ENGLISH}/serialnumber
 echo "Purism, SPC" > strings/${ENGLISH}/manufacturer
 echo "Librem 5" > strings/${ENGLISH}/product
-mkdir -p functions/ecm.usb0 #ethernet
+mkdir -p functions/ncm.usb0 #ethernet
 mkdir -p functions/acm.GS0 # serial
 mkdir -p configs/c.1/strings/${ENGLISH}
-echo "CDC ACM+ECM" > configs/c.1/strings/${ENGLISH}/configuration
+echo "CDC ACM+NCM" > configs/c.1/strings/${ENGLISH}/configuration
 if [ -n "${HOST_ADDR}" ]; then
-    echo "${HOST_ADDR}" > functions/ecm.usb0/host_addr
+    echo "${HOST_ADDR}" > functions/ncm.usb0/host_addr
 fi
 if [ -n "${DEV_ADDR}" ]; then
-    echo "${DEV_ADDR}" > functions/ecm.usb0/dev_addr
+    echo "${DEV_ADDR}" > functions/ncm.usb0/dev_addr
 fi
 ln -sf functions/acm.GS0 configs/c.1
-ln -sf functions/ecm.usb0 configs/c.1
+ln -sf functions/ncm.usb0 configs/c.1
 echo "38100000.usb" > UDC # Bind to the L5 USB controller
--- a/default/gadget/usb_gadget_stop
+++ b/default/gadget/usb_gadget_stop
@@ -2,4 +2,4 @@
 set -e
 cd /sys/kernel/config/usb_gadget/g1
 echo "" > UDC
-rm configs/c.1/acm.GS0 configs/c.1/ecm.usb0
+rm configs/c.1/acm.GS0 configs/c.1/ncm.usb0
--- a/default/initramfs-tools/scripts/local-bottom/0reencrypt
+++ b/default/initramfs-tools/scripts/local-bottom/0reencrypt
+#!/bin/sh
+# Reencrypt the root partition if necessary.
+
+set -e
+
+PREREQS=""
+case $1 in
+    prereqs) echo "${PREREQS}"; exit 0;;
+esac
+
+. /scripts/functions
+
+msg() { [ -x /bin/plymouth ] && plymouth display-message --text="$@" || echo "$@"; }
+
+[ -x /sbin/cryptsetup ] || return 0
+
+DUMPFILE="/var/lib/reencrypt/dump"
+DISABLEFILE="/etc/reencrypt-disabled"
+PASSPHRASE="123456"
+
+# if a file indicates we should do nothing, then just exit
+[ -f "${rootmnt}${DISABLEFILE}" ] && exit 0
+
+# if there's no luks dump to compare to, do nothing
+[ -f "${rootmnt}${DUMPFILE}" ] || exit 0
+
+# check whether rootfs is on a LUKS volume
+if (cryptsetup status ${ROOT} >/dev/null 2>&1); then
+
+	# find out the real device behind LUKS volume
+	DEV=$(cryptsetup status ${ROOT} | awk -F: '$1~/device/ {gsub(/^[ \t]+/, "", $2); print $2}')
+
+	# try to resume an interrupted reencryption
+	(echo $PASSPHRASE | cryptsetup reencrypt --resume-only $DEV 2>/dev/null) || :
+
+	# only reencrypt if luksDump is the same as the one stored at image creation
+	if (cryptsetup luksDump $DEV | cmp -s - "${rootmnt}${DUMPFILE}"); then
+		msg "Encrypting the filesystem, please wait..."
+		echo $PASSPHRASE | cryptsetup reencrypt $DEV
+		msg
+	fi
+fi
+
+# vi: ts=4 noexpandtab
No results found