package/kernel/mac80211/patches/323-0002-brcmfmac-always-print-error-when-PSM-s-watchdog-fire.patch

   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
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   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).
  13
  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
  17 debugging process.
  18
  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.
  21
  22 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  23 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  24 ---
  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(-)
  29
  30 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  31 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  32 @@ -738,6 +738,24 @@ void brcmf_remove_interface(struct brcmf
  33         brcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);
  34  }
  35
  36 +static int brcmf_psm_watchdog_notify(struct brcmf_if *ifp,
  37 +                                    const struct brcmf_event_msg *evtmsg,
  38 +                                    void *data)
  39 +{
  40 +       int err;
  41 +
  42 +       brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
  43 +
  44 +       brcmf_err("PSM's watchdog has fired!\n");
  45 +
  46 +       err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
  47 +                                        evtmsg->datalen);
  48 +       if (err)
  49 +               brcmf_err("Failed to get memory dump, %d\n", err);
  50 +
  51 +       return err;
  52 +}
  53 +
  54  #ifdef CONFIG_INET
  55  #define ARPOL_MAX_ENTRIES      8
  56  static int brcmf_inetaddr_changed(struct notifier_block *nb,
  57 @@ -917,6 +935,10 @@ int brcmf_attach(struct device *dev, str
  58                 goto fail;
  59         }
  60
  61 +       /* Attach to events important for core code */
  62 +       brcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,
  63 +                           brcmf_psm_watchdog_notify);
  64 +
  65         /* attach firmware event handler */
  66         brcmf_fweh_attach(drvr);
  67
  68 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
  69 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
  70 @@ -27,8 +27,8 @@
  71
  72  static struct dentry *root_folder;
  73
  74 -static int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
  75 -                                     size_t len)
  76 +int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
  77 +                              size_t len)
  78  {
  79         void *dump;
  80         size_t ramsize;
  81 @@ -54,24 +54,6 @@ static int brcmf_debug_create_memdump(st
  82         return 0;
  83  }
  84
  85 -static int brcmf_debug_psm_watchdog_notify(struct brcmf_if *ifp,
  86 -                                          const struct brcmf_event_msg *evtmsg,
  87 -                                          void *data)
  88 -{
  89 -       int err;
  90 -
  91 -       brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
  92 -
  93 -       brcmf_err("PSM's watchdog has fired!\n");
  94 -
  95 -       err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
  96 -                                        evtmsg->datalen);
  97 -       if (err)
  98 -               brcmf_err("Failed to get memory dump, %d\n", err);
  99 -
 100 -       return err;
 101 -}
 102 -
 103  void brcmf_debugfs_init(void)
 104  {
 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);
 109
 110 -
 111 -       return brcmf_fweh_register(drvr, BRCMF_E_PSM_WATCHDOG,
 112 -                                  brcmf_debug_psm_watchdog_notify);
 113 +       return 0;
 114  }
 115
 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 {                                                                  \
 120
 121  extern int brcmf_msg_level;
 122
 123 +struct brcmf_bus;
 124  struct brcmf_pub;
 125  #ifdef DEBUG
 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,
 132 +                              size_t len);
 133  #else
 134  static inline void brcmf_debugfs_init(void)
 135  {
 136 @@ -128,6 +131,12 @@ int brcmf_debugfs_add_entry(struct brcmf
 137  {
 138         return 0;
 139  }
 140 +static inline
 141 +int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
 142 +                              size_t len)
 143 +{
 144 +       return 0;
 145 +}
 146  #endif
 147
 148  #endif /* BRCMFMAC_DEBUG_H */