aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--r8152-fix-spurious-wakeups-from-s0i3.patch36
3 files changed, 0 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b2c36dedcb39..981e77213db1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -27,7 +27,6 @@ pkgbase = linux-xanmod-rog
source = acpi-battery-Always-read-fresh-battery-state-on-update.patch
source = x86-change-default-to-spec_store_bypass_disable-prct.patch
source = cfg80211-dont-WARN-if-a-self-managed-device.patch
- source = r8152-fix-spurious-wakeups-from-s0i3.patch
source = iwlwifi-next-patches-through-2020-11-08-5.15.3.patch
source = HID-asus-Reduce-object-size-by-consolidating-calls.patch
source = v16-asus-wmi-Add-support-for-custom-fan-curves.patch
@@ -55,7 +54,6 @@ pkgbase = linux-xanmod-rog
sha256sums = f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90
sha256sums = cc401107f1bf7b7d8e8a78ee594f9db4b6fa252b7239b6aa88f678aef84d935c
sha256sums = 3d8961438b5c8110588ff0b881d472fc71a4304d306808d78a4055a4150f351e
- sha256sums = f47a5a5e329e410a0ae7d46b450707d5575a4deda5b3b58281f5eca14938fb21
sha256sums = b12a5bb789e4c854617ca3c7405fcc3121457ddb6564c8f758edfe4633cf24bd
sha256sums = 544464bf0807b324120767d55867f03014a9fda4e1804768ca341be902d7ade4
sha256sums = 0c422d8f420c1518aab1b980c6cdb6e029a4fa9cde1fd99a63670bb105a44f36
diff --git a/PKGBUILD b/PKGBUILD
index 8738040a6203..caa7656e7c3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -144,9 +144,6 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar
# -- squelch overzealous 802.11 regdomain not set warnings
"cfg80211-dont-WARN-if-a-self-managed-device.patch"
- # -- r8152 s0i3 wake fix
- "r8152-fix-spurious-wakeups-from-s0i3.patch"
-
# 5.15: r8169 hwIDs for the G14?/G15
# cherry-picked iwlwifi patches from -next
@@ -187,7 +184,6 @@ sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8'
'f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90'
'cc401107f1bf7b7d8e8a78ee594f9db4b6fa252b7239b6aa88f678aef84d935c'
'3d8961438b5c8110588ff0b881d472fc71a4304d306808d78a4055a4150f351e'
- 'f47a5a5e329e410a0ae7d46b450707d5575a4deda5b3b58281f5eca14938fb21'
'b12a5bb789e4c854617ca3c7405fcc3121457ddb6564c8f758edfe4633cf24bd'
'544464bf0807b324120767d55867f03014a9fda4e1804768ca341be902d7ade4'
'0c422d8f420c1518aab1b980c6cdb6e029a4fa9cde1fd99a63670bb105a44f36'
diff --git a/r8152-fix-spurious-wakeups-from-s0i3.patch b/r8152-fix-spurious-wakeups-from-s0i3.patch
deleted file mode 100644
index ee04c9d62237..000000000000
--- a/r8152-fix-spurious-wakeups-from-s0i3.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 34dd4f5dfe9291045cb4a847704debb9b89b4afa Mon Sep 17 00:00:00 2001
-From: Mario Limonciello <mario.limonciello@amd.com>
-Date: Thu, 28 Oct 2021 11:54:01 -0500
-Subject: [PATCH] r8152: fix spurious wakeups from s0i3
-
-When an r8152 supported network controller enters runtime suspend
-it's configured that phy activity will wake up. This makes sense
-for system runtime, but if programmed across s0i3 such an interrupt
-leads to waking the system.
-
-To prevent this from happening rewrite wakeup registers to those
-that were saved which if the user didn't intentionally program
-phy wakeup will solve the spurious events.
-
-Reported-by: Matthias Hensler <cubbi@cubbi.de>
-Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
----
- drivers/net/usb/r8152.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
-index 79832374f78d..34f09dd730ad 100644
---- a/drivers/net/usb/r8152.c
-+++ b/drivers/net/usb/r8152.c
-@@ -8425,6 +8425,8 @@ static int rtl8152_system_suspend(struct r8152 *tp)
- napi_enable(napi);
- tasklet_enable(&tp->tx_tl);
- }
-+ if (!pm_suspend_via_firmware() && tp->rtl_ops.autosuspend_en)
-+ tp->rtl_ops.autosuspend_en(tp, false);
-
- return 0;
- }
---
-2.25.1
-