From: Chi-Hsien Lin <Chi-Hsien.Lin@cypress.com>
To: Soeren Moch <smoch@web.de>, Kalle Valo <kvalo@codeaurora.org>
Cc: Stanley Hsu <Stanley.Hsu@cypress.com>,
Arend van Spriel <arend.vanspriel@broadcom.com>,
Franky Lin <franky.lin@broadcom.com>,
Hante Meuleman <hante.meuleman@broadcom.com>,
Wright Feng <Wright.Feng@cypress.com>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"brcm80211-dev-list.pdl@broadcom.com"
<brcm80211-dev-list.pdl@broadcom.com>,
brcm80211-dev-list <brcm80211-dev-list@cypress.com>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 2/8] brcmfmac: set F2 blocksize and watermark for 4359
Date: Tue, 10 Dec 2019 03:37:07 +0000 [thread overview]
Message-ID: <541616d9-78ca-81b2-d785-5ec389265bd1@cypress.com> (raw)
In-Reply-To: <20191209223822.27236-2-smoch@web.de>
On 12/10/2019 6:38, Soeren Moch wrote:
> From: Chung-Hsien Hsu <stanley.hsu@cypress.com>
>
> Set F2 blocksize to 256 bytes and watermark to 0x40 for 4359. Also
> enable and configure F1 MesBusyCtrl. It fixes DMA error while having
> UDP bi-directional traffic.
>
> Signed-off-by: Chung-Hsien Hsu <stanley.hsu@cypress.com>
> [slightly adapted for rebase on mainline linux]
> Signed-off-by: Soeren Moch <smoch@web.de>
Reviewed-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
> ---
> Cc: Kalle Valo <kvalo@codeaurora.org>
> Cc: Arend van Spriel <arend.vanspriel@broadcom.com>
> Cc: Franky Lin <franky.lin@broadcom.com>
> Cc: Hante Meuleman <hante.meuleman@broadcom.com>
> Cc: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
> Cc: Wright Feng <wright.feng@cypress.com>
> Cc: linux-wireless@vger.kernel.org
> Cc: brcm80211-dev-list.pdl@broadcom.com
> Cc: brcm80211-dev-list@cypress.com
> Cc: netdev@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---
> .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 6 +++++-
> .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 15 +++++++++++++++
> 2 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> index 96fd8e2bf773..68baf0189305 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
> @@ -43,6 +43,7 @@
>
> #define SDIO_FUNC1_BLOCKSIZE 64
> #define SDIO_FUNC2_BLOCKSIZE 512
> +#define SDIO_4359_FUNC2_BLOCKSIZE 256
> /* Maximum milliseconds to wait for F2 to come up */
> #define SDIO_WAIT_F2RDY 3000
>
> @@ -903,6 +904,7 @@ static void brcmf_sdiod_host_fixup(struct mmc_host *host)
> static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
> {
> int ret = 0;
> + unsigned int f2_blksz = SDIO_FUNC2_BLOCKSIZE;
>
> sdio_claim_host(sdiodev->func1);
>
> @@ -912,7 +914,9 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
> sdio_release_host(sdiodev->func1);
> goto out;
> }
> - ret = sdio_set_block_size(sdiodev->func2, SDIO_FUNC2_BLOCKSIZE);
> + if (sdiodev->func2->device == SDIO_DEVICE_ID_BROADCOM_4359)
> + f2_blksz = SDIO_4359_FUNC2_BLOCKSIZE;
> + ret = sdio_set_block_size(sdiodev->func2, f2_blksz);
> if (ret) {
> brcmf_err("Failed to set F2 blocksize\n");
> sdio_release_host(sdiodev->func1);
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> index 264ad63232f8..21e535072f3f 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
> @@ -42,6 +42,8 @@
> #define DEFAULT_F2_WATERMARK 0x8
> #define CY_4373_F2_WATERMARK 0x40
> #define CY_43012_F2_WATERMARK 0x60
> +#define CY_4359_F2_WATERMARK 0x40
> +#define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
>
> #ifdef DEBUG
>
> @@ -4205,6 +4207,19 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
> brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
> &err);
> break;
> + case SDIO_DEVICE_ID_BROADCOM_4359:
> + brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
> + CY_4359_F2_WATERMARK);
> + brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
> + CY_4359_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);
> + brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,
> + CY_4359_F1_MESBUSYCTRL, &err);
> + break;
> default:
> brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
> DEFAULT_F2_WATERMARK, &err);
> --
> 2.17.1
>
> .
>
next prev parent reply other threads:[~2019-12-10 3:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 22:38 [PATCH 1/8] brcmfmac: reset two D11 cores if chip has two D11 cores Soeren Moch
2019-12-09 22:38 ` [PATCH 2/8] brcmfmac: set F2 blocksize and watermark for 4359 Soeren Moch
2019-12-10 3:37 ` Chi-Hsien Lin [this message]
2019-12-09 22:38 ` [PATCH 3/8] brcmfmac: fix rambase for 4359/9 Soeren Moch
2019-12-09 22:38 ` [PATCH 4/8] brcmfmac: make errors when setting roaming parameters non-fatal Soeren Moch
2019-12-10 3:37 ` Chi-Hsien Lin
2019-12-09 22:38 ` [PATCH 5/8] brcmfmac: add support for BCM4359 SDIO chipset Soeren Moch
2019-12-10 3:38 ` Chi-Hsien Lin
2019-12-10 6:32 ` Chi-Hsien Lin
2019-12-10 10:12 ` Soeren Moch
2019-12-09 22:38 ` [PATCH 6/8] brcmfmac: add RSDB condition when setting interface combinations Soeren Moch
2019-12-10 3:38 ` Chi-Hsien Lin
2019-12-09 22:38 ` [PATCH 7/8] brcmfmac: not set mbss in vif if firmware does not support MBSS Soeren Moch
2019-12-10 3:38 ` Chi-Hsien Lin
2019-12-09 22:38 ` [PATCH 8/8] arm64: dts: rockchip: RockPro64: enable wifi module at sdio0 Soeren Moch
2019-12-09 23:08 ` Heiko Stübner
2019-12-09 23:29 ` Soeren Moch
2019-12-10 1:18 ` Heiko Stübner
2019-12-10 9:14 ` Kalle Valo
2019-12-10 10:08 ` Soeren Moch
2019-12-10 10:13 ` Heiko Stübner
[not found] ` <5d3bde69-9102-cc81-c1d2-d71b60258906@web.de>
2019-12-11 15:50 ` Soeren Moch
[not found] ` <0101016eef171394-2c71e1b8-45b9-4e38-96f9-2841dd0607ba-000000@us-west-2.amazonses.com>
2019-12-10 10:15 ` Soeren Moch
2019-12-10 3:36 ` [PATCH 1/8] brcmfmac: reset two D11 cores if chip has two D11 cores Chi-Hsien Lin
2019-12-10 9:08 ` Kalle Valo
[not found] ` <0101016eef117d24-d6de85e6-6356-4c73-bff4-f787e8c982bc-000000@us-west-2.amazonses.com>
2019-12-10 10:14 ` Soeren Moch
2019-12-10 10:20 ` Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=541616d9-78ca-81b2-d785-5ec389265bd1@cypress.com \
--to=chi-hsien.lin@cypress.com \
--cc=Stanley.Hsu@cypress.com \
--cc=Wright.Feng@cypress.com \
--cc=arend.vanspriel@broadcom.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211-dev-list@cypress.com \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=smoch@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).