Fixup systemd for XPS 9310

4 files changed, 37 insertions, 3 deletions

diff --git a/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf b/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf
index 47e8b77..4bdee52 100644
--- a/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf
+++ b/.linux/etc/systemd/logind.conf.d/hybrid-sleep.conf
@@ -1,4 +1,11 @@
 [Login]
-HandlePowerKey=suspend-then-hibernate
-HandleLidSwitch=suspend-then-hibernate
-HandleLidSwitchExternalPower=suspend-then-hibernate
+# This config is what should be used for laptops with S3 support
+#HandlePowerKey=suspend-then-hibernate
+#HandleLidSwitch=suspend-then-hibernate
+#HandleLidSwitchExternalPower=suspend-then-hibernate
+
+# But in their infinite wisdom Dell removed S3 support from the 9310, so
+# this is needed to make sure the laptop actually sleeps well.
+HandlePowerKey=hybrid-sleep
+HandleLidSwitch=hybrid-sleep
+HandleLidSwitchExternalPower=hybrid-sleep
diff --git a/.linux/etc/systemd/sleep.conf.d/fix-9310.conf b/.linux/etc/systemd/sleep.conf.d/fix-9310.conf
new file mode 100644
index 0000000..e18032c
--- /dev/null
+++ b/.linux/etc/systemd/sleep.conf.d/fix-9310.conf
@@ -0,0 +1,2 @@
+[Sleep]
+HibernateMode=shutdown
diff --git a/.linux/etc/systemd/system/ath11k-resume.service b/.linux/etc/systemd/system/ath11k-resume.service
new file mode 100644
index 0000000..0b32151
--- /dev/null
+++ b/.linux/etc/systemd/system/ath11k-resume.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Resume: modprobe ath11k_pci
+After=suspend.target
+After=hibernate.target
+
+[Service]
+Type=oneshot
+ExecStartPre=/usr/bin/sleep 3
+ExecStart=/usr/sbin/modprobe ath11k_pci
+
+[Install]
+WantedBy=suspend.target
+WantedBy=hibernate.target
diff --git a/.linux/etc/systemd/system/ath11k-suspend.service b/.linux/etc/systemd/system/ath11k-suspend.service
new file mode 100644
index 0000000..adf0957
--- /dev/null
+++ b/.linux/etc/systemd/system/ath11k-suspend.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Suspend: rmmod ath11k_pci
+Before=sleep.target
+Before=hibernate.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rmmod ath11k_pci
+
+[Install]
+WantedBy=sleep.target
+WantedBy=hibernate.target