From 3518bc69929dd03dc2d0becd95e504e80eb8220d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Thu, 27 Aug 2015 14:58:00 +0000 Subject: [PATCH] mac80211: add pending brcmfmac patch fixing warm reboots MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rafał Miłecki Backport of r46739 git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46740 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...Reset-PCIE-devices-after-recognition.patch | 193 ++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 package/kernel/mac80211/patches/395-brcmfmac-Reset-PCIE-devices-after-recognition.patch diff --git a/package/kernel/mac80211/patches/395-brcmfmac-Reset-PCIE-devices-after-recognition.patch b/package/kernel/mac80211/patches/395-brcmfmac-Reset-PCIE-devices-after-recognition.patch new file mode 100644 index 0000000000..5a7e447e25 --- /dev/null +++ b/package/kernel/mac80211/patches/395-brcmfmac-Reset-PCIE-devices-after-recognition.patch @@ -0,0 +1,193 @@ +From: Hante Meuleman +Date: Thu, 27 Aug 2015 16:14:06 +0200 +Subject: [PATCH] brcmfmac: Reset PCIE devices after recognition. + +When PCIE type devices are being FW reloaded without being properly +reset then the device ends up in a locked state, requiring the +device to be completely powered down. This patch adds a reset +through watchdog at the moment the device (cores) has been +recognized. This will solve warm reboot issues. + +Cc: Rafal Milecki +Reviewed-by: Arend Van Spriel +Reviewed-by: Franky (Zhenhui) Lin +Reviewed-by: Pieter-Paul Giesberts +Signed-off-by: Hante Meuleman +Signed-off-by: Arend van Spriel +--- + +--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.c +@@ -101,6 +101,9 @@ + /* ARM Cortex M3 core, ID 0x82a */ + #define BCM4329_CORE_ARM_BASE 0x18002000 + ++/* Max possibly supported memory size (limited by IO mapped memory) */ ++#define BRCMF_CHIP_MAX_MEMSIZE (4 * 1024 * 1024) ++ + #define CORE_SB(base, field) \ + (base + SBCONFIGOFF + offsetof(struct sbconfig, field)) + #define SBCOREREV(sbidh) \ +@@ -687,6 +690,12 @@ static int brcmf_chip_get_raminfo(struct + brcmf_err("RAM size is undetermined\n"); + return -ENOMEM; + } ++ ++ if (ci->pub.ramsize > BRCMF_CHIP_MAX_MEMSIZE) { ++ brcmf_err("RAM size is incorrect\n"); ++ return -ENOMEM; ++ } ++ + return 0; + } + +@@ -899,6 +908,15 @@ static int brcmf_chip_recognition(struct + + /* assure chip is passive for core access */ + brcmf_chip_set_passive(&ci->pub); ++ ++ /* Call bus specific reset function now. Cores have been determined ++ * but further access may require a chip specific reset at this point. ++ */ ++ if (ci->ops->reset) { ++ ci->ops->reset(ci->ctx, &ci->pub); ++ brcmf_chip_set_passive(&ci->pub); ++ } ++ + return brcmf_chip_get_raminfo(ci); + } + +--- a/drivers/net/wireless/brcm80211/brcmfmac/chip.h ++++ b/drivers/net/wireless/brcm80211/brcmfmac/chip.h +@@ -73,6 +73,7 @@ struct brcmf_buscore_ops { + u32 (*read32)(void *ctx, u32 addr); + void (*write32)(void *ctx, u32 addr, u32 value); + int (*prepare)(void *ctx); ++ int (*reset)(void *ctx, struct brcmf_chip *chip); + int (*setup)(void *ctx, struct brcmf_chip *chip); + void (*activate)(void *ctx, struct brcmf_chip *chip, u32 rstvec); + }; +--- a/drivers/net/wireless/brcm80211/brcmfmac/pcie.c ++++ b/drivers/net/wireless/brcm80211/brcmfmac/pcie.c +@@ -74,6 +74,8 @@ enum brcmf_pcie_state { + #define BRCMF_PCIE_REG_INTMASK 0x94 + #define BRCMF_PCIE_REG_SBMBX 0x98 + ++#define BRCMF_PCIE_REG_LINK_STATUS_CTRL 0xBC ++ + #define BRCMF_PCIE_PCIE2REG_INTMASK 0x24 + #define BRCMF_PCIE_PCIE2REG_MAILBOXINT 0x48 + #define BRCMF_PCIE_PCIE2REG_MAILBOXMASK 0x4C +@@ -466,6 +468,7 @@ brcmf_pcie_select_core(struct brcmf_pcie + + static void brcmf_pcie_reset_device(struct brcmf_pciedev_info *devinfo) + { ++ struct brcmf_core *core; + u16 cfg_offset[] = { BRCMF_PCIE_CFGREG_STATUS_CMD, + BRCMF_PCIE_CFGREG_PM_CSR, + BRCMF_PCIE_CFGREG_MSI_CAP, +@@ -484,32 +487,38 @@ static void brcmf_pcie_reset_device(stru + if (!devinfo->ci) + return; + ++ /* Disable ASPM */ + brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2); +- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGADDR, +- BRCMF_PCIE_CFGREG_LINK_STATUS_CTRL); +- lsc = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA); ++ pci_read_config_dword(devinfo->pdev, BRCMF_PCIE_REG_LINK_STATUS_CTRL, ++ &lsc); + val = lsc & (~BRCMF_PCIE_LINK_STATUS_CTRL_ASPM_ENAB); +- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA, val); ++ pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_LINK_STATUS_CTRL, ++ val); + ++ /* Watchdog reset */ + brcmf_pcie_select_core(devinfo, BCMA_CORE_CHIPCOMMON); + WRITECC32(devinfo, watchdog, 4); + msleep(100); + ++ /* Restore ASPM */ + brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2); +- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGADDR, +- BRCMF_PCIE_CFGREG_LINK_STATUS_CTRL); +- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA, lsc); ++ pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_LINK_STATUS_CTRL, ++ lsc); + +- brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2); +- for (i = 0; i < ARRAY_SIZE(cfg_offset); i++) { +- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGADDR, +- cfg_offset[i]); +- val = brcmf_pcie_read_reg32(devinfo, +- BRCMF_PCIE_PCIE2REG_CONFIGDATA); +- brcmf_dbg(PCIE, "config offset 0x%04x, value 0x%04x\n", +- cfg_offset[i], val); +- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGDATA, +- val); ++ core = brcmf_chip_get_core(devinfo->ci, BCMA_CORE_PCIE2); ++ if (core->rev <= 13) { ++ for (i = 0; i < ARRAY_SIZE(cfg_offset); i++) { ++ brcmf_pcie_write_reg32(devinfo, ++ BRCMF_PCIE_PCIE2REG_CONFIGADDR, ++ cfg_offset[i]); ++ val = brcmf_pcie_read_reg32(devinfo, ++ BRCMF_PCIE_PCIE2REG_CONFIGDATA); ++ brcmf_dbg(PCIE, "config offset 0x%04x, value 0x%04x\n", ++ cfg_offset[i], val); ++ brcmf_pcie_write_reg32(devinfo, ++ BRCMF_PCIE_PCIE2REG_CONFIGDATA, ++ val); ++ } + } + } + +@@ -519,8 +528,6 @@ static void brcmf_pcie_attach(struct brc + u32 config; + + brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2); +- if (brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_INTMASK) != 0) +- brcmf_pcie_reset_device(devinfo); + /* BAR1 window may not be sized properly */ + brcmf_pcie_select_core(devinfo, BCMA_CORE_PCIE2); + brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_CONFIGADDR, 0x4e0); +@@ -1636,6 +1643,23 @@ static int brcmf_pcie_buscoreprep(void * + } + + ++static int brcmf_pcie_buscore_reset(void *ctx, struct brcmf_chip *chip) ++{ ++ struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)ctx; ++ u32 val; ++ ++ devinfo->ci = chip; ++ brcmf_pcie_reset_device(devinfo); ++ ++ val = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT); ++ if (val != 0xffffffff) ++ brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT, ++ val); ++ ++ return 0; ++} ++ ++ + static void brcmf_pcie_buscore_activate(void *ctx, struct brcmf_chip *chip, + u32 rstvec) + { +@@ -1647,6 +1671,7 @@ static void brcmf_pcie_buscore_activate( + + static const struct brcmf_buscore_ops brcmf_pcie_buscore_ops = { + .prepare = brcmf_pcie_buscoreprep, ++ .reset = brcmf_pcie_buscore_reset, + .activate = brcmf_pcie_buscore_activate, + .read32 = brcmf_pcie_buscore_read32, + .write32 = brcmf_pcie_buscore_write32, +@@ -1814,7 +1839,6 @@ brcmf_pcie_remove(struct pci_dev *pdev) + brcmf_pcie_intr_disable(devinfo); + + brcmf_detach(&pdev->dev); +- brcmf_pcie_reset_device(devinfo); + + kfree(bus->bus_priv.pcie); + kfree(bus->msgbuf->flowrings);