From 0844bdda9eca8fab35793cb97b62e2d9041c5ec6 Mon Sep 17 00:00:00 2001 From: Ishan Deshpande Date: Wed, 13 Sep 2023 01:38:01 -0500 Subject: [PATCH 232/296] brcmfmac: Remove chip-id check from kso=0 bail out logic Whenever kso bit is cleared, further reads can fail so we should bail out immediately after kso bit is cleared. This logic is not specific for certain chips, it holds true for all chips. Fix is to remove chip-id check from kso=0 bail out logic Signed-off-by: Ishan Deshpande --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 2be1fc7fe9e2..10a754a0ab34 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -779,15 +779,12 @@ brcmf_sdio_kso_control(struct brcmf_sdio *bus, bool on) /* 1st KSO write goes to AOS wake up core if device is asleep */ brcmf_sdiod_writeb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR, wr_val, &err); - /* In case of 43012 chip, the chip could go down immediately after + /* The chip could go down immediately after * KSO bit is cleared. So the further reads of KSO register could * fail. Thereby just bailing out immediately after clearing KSO * bit, to avoid polling of KSO bit. */ - if (!on && ((bus->ci->chip == CY_CC_43012_CHIP_ID) || - (bus->ci->chip == CY_CC_55500_CHIP_ID) || - (bus->ci->chip == CY_CC_43022_CHIP_ID) || - (bus->ci->chip == CY_CC_55572_CHIP_ID))) + if (!on) return err; if (on) { -- 2.25.1