1 files changed, 47 insertions, 24 deletions

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 0cd5b8d970d7..4d104ab80fd8 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -2999,21 +2999,35 @@ static int brcmf_sdio_trap_info(struct seq_file *seq, struct brcmf_sdio *bus,
         if (error < 0)
                 return error;
 
-        seq_printf(seq,
-                   "dongle trap info: type 0x%x @ epc 0x%08x\n"
-                   "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
-                   "  lr   0x%08x pc   0x%08x offset 0x%x\n"
-                   "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
-                   "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
-                   le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
-                   le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
-                   le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
-                   le32_to_cpu(tr.pc), sh->trap_addr,
-                   le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
-                   le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
-                   le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
-                   le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
-
+        if (seq)
+                seq_printf(seq,
+                           "dongle trap info: type 0x%x @ epc 0x%08x\n"
+                           "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
+                           "  lr   0x%08x pc   0x%08x offset 0x%x\n"
+                           "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
+                           "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
+                           le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
+                           le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
+                           le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
+                           le32_to_cpu(tr.pc), sh->trap_addr,
+                           le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
+                           le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
+                           le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
+                           le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
+        else
+                pr_debug("dongle trap info: type 0x%x @ epc 0x%08x\n"
+                         "  cpsr 0x%08x spsr 0x%08x sp 0x%08x\n"
+                         "  lr   0x%08x pc   0x%08x offset 0x%x\n"
+                         "  r0   0x%08x r1   0x%08x r2 0x%08x r3 0x%08x\n"
+                         "  r4   0x%08x r5   0x%08x r6 0x%08x r7 0x%08x\n",
+                         le32_to_cpu(tr.type), le32_to_cpu(tr.epc),
+                         le32_to_cpu(tr.cpsr), le32_to_cpu(tr.spsr),
+                         le32_to_cpu(tr.r13), le32_to_cpu(tr.r14),
+                         le32_to_cpu(tr.pc), sh->trap_addr,
+                         le32_to_cpu(tr.r0), le32_to_cpu(tr.r1),
+                         le32_to_cpu(tr.r2), le32_to_cpu(tr.r3),
+                         le32_to_cpu(tr.r4), le32_to_cpu(tr.r5),
+                         le32_to_cpu(tr.r6), le32_to_cpu(tr.r7));
         return 0;
 }
 
@@ -3067,8 +3081,10 @@ static int brcmf_sdio_checkdied(struct brcmf_sdio *bus)
         else if (sh.flags & SDPCM_SHARED_ASSERT)
                 brcmf_err("assertion in dongle\n");
 
-        if (sh.flags & SDPCM_SHARED_TRAP)
+        if (sh.flags & SDPCM_SHARED_TRAP) {
                 brcmf_err("firmware trap in dongle\n");
+                brcmf_sdio_trap_info(NULL, bus, &sh);
+        }
 
         return 0;
 }
@@ -3143,9 +3159,12 @@ static int brcmf_debugfs_sdio_count_read(struct seq_file *seq, void *data)
         return 0;
 }
 
-static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
+static void brcmf_sdio_debugfs_create(struct device *dev)
 {
-        struct brcmf_pub *drvr = bus->sdiodev->bus_if->drvr;
+        struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+        struct brcmf_pub *drvr = bus_if->drvr;
+        struct brcmf_sdio_dev *sdiodev = bus_if->bus_priv.sdio;
+        struct brcmf_sdio *bus = sdiodev->bus;
         struct dentry *dentry = brcmf_debugfs_get_devdir(drvr);
 
         if (IS_ERR_OR_NULL(dentry))
@@ -3165,7 +3184,7 @@ static int brcmf_sdio_checkdied(struct brcmf_sdio *bus)
         return 0;
 }
 
-static void brcmf_sdio_debugfs_create(struct brcmf_sdio *bus)
+static void brcmf_sdio_debugfs_create(struct device *dev)
 {
 }
 #endif /* DEBUG */
@@ -3477,8 +3496,6 @@ static int brcmf_sdio_bus_preinit(struct device *dev)
         if (bus->rxbuf)
                 bus->rxblen = value;
 
-        brcmf_sdio_debugfs_create(bus);
-
         /* the commands below use the terms tx and rx from
          * a device perspective, ie. bus:txglom affects the
          * bus transfers from device to host.
@@ -4088,6 +4105,7 @@ static const struct brcmf_bus_ops brcmf_sdio_bus_ops = {
         .get_ramsize = brcmf_sdio_bus_get_ramsize,
         .get_memdump = brcmf_sdio_bus_get_memdump,
         .get_fwname = brcmf_sdio_get_fwname,
+        .debugfs_create = brcmf_sdio_debugfs_create
 };
 
 #define BRCMF_SDIO_FW_CODE      0
@@ -4197,7 +4215,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         } else {
                 /* Disable F2 again */
                 sdio_disable_func(sdiod->func2);
-                goto release;
+                goto checkdied;
         }
 
         if (brcmf_chip_sr_capable(bus->ci)) {
@@ -4218,8 +4236,10 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         }
 
         /* If we didn't come up, turn off backplane clock */
-        if (err != 0)
+        if (err != 0) {
                 brcmf_sdio_clkctl(bus, CLK_NONE, false);
+                goto checkdied;
+        }
 
         sdio_release_host(sdiod->func1);
 
@@ -4233,12 +4253,15 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
         err = brcmf_attach(sdiod->dev, sdiod->settings);
         if (err != 0) {
                 brcmf_err("brcmf_attach failed\n");
-                goto fail;
+                sdio_claim_host(sdiod->func1);
+                goto checkdied;
         }
 
         /* ready */
         return;
 
+checkdied:
+        brcmf_sdio_checkdied(bus);
 release:
         sdio_release_host(sdiod->func1);
 fail: