From 6b66ee40d96dd7fbadc27d9426ffaf962cdac970 Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Mon, 11 Nov 2024 10:54:31 +0800 Subject: [PATCH] Revert "PCI: rockchip: dw: remove wakeup if attached device is down" This reverts commit e15707617c807e82a706dfdd2240c83d62f2634e. This need the system to rmmod wireless ko before suspend, otherwise even if the power is down but removing wakeup will call the sub-device driver to broadcast this uevent to the userspace which prevent the system from into suspend. Whether to rmmod wireless driver is system depend, so revert this commit. Signed-off-by: Shawn Lin Change-Id: I9f0467a7403c1f18820a89ae4707d3bd469910a6 --- drivers/pci/controller/dwc/pcie-dw-rockchip.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/pci/controller/dwc/pcie-dw-rockchip.c b/drivers/pci/controller/dwc/pcie-dw-rockchip.c index c6421475bdb2..ba43751b3056 100644 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@ -1677,8 +1677,7 @@ static int rk_pcie_really_probe(void *p) dw_pcie_dbi_ro_wr_dis(pci); /* 7. framework misc settings */ - if (rk_pcie->skip_scan_in_resume) - device_init_wakeup(dev, true); + device_init_wakeup(dev, true); device_enable_async_suspend(dev); /* Enable async system PM for multiports SoC */ rk_pcie->finish_probe = true; @@ -1914,10 +1913,8 @@ static int __maybe_unused rockchip_dw_pcie_suspend(struct device *dev) */ if (rk_pcie->skip_scan_in_resume) { rfkill_get_wifi_power_state(&power); - if (!power) { - device_init_wakeup(dev, false); + if (!power) goto no_l2; - } } /* 2. Broadcast PME_Turn_Off Message */ @@ -2005,8 +2002,6 @@ static int __maybe_unused rockchip_dw_pcie_resume(struct device *dev) dw_pcie_dbi_ro_wr_dis(pci); rk_pcie->in_suspend = false; - if (rk_pcie->skip_scan_in_resume) - device_init_wakeup(dev, true); return 0;