brcmfmac: correct error handling in brcmf_fws_init()

In brcmf_fws_init() the error flows were not properly handled
and the caller ignored the return value. The only action that
is allowed to fail in brcmf_fws_init() is setting the tlv in
firmware as the feature is not supported on all devices.

Cc: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index a0afef26ac1385cfe258521ab9c2c6a52519144c..59c25463e4285e620aab84d31cfb9c4ed9b7ced1 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -899,7 +899,10 @@ int brcmf_bus_start(struct device *dev)
                goto fail;
 
        drvr->fw_signals = true;
-       (void)brcmf_fws_init(drvr);
+       ret = brcmf_fws_init(drvr);
+       if (ret < 0)
+               goto fail;
+
        brcmf_fws_add_interface(ifp);
 
        drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev);

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
index b0591e3da49aabdbbb0460cada2085ba708c5e85..f9153b115dcfd1ed5c3a9b79c02b940f0c16f1dd 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1897,16 +1897,20 @@ int brcmf_fws_init(struct brcmf_pub *drvr)
                       BRCMF_FWS_FLAGS_CREDIT_STATUS_SIGNALS |
                       BRCMF_FWS_FLAGS_HOST_PROPTXSTATUS_ACTIVE;
 
-       rc = brcmf_fil_iovar_int_set(drvr->iflist[0], "tlv", tlv);
+       rc = brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
+                                brcmf_fws_notify_credit_map);
        if (rc < 0) {
-               brcmf_err("failed to set bdcv2 tlv signaling\n");
+               brcmf_err("register credit map handler failed\n");
                goto fail;
        }
 
-       if (brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
-                               brcmf_fws_notify_credit_map)) {
-               brcmf_err("register credit map handler failed\n");
-               goto fail;
+       /* setting the iovar may fail if feature is unsupported
+        * so leave the rc as is so driver initialization can
+        * continue.
+        */
+       if (brcmf_fil_iovar_int_set(drvr->iflist[0], "tlv", tlv)) {
+               brcmf_err("failed to set bdcv2 tlv signaling\n");
+               goto fail_event;
        }
 
        brcmf_fws_hanger_init(&drvr->fws->hanger);
@@ -1922,9 +1926,9 @@ int brcmf_fws_init(struct brcmf_pub *drvr)
                  drvr->fw_signals ? "enabled" : "disabled", tlv);
        return 0;
 
+fail_event:
+       brcmf_fweh_unregister(drvr, BRCMF_E_FIFO_CREDIT_MAP);
 fail:
-       /* disable flow control entirely */
-       drvr->fw_signals = false;
        brcmf_fws_deinit(drvr);
        return rc;
 }
@@ -1937,6 +1941,14 @@ void brcmf_fws_deinit(struct brcmf_pub *drvr)
        if (!fws)
                return;
 
+       /* disable firmware signalling entirely
+        * to avoid using the workqueue.
+        */
+       drvr->fw_signals = false;
+
+       if (drvr->fws->fws_wq)
+               destroy_workqueue(drvr->fws->fws_wq);
+
        /* cleanup */
        brcmf_fws_lock(drvr, flags);
        brcmf_fws_cleanup(fws, -1);