diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2019-07-22 10:45:38 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2019-07-22 14:15:17 +0200 |
commit | a63907b3bbb07724d6526b20ae18ad90f351e954 (patch) | |
tree | 8fc98251910be8d12cfbbd387c35ce307cff7acc /package/kernel/mac80211/patches/319-v4.12-0023-brcmfmac-restore-bus-state-when-enter_D3-fails.patch | |
parent | 1592815b2c852da83a8dcc62ffae967b6d7ea9d9 (diff) | |
download | upstream-a63907b3bbb07724d6526b20ae18ad90f351e954.tar.gz upstream-a63907b3bbb07724d6526b20ae18ad90f351e954.tar.bz2 upstream-a63907b3bbb07724d6526b20ae18ad90f351e954.zip |
mac80211: brcmfmac: rename v4.12 patches to allow more backports
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'package/kernel/mac80211/patches/319-v4.12-0023-brcmfmac-restore-bus-state-when-enter_D3-fails.patch')
-rw-r--r-- | package/kernel/mac80211/patches/319-v4.12-0023-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-0023-brcmfmac-restore-bus-state-when-enter_D3-fails.patch b/package/kernel/mac80211/patches/319-v4.12-0023-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-0023-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; + } + |