projects / openwrt / staging / pepe2k.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
mac80211: brcmfmac: backport BCDC layer changes from kernel 4.12
[openwrt/staging/pepe2k.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 @@ -177,8 +177,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 @@ -194,9 +194,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 @@ -242,9 +242,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 @@ -307,8 +307,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 @@ -450,7 +450,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 @@ -89,7 +89,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 @@ -103,7 +103,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 @@ -112,8 +114,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 @@ -143,7 +143,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 @@ -156,24 +156,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 @@ -186,7 +186,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 @@ -199,6 +199,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 @@ -206,7 +207,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 @@ -265,7 +266,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 @@ -575,7 +576,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 @@ -589,7 +590,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 @@ -635,7 +636,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 @@ -711,6 +712,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 @@ -723,7 +725,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 @@ -753,8 +755,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 @@ -812,7 +814,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 @@ -862,16 +864,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 @@ -915,7 +918,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 @@ -932,7 +935,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 @@ -944,8 +947,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 @@ -955,8 +958,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 @@ -1133,7 +1136,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 @@ -1188,7 +1191,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 @@ -1296,6 +1299,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 @@ -1303,7 +1307,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_proto_reset_if(drvr, 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 @@ -1251,6 +1251,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 @@ -1263,7 +1264,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 @@ -1453,6 +1454,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 @@ -1476,12 +1478,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 @@ -1587,12 +1589,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 = drvr_to_fws(ifp->drvr);
670 + struct brcmf_pub *drvr = ifp->drvr;
671 + struct brcmf_fws_info *fws = drvr_to_fws(drvr);
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 @@ -1654,6 +1657,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 @@ -1668,7 +1672,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 @@ -1705,7 +1709,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 @@ -1970,6 +1974,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 @@ -1983,11 +1988,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 @@ -2092,7 +2097,8 @@ static int brcmf_fws_assign_htod(struct
730
731 int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
732 {
733 - struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr);
734 + struct brcmf_pub *drvr = ifp->drvr;
735 + struct brcmf_fws_info *fws = drvr_to_fws(drvr);
736 struct brcmf_skbuff_cb *skcb = brcmf_skbcb(skb);
737 struct ethhdr *eh = (struct ethhdr *)(skb->data);
738 int fifo = BRCMF_FWS_FIFO_BCMC;
739 @@ -2120,7 +2126,7 @@ int brcmf_fws_process_skb(struct brcmf_i
740 brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_DELAYED, fifo, skb);
741 brcmf_fws_schedule_deq(fws);
742 } else {
743 - brcmf_err("drop skb: no hanger slot\n");
744 + bphy_err(drvr, "drop skb: no hanger slot\n");
745 brcmf_txfinalize(ifp, skb, false);
746 rc = -ENOMEM;
747 }
748 @@ -2338,7 +2344,7 @@ struct brcmf_fws_info *brcmf_fws_attach(
749
750 fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
751 if (fws->fws_wq == NULL) {
752 - brcmf_err("workqueue creation failed\n");
753 + bphy_err(drvr, "workqueue creation failed\n");
754 rc = -EBADF;
755 goto fail;
756 }
757 @@ -2354,13 +2360,13 @@ struct brcmf_fws_info *brcmf_fws_attach(
758 rc = brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
759 brcmf_fws_notify_credit_map);
760 if (rc < 0) {
761 - brcmf_err("register credit map handler failed\n");
762 + bphy_err(drvr, "register credit map handler failed\n");
763 goto fail;
764 }
765 rc = brcmf_fweh_register(drvr, BRCMF_E_BCMC_CREDIT_SUPPORT,
766 brcmf_fws_notify_bcmc_credit_support);
767 if (rc < 0) {
768 - brcmf_err("register bcmc credit handler failed\n");
769 + bphy_err(drvr, "register bcmc credit handler failed\n");
770 brcmf_fweh_unregister(drvr, BRCMF_E_FIFO_CREDIT_MAP);
771 goto fail;
772 }
773 @@ -2372,7 +2378,7 @@ struct brcmf_fws_info *brcmf_fws_attach(
774 fws->fw_signals = true;
775 ifp = brcmf_get_ifp(drvr, 0);
776 if (brcmf_fil_iovar_int_set(ifp, "tlv", tlv)) {
777 - brcmf_err("failed to set bdcv2 tlv signaling\n");
778 + bphy_err(drvr, "failed to set bdcv2 tlv signaling\n");
779 fws->fcmode = BRCMF_FWS_FCMODE_NONE;
780 fws->fw_signals = false;
781 }
782 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
783 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
784 @@ -439,7 +439,7 @@ static int brcmf_msgbuf_tx_ioctl(struct
785 brcmf_commonring_lock(commonring);
786 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
787 if (!ret_ptr) {
788 - brcmf_err("Failed to reserve space in commonring\n");
789 + bphy_err(drvr, "Failed to reserve space in commonring\n");
790 brcmf_commonring_unlock(commonring);
791 return -ENOMEM;
792 }
793 @@ -502,7 +502,7 @@ static int brcmf_msgbuf_query_dcmd(struc
794
795 timeout = brcmf_msgbuf_ioctl_resp_wait(msgbuf);
796 if (!timeout) {
797 - brcmf_err("Timeout on response for query command\n");
798 + bphy_err(drvr, "Timeout on response for query command\n");
799 return -EIO;
800 }
801
802 @@ -578,6 +578,7 @@ static u32
803 brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
804 struct brcmf_msgbuf_work_item *work)
805 {
806 + struct brcmf_pub *drvr = msgbuf->drvr;
807 struct msgbuf_tx_flowring_create_req *create;
808 struct brcmf_commonring *commonring;
809 void *ret_ptr;
810 @@ -593,7 +594,7 @@ brcmf_msgbuf_flowring_create_worker(stru
811 &msgbuf->flowring_dma_handle[flowid],
812 GFP_KERNEL);
813 if (!dma_buf) {
814 - brcmf_err("dma_alloc_coherent failed\n");
815 + bphy_err(drvr, "dma_alloc_coherent failed\n");
816 brcmf_flowring_delete(msgbuf->flow, flowid);
817 return BRCMF_FLOWRING_INVALID_ID;
818 }
819 @@ -606,7 +607,7 @@ brcmf_msgbuf_flowring_create_worker(stru
820 brcmf_commonring_lock(commonring);
821 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
822 if (!ret_ptr) {
823 - brcmf_err("Failed to reserve space in commonring\n");
824 + bphy_err(drvr, "Failed to reserve space in commonring\n");
825 brcmf_commonring_unlock(commonring);
826 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
827 return BRCMF_FLOWRING_INVALID_ID;
828 @@ -633,7 +634,7 @@ brcmf_msgbuf_flowring_create_worker(stru
829 err = brcmf_commonring_write_complete(commonring);
830 brcmf_commonring_unlock(commonring);
831 if (err) {
832 - brcmf_err("Failed to write commonring\n");
833 + bphy_err(drvr, "Failed to write commonring\n");
834 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
835 return BRCMF_FLOWRING_INVALID_ID;
836 }
837 @@ -692,6 +693,7 @@ static u32 brcmf_msgbuf_flowring_create(
838 static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
839 {
840 struct brcmf_flowring *flow = msgbuf->flow;
841 + struct brcmf_pub *drvr = msgbuf->drvr;
842 struct brcmf_commonring *commonring;
843 void *ret_ptr;
844 u32 count;
845 @@ -711,8 +713,8 @@ static void brcmf_msgbuf_txflow(struct b
846 while (brcmf_flowring_qlen(flow, flowid)) {
847 skb = brcmf_flowring_dequeue(flow, flowid);
848 if (skb == NULL) {
849 - brcmf_err("No SKB, but qlen %d\n",
850 - brcmf_flowring_qlen(flow, flowid));
851 + bphy_err(drvr, "No SKB, but qlen %d\n",
852 + brcmf_flowring_qlen(flow, flowid));
853 break;
854 }
855 skb_orphan(skb);
856 @@ -720,7 +722,7 @@ static void brcmf_msgbuf_txflow(struct b
857 msgbuf->tx_pktids, skb, ETH_HLEN,
858 &physaddr, &pktid)) {
859 brcmf_flowring_reinsert(flow, flowid, skb);
860 - brcmf_err("No PKTID available !!\n");
861 + bphy_err(drvr, "No PKTID available !!\n");
862 break;
863 }
864 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
865 @@ -891,6 +893,7 @@ brcmf_msgbuf_process_txstatus(struct brc
866
867 static u32 brcmf_msgbuf_rxbuf_data_post(struct brcmf_msgbuf *msgbuf, u32 count)
868 {
869 + struct brcmf_pub *drvr = msgbuf->drvr;
870 struct brcmf_commonring *commonring;
871 void *ret_ptr;
872 struct sk_buff *skb;
873 @@ -918,7 +921,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(
874 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
875
876 if (skb == NULL) {
877 - brcmf_err("Failed to alloc SKB\n");
878 + bphy_err(drvr, "Failed to alloc SKB\n");
879 brcmf_commonring_write_cancel(commonring, alloced - i);
880 break;
881 }
882 @@ -928,7 +931,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(
883 msgbuf->rx_pktids, skb, 0,
884 &physaddr, &pktid)) {
885 dev_kfree_skb_any(skb);
886 - brcmf_err("No PKTID available !!\n");
887 + bphy_err(drvr, "No PKTID available !!\n");
888 brcmf_commonring_write_cancel(commonring, alloced - i);
889 break;
890 }
891 @@ -998,6 +1001,7 @@ static u32
892 brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
893 u32 count)
894 {
895 + struct brcmf_pub *drvr = msgbuf->drvr;
896 struct brcmf_commonring *commonring;
897 void *ret_ptr;
898 struct sk_buff *skb;
899 @@ -1015,7 +1019,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
900 count,
901 &alloced);
902 if (!ret_ptr) {
903 - brcmf_err("Failed to reserve space in commonring\n");
904 + bphy_err(drvr, "Failed to reserve space in commonring\n");
905 brcmf_commonring_unlock(commonring);
906 return 0;
907 }
908 @@ -1027,7 +1031,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
909 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
910
911 if (skb == NULL) {
912 - brcmf_err("Failed to alloc SKB\n");
913 + bphy_err(drvr, "Failed to alloc SKB\n");
914 brcmf_commonring_write_cancel(commonring, alloced - i);
915 break;
916 }
917 @@ -1037,7 +1041,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
918 msgbuf->rx_pktids, skb, 0,
919 &physaddr, &pktid)) {
920 dev_kfree_skb_any(skb);
921 - brcmf_err("No PKTID available !!\n");
922 + bphy_err(drvr, "No PKTID available !!\n");
923 brcmf_commonring_write_cancel(commonring, alloced - i);
924 break;
925 }
926 @@ -1089,6 +1093,7 @@ static void brcmf_msgbuf_rxbuf_event_pos
927
928 static void brcmf_msgbuf_process_event(struct brcmf_msgbuf *msgbuf, void *buf)
929 {
930 + struct brcmf_pub *drvr = msgbuf->drvr;
931 struct msgbuf_rx_event *event;
932 u32 idx;
933 u16 buflen;
934 @@ -1115,8 +1120,8 @@ static void brcmf_msgbuf_process_event(s
935
936 ifp = brcmf_get_ifp(msgbuf->drvr, event->msg.ifidx);
937 if (!ifp || !ifp->ndev) {
938 - brcmf_err("Received pkt for invalid ifidx %d\n",
939 - event->msg.ifidx);
940 + bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
941 + event->msg.ifidx);
942 goto exit;
943 }
944
945 @@ -1132,6 +1137,7 @@ exit:
946 static void
947 brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
948 {
949 + struct brcmf_pub *drvr = msgbuf->drvr;
950 struct msgbuf_rx_complete *rx_complete;
951 struct sk_buff *skb;
952 u16 data_offset;
953 @@ -1165,7 +1171,7 @@ brcmf_msgbuf_process_rx_complete(struct
954 ifp = msgbuf->drvr->mon_if;
955
956 if (!ifp) {
957 - brcmf_err("Received unexpected monitor pkt\n");
958 + bphy_err(drvr, "Received unexpected monitor pkt\n");
959 brcmu_pkt_buf_free_skb(skb);
960 return;
961 }
962 @@ -1176,8 +1182,8 @@ brcmf_msgbuf_process_rx_complete(struct
963
964 ifp = brcmf_get_ifp(msgbuf->drvr, rx_complete->msg.ifidx);
965 if (!ifp || !ifp->ndev) {
966 - brcmf_err("Received pkt for invalid ifidx %d\n",
967 - rx_complete->msg.ifidx);
968 + bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
969 + rx_complete->msg.ifidx);
970 brcmu_pkt_buf_free_skb(skb);
971 return;
972 }
973 @@ -1190,13 +1196,15 @@ static void brcmf_msgbuf_process_ring_st
974 void *buf)
975 {
976 struct msgbuf_ring_status *ring_status = buf;
977 + struct brcmf_pub *drvr = msgbuf->drvr;
978 int err;
979
980 err = le16_to_cpu(ring_status->compl_hdr.status);
981 if (err) {
982 int ring = le16_to_cpu(ring_status->compl_hdr.flow_ring_id);
983
984 - brcmf_err("Firmware reported ring %d error: %d\n", ring, err);
985 + bphy_err(drvr, "Firmware reported ring %d error: %d\n", ring,
986 + err);
987 }
988 }
989
990 @@ -1204,6 +1212,7 @@ static void
991 brcmf_msgbuf_process_flow_ring_create_response(struct brcmf_msgbuf *msgbuf,
992 void *buf)
993 {
994 + struct brcmf_pub *drvr = msgbuf->drvr;
995 struct msgbuf_flowring_create_resp *flowring_create_resp;
996 u16 status;
997 u16 flowid;
998 @@ -1215,7 +1224,7 @@ brcmf_msgbuf_process_flow_ring_create_re
999 status = le16_to_cpu(flowring_create_resp->compl_hdr.status);
1000
1001 if (status) {
1002 - brcmf_err("Flowring creation failed, code %d\n", status);
1003 + bphy_err(drvr, "Flowring creation failed, code %d\n", status);
1004 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1005 return;
1006 }
1007 @@ -1232,6 +1241,7 @@ static void
1008 brcmf_msgbuf_process_flow_ring_delete_response(struct brcmf_msgbuf *msgbuf,
1009 void *buf)
1010 {
1011 + struct brcmf_pub *drvr = msgbuf->drvr;
1012 struct msgbuf_flowring_delete_resp *flowring_delete_resp;
1013 u16 status;
1014 u16 flowid;
1015 @@ -1243,7 +1253,7 @@ brcmf_msgbuf_process_flow_ring_delete_re
1016 status = le16_to_cpu(flowring_delete_resp->compl_hdr.status);
1017
1018 if (status) {
1019 - brcmf_err("Flowring deletion failed, code %d\n", status);
1020 + bphy_err(drvr, "Flowring deletion failed, code %d\n", status);
1021 brcmf_flowring_delete(msgbuf->flow, flowid);
1022 return;
1023 }
1024 @@ -1256,6 +1266,7 @@ brcmf_msgbuf_process_flow_ring_delete_re
1025
1026 static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
1027 {
1028 + struct brcmf_pub *drvr = msgbuf->drvr;
1029 struct msgbuf_common_hdr *msg;
1030
1031 msg = (struct msgbuf_common_hdr *)buf;
1032 @@ -1292,7 +1303,7 @@ static void brcmf_msgbuf_process_msgtype
1033 brcmf_msgbuf_process_rx_complete(msgbuf, buf);
1034 break;
1035 default:
1036 - brcmf_err("Unsupported msgtype %d\n", msg->msgtype);
1037 + bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
1038 break;
1039 }
1040 }
1041 @@ -1375,7 +1386,7 @@ void brcmf_msgbuf_delete_flowring(struct
1042 brcmf_commonring_lock(commonring);
1043 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
1044 if (!ret_ptr) {
1045 - brcmf_err("FW unaware, flowring will be removed !!\n");
1046 + bphy_err(drvr, "FW unaware, flowring will be removed !!\n");
1047 brcmf_commonring_unlock(commonring);
1048 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1049 return;
1050 @@ -1399,7 +1410,7 @@ void brcmf_msgbuf_delete_flowring(struct
1051 err = brcmf_commonring_write_complete(commonring);
1052 brcmf_commonring_unlock(commonring);
1053 if (err) {
1054 - brcmf_err("Failed to submit RING_DELETE, flowring will be removed\n");
1055 + bphy_err(drvr, "Failed to submit RING_DELETE, flowring will be removed\n");
1056 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1057 }
1058 }
1059 @@ -1469,8 +1480,8 @@ int brcmf_proto_msgbuf_attach(struct brc
1060 if_msgbuf = drvr->bus_if->msgbuf;
1061
1062 if (if_msgbuf->max_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
1063 - brcmf_err("driver not configured for this many flowrings %d\n",
1064 - if_msgbuf->max_flowrings);
1065 + bphy_err(drvr, "driver not configured for this many flowrings %d\n",
1066 + if_msgbuf->max_flowrings);
1067 if_msgbuf->max_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
1068 }
1069
1070 @@ -1480,7 +1491,7 @@ int brcmf_proto_msgbuf_attach(struct brc
1071
1072 msgbuf->txflow_wq = create_singlethread_workqueue("msgbuf_txflow");
1073 if (msgbuf->txflow_wq == NULL) {
1074 - brcmf_err("workqueue creation failed\n");
1075 + bphy_err(drvr, "workqueue creation failed\n");
1076 goto fail;
1077 }
1078 INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker);
1079 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
1080 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
1081 @@ -434,6 +434,7 @@ static void brcmf_p2p_print_actframe(boo
1082 */
1083 static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
1084 {
1085 + struct brcmf_pub *drvr = ifp->drvr;
1086 s32 ret = 0;
1087
1088 brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
1089 @@ -450,7 +451,7 @@ static int brcmf_p2p_set_firmware(struct
1090 ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
1091 ETH_ALEN);
1092 if (ret)
1093 - brcmf_err("failed to update device address ret %d\n", ret);
1094 + bphy_err(drvr, "failed to update device address ret %d\n", ret);
1095
1096 return ret;
1097 }
1098 @@ -572,13 +573,14 @@ static s32 brcmf_p2p_deinit_discovery(st
1099 */
1100 static int brcmf_p2p_enable_discovery(struct brcmf_p2p_info *p2p)
1101 {
1102 + struct brcmf_pub *drvr = p2p->cfg->pub;
1103 struct brcmf_cfg80211_vif *vif;
1104 s32 ret = 0;
1105
1106 brcmf_dbg(TRACE, "enter\n");
1107 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1108 if (!vif) {
1109 - brcmf_err("P2P config device not available\n");
1110 + bphy_err(drvr, "P2P config device not available\n");
1111 ret = -EPERM;
1112 goto exit;
1113 }
1114 @@ -592,13 +594,13 @@ static int brcmf_p2p_enable_discovery(st
1115 vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
1116 ret = brcmf_fil_iovar_int_set(vif->ifp, "p2p_disc", 1);
1117 if (ret < 0) {
1118 - brcmf_err("set p2p_disc error\n");
1119 + bphy_err(drvr, "set p2p_disc error\n");
1120 goto exit;
1121 }
1122 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1123 ret = brcmf_p2p_set_discover_state(vif->ifp, WL_P2P_DISC_ST_SCAN, 0, 0);
1124 if (ret < 0) {
1125 - brcmf_err("unable to set WL_P2P_DISC_ST_SCAN\n");
1126 + bphy_err(drvr, "unable to set WL_P2P_DISC_ST_SCAN\n");
1127 goto exit;
1128 }
1129
1130 @@ -610,7 +612,7 @@ static int brcmf_p2p_enable_discovery(st
1131 */
1132 ret = brcmf_fil_bsscfg_int_set(vif->ifp, "wsec", AES_ENABLED);
1133 if (ret < 0) {
1134 - brcmf_err("wsec error %d\n", ret);
1135 + bphy_err(drvr, "wsec error %d\n", ret);
1136 goto exit;
1137 }
1138
1139 @@ -632,6 +634,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1140 u16 chanspecs[], s32 search_state,
1141 enum p2p_bss_type bss_type)
1142 {
1143 + struct brcmf_pub *drvr = p2p->cfg->pub;
1144 s32 ret = 0;
1145 s32 memsize = offsetof(struct brcmf_p2p_scan_le,
1146 eparams.params_le.channel_list);
1147 @@ -650,7 +653,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1148
1149 vif = p2p->bss_idx[bss_type].vif;
1150 if (vif == NULL) {
1151 - brcmf_err("no vif for bss type %d\n", bss_type);
1152 + bphy_err(drvr, "no vif for bss type %d\n", bss_type);
1153 ret = -EINVAL;
1154 goto exit;
1155 }
1156 @@ -678,7 +681,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1157 BRCMF_P2P_WILDCARD_SSID_LEN);
1158 break;
1159 default:
1160 - brcmf_err(" invalid search state %d\n", search_state);
1161 + bphy_err(drvr, " invalid search state %d\n", search_state);
1162 ret = -EINVAL;
1163 goto exit;
1164 }
1165 @@ -765,6 +768,7 @@ static s32 brcmf_p2p_run_escan(struct br
1166 struct cfg80211_scan_request *request)
1167 {
1168 struct brcmf_p2p_info *p2p = &cfg->p2p;
1169 + struct brcmf_pub *drvr = cfg->pub;
1170 s32 err = 0;
1171 s32 search_state = WL_P2P_DISC_ST_SCAN;
1172 struct brcmf_cfg80211_vif *vif;
1173 @@ -827,7 +831,7 @@ static s32 brcmf_p2p_run_escan(struct br
1174 }
1175 exit:
1176 if (err)
1177 - brcmf_err("error (%d)\n", err);
1178 + bphy_err(drvr, "error (%d)\n", err);
1179 return err;
1180 }
1181
1182 @@ -924,19 +928,20 @@ int brcmf_p2p_scan_prep(struct wiphy *wi
1183 static s32
1184 brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
1185 {
1186 + struct brcmf_pub *drvr = p2p->cfg->pub;
1187 struct brcmf_cfg80211_vif *vif;
1188 struct brcmu_chan ch;
1189 s32 err = 0;
1190
1191 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1192 if (!vif) {
1193 - brcmf_err("Discovery is not set, so we have nothing to do\n");
1194 + bphy_err(drvr, "Discovery is not set, so we have nothing to do\n");
1195 err = -EPERM;
1196 goto exit;
1197 }
1198
1199 if (test_bit(BRCMF_P2P_STATUS_DISCOVER_LISTEN, &p2p->status)) {
1200 - brcmf_err("Previous LISTEN is not completed yet\n");
1201 + bphy_err(drvr, "Previous LISTEN is not completed yet\n");
1202 /* WAR: prevent cookie mismatch in wpa_supplicant return OK */
1203 goto exit;
1204 }
1205 @@ -1053,6 +1058,7 @@ void brcmf_p2p_cancel_remain_on_channel(
1206 */
1207 static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
1208 {
1209 + struct brcmf_pub *drvr = p2p->cfg->pub;
1210 s32 err;
1211 u32 channel_cnt;
1212 u16 *default_chan_list;
1213 @@ -1068,7 +1074,7 @@ static s32 brcmf_p2p_act_frm_search(stru
1214 default_chan_list = kzalloc(channel_cnt * sizeof(*default_chan_list),
1215 GFP_KERNEL);
1216 if (default_chan_list == NULL) {
1217 - brcmf_err("channel list allocation failed\n");
1218 + bphy_err(drvr, "channel list allocation failed\n");
1219 err = -ENOMEM;
1220 goto exit;
1221 }
1222 @@ -1110,6 +1116,7 @@ static void brcmf_p2p_afx_handler(struct
1223 struct brcmf_p2p_info *p2p = container_of(afx_hdl,
1224 struct brcmf_p2p_info,
1225 afx_hdl);
1226 + struct brcmf_pub *drvr = p2p->cfg->pub;
1227 s32 err;
1228
1229 if (!afx_hdl->is_active)
1230 @@ -1123,7 +1130,7 @@ static void brcmf_p2p_afx_handler(struct
1231 err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan);
1232
1233 if (err) {
1234 - brcmf_err("ERROR occurred! value is (%d)\n", err);
1235 + bphy_err(drvr, "ERROR occurred! value is (%d)\n", err);
1236 if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
1237 &p2p->status))
1238 complete(&afx_hdl->act_frm_scan);
1239 @@ -1345,7 +1352,8 @@ int brcmf_p2p_notify_action_frame_rx(str
1240 const struct brcmf_event_msg *e,
1241 void *data)
1242 {
1243 - struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
1244 + struct brcmf_pub *drvr = ifp->drvr;
1245 + struct brcmf_cfg80211_info *cfg = drvr->config;
1246 struct brcmf_p2p_info *p2p = &cfg->p2p;
1247 struct afx_hdl *afx_hdl = &p2p->afx_hdl;
1248 struct wireless_dev *wdev;
1249 @@ -1416,7 +1424,7 @@ int brcmf_p2p_notify_action_frame_rx(str
1250 mgmt_frame = kzalloc(offsetof(struct ieee80211_mgmt, u) +
1251 mgmt_frame_len, GFP_KERNEL);
1252 if (!mgmt_frame) {
1253 - brcmf_err("No memory available for action frame\n");
1254 + bphy_err(drvr, "No memory available for action frame\n");
1255 return -ENOMEM;
1256 }
1257 memcpy(mgmt_frame->da, ifp->mac_addr, ETH_ALEN);
1258 @@ -1499,6 +1507,7 @@ int brcmf_p2p_notify_action_tx_complete(
1259 static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
1260 struct brcmf_fil_af_params_le *af_params)
1261 {
1262 + struct brcmf_pub *drvr = p2p->cfg->pub;
1263 struct brcmf_cfg80211_vif *vif;
1264 s32 err = 0;
1265 s32 timeout = 0;
1266 @@ -1513,7 +1522,7 @@ static s32 brcmf_p2p_tx_action_frame(str
1267 err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params,
1268 sizeof(*af_params));
1269 if (err) {
1270 - brcmf_err(" sending action frame has failed\n");
1271 + bphy_err(drvr, " sending action frame has failed\n");
1272 goto exit;
1273 }
1274
1275 @@ -1563,6 +1572,7 @@ static s32 brcmf_p2p_pub_af_tx(struct br
1276 struct brcmf_config_af_params *config_af_params)
1277 {
1278 struct brcmf_p2p_info *p2p = &cfg->p2p;
1279 + struct brcmf_pub *drvr = cfg->pub;
1280 struct brcmf_fil_action_frame_le *action_frame;
1281 struct brcmf_p2p_pub_act_frame *act_frm;
1282 s32 err = 0;
1283 @@ -1641,8 +1651,8 @@ static s32 brcmf_p2p_pub_af_tx(struct br
1284 config_af_params->extra_listen = false;
1285 break;
1286 default:
1287 - brcmf_err("Unknown p2p pub act frame subtype: %d\n",
1288 - act_frm->subtype);
1289 + bphy_err(drvr, "Unknown p2p pub act frame subtype: %d\n",
1290 + act_frm->subtype);
1291 err = -EINVAL;
1292 }
1293 return err;
1294 @@ -1664,6 +1674,7 @@ bool brcmf_p2p_send_action_frame(struct
1295 struct brcmf_fil_action_frame_le *action_frame;
1296 struct brcmf_config_af_params config_af_params;
1297 struct afx_hdl *afx_hdl = &p2p->afx_hdl;
1298 + struct brcmf_pub *drvr = cfg->pub;
1299 u16 action_frame_len;
1300 bool ack = false;
1301 u8 category;
1302 @@ -1699,7 +1710,7 @@ bool brcmf_p2p_send_action_frame(struct
1303 if (brcmf_p2p_pub_af_tx(cfg, af_params, &config_af_params)) {
1304 /* Just send unknown subtype frame with */
1305 /* default parameters. */
1306 - brcmf_err("P2P Public action frame, unknown subtype.\n");
1307 + bphy_err(drvr, "P2P Public action frame, unknown subtype.\n");
1308 }
1309 } else if (brcmf_p2p_is_gas_action(action_frame->data,
1310 action_frame_len)) {
1311 @@ -1721,7 +1732,7 @@ bool brcmf_p2p_send_action_frame(struct
1312 af_params->dwell_time =
1313 cpu_to_le32(P2P_AF_MIN_DWELL_TIME);
1314 } else {
1315 - brcmf_err("Unknown action type: %d\n", action);
1316 + bphy_err(drvr, "Unknown action type: %d\n", action);
1317 goto exit;
1318 }
1319 } else if (brcmf_p2p_is_p2p_action(action_frame->data,
1320 @@ -1729,8 +1740,8 @@ bool brcmf_p2p_send_action_frame(struct
1321 /* do not configure anything. it will be */
1322 /* sent with a default configuration */
1323 } else {
1324 - brcmf_err("Unknown Frame: category 0x%x, action 0x%x\n",
1325 - category, action);
1326 + bphy_err(drvr, "Unknown Frame: category 0x%x, action 0x%x\n",
1327 + category, action);
1328 return false;
1329 }
1330
1331 @@ -1768,7 +1779,7 @@ bool brcmf_p2p_send_action_frame(struct
1332
1333 if (brcmf_p2p_af_searching_channel(p2p) ==
1334 P2P_INVALID_CHANNEL) {
1335 - brcmf_err("Couldn't find peer's channel.\n");
1336 + bphy_err(drvr, "Couldn't find peer's channel.\n");
1337 goto exit;
1338 }
1339
1340 @@ -1790,7 +1801,8 @@ bool brcmf_p2p_send_action_frame(struct
1341 tx_retry++;
1342 }
1343 if (ack == false) {
1344 - brcmf_err("Failed to send Action Frame(retry %d)\n", tx_retry);
1345 + bphy_err(drvr, "Failed to send Action Frame(retry %d)\n",
1346 + tx_retry);
1347 clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
1348 }
1349
1350 @@ -1972,6 +1984,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1351 enum brcmf_fil_p2p_if_types if_type)
1352 {
1353 struct brcmf_p2p_info *p2p = &cfg->p2p;
1354 + struct brcmf_pub *drvr = cfg->pub;
1355 struct brcmf_cfg80211_vif *vif;
1356 struct brcmf_fil_p2p_if_le if_request;
1357 s32 err;
1358 @@ -1981,13 +1994,13 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1359
1360 vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
1361 if (!vif) {
1362 - brcmf_err("vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
1363 + bphy_err(drvr, "vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
1364 return -EPERM;
1365 }
1366 brcmf_notify_escan_complete(cfg, vif->ifp, true, true);
1367 vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
1368 if (!vif) {
1369 - brcmf_err("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
1370 + bphy_err(drvr, "vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
1371 return -EPERM;
1372 }
1373 brcmf_set_mpc(vif->ifp, 0);
1374 @@ -2005,7 +2018,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1375 err = brcmf_fil_iovar_data_set(vif->ifp, "p2p_ifupd", &if_request,
1376 sizeof(if_request));
1377 if (err) {
1378 - brcmf_err("p2p_ifupd FAILED, err=%d\n", err);
1379 + bphy_err(drvr, "p2p_ifupd FAILED, err=%d\n", err);
1380 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1381 return err;
1382 }
1383 @@ -2013,7 +2026,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1384 BRCMF_VIF_EVENT_TIMEOUT);
1385 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1386 if (!err) {
1387 - brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
1388 + bphy_err(drvr, "No BRCMF_E_IF_CHANGE event received\n");
1389 return -EIO;
1390 }
1391
1392 @@ -2076,6 +2089,7 @@ static struct wireless_dev *brcmf_p2p_cr
1393 struct wiphy *wiphy,
1394 u8 *addr)
1395 {
1396 + struct brcmf_pub *drvr = p2p->cfg->pub;
1397 struct brcmf_cfg80211_vif *p2p_vif;
1398 struct brcmf_if *p2p_ifp;
1399 struct brcmf_if *pri_ifp;
1400 @@ -2087,7 +2101,7 @@ static struct wireless_dev *brcmf_p2p_cr
1401
1402 p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);
1403 if (IS_ERR(p2p_vif)) {
1404 - brcmf_err("could not create discovery vif\n");
1405 + bphy_err(drvr, "could not create discovery vif\n");
1406 return (struct wireless_dev *)p2p_vif;
1407 }
1408
1409 @@ -2101,7 +2115,7 @@ static struct wireless_dev *brcmf_p2p_cr
1410 /* Initialize P2P Discovery in the firmware */
1411 err = brcmf_fil_iovar_int_set(pri_ifp, "p2p_disc", 1);
1412 if (err < 0) {
1413 - brcmf_err("set p2p_disc error\n");
1414 + bphy_err(drvr, "set p2p_disc error\n");
1415 brcmf_fweh_p2pdev_setup(pri_ifp, false);
1416 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
1417 goto fail;
1418 @@ -2113,7 +2127,7 @@ static struct wireless_dev *brcmf_p2p_cr
1419 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
1420 brcmf_fweh_p2pdev_setup(pri_ifp, false);
1421 if (!err) {
1422 - brcmf_err("timeout occurred\n");
1423 + bphy_err(drvr, "timeout occurred\n");
1424 err = -EIO;
1425 goto fail;
1426 }
1427 @@ -2127,7 +2141,7 @@ static struct wireless_dev *brcmf_p2p_cr
1428 /* verify bsscfg index for P2P discovery */
1429 err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bsscfgidx);
1430 if (err < 0) {
1431 - brcmf_err("retrieving discover bsscfg index failed\n");
1432 + bphy_err(drvr, "retrieving discover bsscfg index failed\n");
1433 goto fail;
1434 }
1435
1436 @@ -2162,6 +2176,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1437 {
1438 struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
1439 struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
1440 + struct brcmf_pub *drvr = cfg->pub;
1441 struct brcmf_cfg80211_vif *vif;
1442 enum brcmf_fil_p2p_if_types iftype;
1443 int err;
1444 @@ -2202,7 +2217,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1445 BRCMF_VIF_EVENT_TIMEOUT);
1446 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1447 if (!err) {
1448 - brcmf_err("timeout occurred\n");
1449 + bphy_err(drvr, "timeout occurred\n");
1450 err = -EIO;
1451 goto fail;
1452 }
1453 @@ -2210,7 +2225,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1454 /* interface created in firmware */
1455 ifp = vif->ifp;
1456 if (!ifp) {
1457 - brcmf_err("no if pointer provided\n");
1458 + bphy_err(drvr, "no if pointer provided\n");
1459 err = -ENOENT;
1460 goto fail;
1461 }
1462 @@ -2221,7 +2236,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1463 #endif /* >= 3.17.0 */
1464 err = brcmf_net_attach(ifp, true);
1465 if (err) {
1466 - brcmf_err("Registering netdevice failed\n");
1467 + bphy_err(drvr, "Registering netdevice failed\n");
1468 goto fail;
1469 }
1470
1471 @@ -2375,6 +2390,7 @@ void brcmf_p2p_stop_device(struct wiphy
1472 */
1473 s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)
1474 {
1475 + struct brcmf_pub *drvr = cfg->pub;
1476 struct brcmf_p2p_info *p2p;
1477 struct brcmf_if *pri_ifp;
1478 s32 err = 0;
1479 @@ -2389,7 +2405,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg802
1480 if (p2pdev_forced) {
1481 err_ptr = brcmf_p2p_create_p2pdev(p2p, NULL, NULL);
1482 if (IS_ERR(err_ptr)) {
1483 - brcmf_err("P2P device creation failed.\n");
1484 + bphy_err(drvr, "P2P device creation failed.\n");
1485 err = PTR_ERR(err_ptr);
1486 }
1487 } else {
1488 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
1489 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
1490 @@ -47,6 +47,7 @@ static int brcmf_pno_channel_config(stru
1491 static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
1492 u32 mscan, u32 bestn)
1493 {
1494 + struct brcmf_pub *drvr = ifp->drvr;
1495 struct brcmf_pno_param_le pfn_param;
1496 u16 flags;
1497 u32 pfnmem;
1498 @@ -75,13 +76,13 @@ static int brcmf_pno_config(struct brcmf
1499 /* set bestn in firmware */
1500 err = brcmf_fil_iovar_int_set(ifp, "pfnmem", pfnmem);
1501 if (err < 0) {
1502 - brcmf_err("failed to set pfnmem\n");
1503 + bphy_err(drvr, "failed to set pfnmem\n");
1504 goto exit;
1505 }
1506 /* get max mscan which the firmware supports */
1507 err = brcmf_fil_iovar_int_get(ifp, "pfnmem", &pfnmem);
1508 if (err < 0) {
1509 - brcmf_err("failed to get pfnmem\n");
1510 + bphy_err(drvr, "failed to get pfnmem\n");
1511 goto exit;
1512 }
1513 mscan = min_t(u32, mscan, pfnmem);
1514 @@ -95,7 +96,7 @@ static int brcmf_pno_config(struct brcmf
1515 err = brcmf_fil_iovar_data_set(ifp, "pfn_set", &pfn_param,
1516 sizeof(pfn_param));
1517 if (err)
1518 - brcmf_err("pfn_set failed, err=%d\n", err);
1519 + bphy_err(drvr, "pfn_set failed, err=%d\n", err);
1520
1521 exit:
1522 return err;
1523 @@ -104,6 +105,7 @@ exit:
1524 static int brcmf_pno_set_random(struct brcmf_if *ifp, u8 *mac_addr,
1525 u8 *mac_mask)
1526 {
1527 + struct brcmf_pub *drvr = ifp->drvr;
1528 struct brcmf_pno_macaddr_le pfn_mac;
1529 int err, i;
1530
1531 @@ -123,7 +125,7 @@ static int brcmf_pno_set_random(struct b
1532 err = brcmf_fil_iovar_data_set(ifp, "pfn_macaddr", &pfn_mac,
1533 sizeof(pfn_mac));
1534 if (err)
1535 - brcmf_err("pfn_macaddr failed, err=%d\n", err);
1536 + bphy_err(drvr, "pfn_macaddr failed, err=%d\n", err);
1537
1538 return err;
1539 }
1540 @@ -165,6 +167,7 @@ static bool brcmf_is_ssid_active(struct
1541
1542 int brcmf_pno_clean(struct brcmf_if *ifp)
1543 {
1544 + struct brcmf_pub *drvr = ifp->drvr;
1545 int ret;
1546
1547 /* Disable pfn */
1548 @@ -174,7 +177,7 @@ int brcmf_pno_clean(struct brcmf_if *ifp
1549 ret = brcmf_fil_iovar_data_set(ifp, "pfnclear", NULL, 0);
1550 }
1551 if (ret < 0)
1552 - brcmf_err("failed code %d\n", ret);
1553 + bphy_err(drvr, "failed code %d\n", ret);
1554
1555 return ret;
1556 }
1557 @@ -182,6 +185,7 @@ int brcmf_pno_clean(struct brcmf_if *ifp
1558 int brcmf_pno_start_sched_scan(struct brcmf_if *ifp,
1559 struct cfg80211_sched_scan_request *req)
1560 {
1561 + struct brcmf_pub *drvr = ifp->drvr;
1562 struct brcmf_pno_config_le pno_cfg;
1563 struct cfg80211_ssid *ssid;
1564 u16 chan;
1565 @@ -190,7 +194,7 @@ int brcmf_pno_start_sched_scan(struct br
1566 /* clean up everything */
1567 ret = brcmf_pno_clean(ifp);
1568 if (ret < 0) {
1569 - brcmf_err("failed error=%d\n", ret);
1570 + bphy_err(drvr, "failed error=%d\n", ret);
1571 return ret;
1572 }
1573
1574 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
1575 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
1576 @@ -47,15 +47,15 @@ int brcmf_proto_attach(struct brcmf_pub
1577 if (brcmf_proto_msgbuf_attach(drvr))
1578 goto fail;
1579 } else {
1580 - brcmf_err("Unsupported proto type %d\n",
1581 - drvr->bus_if->proto_type);
1582 + bphy_err(drvr, "Unsupported proto type %d\n",
1583 + drvr->bus_if->proto_type);
1584 goto fail;
1585 }
1586 if (!proto->tx_queue_data || (proto->hdrpull == NULL) ||
1587 (proto->query_dcmd == NULL) || (proto->set_dcmd == NULL) ||
1588 (proto->configure_addr_mode == NULL) ||
1589 (proto->delete_peer == NULL) || (proto->add_tdls_peer == NULL)) {
1590 - brcmf_err("Not all proto handlers have been installed\n");
1591 + bphy_err(drvr, "Not all proto handlers have been installed\n");
1592 goto fail;
1593 }
1594 return 0;
Staging tree of Piotr Dymacz