DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD2FA20892
From:   Arend van Spriel <arend.vanspriel@broadcom.com>
Subject: Re: [PATCH 09/11] brcmfmac: disable command decode in sdio_aos for
 43012/4339/4345
To:     Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com>,
        "linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>
References: <1541476188-75475-1-git-send-email-chi-hsien.lin@cypress.com>
 <1541476188-75475-10-git-send-email-chi-hsien.lin@cypress.com>
Cc:     "brcm80211-dev-list@broadcom.com" <brcm80211-dev-list@broadcom.com>,
        brcm80211-dev-list <brcm80211-dev-list@cypress.com>,
        Franky Lin <franky.lin@broadcom.com>,
        Hante Meuleman <hante.meuleman@broadcom.com>,
        Wright Feng <Wright.Feng@cypress.com>,
        Kalle Valo <kvalo@codeaurora.org>
Message-ID: <ccee0c01-c63b-4ff2-b4ea-5a4e39d15029@broadcom.com>
Date:   Thu, 8 Nov 2018 12:54:32 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101
 Thunderbird/45.8.0
MIME-Version: 1.0
In-Reply-To: <1541476188-75475-10-git-send-email-chi-hsien.lin@cypress.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

On 11/6/2018 4:50 AM, Chi-Hsien Lin wrote:
> From: Wright Feng <wright.feng@cypress.com>
>
> Transaction between AOS and SDIOD is not protected, and if cmd 52
> received in AOS and in the middle of response state changed from AOS to
> SDIOD, response is corrupted and it causes to SDIO Host controller to
> hang.

I think it would be good to elaborate on what AOS stands for. It is a 
part of the SDIOD core that becomes active when the rest of SDIOD is 
sleeping to keep SDIO bus alive responding to reduced set of commands.

I would actually suggest to collapse patch 10 and 11 in this one.

Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Wright Feng <wright.feng@cypress.com>
> Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
> ---
>  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index e7ee144dc5dd..d507d8f15e48 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -3363,15 +3363,21 @@ static void brcmf_sdio_sr_init(struct brcmf_sdio *bus)
>
>  	if (bus->ci->chip == CY_CC_43012_CHIP_ID) {
>  		wakeupctrl = SBSDIO_FUNC1_WCTRL_ALPWAIT_SHIFT;
> -		cardcap = SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC;
>  		chipclkcsr = SBSDIO_HT_AVAIL_REQ;
>  	} else {
>  		wakeupctrl = SBSDIO_FUNC1_WCTRL_HTWAIT_SHIFT;
> -		cardcap = (SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT |
> -				   SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT);
>  		chipclkcsr = SBSDIO_FORCE_HT;
>  	}
>
> +	if (bus->ci->chip == CY_CC_43012_CHIP_ID ||
> +	    bus->ci->chip == BRCM_CC_4339_CHIP_ID ||
> +	    bus->ci->chip == BRCM_CC_4345_CHIP_ID) {

use brcmf_sdio_aos_no_decode(bus) helper here.

> +		cardcap = SDIO_CCCR_BRCM_CARDCAP_CMD_NODEC;
> +	} else {
> +		cardcap = (SDIO_CCCR_BRCM_CARDCAP_CMD14_SUPPORT |
> +			   SDIO_CCCR_BRCM_CARDCAP_CMD14_EXT);
> +	}
> +
>  	val = brcmf_sdiod_readb(bus->sdiodev, SBSDIO_FUNC1_WAKEUPCTRL, &err);
>  	if (err) {
>  		brcmf_err("error reading SBSDIO_FUNC1_WAKEUPCTRL\n");
>