projects / openwrt / staging / jogo.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
mac80211: brcmfmac: backport 5.0 & 5.1 important changes/fixes
[openwrt/staging/jogo.git] / package / kernel / mac80211 / patches / 339-v5.1-0009-brcmfmac-use-bphy_err-in-all-wiphy-related-code.patch
1 From dcb1471bc6d0541d636c7ecd9239573304842884 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Tue, 19 Feb 2019 23:42:19 +0100
4 Subject: [PATCH] brcmfmac: use bphy_err() in all wiphy-related code
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 This recently added macro provides more meaningful error messages thanks
10 to identifying a specific wiphy. It's especially important on systems
11 with few cards supported by the same (brcmfmac) driver.
12
13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
14 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
16 ---
17 .../broadcom/brcm80211/brcmfmac/bcdc.c | 22 ++---
18 .../broadcom/brcm80211/brcmfmac/common.c | 39 ++++----
19 .../broadcom/brcm80211/brcmfmac/core.c | 74 ++++++++--------
20 .../broadcom/brcm80211/brcmfmac/feature.c | 8 +-
21 .../broadcom/brcm80211/brcmfmac/fweh.c | 25 +++---
22 .../broadcom/brcm80211/brcmfmac/fwil.c | 10 +--
23 .../broadcom/brcm80211/brcmfmac/fwsignal.c | 38 ++++----
24 .../broadcom/brcm80211/brcmfmac/msgbuf.c | 65 ++++++++------
25 .../broadcom/brcm80211/brcmfmac/p2p.c | 88 +++++++++++--------
26 .../broadcom/brcm80211/brcmfmac/pno.c | 22 +++--
27 .../broadcom/brcm80211/brcmfmac/proto.c | 6 +-
28 11 files changed, 224 insertions(+), 173 deletions(-)
29
30 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
31 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
32 @@ -169,8 +169,8 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf
33
34 ret = brcmf_proto_bcdc_msg(drvr, ifidx, cmd, buf, len, false);
35 if (ret < 0) {
36 - brcmf_err("brcmf_proto_bcdc_msg failed w/status %d\n",
37 - ret);
38 + bphy_err(drvr, "brcmf_proto_bcdc_msg failed w/status %d\n",
39 + ret);
40 goto done;
41 }
42
43 @@ -186,9 +186,9 @@ retry:
44 if ((id < bcdc->reqid) && (++retries < RETRIES))
45 goto retry;
46 if (id != bcdc->reqid) {
47 - brcmf_err("%s: unexpected request id %d (expected %d)\n",
48 - brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
49 - bcdc->reqid);
50 + bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",
51 + brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
52 + bcdc->reqid);
53 ret = -EINVAL;
54 goto done;
55 }
56 @@ -234,9 +234,9 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_p
57 id = (flags & BCDC_DCMD_ID_MASK) >> BCDC_DCMD_ID_SHIFT;
58
59 if (id != bcdc->reqid) {
60 - brcmf_err("%s: unexpected request id %d (expected %d)\n",
61 - brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
62 - bcdc->reqid);
63 + bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",
64 + brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
65 + bcdc->reqid);
66 ret = -EINVAL;
67 goto done;
68 }
69 @@ -299,8 +299,8 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pu
70 }
71 if (((h->flags & BCDC_FLAG_VER_MASK) >> BCDC_FLAG_VER_SHIFT) !=
72 BCDC_PROTO_VER) {
73 - brcmf_err("%s: non-BCDC packet received, flags 0x%x\n",
74 - brcmf_ifname(tmp_if), h->flags);
75 + bphy_err(drvr, "%s: non-BCDC packet received, flags 0x%x\n",
76 + brcmf_ifname(tmp_if), h->flags);
77 return -EBADE;
78 }
79
80 @@ -379,7 +379,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
81
82 /* ensure that the msg buf directly follows the cdc msg struct */
83 if ((unsigned long)(&bcdc->msg + 1) != (unsigned long)bcdc->buf) {
84 - brcmf_err("struct brcmf_proto_bcdc is not correctly defined\n");
85 + bphy_err(drvr, "struct brcmf_proto_bcdc is not correctly defined\n");
86 goto fail;
87 }
88
89 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
90 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
91 @@ -89,6 +89,7 @@ struct brcmf_mp_global_t brcmf_mp_global
92
93 void brcmf_c_set_joinpref_default(struct brcmf_if *ifp)
94 {
95 + struct brcmf_pub *drvr = ifp->drvr;
96 struct brcmf_join_pref_params join_pref_params[2];
97 int err;
98
99 @@ -105,11 +106,12 @@ void brcmf_c_set_joinpref_default(struct
100 err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
101 sizeof(join_pref_params));
102 if (err)
103 - brcmf_err("Set join_pref error (%d)\n", err);
104 + bphy_err(drvr, "Set join_pref error (%d)\n", err);
105 }
106
107 int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
108 {
109 + struct brcmf_pub *drvr = ifp->drvr;
110 s8 eventmask[BRCMF_EVENTING_MASK_LEN];
111 u8 buf[BRCMF_DCMD_SMLEN];
112 struct brcmf_rev_info_le revinfo;
113 @@ -121,7 +123,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
114 err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,
115 sizeof(ifp->mac_addr));
116 if (err < 0) {
117 - brcmf_err("Retrieving cur_etheraddr failed, %d\n", err);
118 + bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);
119 goto done;
120 }
121 memcpy(ifp->drvr->wiphy->perm_addr, ifp->drvr->mac, ETH_ALEN);
122 @@ -131,7 +133,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
123 &revinfo, sizeof(revinfo));
124 ri = &ifp->drvr->revinfo;
125 if (err < 0) {
126 - brcmf_err("retrieving revision info failed, %d\n", err);
127 + bphy_err(drvr, "retrieving revision info failed, %d\n", err);
128 } else {
129 ri->vendorid = le32_to_cpu(revinfo.vendorid);
130 ri->deviceid = le32_to_cpu(revinfo.deviceid);
131 @@ -158,8 +160,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
132 strcpy(buf, "ver");
133 err = brcmf_fil_iovar_data_get(ifp, "ver", buf, sizeof(buf));
134 if (err < 0) {
135 - brcmf_err("Retrieving version information failed, %d\n",
136 - err);
137 + bphy_err(drvr, "Retrieving version information failed, %d\n",
138 + err);
139 goto done;
140 }
141 ptr = (char *)buf;
142 @@ -175,7 +177,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
143 /* set mpc */
144 err = brcmf_fil_iovar_int_set(ifp, "mpc", 1);
145 if (err) {
146 - brcmf_err("failed setting mpc\n");
147 + bphy_err(drvr, "failed setting mpc\n");
148 goto done;
149 }
150
151 @@ -185,14 +187,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
152 err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,
153 BRCMF_EVENTING_MASK_LEN);
154 if (err) {
155 - brcmf_err("Get event_msgs error (%d)\n", err);
156 + bphy_err(drvr, "Get event_msgs error (%d)\n", err);
157 goto done;
158 }
159 setbit(eventmask, BRCMF_E_IF);
160 err = brcmf_fil_iovar_data_set(ifp, "event_msgs", eventmask,
161 BRCMF_EVENTING_MASK_LEN);
162 if (err) {
163 - brcmf_err("Set event_msgs error (%d)\n", err);
164 + bphy_err(drvr, "Set event_msgs error (%d)\n", err);
165 goto done;
166 }
167
168 @@ -200,8 +202,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
169 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
170 BRCMF_DEFAULT_SCAN_CHANNEL_TIME);
171 if (err) {
172 - brcmf_err("BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",
173 - err);
174 + bphy_err(drvr, "BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",
175 + err);
176 goto done;
177 }
178
179 @@ -209,8 +211,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
180 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
181 BRCMF_DEFAULT_SCAN_UNASSOC_TIME);
182 if (err) {
183 - brcmf_err("BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",
184 - err);
185 + bphy_err(drvr, "BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",
186 + err);
187 goto done;
188 }
189
190 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
191 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
192 @@ -90,7 +90,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
193 s32 bsscfgidx;
194
195 if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {
196 - brcmf_err("ifidx %d out of range\n", ifidx);
197 + bphy_err(drvr, "ifidx %d out of range\n", ifidx);
198 return NULL;
199 }
200
201 @@ -104,7 +104,9 @@ struct brcmf_if *brcmf_get_ifp(struct br
202
203 static void _brcmf_set_multicast_list(struct work_struct *work)
204 {
205 - struct brcmf_if *ifp;
206 + struct brcmf_if *ifp = container_of(work, struct brcmf_if,
207 + multicast_work);
208 + struct brcmf_pub *drvr = ifp->drvr;
209 struct net_device *ndev;
210 struct netdev_hw_addr *ha;
211 u32 cmd_value, cnt;
212 @@ -113,8 +115,6 @@ static void _brcmf_set_multicast_list(st
213 u32 buflen;
214 s32 err;
215
216 - ifp = container_of(work, struct brcmf_if, multicast_work);
217 -
218 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
219
220 ndev = ifp->ndev;
221 @@ -144,7 +144,7 @@ static void _brcmf_set_multicast_list(st
222
223 err = brcmf_fil_iovar_data_set(ifp, "mcast_list", buf, buflen);
224 if (err < 0) {
225 - brcmf_err("Setting mcast_list failed, %d\n", err);
226 + bphy_err(drvr, "Setting mcast_list failed, %d\n", err);
227 cmd_value = cnt ? true : cmd_value;
228 }
229
230 @@ -157,24 +157,24 @@ static void _brcmf_set_multicast_list(st
231 */
232 err = brcmf_fil_iovar_int_set(ifp, "allmulti", cmd_value);
233 if (err < 0)
234 - brcmf_err("Setting allmulti failed, %d\n", err);
235 + bphy_err(drvr, "Setting allmulti failed, %d\n", err);
236
237 /*Finally, pick up the PROMISC flag */
238 cmd_value = (ndev->flags & IFF_PROMISC) ? true : false;
239 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PROMISC, cmd_value);
240 if (err < 0)
241 - brcmf_err("Setting BRCMF_C_SET_PROMISC failed, %d\n",
242 - err);
243 + bphy_err(drvr, "Setting BRCMF_C_SET_PROMISC failed, %d\n",
244 + err);
245 }
246
247 #if IS_ENABLED(CONFIG_IPV6)
248 static void _brcmf_update_ndtable(struct work_struct *work)
249 {
250 - struct brcmf_if *ifp;
251 + struct brcmf_if *ifp = container_of(work, struct brcmf_if,
252 + ndoffload_work);
253 + struct brcmf_pub *drvr = ifp->drvr;
254 int i, ret;
255
256 - ifp = container_of(work, struct brcmf_if, ndoffload_work);
257 -
258 /* clear the table in firmware */
259 ret = brcmf_fil_iovar_data_set(ifp, "nd_hostip_clear", NULL, 0);
260 if (ret) {
261 @@ -187,7 +187,7 @@ static void _brcmf_update_ndtable(struct
262 &ifp->ipv6_addr_tbl[i],
263 sizeof(struct in6_addr));
264 if (ret)
265 - brcmf_err("add nd ip err %d\n", ret);
266 + bphy_err(drvr, "add nd ip err %d\n", ret);
267 }
268 }
269 #else
270 @@ -200,6 +200,7 @@ static int brcmf_netdev_set_mac_address(
271 {
272 struct brcmf_if *ifp = netdev_priv(ndev);
273 struct sockaddr *sa = (struct sockaddr *)addr;
274 + struct brcmf_pub *drvr = ifp->drvr;
275 int err;
276
277 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
278 @@ -207,7 +208,7 @@ static int brcmf_netdev_set_mac_address(
279 err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa->sa_data,
280 ETH_ALEN);
281 if (err < 0) {
282 - brcmf_err("Setting cur_etheraddr failed, %d\n", err);
283 + bphy_err(drvr, "Setting cur_etheraddr failed, %d\n", err);
284 } else {
285 brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
286 memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
287 @@ -266,7 +267,7 @@ static netdev_tx_t brcmf_netdev_start_xm
288
289 /* Can the device send data? */
290 if (drvr->bus_if->state != BRCMF_BUS_UP) {
291 - brcmf_err("xmit rejected state=%d\n", drvr->bus_if->state);
292 + bphy_err(drvr, "xmit rejected state=%d\n", drvr->bus_if->state);
293 netif_stop_queue(ndev);
294 dev_kfree_skb(skb);
295 ret = -ENODEV;
296 @@ -604,7 +605,7 @@ static int brcmf_netdev_open(struct net_
297
298 /* If bus is not ready, can't continue */
299 if (bus_if->state != BRCMF_BUS_UP) {
300 - brcmf_err("failed bus is not ready\n");
301 + bphy_err(drvr, "failed bus is not ready\n");
302 return -EAGAIN;
303 }
304
305 @@ -618,7 +619,7 @@ static int brcmf_netdev_open(struct net_
306 ndev->features &= ~NETIF_F_IP_CSUM;
307
308 if (brcmf_cfg80211_up(ndev)) {
309 - brcmf_err("failed to bring up cfg80211\n");
310 + bphy_err(drvr, "failed to bring up cfg80211\n");
311 return -EIO;
312 }
313
314 @@ -663,7 +664,7 @@ int brcmf_net_attach(struct brcmf_if *if
315 else
316 err = register_netdev(ndev);
317 if (err != 0) {
318 - brcmf_err("couldn't register the net device\n");
319 + bphy_err(drvr, "couldn't register the net device\n");
320 goto fail;
321 }
322
323 @@ -739,6 +740,7 @@ static const struct net_device_ops brcmf
324
325 static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
326 {
327 + struct brcmf_pub *drvr = ifp->drvr;
328 struct net_device *ndev;
329
330 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d mac=%pM\n", ifp->bsscfgidx,
331 @@ -751,7 +753,7 @@ static int brcmf_net_p2p_attach(struct b
332 memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
333
334 if (register_netdev(ndev) != 0) {
335 - brcmf_err("couldn't register the p2p net device\n");
336 + bphy_err(drvr, "couldn't register the p2p net device\n");
337 goto fail;
338 }
339
340 @@ -781,8 +783,8 @@ struct brcmf_if *brcmf_add_if(struct brc
341 */
342 if (ifp) {
343 if (ifidx) {
344 - brcmf_err("ERROR: netdev:%s already exists\n",
345 - ifp->ndev->name);
346 + bphy_err(drvr, "ERROR: netdev:%s already exists\n",
347 + ifp->ndev->name);
348 netif_stop_queue(ifp->ndev);
349 brcmf_net_detach(ifp->ndev, false);
350 drvr->iflist[bsscfgidx] = NULL;
351 @@ -840,7 +842,7 @@ static void brcmf_del_if(struct brcmf_pu
352 ifp = drvr->iflist[bsscfgidx];
353 drvr->iflist[bsscfgidx] = NULL;
354 if (!ifp) {
355 - brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx);
356 + bphy_err(drvr, "Null interface, bsscfgidx=%d\n", bsscfgidx);
357 return;
358 }
359 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,
360 @@ -890,16 +892,17 @@ static int brcmf_psm_watchdog_notify(str
361 const struct brcmf_event_msg *evtmsg,
362 void *data)
363 {
364 + struct brcmf_pub *drvr = ifp->drvr;
365 int err;
366
367 brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
368
369 - brcmf_err("PSM's watchdog has fired!\n");
370 + bphy_err(drvr, "PSM's watchdog has fired!\n");
371
372 err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
373 evtmsg->datalen);
374 if (err)
375 - brcmf_err("Failed to get memory dump, %d\n", err);
376 + bphy_err(drvr, "Failed to get memory dump, %d\n", err);
377
378 return err;
379 }
380 @@ -943,7 +946,7 @@ static int brcmf_inetaddr_changed(struct
381 ret = brcmf_fil_iovar_data_get(ifp, "arp_hostip", addr_table,
382 sizeof(addr_table));
383 if (ret) {
384 - brcmf_err("fail to get arp ip table err:%d\n", ret);
385 + bphy_err(drvr, "fail to get arp ip table err:%d\n", ret);
386 return NOTIFY_OK;
387 }
388
389 @@ -960,7 +963,7 @@ static int brcmf_inetaddr_changed(struct
390 ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip",
391 &ifa->ifa_address, sizeof(ifa->ifa_address));
392 if (ret)
393 - brcmf_err("add arp ip err %d\n", ret);
394 + bphy_err(drvr, "add arp ip err %d\n", ret);
395 }
396 break;
397 case NETDEV_DOWN:
398 @@ -972,8 +975,8 @@ static int brcmf_inetaddr_changed(struct
399 ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip_clear",
400 NULL, 0);
401 if (ret) {
402 - brcmf_err("fail to clear arp ip table err:%d\n",
403 - ret);
404 + bphy_err(drvr, "fail to clear arp ip table err:%d\n",
405 + ret);
406 return NOTIFY_OK;
407 }
408 for (i = 0; i < ARPOL_MAX_ENTRIES; i++) {
409 @@ -983,8 +986,8 @@ static int brcmf_inetaddr_changed(struct
410 &addr_table[i],
411 sizeof(addr_table[i]));
412 if (ret)
413 - brcmf_err("add arp ip err %d\n",
414 - ret);
415 + bphy_err(drvr, "add arp ip err %d\n",
416 + ret);
417 }
418 }
419 break;
420 @@ -1161,7 +1164,7 @@ int brcmf_bus_started(struct device *dev
421 return 0;
422
423 fail:
424 - brcmf_err("failed: %d\n", ret);
425 + bphy_err(drvr, "failed: %d\n", ret);
426 if (drvr->config) {
427 brcmf_cfg80211_detach(drvr->config);
428 drvr->config = NULL;
429 @@ -1220,7 +1223,7 @@ int brcmf_attach(struct device *dev, str
430 /* Attach and link in the protocol */
431 ret = brcmf_proto_attach(drvr);
432 if (ret != 0) {
433 - brcmf_err("brcmf_prot_attach failed\n");
434 + bphy_err(drvr, "brcmf_prot_attach failed\n");
435 goto fail;
436 }
437
438 @@ -1330,6 +1333,7 @@ static int brcmf_get_pend_8021x_cnt(stru
439
440 int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)
441 {
442 + struct brcmf_pub *drvr = ifp->drvr;
443 int err;
444
445 err = wait_event_timeout(ifp->pend_8021x_wait,
446 @@ -1337,7 +1341,7 @@ int brcmf_netdev_wait_pend8021x(struct b
447 MAX_WAIT_FOR_8021X_TX);
448
449 if (!err)
450 - brcmf_err("Timed out waiting for no pending 802.1x packets\n");
451 + bphy_err(drvr, "Timed out waiting for no pending 802.1x packets\n");
452
453 return !err;
454 }
455 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
456 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
457 @@ -158,13 +158,14 @@ static void brcmf_feat_iovar_int_get(str
458 #define MAX_CAPS_BUFFER_SIZE 768
459 static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp)
460 {
461 + struct brcmf_pub *drvr = ifp->drvr;
462 char caps[MAX_CAPS_BUFFER_SIZE];
463 enum brcmf_feat_id id;
464 int i, err;
465
466 err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
467 if (err) {
468 - brcmf_err("could not get firmware cap (%d)\n", err);
469 + bphy_err(drvr, "could not get firmware cap (%d)\n", err);
470 return;
471 }
472
473 @@ -189,14 +190,15 @@ static void brcmf_feat_firmware_capabili
474 static int brcmf_feat_fwcap_debugfs_read(struct seq_file *seq, void *data)
475 {
476 struct brcmf_bus *bus_if = dev_get_drvdata(seq->private);
477 - struct brcmf_if *ifp = brcmf_get_ifp(bus_if->drvr, 0);
478 + struct brcmf_pub *drvr = bus_if->drvr;
479 + struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
480 char caps[MAX_CAPS_BUFFER_SIZE + 1] = { };
481 char *tmp;
482 int err;
483
484 err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
485 if (err) {
486 - brcmf_err("could not get firmware cap (%d)\n", err);
487 + bphy_err(drvr, "could not get firmware cap (%d)\n", err);
488 return err;
489 }
490
491 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
492 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
493 @@ -102,7 +102,8 @@ static void brcmf_fweh_queue_event(struc
494 schedule_work(&fweh->event_work);
495 }
496
497 -static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
498 +static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,
499 + struct brcmf_if *ifp,
500 enum brcmf_fweh_event_code code,
501 struct brcmf_event_msg *emsg,
502 void *data)
503 @@ -117,9 +118,9 @@ static int brcmf_fweh_call_event_handler
504 if (fweh->evt_handler[code])
505 err = fweh->evt_handler[code](ifp, emsg, data);
506 else
507 - brcmf_err("unhandled event %d ignored\n", code);
508 + bphy_err(drvr, "unhandled event %d ignored\n", code);
509 } else {
510 - brcmf_err("no interface object\n");
511 + bphy_err(drvr, "no interface object\n");
512 }
513 return err;
514 }
515 @@ -158,7 +159,7 @@ static void brcmf_fweh_handle_if_event(s
516 return;
517 }
518 if (ifevent->ifidx >= BRCMF_MAX_IFS) {
519 - brcmf_err("invalid interface index: %u\n", ifevent->ifidx);
520 + bphy_err(drvr, "invalid interface index: %u\n", ifevent->ifidx);
521 return;
522 }
523
524 @@ -181,7 +182,8 @@ static void brcmf_fweh_handle_if_event(s
525 if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)
526 brcmf_fws_reset_interface(ifp);
527
528 - err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
529 + err = brcmf_fweh_call_event_handler(drvr, ifp, emsg->event_code, emsg,
530 + data);
531
532 if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
533 bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
534 @@ -273,11 +275,11 @@ static void brcmf_fweh_event_worker(stru
535 ifp = drvr->iflist[0];
536 else
537 ifp = drvr->iflist[emsg.bsscfgidx];
538 - err = brcmf_fweh_call_event_handler(ifp, event->code, &emsg,
539 - event->data);
540 + err = brcmf_fweh_call_event_handler(drvr, ifp, event->code,
541 + &emsg, event->data);
542 if (err) {
543 - brcmf_err("event handler failed (%d)\n",
544 - event->code);
545 + bphy_err(drvr, "event handler failed (%d)\n",
546 + event->code);
547 err = 0;
548 }
549 event_free:
550 @@ -344,7 +346,7 @@ int brcmf_fweh_register(struct brcmf_pub
551 brcmf_fweh_handler_t handler)
552 {
553 if (drvr->fweh.evt_handler[code]) {
554 - brcmf_err("event code %d already registered\n", code);
555 + bphy_err(drvr, "event code %d already registered\n", code);
556 return -ENOSPC;
557 }
558 drvr->fweh.evt_handler[code] = handler;
559 @@ -374,6 +376,7 @@ void brcmf_fweh_unregister(struct brcmf_
560 */
561 int brcmf_fweh_activate_events(struct brcmf_if *ifp)
562 {
563 + struct brcmf_pub *drvr = ifp->drvr;
564 int i, err;
565 s8 eventmask[BRCMF_EVENTING_MASK_LEN];
566
567 @@ -393,7 +396,7 @@ int brcmf_fweh_activate_events(struct br
568 err = brcmf_fil_iovar_data_set(ifp, "event_msgs",
569 eventmask, BRCMF_EVENTING_MASK_LEN);
570 if (err)
571 - brcmf_err("Set event_msgs error (%d)\n", err);
572 + bphy_err(drvr, "Set event_msgs error (%d)\n", err);
573
574 return err;
575 }
576 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
577 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
578 @@ -110,7 +110,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp,
579 s32 err;
580
581 if (drvr->bus_if->state != BRCMF_BUS_UP) {
582 - brcmf_err("bus is down. we have nothing to do.\n");
583 + bphy_err(drvr, "bus is down. we have nothing to do.\n");
584 return -EIO;
585 }
586
587 @@ -236,7 +236,7 @@ brcmf_fil_iovar_data_set(struct brcmf_if
588 buflen, true);
589 } else {
590 err = -EPERM;
591 - brcmf_err("Creating iovar failed\n");
592 + bphy_err(drvr, "Creating iovar failed\n");
593 }
594
595 mutex_unlock(&drvr->proto_block);
596 @@ -262,7 +262,7 @@ brcmf_fil_iovar_data_get(struct brcmf_if
597 memcpy(data, drvr->proto_buf, len);
598 } else {
599 err = -EPERM;
600 - brcmf_err("Creating iovar failed\n");
601 + bphy_err(drvr, "Creating iovar failed\n");
602 }
603
604 brcmf_dbg(FIL, "ifidx=%d, name=%s, len=%d\n", ifp->ifidx, name, len);
605 @@ -360,7 +360,7 @@ brcmf_fil_bsscfg_data_set(struct brcmf_i
606 buflen, true);
607 } else {
608 err = -EPERM;
609 - brcmf_err("Creating bsscfg failed\n");
610 + bphy_err(drvr, "Creating bsscfg failed\n");
611 }
612
613 mutex_unlock(&drvr->proto_block);
614 @@ -386,7 +386,7 @@ brcmf_fil_bsscfg_data_get(struct brcmf_i
615 memcpy(data, drvr->proto_buf, len);
616 } else {
617 err = -EPERM;
618 - brcmf_err("Creating bsscfg failed\n");
619 + bphy_err(drvr, "Creating bsscfg failed\n");
620 }
621 brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d\n", ifp->ifidx,
622 ifp->bsscfgidx, name, len);
623 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
624 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
625 @@ -1250,6 +1250,7 @@ static int brcmf_fws_enq(struct brcmf_fw
626 enum brcmf_fws_skb_state state, int fifo,
627 struct sk_buff *p)
628 {
629 + struct brcmf_pub *drvr = fws->drvr;
630 int prec = 2 * fifo;
631 u32 *qfull_stat = &fws->stats.delayq_full_error;
632 struct brcmf_fws_mac_descriptor *entry;
633 @@ -1262,7 +1263,7 @@ static int brcmf_fws_enq(struct brcmf_fw
634
635 entry = brcmf_skbcb(p)->mac;
636 if (entry == NULL) {
637 - brcmf_err("no mac descriptor found for skb %p\n", p);
638 + bphy_err(drvr, "no mac descriptor found for skb %p\n", p);
639 return -ENOENT;
640 }
641
642 @@ -1452,6 +1453,7 @@ static int
643 brcmf_fws_txs_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,
644 u32 genbit, u16 seq)
645 {
646 + struct brcmf_pub *drvr = fws->drvr;
647 u32 fifo;
648 int ret;
649 bool remove_from_hanger = true;
650 @@ -1475,12 +1477,12 @@ brcmf_fws_txs_process(struct brcmf_fws_i
651 else if (flags == BRCMF_FWS_TXSTATUS_HOST_TOSSED)
652 fws->stats.txs_host_tossed++;
653 else
654 - brcmf_err("unexpected txstatus\n");
655 + bphy_err(drvr, "unexpected txstatus\n");
656
657 ret = brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
658 remove_from_hanger);
659 if (ret != 0) {
660 - brcmf_err("no packet in hanger slot: hslot=%d\n", hslot);
661 + bphy_err(drvr, "no packet in hanger slot: hslot=%d\n", hslot);
662 return ret;
663 }
664
665 @@ -1586,12 +1588,13 @@ static int brcmf_fws_notify_credit_map(s
666 const struct brcmf_event_msg *e,
667 void *data)
668 {
669 - struct brcmf_fws_info *fws = ifp->drvr->fws;
670 + struct brcmf_pub *drvr = ifp->drvr;
671 + struct brcmf_fws_info *fws = drvr->fws;
672 int i;
673 u8 *credits = data;
674
675 if (e->datalen < BRCMF_FWS_FIFO_COUNT) {
676 - brcmf_err("event payload too small (%d)\n", e->datalen);
677 + bphy_err(drvr, "event payload too small (%d)\n", e->datalen);
678 return -EINVAL;
679 }
680 if (fws->creditmap_received)
681 @@ -1653,6 +1656,7 @@ static void brcmf_rxreorder_get_skb_list
682
683 void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)
684 {
685 + struct brcmf_pub *drvr = ifp->drvr;
686 u8 *reorder_data;
687 u8 flow_id, max_idx, cur_idx, exp_idx, end_idx;
688 struct brcmf_ampdu_rx_reorder *rfi;
689 @@ -1667,7 +1671,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
690
691 /* validate flags and flow id */
692 if (flags == 0xFF) {
693 - brcmf_err("invalid flags...so ignore this packet\n");
694 + bphy_err(drvr, "invalid flags...so ignore this packet\n");
695 brcmf_netif_rx(ifp, pkt);
696 return;
697 }
698 @@ -1704,7 +1708,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
699 flow_id, max_idx);
700 rfi = kzalloc(buf_size, GFP_ATOMIC);
701 if (rfi == NULL) {
702 - brcmf_err("failed to alloc buffer\n");
703 + bphy_err(drvr, "failed to alloc buffer\n");
704 brcmf_netif_rx(ifp, pkt);
705 return;
706 }
707 @@ -1969,6 +1973,7 @@ static u8 brcmf_fws_precommit_skb(struct
708 static void brcmf_fws_rollback_toq(struct brcmf_fws_info *fws,
709 struct sk_buff *skb, int fifo)
710 {
711 + struct brcmf_pub *drvr = fws->drvr;
712 struct brcmf_fws_mac_descriptor *entry;
713 struct sk_buff *pktout;
714 int qidx, hslot;
715 @@ -1982,11 +1987,11 @@ static void brcmf_fws_rollback_toq(struc
716
717 pktout = brcmu_pktq_penq_head(&entry->psq, qidx, skb);
718 if (pktout == NULL) {
719 - brcmf_err("%s queue %d full\n", entry->name, qidx);
720 + bphy_err(drvr, "%s queue %d full\n", entry->name, qidx);
721 rc = -ENOSPC;
722 }
723 } else {
724 - brcmf_err("%s entry removed\n", entry->name);
725 + bphy_err(drvr, "%s entry removed\n", entry->name);
726 rc = -ENOENT;
727 }
728
729 @@ -2120,7 +2125,7 @@ int brcmf_fws_process_skb(struct brcmf_i
730 brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_DELAYED, fifo, skb);
731 brcmf_fws_schedule_deq(fws);
732 } else {
733 - brcmf_err("drop skb: no hanger slot\n");
734 + bphy_err(drvr, "drop skb: no hanger slot\n");
735 brcmf_txfinalize(ifp, skb, false);
736 rc = -ENOMEM;
737 }
738 @@ -2339,7 +2344,7 @@ int brcmf_fws_init(struct brcmf_pub *drv
739
740 fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
741 if (fws->fws_wq == NULL) {
742 - brcmf_err("workqueue creation failed\n");
743 + bphy_err(drvr, "workqueue creation failed\n");
744 rc = -EBADF;
745 goto fail;
746 }
747 @@ -2355,13 +2360,13 @@ int brcmf_fws_init(struct brcmf_pub *drv
748 rc = brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
749 brcmf_fws_notify_credit_map);
750 if (rc < 0) {
751 - brcmf_err("register credit map handler failed\n");
752 + bphy_err(drvr, "register credit map handler failed\n");
753 goto fail;
754 }
755 rc = brcmf_fweh_register(drvr, BRCMF_E_BCMC_CREDIT_SUPPORT,
756 brcmf_fws_notify_bcmc_credit_support);
757 if (rc < 0) {
758 - brcmf_err("register bcmc credit handler failed\n");
759 + bphy_err(drvr, "register bcmc credit handler failed\n");
760 brcmf_fweh_unregister(drvr, BRCMF_E_FIFO_CREDIT_MAP);
761 goto fail;
762 }
763 @@ -2373,7 +2378,7 @@ int brcmf_fws_init(struct brcmf_pub *drv
764 fws->fw_signals = true;
765 ifp = brcmf_get_ifp(drvr, 0);
766 if (brcmf_fil_iovar_int_set(ifp, "tlv", tlv)) {
767 - brcmf_err("failed to set bdcv2 tlv signaling\n");
768 + bphy_err(drvr, "failed to set bdcv2 tlv signaling\n");
769 fws->fcmode = BRCMF_FWS_FCMODE_NONE;
770 fws->fw_signals = false;
771 }
772 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
773 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
774 @@ -439,7 +439,7 @@ static int brcmf_msgbuf_tx_ioctl(struct
775 brcmf_commonring_lock(commonring);
776 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
777 if (!ret_ptr) {
778 - brcmf_err("Failed to reserve space in commonring\n");
779 + bphy_err(drvr, "Failed to reserve space in commonring\n");
780 brcmf_commonring_unlock(commonring);
781 return -ENOMEM;
782 }
783 @@ -502,7 +502,7 @@ static int brcmf_msgbuf_query_dcmd(struc
784
785 timeout = brcmf_msgbuf_ioctl_resp_wait(msgbuf);
786 if (!timeout) {
787 - brcmf_err("Timeout on response for query command\n");
788 + bphy_err(drvr, "Timeout on response for query command\n");
789 return -EIO;
790 }
791
792 @@ -578,6 +578,7 @@ static u32
793 brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
794 struct brcmf_msgbuf_work_item *work)
795 {
796 + struct brcmf_pub *drvr = msgbuf->drvr;
797 struct msgbuf_tx_flowring_create_req *create;
798 struct brcmf_commonring *commonring;
799 void *ret_ptr;
800 @@ -593,7 +594,7 @@ brcmf_msgbuf_flowring_create_worker(stru
801 &msgbuf->flowring_dma_handle[flowid],
802 GFP_KERNEL);
803 if (!dma_buf) {
804 - brcmf_err("dma_alloc_coherent failed\n");
805 + bphy_err(drvr, "dma_alloc_coherent failed\n");
806 brcmf_flowring_delete(msgbuf->flow, flowid);
807 return BRCMF_FLOWRING_INVALID_ID;
808 }
809 @@ -606,7 +607,7 @@ brcmf_msgbuf_flowring_create_worker(stru
810 brcmf_commonring_lock(commonring);
811 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
812 if (!ret_ptr) {
813 - brcmf_err("Failed to reserve space in commonring\n");
814 + bphy_err(drvr, "Failed to reserve space in commonring\n");
815 brcmf_commonring_unlock(commonring);
816 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
817 return BRCMF_FLOWRING_INVALID_ID;
818 @@ -633,7 +634,7 @@ brcmf_msgbuf_flowring_create_worker(stru
819 err = brcmf_commonring_write_complete(commonring);
820 brcmf_commonring_unlock(commonring);
821 if (err) {
822 - brcmf_err("Failed to write commonring\n");
823 + bphy_err(drvr, "Failed to write commonring\n");
824 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
825 return BRCMF_FLOWRING_INVALID_ID;
826 }
827 @@ -692,6 +693,7 @@ static u32 brcmf_msgbuf_flowring_create(
828 static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
829 {
830 struct brcmf_flowring *flow = msgbuf->flow;
831 + struct brcmf_pub *drvr = msgbuf->drvr;
832 struct brcmf_commonring *commonring;
833 void *ret_ptr;
834 u32 count;
835 @@ -711,8 +713,8 @@ static void brcmf_msgbuf_txflow(struct b
836 while (brcmf_flowring_qlen(flow, flowid)) {
837 skb = brcmf_flowring_dequeue(flow, flowid);
838 if (skb == NULL) {
839 - brcmf_err("No SKB, but qlen %d\n",
840 - brcmf_flowring_qlen(flow, flowid));
841 + bphy_err(drvr, "No SKB, but qlen %d\n",
842 + brcmf_flowring_qlen(flow, flowid));
843 break;
844 }
845 skb_orphan(skb);
846 @@ -720,7 +722,7 @@ static void brcmf_msgbuf_txflow(struct b
847 msgbuf->tx_pktids, skb, ETH_HLEN,
848 &physaddr, &pktid)) {
849 brcmf_flowring_reinsert(flow, flowid, skb);
850 - brcmf_err("No PKTID available !!\n");
851 + bphy_err(drvr, "No PKTID available !!\n");
852 break;
853 }
854 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
855 @@ -891,6 +893,7 @@ brcmf_msgbuf_process_txstatus(struct brc
856
857 static u32 brcmf_msgbuf_rxbuf_data_post(struct brcmf_msgbuf *msgbuf, u32 count)
858 {
859 + struct brcmf_pub *drvr = msgbuf->drvr;
860 struct brcmf_commonring *commonring;
861 void *ret_ptr;
862 struct sk_buff *skb;
863 @@ -918,7 +921,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(
864 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
865
866 if (skb == NULL) {
867 - brcmf_err("Failed to alloc SKB\n");
868 + bphy_err(drvr, "Failed to alloc SKB\n");
869 brcmf_commonring_write_cancel(commonring, alloced - i);
870 break;
871 }
872 @@ -928,7 +931,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(
873 msgbuf->rx_pktids, skb, 0,
874 &physaddr, &pktid)) {
875 dev_kfree_skb_any(skb);
876 - brcmf_err("No PKTID available !!\n");
877 + bphy_err(drvr, "No PKTID available !!\n");
878 brcmf_commonring_write_cancel(commonring, alloced - i);
879 break;
880 }
881 @@ -998,6 +1001,7 @@ static u32
882 brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
883 u32 count)
884 {
885 + struct brcmf_pub *drvr = msgbuf->drvr;
886 struct brcmf_commonring *commonring;
887 void *ret_ptr;
888 struct sk_buff *skb;
889 @@ -1015,7 +1019,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
890 count,
891 &alloced);
892 if (!ret_ptr) {
893 - brcmf_err("Failed to reserve space in commonring\n");
894 + bphy_err(drvr, "Failed to reserve space in commonring\n");
895 brcmf_commonring_unlock(commonring);
896 return 0;
897 }
898 @@ -1027,7 +1031,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
899 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
900
901 if (skb == NULL) {
902 - brcmf_err("Failed to alloc SKB\n");
903 + bphy_err(drvr, "Failed to alloc SKB\n");
904 brcmf_commonring_write_cancel(commonring, alloced - i);
905 break;
906 }
907 @@ -1037,7 +1041,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
908 msgbuf->rx_pktids, skb, 0,
909 &physaddr, &pktid)) {
910 dev_kfree_skb_any(skb);
911 - brcmf_err("No PKTID available !!\n");
912 + bphy_err(drvr, "No PKTID available !!\n");
913 brcmf_commonring_write_cancel(commonring, alloced - i);
914 break;
915 }
916 @@ -1089,6 +1093,7 @@ static void brcmf_msgbuf_rxbuf_event_pos
917
918 static void brcmf_msgbuf_process_event(struct brcmf_msgbuf *msgbuf, void *buf)
919 {
920 + struct brcmf_pub *drvr = msgbuf->drvr;
921 struct msgbuf_rx_event *event;
922 u32 idx;
923 u16 buflen;
924 @@ -1115,8 +1120,8 @@ static void brcmf_msgbuf_process_event(s
925
926 ifp = brcmf_get_ifp(msgbuf->drvr, event->msg.ifidx);
927 if (!ifp || !ifp->ndev) {
928 - brcmf_err("Received pkt for invalid ifidx %d\n",
929 - event->msg.ifidx);
930 + bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
931 + event->msg.ifidx);
932 goto exit;
933 }
934
935 @@ -1132,6 +1137,7 @@ exit:
936 static void
937 brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
938 {
939 + struct brcmf_pub *drvr = msgbuf->drvr;
940 struct msgbuf_rx_complete *rx_complete;
941 struct sk_buff *skb;
942 u16 data_offset;
943 @@ -1165,7 +1171,7 @@ brcmf_msgbuf_process_rx_complete(struct
944 ifp = msgbuf->drvr->mon_if;
945
946 if (!ifp) {
947 - brcmf_err("Received unexpected monitor pkt\n");
948 + bphy_err(drvr, "Received unexpected monitor pkt\n");
949 brcmu_pkt_buf_free_skb(skb);
950 return;
951 }
952 @@ -1176,8 +1182,8 @@ brcmf_msgbuf_process_rx_complete(struct
953
954 ifp = brcmf_get_ifp(msgbuf->drvr, rx_complete->msg.ifidx);
955 if (!ifp || !ifp->ndev) {
956 - brcmf_err("Received pkt for invalid ifidx %d\n",
957 - rx_complete->msg.ifidx);
958 + bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
959 + rx_complete->msg.ifidx);
960 brcmu_pkt_buf_free_skb(skb);
961 return;
962 }
963 @@ -1190,13 +1196,15 @@ static void brcmf_msgbuf_process_ring_st
964 void *buf)
965 {
966 struct msgbuf_ring_status *ring_status = buf;
967 + struct brcmf_pub *drvr = msgbuf->drvr;
968 int err;
969
970 err = le16_to_cpu(ring_status->compl_hdr.status);
971 if (err) {
972 int ring = le16_to_cpu(ring_status->compl_hdr.flow_ring_id);
973
974 - brcmf_err("Firmware reported ring %d error: %d\n", ring, err);
975 + bphy_err(drvr, "Firmware reported ring %d error: %d\n", ring,
976 + err);
977 }
978 }
979
980 @@ -1204,6 +1212,7 @@ static void
981 brcmf_msgbuf_process_flow_ring_create_response(struct brcmf_msgbuf *msgbuf,
982 void *buf)
983 {
984 + struct brcmf_pub *drvr = msgbuf->drvr;
985 struct msgbuf_flowring_create_resp *flowring_create_resp;
986 u16 status;
987 u16 flowid;
988 @@ -1215,7 +1224,7 @@ brcmf_msgbuf_process_flow_ring_create_re
989 status = le16_to_cpu(flowring_create_resp->compl_hdr.status);
990
991 if (status) {
992 - brcmf_err("Flowring creation failed, code %d\n", status);
993 + bphy_err(drvr, "Flowring creation failed, code %d\n", status);
994 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
995 return;
996 }
997 @@ -1232,6 +1241,7 @@ static void
998 brcmf_msgbuf_process_flow_ring_delete_response(struct brcmf_msgbuf *msgbuf,
999 void *buf)
1000 {
1001 + struct brcmf_pub *drvr = msgbuf->drvr;
1002 struct msgbuf_flowring_delete_resp *flowring_delete_resp;
1003 u16 status;
1004 u16 flowid;
1005 @@ -1243,7 +1253,7 @@ brcmf_msgbuf_process_flow_ring_delete_re
1006 status = le16_to_cpu(flowring_delete_resp->compl_hdr.status);
1007
1008 if (status) {
1009 - brcmf_err("Flowring deletion failed, code %d\n", status);
1010 + bphy_err(drvr, "Flowring deletion failed, code %d\n", status);
1011 brcmf_flowring_delete(msgbuf->flow, flowid);
1012 return;
1013 }
1014 @@ -1256,6 +1266,7 @@ brcmf_msgbuf_process_flow_ring_delete_re
1015
1016 static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
1017 {
1018 + struct brcmf_pub *drvr = msgbuf->drvr;
1019 struct msgbuf_common_hdr *msg;
1020
1021 msg = (struct msgbuf_common_hdr *)buf;
1022 @@ -1292,7 +1303,7 @@ static void brcmf_msgbuf_process_msgtype
1023 brcmf_msgbuf_process_rx_complete(msgbuf, buf);
1024 break;
1025 default:
1026 - brcmf_err("Unsupported msgtype %d\n", msg->msgtype);
1027 + bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
1028 break;
1029 }
1030 }
1031 @@ -1375,7 +1386,7 @@ void brcmf_msgbuf_delete_flowring(struct
1032 brcmf_commonring_lock(commonring);
1033 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
1034 if (!ret_ptr) {
1035 - brcmf_err("FW unaware, flowring will be removed !!\n");
1036 + bphy_err(drvr, "FW unaware, flowring will be removed !!\n");
1037 brcmf_commonring_unlock(commonring);
1038 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1039 return;
1040 @@ -1399,7 +1410,7 @@ void brcmf_msgbuf_delete_flowring(struct
1041 err = brcmf_commonring_write_complete(commonring);
1042 brcmf_commonring_unlock(commonring);
1043 if (err) {
1044 - brcmf_err("Failed to submit RING_DELETE, flowring will be removed\n");
1045 + bphy_err(drvr, "Failed to submit RING_DELETE, flowring will be removed\n");
1046 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1047 }
1048 }
1049 @@ -1469,8 +1480,8 @@ int brcmf_proto_msgbuf_attach(struct brc
1050 if_msgbuf = drvr->bus_if->msgbuf;
1051
1052 if (if_msgbuf->max_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
1053 - brcmf_err("driver not configured for this many flowrings %d\n",
1054 - if_msgbuf->max_flowrings);
1055 + bphy_err(drvr, "driver not configured for this many flowrings %d\n",
1056 + if_msgbuf->max_flowrings);
1057 if_msgbuf->max_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
1058 }
1059
1060 @@ -1480,7 +1491,7 @@ int brcmf_proto_msgbuf_attach(struct brc
1061
1062 msgbuf->txflow_wq = create_singlethread_workqueue("msgbuf_txflow");
1063 if (msgbuf->txflow_wq == NULL) {
1064 - brcmf_err("workqueue creation failed\n");
1065 + bphy_err(drvr, "workqueue creation failed\n");
1066 goto fail;
1067 }
1068 INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker);
1069 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
1070 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
1071 @@ -434,6 +434,7 @@ static void brcmf_p2p_print_actframe(boo
1072 */
1073 static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
1074 {
1075 + struct brcmf_pub *drvr = ifp->drvr;
1076 s32 ret = 0;
1077
1078 brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
1079 @@ -450,7 +451,7 @@ static int brcmf_p2p_set_firmware(struct
1080 ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
1081 ETH_ALEN);
1082 if (ret)
1083 - brcmf_err("failed to update device address ret %d\n", ret);
1084 + bphy_err(drvr, "failed to update device address ret %d\n", ret);
1085
1086 return ret;
1087 }
1088 @@ -572,13 +573,14 @@ static s32 brcmf_p2p_deinit_discovery(st
1089 */
1090 static int brcmf_p2p_enable_discovery(struct brcmf_p2p_info *p2p)
1091 {
1092 + struct brcmf_pub *drvr = p2p->cfg->pub;
1093 struct brcmf_cfg80211_vif *vif;
1094 s32 ret = 0;
1095
1096 brcmf_dbg(TRACE, "enter\n");
1097 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1098 if (!vif) {
1099 - brcmf_err("P2P config device not available\n");
1100 + bphy_err(drvr, "P2P config device not available\n");
1101 ret = -EPERM;
1102 goto exit;
1103 }
1104 @@ -592,13 +594,13 @@ static int brcmf_p2p_enable_discovery(st
1105 vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
1106 ret = brcmf_fil_iovar_int_set(vif->ifp, "p2p_disc", 1);
1107 if (ret < 0) {
1108 - brcmf_err("set p2p_disc error\n");
1109 + bphy_err(drvr, "set p2p_disc error\n");
1110 goto exit;
1111 }
1112 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1113 ret = brcmf_p2p_set_discover_state(vif->ifp, WL_P2P_DISC_ST_SCAN, 0, 0);
1114 if (ret < 0) {
1115 - brcmf_err("unable to set WL_P2P_DISC_ST_SCAN\n");
1116 + bphy_err(drvr, "unable to set WL_P2P_DISC_ST_SCAN\n");
1117 goto exit;
1118 }
1119
1120 @@ -610,7 +612,7 @@ static int brcmf_p2p_enable_discovery(st
1121 */
1122 ret = brcmf_fil_bsscfg_int_set(vif->ifp, "wsec", AES_ENABLED);
1123 if (ret < 0) {
1124 - brcmf_err("wsec error %d\n", ret);
1125 + bphy_err(drvr, "wsec error %d\n", ret);
1126 goto exit;
1127 }
1128
1129 @@ -632,6 +634,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1130 u16 chanspecs[], s32 search_state,
1131 enum p2p_bss_type bss_type)
1132 {
1133 + struct brcmf_pub *drvr = p2p->cfg->pub;
1134 s32 ret = 0;
1135 s32 memsize = offsetof(struct brcmf_p2p_scan_le,
1136 eparams.params_le.channel_list);
1137 @@ -650,7 +653,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1138
1139 vif = p2p->bss_idx[bss_type].vif;
1140 if (vif == NULL) {
1141 - brcmf_err("no vif for bss type %d\n", bss_type);
1142 + bphy_err(drvr, "no vif for bss type %d\n", bss_type);
1143 ret = -EINVAL;
1144 goto exit;
1145 }
1146 @@ -678,7 +681,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1147 BRCMF_P2P_WILDCARD_SSID_LEN);
1148 break;
1149 default:
1150 - brcmf_err(" invalid search state %d\n", search_state);
1151 + bphy_err(drvr, " invalid search state %d\n", search_state);
1152 ret = -EINVAL;
1153 goto exit;
1154 }
1155 @@ -765,6 +768,7 @@ static s32 brcmf_p2p_run_escan(struct br
1156 struct cfg80211_scan_request *request)
1157 {
1158 struct brcmf_p2p_info *p2p = &cfg->p2p;
1159 + struct brcmf_pub *drvr = cfg->pub;
1160 s32 err = 0;
1161 s32 search_state = WL_P2P_DISC_ST_SCAN;
1162 struct brcmf_cfg80211_vif *vif;
1163 @@ -827,7 +831,7 @@ static s32 brcmf_p2p_run_escan(struct br
1164 }
1165 exit:
1166 if (err)
1167 - brcmf_err("error (%d)\n", err);
1168 + bphy_err(drvr, "error (%d)\n", err);
1169 return err;
1170 }
1171
1172 @@ -924,19 +928,20 @@ int brcmf_p2p_scan_prep(struct wiphy *wi
1173 static s32
1174 brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
1175 {
1176 + struct brcmf_pub *drvr = p2p->cfg->pub;
1177 struct brcmf_cfg80211_vif *vif;
1178 struct brcmu_chan ch;
1179 s32 err = 0;
1180
1181 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1182 if (!vif) {
1183 - brcmf_err("Discovery is not set, so we have nothing to do\n");
1184 + bphy_err(drvr, "Discovery is not set, so we have nothing to do\n");
1185 err = -EPERM;
1186 goto exit;
1187 }
1188
1189 if (test_bit(BRCMF_P2P_STATUS_DISCOVER_LISTEN, &p2p->status)) {
1190 - brcmf_err("Previous LISTEN is not completed yet\n");
1191 + bphy_err(drvr, "Previous LISTEN is not completed yet\n");
1192 /* WAR: prevent cookie mismatch in wpa_supplicant return OK */
1193 goto exit;
1194 }
1195 @@ -1053,6 +1058,7 @@ void brcmf_p2p_cancel_remain_on_channel(
1196 */
1197 static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
1198 {
1199 + struct brcmf_pub *drvr = p2p->cfg->pub;
1200 s32 err;
1201 u32 channel_cnt;
1202 u16 *default_chan_list;
1203 @@ -1068,7 +1074,7 @@ static s32 brcmf_p2p_act_frm_search(stru
1204 default_chan_list = kzalloc(channel_cnt * sizeof(*default_chan_list),
1205 GFP_KERNEL);
1206 if (default_chan_list == NULL) {
1207 - brcmf_err("channel list allocation failed\n");
1208 + bphy_err(drvr, "channel list allocation failed\n");
1209 err = -ENOMEM;
1210 goto exit;
1211 }
1212 @@ -1110,6 +1116,7 @@ static void brcmf_p2p_afx_handler(struct
1213 struct brcmf_p2p_info *p2p = container_of(afx_hdl,
1214 struct brcmf_p2p_info,
1215 afx_hdl);
1216 + struct brcmf_pub *drvr = p2p->cfg->pub;
1217 s32 err;
1218
1219 if (!afx_hdl->is_active)
1220 @@ -1123,7 +1130,7 @@ static void brcmf_p2p_afx_handler(struct
1221 err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan);
1222
1223 if (err) {
1224 - brcmf_err("ERROR occurred! value is (%d)\n", err);
1225 + bphy_err(drvr, "ERROR occurred! value is (%d)\n", err);
1226 if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
1227 &p2p->status))
1228 complete(&afx_hdl->act_frm_scan);
1229 @@ -1345,7 +1352,8 @@ int brcmf_p2p_notify_action_frame_rx(str
1230 const struct brcmf_event_msg *e,
1231 void *data)
1232 {
1233 - struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
1234 + struct brcmf_pub *drvr = ifp->drvr;
1235 + struct brcmf_cfg80211_info *cfg = drvr->config;
1236 struct brcmf_p2p_info *p2p = &cfg->p2p;
1237 struct afx_hdl *afx_hdl = &p2p->afx_hdl;
1238 struct wireless_dev *wdev;
1239 @@ -1416,7 +1424,7 @@ int brcmf_p2p_notify_action_frame_rx(str
1240 mgmt_frame = kzalloc(offsetof(struct ieee80211_mgmt, u) +
1241 mgmt_frame_len, GFP_KERNEL);
1242 if (!mgmt_frame) {
1243 - brcmf_err("No memory available for action frame\n");
1244 + bphy_err(drvr, "No memory available for action frame\n");
1245 return -ENOMEM;
1246 }
1247 memcpy(mgmt_frame->da, ifp->mac_addr, ETH_ALEN);
1248 @@ -1499,6 +1507,7 @@ int brcmf_p2p_notify_action_tx_complete(
1249 static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
1250 struct brcmf_fil_af_params_le *af_params)
1251 {
1252 + struct brcmf_pub *drvr = p2p->cfg->pub;
1253 struct brcmf_cfg80211_vif *vif;
1254 s32 err = 0;
1255 s32 timeout = 0;
1256 @@ -1513,7 +1522,7 @@ static s32 brcmf_p2p_tx_action_frame(str
1257 err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params,
1258 sizeof(*af_params));
1259 if (err) {
1260 - brcmf_err(" sending action frame has failed\n");
1261 + bphy_err(drvr, " sending action frame has failed\n");
1262 goto exit;
1263 }
1264
1265 @@ -1563,6 +1572,7 @@ static s32 brcmf_p2p_pub_af_tx(struct br
1266 struct brcmf_config_af_params *config_af_params)
1267 {
1268 struct brcmf_p2p_info *p2p = &cfg->p2p;
1269 + struct brcmf_pub *drvr = cfg->pub;
1270 struct brcmf_fil_action_frame_le *action_frame;
1271 struct brcmf_p2p_pub_act_frame *act_frm;
1272 s32 err = 0;
1273 @@ -1641,8 +1651,8 @@ static s32 brcmf_p2p_pub_af_tx(struct br
1274 config_af_params->extra_listen = false;
1275 break;
1276 default:
1277 - brcmf_err("Unknown p2p pub act frame subtype: %d\n",
1278 - act_frm->subtype);
1279 + bphy_err(drvr, "Unknown p2p pub act frame subtype: %d\n",
1280 + act_frm->subtype);
1281 err = -EINVAL;
1282 }
1283 return err;
1284 @@ -1664,6 +1674,7 @@ bool brcmf_p2p_send_action_frame(struct
1285 struct brcmf_fil_action_frame_le *action_frame;
1286 struct brcmf_config_af_params config_af_params;
1287 struct afx_hdl *afx_hdl = &p2p->afx_hdl;
1288 + struct brcmf_pub *drvr = cfg->pub;
1289 u16 action_frame_len;
1290 bool ack = false;
1291 u8 category;
1292 @@ -1699,7 +1710,7 @@ bool brcmf_p2p_send_action_frame(struct
1293 if (brcmf_p2p_pub_af_tx(cfg, af_params, &config_af_params)) {
1294 /* Just send unknown subtype frame with */
1295 /* default parameters. */
1296 - brcmf_err("P2P Public action frame, unknown subtype.\n");
1297 + bphy_err(drvr, "P2P Public action frame, unknown subtype.\n");
1298 }
1299 } else if (brcmf_p2p_is_gas_action(action_frame->data,
1300 action_frame_len)) {
1301 @@ -1721,7 +1732,7 @@ bool brcmf_p2p_send_action_frame(struct
1302 af_params->dwell_time =
1303 cpu_to_le32(P2P_AF_MIN_DWELL_TIME);
1304 } else {
1305 - brcmf_err("Unknown action type: %d\n", action);
1306 + bphy_err(drvr, "Unknown action type: %d\n", action);
1307 goto exit;
1308 }
1309 } else if (brcmf_p2p_is_p2p_action(action_frame->data,
1310 @@ -1729,8 +1740,8 @@ bool brcmf_p2p_send_action_frame(struct
1311 /* do not configure anything. it will be */
1312 /* sent with a default configuration */
1313 } else {
1314 - brcmf_err("Unknown Frame: category 0x%x, action 0x%x\n",
1315 - category, action);
1316 + bphy_err(drvr, "Unknown Frame: category 0x%x, action 0x%x\n",
1317 + category, action);
1318 return false;
1319 }
1320
1321 @@ -1768,7 +1779,7 @@ bool brcmf_p2p_send_action_frame(struct
1322
1323 if (brcmf_p2p_af_searching_channel(p2p) ==
1324 P2P_INVALID_CHANNEL) {
1325 - brcmf_err("Couldn't find peer's channel.\n");
1326 + bphy_err(drvr, "Couldn't find peer's channel.\n");
1327 goto exit;
1328 }
1329
1330 @@ -1790,7 +1801,8 @@ bool brcmf_p2p_send_action_frame(struct
1331 tx_retry++;
1332 }
1333 if (ack == false) {
1334 - brcmf_err("Failed to send Action Frame(retry %d)\n", tx_retry);
1335 + bphy_err(drvr, "Failed to send Action Frame(retry %d)\n",
1336 + tx_retry);
1337 clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
1338 }
1339
1340 @@ -1972,6 +1984,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1341 enum brcmf_fil_p2p_if_types if_type)
1342 {
1343 struct brcmf_p2p_info *p2p = &cfg->p2p;
1344 + struct brcmf_pub *drvr = cfg->pub;
1345 struct brcmf_cfg80211_vif *vif;
1346 struct brcmf_fil_p2p_if_le if_request;
1347 s32 err;
1348 @@ -1981,13 +1994,13 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1349
1350 vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
1351 if (!vif) {
1352 - brcmf_err("vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
1353 + bphy_err(drvr, "vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
1354 return -EPERM;
1355 }
1356 brcmf_notify_escan_complete(cfg, vif->ifp, true, true);
1357 vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
1358 if (!vif) {
1359 - brcmf_err("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
1360 + bphy_err(drvr, "vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
1361 return -EPERM;
1362 }
1363 brcmf_set_mpc(vif->ifp, 0);
1364 @@ -2005,7 +2018,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1365 err = brcmf_fil_iovar_data_set(vif->ifp, "p2p_ifupd", &if_request,
1366 sizeof(if_request));
1367 if (err) {
1368 - brcmf_err("p2p_ifupd FAILED, err=%d\n", err);
1369 + bphy_err(drvr, "p2p_ifupd FAILED, err=%d\n", err);
1370 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1371 return err;
1372 }
1373 @@ -2013,7 +2026,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1374 BRCMF_VIF_EVENT_TIMEOUT);
1375 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1376 if (!err) {
1377 - brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
1378 + bphy_err(drvr, "No BRCMF_E_IF_CHANGE event received\n");
1379 return -EIO;
1380 }
1381
1382 @@ -2076,6 +2089,7 @@ static struct wireless_dev *brcmf_p2p_cr
1383 struct wiphy *wiphy,
1384 u8 *addr)
1385 {
1386 + struct brcmf_pub *drvr = p2p->cfg->pub;
1387 struct brcmf_cfg80211_vif *p2p_vif;
1388 struct brcmf_if *p2p_ifp;
1389 struct brcmf_if *pri_ifp;
1390 @@ -2087,7 +2101,7 @@ static struct wireless_dev *brcmf_p2p_cr
1391
1392 p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);
1393 if (IS_ERR(p2p_vif)) {
1394 - brcmf_err("could not create discovery vif\n");
1395 + bphy_err(drvr, "could not create discovery vif\n");
1396 return (struct wireless_dev *)p2p_vif;
1397 }
1398
1399 @@ -2101,7 +2115,7 @@ static struct wireless_dev *brcmf_p2p_cr
1400 /* Initialize P2P Discovery in the firmware */
1401 err = brcmf_fil_iovar_int_set(pri_ifp, "p2p_disc", 1);
1402 if (err < 0) {
1403 - brcmf_err("set p2p_disc error\n");
1404 + bphy_err(drvr, "set p2p_disc error\n");
1405 brcmf_fweh_p2pdev_setup(pri_ifp, false);
1406 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
1407 goto fail;
1408 @@ -2113,7 +2127,7 @@ static struct wireless_dev *brcmf_p2p_cr
1409 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
1410 brcmf_fweh_p2pdev_setup(pri_ifp, false);
1411 if (!err) {
1412 - brcmf_err("timeout occurred\n");
1413 + bphy_err(drvr, "timeout occurred\n");
1414 err = -EIO;
1415 goto fail;
1416 }
1417 @@ -2127,7 +2141,7 @@ static struct wireless_dev *brcmf_p2p_cr
1418 /* verify bsscfg index for P2P discovery */
1419 err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bsscfgidx);
1420 if (err < 0) {
1421 - brcmf_err("retrieving discover bsscfg index failed\n");
1422 + bphy_err(drvr, "retrieving discover bsscfg index failed\n");
1423 goto fail;
1424 }
1425
1426 @@ -2162,6 +2176,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1427 {
1428 struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
1429 struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
1430 + struct brcmf_pub *drvr = cfg->pub;
1431 struct brcmf_cfg80211_vif *vif;
1432 enum brcmf_fil_p2p_if_types iftype;
1433 int err;
1434 @@ -2202,7 +2217,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1435 BRCMF_VIF_EVENT_TIMEOUT);
1436 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1437 if (!err) {
1438 - brcmf_err("timeout occurred\n");
1439 + bphy_err(drvr, "timeout occurred\n");
1440 err = -EIO;
1441 goto fail;
1442 }
1443 @@ -2210,7 +2225,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1444 /* interface created in firmware */
1445 ifp = vif->ifp;
1446 if (!ifp) {
1447 - brcmf_err("no if pointer provided\n");
1448 + bphy_err(drvr, "no if pointer provided\n");
1449 err = -ENOENT;
1450 goto fail;
1451 }
1452 @@ -2221,7 +2236,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1453 #endif /* >= 3.17.0 */
1454 err = brcmf_net_attach(ifp, true);
1455 if (err) {
1456 - brcmf_err("Registering netdevice failed\n");
1457 + bphy_err(drvr, "Registering netdevice failed\n");
1458 goto fail;
1459 }
1460
1461 @@ -2375,6 +2390,7 @@ void brcmf_p2p_stop_device(struct wiphy
1462 */
1463 s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)
1464 {
1465 + struct brcmf_pub *drvr = cfg->pub;
1466 struct brcmf_p2p_info *p2p;
1467 struct brcmf_if *pri_ifp;
1468 s32 err = 0;
1469 @@ -2389,7 +2405,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg802
1470 if (p2pdev_forced) {
1471 err_ptr = brcmf_p2p_create_p2pdev(p2p, NULL, NULL);
1472 if (IS_ERR(err_ptr)) {
1473 - brcmf_err("P2P device creation failed.\n");
1474 + bphy_err(drvr, "P2P device creation failed.\n");
1475 err = PTR_ERR(err_ptr);
1476 }
1477 } else {
1478 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
1479 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
1480 @@ -47,6 +47,7 @@ static int brcmf_pno_channel_config(stru
1481 static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
1482 u32 mscan, u32 bestn)
1483 {
1484 + struct brcmf_pub *drvr = ifp->drvr;
1485 struct brcmf_pno_param_le pfn_param;
1486 u16 flags;
1487 u32 pfnmem;
1488 @@ -75,13 +76,13 @@ static int brcmf_pno_config(struct brcmf
1489 /* set bestn in firmware */
1490 err = brcmf_fil_iovar_int_set(ifp, "pfnmem", pfnmem);
1491 if (err < 0) {
1492 - brcmf_err("failed to set pfnmem\n");
1493 + bphy_err(drvr, "failed to set pfnmem\n");
1494 goto exit;
1495 }
1496 /* get max mscan which the firmware supports */
1497 err = brcmf_fil_iovar_int_get(ifp, "pfnmem", &pfnmem);
1498 if (err < 0) {
1499 - brcmf_err("failed to get pfnmem\n");
1500 + bphy_err(drvr, "failed to get pfnmem\n");
1501 goto exit;
1502 }
1503 mscan = min_t(u32, mscan, pfnmem);
1504 @@ -95,7 +96,7 @@ static int brcmf_pno_config(struct brcmf
1505 err = brcmf_fil_iovar_data_set(ifp, "pfn_set", &pfn_param,
1506 sizeof(pfn_param));
1507 if (err)
1508 - brcmf_err("pfn_set failed, err=%d\n", err);
1509 + bphy_err(drvr, "pfn_set failed, err=%d\n", err);
1510
1511 exit:
1512 return err;
1513 @@ -104,6 +105,7 @@ exit:
1514 static int brcmf_pno_set_random(struct brcmf_if *ifp, u8 *mac_addr,
1515 u8 *mac_mask)
1516 {
1517 + struct brcmf_pub *drvr = ifp->drvr;
1518 struct brcmf_pno_macaddr_le pfn_mac;
1519 int err, i;
1520
1521 @@ -123,7 +125,7 @@ static int brcmf_pno_set_random(struct b
1522 err = brcmf_fil_iovar_data_set(ifp, "pfn_macaddr", &pfn_mac,
1523 sizeof(pfn_mac));
1524 if (err)
1525 - brcmf_err("pfn_macaddr failed, err=%d\n", err);
1526 + bphy_err(drvr, "pfn_macaddr failed, err=%d\n", err);
1527
1528 return err;
1529 }
1530 @@ -165,6 +167,7 @@ static bool brcmf_is_ssid_active(struct
1531
1532 int brcmf_pno_clean(struct brcmf_if *ifp)
1533 {
1534 + struct brcmf_pub *drvr = ifp->drvr;
1535 int ret;
1536
1537 /* Disable pfn */
1538 @@ -174,7 +177,7 @@ int brcmf_pno_clean(struct brcmf_if *ifp
1539 ret = brcmf_fil_iovar_data_set(ifp, "pfnclear", NULL, 0);
1540 }
1541 if (ret < 0)
1542 - brcmf_err("failed code %d\n", ret);
1543 + bphy_err(drvr, "failed code %d\n", ret);
1544
1545 return ret;
1546 }
1547 @@ -182,6 +185,7 @@ int brcmf_pno_clean(struct brcmf_if *ifp
1548 int brcmf_pno_start_sched_scan(struct brcmf_if *ifp,
1549 struct cfg80211_sched_scan_request *req)
1550 {
1551 + struct brcmf_pub *drvr = ifp->drvr;
1552 struct brcmu_d11inf *d11inf;
1553 struct brcmf_pno_config_le pno_cfg;
1554 struct cfg80211_ssid *ssid;
1555 @@ -191,7 +195,7 @@ int brcmf_pno_start_sched_scan(struct br
1556 /* clean up everything */
1557 ret = brcmf_pno_clean(ifp);
1558 if (ret < 0) {
1559 - brcmf_err("failed error=%d\n", ret);
1560 + bphy_err(drvr, "failed error=%d\n", ret);
1561 return ret;
1562 }
1563
1564 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
1565 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
1566 @@ -47,15 +47,15 @@ int brcmf_proto_attach(struct brcmf_pub
1567 if (brcmf_proto_msgbuf_attach(drvr))
1568 goto fail;
1569 } else {
1570 - brcmf_err("Unsupported proto type %d\n",
1571 - drvr->bus_if->proto_type);
1572 + bphy_err(drvr, "Unsupported proto type %d\n",
1573 + drvr->bus_if->proto_type);
1574 goto fail;
1575 }
1576 if (!proto->tx_queue_data || (proto->hdrpull == NULL) ||
1577 (proto->query_dcmd == NULL) || (proto->set_dcmd == NULL) ||
1578 (proto->configure_addr_mode == NULL) ||
1579 (proto->delete_peer == NULL) || (proto->add_tdls_peer == NULL)) {
1580 - brcmf_err("Not all proto handlers have been installed\n");
1581 + bphy_err(drvr, "Not all proto handlers have been installed\n");
1582 goto fail;
1583 }
1584 return 0;
Staging tree of Jonas Gorski