shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "PCI: rockchip: dw: remove wakeup if attached device is down"

Browse Source 
This reverts commit e15707617c.

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 <shawn.lin@rock-chips.com>
Change-Id: I9f0467a7403c1f18820a89ae4707d3bd469910a6
This commit is contained in:
Shawn Lin
2024-11-11 10:54:31 +08:00
parent 2cf096b707
commit 6b66ee40d9
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/pci/controller/dwc/pcie-dw-rockchip.c
View File

@@ -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;