DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C888920892
From:   Arend van Spriel <arend.vanspriel@broadcom.com>
Subject: Re: [PATCH 06/11] brcmfmac: saverestore support changes for 43012
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-7-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>,
        Praveen Babu Chandran <Praveen.Chandran@cypress.com>
Message-ID: <137600e1-b188-1905-99e4-841c656ab322@broadcom.com>
Date:   Thu, 8 Nov 2018 12:53:51 +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-7-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: Praveen Babu C <praveen.chandran@cypress.com>
>
> Add saverestore register settings for 43012.

I would collapse this commit with PATCH 04/11.

Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Praveen Babu C <praveen.chandran@cypress.com>
> Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
> ---
>  .../wireless/broadcom/brcm80211/brcmfmac/chip.c    |  5 +++++
>  .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    | 22 +++++++++++++++++-----
>  2 files changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index 299f59f58d8c..a32eb5f868b5 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -3354,16 +3354,29 @@ static void brcmf_sdio_sr_init(struct brcmf_sdio *bus)
>  {
>  	int err = 0;
>  	u8 val;
> +	u8 wakeupctrl;
> +	u8 cardcap;
> +	u8 chipclkcsr;
>
>  	brcmf_dbg(TRACE, "Enter\n");
>
> +	if (bus->ci->chip == CY_CC_43012_CHIP_ID) {

Use brcmf_chip_is_ulp() here as well (see PATCH 04/11).

hmmm..wait. This is actually disabling the command decode for 43012, 
which is claimed to be done in PATCH 09/11. So maybe another helper 
would be more appropriate here, eg. brcmf_sdio_aos_no_decode(bus).

> +		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;
> +	}
> +