diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | r8152-fix-spurious-wakeups-from-s0i3.patch | 36 |
3 files changed, 42 insertions, 0 deletions
@@ -25,6 +25,7 @@ pkgbase = linux-xanmod-rog source = acpi-battery-Always-read-fresh-battery-state-on-update.patch source = hwmon-k10temp-support-Zen3-APUs.patch source = cfg80211-dont-WARN-if-a-self-managed-device.patch + source = r8152-fix-spurious-wakeups-from-s0i3.patch source = asus-wmi-Add-panel-overdrive-functionality.patch source = asus-wmi-Add-dgpu-disable-method.patch source = asus-wmi-Add-egpu-enable-method.patch @@ -63,6 +64,7 @@ pkgbase = linux-xanmod-rog sha256sums = f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90 sha256sums = de8c9747637768c4356c06aa65c3f157c526aa420f21fdd5edd0ed06f720a62e sha256sums = 3d8961438b5c8110588ff0b881d472fc71a4304d306808d78a4055a4150f351e + sha256sums = f47a5a5e329e410a0ae7d46b450707d5575a4deda5b3b58281f5eca14938fb21 sha256sums = 1ab75535772c63567384eb2ac74753e4d5db2f3317cb265aedf6151b9f18c6c2 sha256sums = 8cc771f37ee08ad5796e6db64f180c1415a5f6e03eb3045272dade30ca754b53 sha256sums = f3461e7cc759fd4cef2ec5c4fa15b80fa6d37e16008db223f77ed88a65aa938e @@ -118,6 +118,9 @@ 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" + # ASUS ROG enablement "asus-wmi-Add-panel-overdrive-functionality.patch" # landing in 5.15 "asus-wmi-Add-dgpu-disable-method.patch" # " @@ -168,6 +171,7 @@ sha256sums=('7e068b5e0d26a62b10e5320b25dce57588cbbc6f781c090442138c9c9c3271b2' 'f7a4bf6293912bfc4a20743e58a5a266be8c4dbe3c1862d196d3a3b45f2f7c90' 'de8c9747637768c4356c06aa65c3f157c526aa420f21fdd5edd0ed06f720a62e' '3d8961438b5c8110588ff0b881d472fc71a4304d306808d78a4055a4150f351e' + 'f47a5a5e329e410a0ae7d46b450707d5575a4deda5b3b58281f5eca14938fb21' '1ab75535772c63567384eb2ac74753e4d5db2f3317cb265aedf6151b9f18c6c2' '8cc771f37ee08ad5796e6db64f180c1415a5f6e03eb3045272dade30ca754b53' 'f3461e7cc759fd4cef2ec5c4fa15b80fa6d37e16008db223f77ed88a65aa938e' diff --git a/r8152-fix-spurious-wakeups-from-s0i3.patch b/r8152-fix-spurious-wakeups-from-s0i3.patch new file mode 100644 index 000000000000..ee04c9d62237 --- /dev/null +++ b/r8152-fix-spurious-wakeups-from-s0i3.patch @@ -0,0 +1,36 @@ +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 + |