git.openwrt.org Git - openwrt/staging/xback.git/blob

   1 From b7ed5d5a78fccee96cf8919ac2c7a064c2f4c45b Mon Sep 17 00:00:00 2001
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Mon, 21 Apr 2025 11:25:18 +0200
   4 Subject: [PATCH] r8169: use pci_prepare_to_sleep in rtl_shutdown
   5
   6 Use pci_prepare_to_sleep() like PCI core does in pci_pm_suspend_noirq.
   7 This aligns setting a low-power mode during shutdown with the handling
   8 of the transition to system suspend. Also the transition to runtime
   9 suspend uses pci_target_state() instead of setting D3hot unconditionally.
  10
  11 Note: pci_prepare_to_sleep() uses device_may_wakeup() to check whether
  12       device may generate wakeup events. So we don't lose anything by
  13       not passing tp->saved_wolopts any longer.
  14
  15 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  16 Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
  17 Link: https://patch.msgid.link/f573fdbd-ba6d-41c1-b68f-311d3c88db2c@gmail.com
  18 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  19 ---
  20  drivers/net/ethernet/realtek/r8169_main.c | 6 ++----
  21  1 file changed, 2 insertions(+), 4 deletions(-)
  22
  23 --- a/drivers/net/ethernet/realtek/r8169_main.c
  24 +++ b/drivers/net/ethernet/realtek/r8169_main.c
  25 @@ -5039,10 +5039,8 @@ static void rtl_shutdown(struct pci_dev
  26         /* Restore original MAC address */
  27         rtl_rar_set(tp, tp->dev->perm_addr);
  28
  29 -       if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled) {
  30 -               pci_wake_from_d3(pdev, tp->saved_wolopts);
  31 -               pci_set_power_state(pdev, PCI_D3hot);
  32 -       }
  33 +       if (system_state == SYSTEM_POWER_OFF && !tp->dash_enabled)
  34 +               pci_prepare_to_sleep(pdev);
  35  }
  36
  37  static void rtl_remove_one(struct pci_dev *pdev)