From 17b6215519e601ad7fd532f095e433e456ceac4b Mon Sep 17 00:00:00 2001 From: Christian Neukirchen Date: Wed, 16 Jul 2014 18:18:52 +0200 Subject: [PATCH] New package: pm-utils-1.4.1 --- .../pm-utils/patches/02-logging-append.patch | 17 ++++++++ .../12-fix-intel-audio-powersave-hook.patch | 38 +++++++++++++++++ .../patches/13-49bluetooth-sync.patch | 41 +++++++++++++++++++ .../patches/14-disable-sata-alpm.patch | 24 +++++++++++ srcpkgs/pm-utils/template | 22 ++++++++++ 5 files changed, 142 insertions(+) create mode 100644 srcpkgs/pm-utils/patches/02-logging-append.patch create mode 100644 srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch create mode 100644 srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch create mode 100644 srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch create mode 100644 srcpkgs/pm-utils/template diff --git a/srcpkgs/pm-utils/patches/02-logging-append.patch b/srcpkgs/pm-utils/patches/02-logging-append.patch new file mode 100644 index 0000000000..2753097ab5 --- /dev/null +++ b/srcpkgs/pm-utils/patches/02-logging-append.patch @@ -0,0 +1,17 @@ +Author: James Westby +Description: Do not clear the log file on each operation, but instead append to it. + This makes debugging of several suspends much easier. +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=25255 +Bug-Ubuntu: https://launchpad.net/bugs/410352 + +--- pm/pm-functions.in 2010-07-05 18:41:21.118322244 +0200 ++++ pm/pm-functions.in 2010-07-05 18:41:24.126325221 +0200 +@@ -271,7 +271,7 @@ + return 1 + fi + export LOGGING=true +- exec > "$1" 2>&1 ++ exec >> "$1" 2>&1 + } + + check_suspend() { [ -n "$SUSPEND_MODULE" ]; } diff --git a/srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch b/srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch new file mode 100644 index 0000000000..1c27047982 --- /dev/null +++ b/srcpkgs/pm-utils/patches/12-fix-intel-audio-powersave-hook.patch @@ -0,0 +1,38 @@ +From: Florian Kriener +To: submit@bugs.debian.org +Subject: [pm-utils] wrong path in intel-audio-powersave (and a small bug) +Date: Sat, 25 Sep 2010 11:27:30 +0200 + +In the script intel-audio-powersave is this loop + +for dev in /sys/module/snd_*/parameters/power_save; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for $s to %d..." "$dev##*/" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + +I think it should be + +for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue + printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. +done + + +This fixes the two bugs. + +--- pm/power.d/intel-audio-powersave ++++ pm/power.d/intel-audio-powersave +@@ -20,9 +20,9 @@ EOF + + audio_powersave() { + [ "$INTEL_AUDIO_POWERSAVE" = "true" ] || exit $NA +- for dev in /sys/module/snd_*/parameters/power_save; do ++ for dev in /sys/module/snd_*; do + [ -w "$dev/parameters/power_save" ] || continue +- printf "Setting power savings for $s to %d..." "$dev##*/" "$1" ++ printf "Setting power savings for %s to %d..." "${dev##*/}" "$1" + echo $1 > "$dev/parameters/power_save" && echo Done. || echo Failed. + done + } diff --git a/srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch b/srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch new file mode 100644 index 0000000000..8afaf37f30 --- /dev/null +++ b/srcpkgs/pm-utils/patches/13-49bluetooth-sync.patch @@ -0,0 +1,41 @@ +From 640b53438c20818b3e344343b58b1f1765606a85 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Mon, 31 Jan 2011 15:30:01 +0100 +Subject: [PATCH] 49bluetooth: Wait for btusb module to get unused + +The 49bluetooth hook disables /proc/acpi/ibm/bluetooth but this isn't +synchronous, i. e. it doesn't wait until the module usage count actually drops +to 0. Due to that, it's impossible to add btusb to SUSPEND_MODULES (on some +models/older kernels you need to do that to fix suspend problems), as at that +point the module is still in use. + +On my system (ThinkPad X201) the module takes between 0.3 and 0.5 seconds to +unload, so use 100 ms wait steps with a timeout of 2 seconds. + +Bug: https://bugs.freedesktop.org//show_bug.cgi?id=33759 +Bug-Ubuntu: https://launchpad.net/bugs/698331 +--- + pm/sleep.d/49bluetooth | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +--- pm/sleep.d/49bluetooth ++++ pm/sleep.d/49bluetooth +@@ -12,6 +12,15 @@ suspend_bluetooth() + if grep -q enabled /proc/acpi/ibm/bluetooth; then + savestate ibm_bluetooth enable + echo disable > /proc/acpi/ibm/bluetooth ++ ++ # wait for up to 2 seconds for the module to actually get ++ # unused ++ TIMEOUT=20 ++ while [ $TIMEOUT -ge 0 ]; do ++ [ `cat /sys/module/btusb/refcnt` = 0 ] && break ++ TIMEOUT=$((TIMEOUT-1)) ++ sleep 0.1 ++ done + else + savestate ibm_bluetooth disable + fi +-- +1.7.2.3 + diff --git a/srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch b/srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch new file mode 100644 index 0000000000..4df76cdc48 --- /dev/null +++ b/srcpkgs/pm-utils/patches/14-disable-sata-alpm.patch @@ -0,0 +1,24 @@ +Description: Disable SATA link power management by default, as it still causes disk errors and corruptions on many hardware. +Author: Martin Pitt +Bug-Ubuntu: https://launchpad.net/bugs/539467 + +--- pm/power.d/sata_alpm 2011-02-01 15:53:09.164867778 +0100 ++++ pm/power.d/sata_alpm 2011-02-01 15:53:28.954867786 +0100 +@@ -2,7 +2,7 @@ + + . "${PM_FUNCTIONS}" + +-SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-true} ++SATA_ALPM_ENABLE=${SATA_ALPM_ENABLE:-false} + + help() { + cat <