zhao
b34543084f
All checks were successful
target_linux_generic / Update target_linux_generic (openwrt-25.12) (push) Successful in 8s
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From b7ed5d5a78fccee96cf8919ac2c7a064c2f4c45b Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Mon, 21 Apr 2025 11:25:18 +0200
|
|
Subject: [PATCH] r8169: use pci_prepare_to_sleep in rtl_shutdown
|
|
|
|
Use pci_prepare_to_sleep() like PCI core does in pci_pm_suspend_noirq.
|
|
This aligns setting a low-power mode during shutdown with the handling
|
|
of the transition to system suspend. Also the transition to runtime
|
|
suspend uses pci_target_state() instead of setting D3hot unconditionally.
|
|
|
|
Note: pci_prepare_to_sleep() uses device_may_wakeup() to check whether
|
|
device may generate wakeup events. So we don't lose anything by
|
|
not passing tp->saved_wolopts any longer.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
|
|
Link: https://patch.msgid.link/f573fdbd-ba6d-41c1-b68f-311d3c88db2c@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -5037,10 +5037,8 @@ static void rtl_shutdown(struct pci_dev
|
|
/* Restore original MAC address */
|
|
rtl_rar_set(tp, tp->dev->perm_addr);
|
|
|
|
- if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled) {
|
|
- pci_wake_from_d3(pdev, tp->saved_wolopts);
|
|
- pci_set_power_state(pdev, PCI_D3hot);
|
|
- }
|
|
+ if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled)
|
|
+ pci_prepare_to_sleep(pdev);
|
|
}
|
|
|
|
static void rtl_remove_one(struct pci_dev *pdev)
|