1 From f1ac3aa212af6dd0a36dc07a63f95f91be6f4935 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Fri, 24 Feb 2017 17:32:46 +0100
4 Subject: [PATCH] brcmfmac: always print error when PSM's watchdog fires
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 So far we were attaching BRCMF_E_PSM_WATCHDOG event listener in
10 brcmf_debug_attach which gets compiled only with CONFIG_BRCMDBG. This
11 event means something went wrong and firmware / hardware usually can't
12 be expected to work (reliably).
14 Such a problem is significant for user experience so I believe we should
15 print an error unconditionally (even with debugging disabled). What can
16 be indeed optional is dumping bus memory as this is clearly part of
19 In the future we may also try to extend this listener by trying to
20 recover from the error or at least signal it to the cfg80211.
22 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
23 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
25 .../wireless/broadcom/brcm80211/brcmfmac/core.c | 22 ++++++++++++++++++
26 .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 26 +++-------------------
27 .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 9 ++++++++
28 3 files changed, 34 insertions(+), 23 deletions(-)
30 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
31 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
32 @@ -748,6 +748,24 @@ void brcmf_remove_interface(struct brcmf
33 brcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);
36 +static int brcmf_psm_watchdog_notify(struct brcmf_if *ifp,
37 + const struct brcmf_event_msg *evtmsg,
42 + brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
44 + brcmf_err("PSM's watchdog has fired!\n");
46 + err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
49 + brcmf_err("Failed to get memory dump, %d\n", err);
55 #define ARPOL_MAX_ENTRIES 8
56 static int brcmf_inetaddr_changed(struct notifier_block *nb,
57 @@ -927,6 +945,10 @@ int brcmf_attach(struct device *dev, str
61 + /* Attach to events important for core code */
62 + brcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,
63 + brcmf_psm_watchdog_notify);
65 /* attach firmware event handler */
66 brcmf_fweh_attach(drvr);
68 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
69 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
72 static struct dentry *root_folder;
74 -static int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
76 +int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
81 @@ -54,24 +54,6 @@ static int brcmf_debug_create_memdump(st
85 -static int brcmf_debug_psm_watchdog_notify(struct brcmf_if *ifp,
86 - const struct brcmf_event_msg *evtmsg,
91 - brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
93 - brcmf_err("PSM's watchdog has fired!\n");
95 - err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
98 - brcmf_err("Failed to get memory dump, %d\n", err);
103 void brcmf_debugfs_init(void)
105 root_folder = debugfs_create_dir(KBUILD_MODNAME, NULL);
106 @@ -99,9 +81,7 @@ int brcmf_debug_attach(struct brcmf_pub
107 if (IS_ERR(drvr->dbgfs_dir))
108 return PTR_ERR(drvr->dbgfs_dir);
111 - return brcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,
112 - brcmf_debug_psm_watchdog_notify);
116 void brcmf_debug_detach(struct brcmf_pub *drvr)
117 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
118 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
119 @@ -99,6 +99,7 @@ do { \
121 extern int brcmf_msg_level;
126 void brcmf_debugfs_init(void);
127 @@ -108,6 +109,8 @@ void brcmf_debug_detach(struct brcmf_pub
128 struct dentry *brcmf_debugfs_get_devdir(struct brcmf_pub *drvr);
129 int brcmf_debugfs_add_entry(struct brcmf_pub *drvr, const char *fn,
130 int (*read_fn)(struct seq_file *seq, void *data));
131 +int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
134 static inline void brcmf_debugfs_init(void)
136 @@ -128,6 +131,12 @@ int brcmf_debugfs_add_entry(struct brcmf
141 +int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
148 #endif /* BRCMFMAC_DEBUG_H */