diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-06-30 03:29:30 +0000 |
---|---|---|
committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2023-06-30 03:29:30 +0000 |
commit | 3f1ba7725ff4d24e928272d98ec31d0e1c93cca6 (patch) | |
tree | 85d1182c78852bcc8f20d14cefccbe6b5f2e367c | |
parent | 6d72fc17941bdb01220205751fd913c5127cd615 (diff) | |
parent | e3f2b12a058bed9ad4effc2bcd4474ce32d4e4bb (diff) | |
download | bcm4398-3f1ba7725ff4d24e928272d98ec31d0e1c93cca6.tar.gz |
Merge "Revert "DHD: 4398 - Disable L1SS before D3 inform during suspend"" into android14-gs-pixel-5.15-udc-d1
-rw-r--r-- | dhd_pcie.c | 21 | ||||
-rw-r--r-- | dhd_pcie_linux.c | 1 |
2 files changed, 1 insertions, 21 deletions
@@ -11277,13 +11277,7 @@ dhdpcie_bus_suspend(struct dhd_bus *bus, bool state) d3_read_retry++; } } -#else /* DHD_PCIE_NATIVE_RUNTIMEPM */ - /* - * Disable L1ss on EP and RC side before doing D3 - */ - DHD_PRINT(("%s: disable L1SS during suspend, before D3 inform\n", __func__)); - dhd_plat_l1ss_ctrl(0); - +#else DHD_OS_WAKE_LOCK_WAIVE(bus->dhd); #ifdef DHD_TIMESYNC /* disable time sync mechanism, if configed */ @@ -11301,22 +11295,15 @@ dhdpcie_bus_suspend(struct dhd_bus *bus, bool state) #if defined(PCIE_OOB) || defined(PCIE_INB_DW) DHD_BUS_INB_DW_LOCK(bus->inb_lock, flags); - DHD_PRINT(("%s: Before DW_ASSERT inband_dw_state:%d\n", - __FUNCTION__, dhdpcie_bus_get_pcie_inband_dw_state(bus))); if (dhdpcie_bus_get_pcie_inband_dw_state(bus) == DW_DEVICE_DS_DISABLED_WAIT) { DHD_BUS_INB_DW_UNLOCK(bus->inb_lock, flags); DHD_ERROR(("Waiting for DS-Exit, abort suspend\n")); rc = BCME_ERROR; - dhd_plat_l1ss_ctrl(1); goto fail; } DHD_BUS_INB_DW_UNLOCK(bus->inb_lock, flags); dhd_bus_set_device_wake(bus, TRUE, __FUNCTION__); - DHD_BUS_INB_DW_LOCK(bus->inb_lock, flags); - DHD_PRINT(("%s: After DW_ASSERT inband_dw_state:%d\n", - __FUNCTION__, dhdpcie_bus_get_pcie_inband_dw_state(bus))); - DHD_BUS_INB_DW_UNLOCK(bus->inb_lock, flags); #endif /* defined(PCIE_OOB) || defined(PCIE_INB_DW) */ #ifdef PCIE_OOB bus->oob_presuspend = TRUE; @@ -11350,11 +11337,7 @@ dhdpcie_bus_suspend(struct dhd_bus *bus, bool state) #ifdef PCIE_INB_DW if (INBAND_DW_ENAB(bus)) { DHD_BUS_INB_DW_LOCK(bus->inb_lock, flags); - DHD_PRINT(("%s: Before D3_INFORM inband_dw_state:%d\n", - __FUNCTION__, dhdpcie_bus_get_pcie_inband_dw_state(bus))); dhdpcie_send_mb_data(bus, H2D_HOST_D3_INFORM, __FUNCTION__); - DHD_PRINT(("%s: After D3_INFORM inband_dw_state:%d\n", - __FUNCTION__, dhdpcie_bus_get_pcie_inband_dw_state(bus))); DHD_BUS_INB_DW_UNLOCK(bus->inb_lock, flags); } else #endif /* PCIE_INB_DW */ @@ -11410,8 +11393,6 @@ dhdpcie_bus_suspend(struct dhd_bus *bus, bool state) DHD_ERROR(("%s():Suspend failed because of wakelock" "restoring Dongle to D0\n", __FUNCTION__)); - dhd_plat_l1ss_ctrl(1); - if (bus->dhd->dhd_watchdog_ms_backup) { DHD_PRINT(("%s: Enabling wdtick due to wakelock active\n", __FUNCTION__)); diff --git a/dhd_pcie_linux.c b/dhd_pcie_linux.c index a0a4cf0..5a625ef 100644 --- a/dhd_pcie_linux.c +++ b/dhd_pcie_linux.c @@ -1398,7 +1398,6 @@ static int dhdpcie_resume_dev(struct pci_dev *dev) * Re-enable L1ss in Resume path. Implementation defalts to NOP * If need override in the paltform file */ - DHD_PRINT(("%s: enable L1SS during resume\n", __func__)); dhd_plat_l1ss_ctrl(1); |