lkml.org 
[lkml]   [2019]   [Nov]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 046/219] brcmfmac: set F2 watermark to 256 for 4373
    Date
    From: Wright Feng <wright.feng@cypress.com>

    [ Upstream commit e1a08730eeb0bad4d82c3bc40e74854872de618d ]

    We got SDIO_CRC_ERROR with 4373 on SDR104 when doing bi-directional
    throughput test. Enable watermark to 256 to guarantee the operation
    stability.

    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>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../broadcom/brcm80211/brcmfmac/sdio.c | 26 +++++++++++++++++--
    1 file changed, 24 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    index 53e4962ceb8ae..e487dd78cc024 100644
    --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
    @@ -49,6 +49,10 @@
    #define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
    #define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)

    +/* watermark expressed in number of words */
    +#define DEFAULT_F2_WATERMARK 0x8
    +#define CY_4373_F2_WATERMARK 0x40
    +
    #ifdef DEBUG

    #define BRCMF_TRAP_INFO_SIZE 80
    @@ -138,6 +142,8 @@ struct rte_console {
    /* 1: isolate internal sdio signals, put external pads in tri-state; requires
    * sdio bus power cycle to clear (rev 9) */
    #define SBSDIO_DEVCTL_PADS_ISO 0x08
    +/* 1: enable F2 Watermark */
    +#define SBSDIO_DEVCTL_F2WM_ENAB 0x10
    /* Force SD->SB reset mapping (rev 11) */
    #define SBSDIO_DEVCTL_SB_RST_CTL 0x30
    /* Determined by CoreControl bit */
    @@ -4060,6 +4066,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
    void *nvram;
    u32 nvram_len;
    u8 saveclk;
    + u8 devctl;

    brcmf_dbg(TRACE, "Enter: dev=%s, err=%d\n", dev_name(dev), err);

    @@ -4115,8 +4122,23 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
    brcmf_sdiod_writel(sdiod, core->base + SD_REG(hostintmask),
    bus->hostintmask, NULL);

    -
    - brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK, 8, &err);
    + switch (sdiod->func1->device) {
    + case SDIO_DEVICE_ID_CYPRESS_4373:
    + brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
    + CY_4373_F2_WATERMARK);
    + brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
    + CY_4373_F2_WATERMARK, &err);
    + devctl = brcmf_sdiod_readb(sdiod, SBSDIO_DEVICE_CTL,
    + &err);
    + devctl |= SBSDIO_DEVCTL_F2WM_ENAB;
    + brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
    + &err);
    + break;
    + default:
    + brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
    + DEFAULT_F2_WATERMARK, &err);
    + break;
    + }
    } else {
    /* Disable F2 again */
    sdio_disable_func(sdiod->func2);
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-22 07:29    [W:4.064 / U:0.940 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site