You've already forked linux-t2-patches
mirror of
https://github.com/t2linux/linux-t2-patches.git
synced 2026-04-30 13:52:11 -07:00
Aditya Garg
55 lines
2.1 KiB
Diff
55 lines
2.1 KiB
Diff
From 66c8e1424e89aebddce3f0bea7961f8848eaf9ac Mon Sep 17 00:00:00 2001
|
|
From: Hector Martin <marcan@marcan.st>
|
|
Date: Mon, 20 Dec 2021 20:00:57 +0900
|
|
Subject: [PATCH 20/33] brcmfmac: chip: Only disable D11 cores; handle an
|
|
arbitrary number
|
|
|
|
At least on BCM4387, the D11 cores are held in reset on cold startup and
|
|
firmware expects to release reset itself. Just assert reset here and let
|
|
firmware deassert it. Premature deassertion results in the firmware
|
|
failing to initialize properly some of the time, with strange AXI bus
|
|
errors.
|
|
|
|
Also, BCM4387 has 3 cores, up from 2. The logic for handling that is in
|
|
brcmf_chip_ai_resetcore(), but since we aren't using that any more, just
|
|
handle it here.
|
|
|
|
Signed-off-by: Hector Martin <marcan@marcan.st>
|
|
Signed-off-by: Aun-Ali Zaidi <admin@kodeit.net>
|
|
---
|
|
.../wireless/broadcom/brcm80211/brcmfmac/chip.c | 14 +++++++++-----
|
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
index 73ab96968..15a1211f0 100644
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
@@ -1289,15 +1289,19 @@ static bool brcmf_chip_cm3_set_active(struct brcmf_chip_priv *chip)
|
|
static inline void
|
|
brcmf_chip_cr4_set_passive(struct brcmf_chip_priv *chip)
|
|
{
|
|
+ int i;
|
|
struct brcmf_core *core;
|
|
|
|
brcmf_chip_disable_arm(chip, BCMA_CORE_ARM_CR4);
|
|
|
|
- core = brcmf_chip_get_core(&chip->pub, BCMA_CORE_80211);
|
|
- brcmf_chip_resetcore(core, D11_BCMA_IOCTL_PHYRESET |
|
|
- D11_BCMA_IOCTL_PHYCLOCKEN,
|
|
- D11_BCMA_IOCTL_PHYCLOCKEN,
|
|
- D11_BCMA_IOCTL_PHYCLOCKEN);
|
|
+ /*
|
|
+ * Disable the cores only and let the firmware enable them.
|
|
+ * Releasing reset ourselves breaks BCM4387 in weird ways.
|
|
+ */
|
|
+ for (i = 0; (core = brcmf_chip_get_d11core(&chip->pub, i)); i++)
|
|
+ brcmf_chip_coredisable(core, D11_BCMA_IOCTL_PHYRESET |
|
|
+ D11_BCMA_IOCTL_PHYCLOCKEN,
|
|
+ D11_BCMA_IOCTL_PHYCLOCKEN);
|
|
}
|
|
|
|
static bool brcmf_chip_cr4_set_active(struct brcmf_chip_priv *chip, u32 rstvec)
|
|
--
|
|
2.25.1
|
|
|