diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2018-08-16 10:02:41 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2018-08-16 13:07:23 +0200 |
commit | 00b4e65677266b589e40999578b5a47eacc1b06e (patch) | |
tree | b76567d3ef96a6a8537c3e503ec4281245d908af /package/kernel/mac80211/patches/319-v4.12-0005-brcmfmac-restore-bus-state-when-enter_D3-fails.patch | |
parent | f8c364b7204259b379c96f3e04d65ceed0a8fbe7 (diff) | |
download | upstream-00b4e65677266b589e40999578b5a47eacc1b06e.tar.gz upstream-00b4e65677266b589e40999578b5a47eacc1b06e.tar.bz2 upstream-00b4e65677266b589e40999578b5a47eacc1b06e.zip |
mac80211: brcmfmac: backport important changes from the 4.12
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/319-v4.12-0005-brcmfmac-restore-bus-state-when-enter_D3-fails.patch')
-rw-r--r-- | package/kernel/mac80211/patches/319-v4.12-0005-brcmfmac-restore-bus-state-when-enter_D3-fails.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/319-v4.12-0005-brcmfmac-restore-bus-state-when-enter_D3-fails.patch b/package/kernel/mac80211/patches/319-v4.12-0005-brcmfmac-restore-bus-state-when-enter_D3-fails.patch new file mode 100644 index 0000000000..689fcd71fd --- /dev/null +++ b/package/kernel/mac80211/patches/319-v4.12-0005-brcmfmac-restore-bus-state-when-enter_D3-fails.patch @@ -0,0 +1,29 @@ +From 49fe9b59f0e9b750f173fbe44637c436ba1030d2 Mon Sep 17 00:00:00 2001 +From: Arend Van Spriel <arend.vanspriel@broadcom.com> +Date: Tue, 28 Mar 2017 11:43:27 +0100 +Subject: [PATCH] brcmfmac: restore bus state when enter_D3 fails + +In brcmf_pcie_suspend() we inform the firmware on the device that +it will enter in D3 state. Before this is done we already bring down +the bus state. However, When entering D3 fails we abort the suspend +and the bus state need to be restored. + +Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com> +Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> +Reviewed-by: Franky Lin <franky.lin@broadcom.com> +Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> +Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +@@ -1877,6 +1877,7 @@ static int brcmf_pcie_pm_enter_D3(struct + BRCMF_PCIE_MBDATA_TIMEOUT); + if (!devinfo->mbdata_completed) { + brcmf_err("Timeout on response for entering D3 substate\n"); ++ brcmf_bus_change_state(bus, BRCMF_BUS_UP); + return -EIO; + } + |