1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
2 Date: Mon, 8 Jun 2015 16:11:40 +0200
3 Subject: [PATCH] brcmfmac: register wiphy(s) during module_init
5 Content-Type: text/plain; charset=UTF-8
6 Content-Transfer-Encoding: 8bit
8 This is needed by OpenWrt which expects all PHYs to be created after
9 module loads successfully.
11 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
14 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
15 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
16 @@ -1276,6 +1276,7 @@ int __init brcmf_core_init(void)
18 if (!schedule_work(&brcmf_driver_work))
20 + flush_work(&brcmf_driver_work);
24 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
25 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
26 @@ -444,6 +444,7 @@ struct brcmf_fw {
28 void (*done)(struct device *dev, const struct firmware *fw,
29 void *nvram_image, u32 nvram_len);
30 + struct completion *completion;
33 static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
34 @@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done(
37 fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
38 + if (fwctx->completion)
39 + complete(fwctx->completion);
43 @@ -485,6 +488,8 @@ fail:
44 brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
45 release_firmware(fwctx->code);
46 device_release_driver(fwctx->dev);
47 + if (fwctx->completion)
48 + complete(fwctx->completion);
52 @@ -500,6 +505,8 @@ static void brcmf_fw_request_code_done(c
53 /* only requested code so done here */
54 if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
55 fwctx->done(fwctx->dev, fw, NULL, 0);
56 + if (fwctx->completion)
57 + complete(fwctx->completion);
61 @@ -517,6 +524,8 @@ static void brcmf_fw_request_code_done(c
63 brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
64 device_release_driver(fwctx->dev);
65 + if (fwctx->completion)
66 + complete(fwctx->completion);
70 @@ -528,6 +537,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
71 u16 domain_nr, u16 bus_nr)
73 struct brcmf_fw *fwctx;
74 + struct completion completion;
77 brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
79 @@ -548,9 +559,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
80 fwctx->domain_nr = domain_nr;
81 fwctx->bus_nr = bus_nr;
83 - return request_firmware_nowait(THIS_MODULE, true, code, dev,
84 + init_completion(&completion);
85 + fwctx->completion = &completion;
87 + err = request_firmware_nowait(THIS_MODULE, true, code, dev,
89 brcmf_fw_request_code_done);
91 + wait_for_completion_timeout(fwctx->completion,
92 + msecs_to_jiffies(5000));
93 + fwctx->completion = NULL;
97 int brcmf_fw_get_firmwares(struct device *dev, u16 flags,