All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/5] brcmfmac: SDIO parameter change series
@ 2020-05-21  3:48 Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 1/5] brcmfmac: set F2 blocksize for 4373 Chi-Hsien Lin
                   ` (5 more replies)
  0 siblings, 6 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-21  3:48 UTC (permalink / raw)
  To: linux-wireless
  Cc: brcm80211-dev-list, brcm80211-dev-list, Arend van Spriel,
	Franky Lin, Hante Meuleman, Wright Feng, Kalle Valo,
	Chi-Hsien Lin

Set F2 blocksize and watermark for several chips to fix bus error during
stress tests.


Double Lo (2):
  brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode
  brcmfmac: 43012 Update MES Watermark

Frank Kao (1):
  brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO

Wright Feng (2):
  brcmfmac: set F2 blocksize for 4373
  brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode

 .../broadcom/brcm80211/brcmfmac/bcmsdh.c      | 22 ++++++-
 .../broadcom/brcm80211/brcmfmac/sdio.c        | 58 ++++++++++++++++---
 2 files changed, 70 insertions(+), 10 deletions(-)

--
2.25.0


This message and any attachments may contain confidential information from Cypress or its subsidiaries. If it has been received in error, please advise the sender and immediately delete this message.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/5] brcmfmac: set F2 blocksize for 4373
  2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
@ 2020-05-21  3:48 ` Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 2/5] brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode Chi-Hsien Lin
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-21  3:48 UTC (permalink / raw)
  To: linux-wireless
  Cc: brcm80211-dev-list, brcm80211-dev-list, Arend van Spriel,
	Franky Lin, Hante Meuleman, Wright Feng, Kalle Valo,
	Chi-hsien Lin

From: Wright Feng <wright.feng@cypress.com>

Set F2 blocksize to 256 bytes for 4373. It fixes DMA error while having
UDP bi-directional traffic. Also use a defined F1 MesBusyCtrl value.

Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
---
 .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c  | 14 +++++++++++++-
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 22a17ae09e94..bb3196cba683 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_4373_FUNC2_BLOCKSIZE      256
 #define SDIO_4359_FUNC2_BLOCKSIZE      256
 /* Maximum milliseconds to wait for F2 to come up */
 #define SDIO_WAIT_F2RDY        3000
@@ -910,13 +911,24 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
                sdio_release_host(sdiodev->func1);
                goto out;
        }
-       if (sdiodev->func2->device == SDIO_DEVICE_ID_BROADCOM_4359)
+       switch (sdiodev->func2->device) {
+       case SDIO_DEVICE_ID_CYPRESS_4373:
+               f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
+               break;
+       case SDIO_DEVICE_ID_BROADCOM_4359:
                f2_blksz = SDIO_4359_FUNC2_BLOCKSIZE;
+               break;
+       default:
+               break;
+       }
+
        ret = sdio_set_block_size(sdiodev->func2, f2_blksz);
        if (ret) {
                brcmf_err("Failed to set F2 blocksize\n");
                sdio_release_host(sdiodev->func1);
                goto out;
+       } else {
+               brcmf_dbg(SDIO, "set F2 blocksize to %d\n", f2_blksz);
        }

        /* increase F2 timeout */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index ce6f15284277..dce22cd2279d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -41,6 +41,7 @@
 /* watermark expressed in number of words */
 #define DEFAULT_F2_WATERMARK    0x8
 #define CY_4373_F2_WATERMARK    0x40
+#define CY_4373_F1_MESBUSYCTRL  (CY_4373_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
 #define CY_43012_F2_WATERMARK    0x60
 #define CY_4359_F2_WATERMARK   0x40
 #define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
@@ -4195,8 +4196,7 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
                        brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
                                           &err);
                        brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,
-                                          CY_4373_F2_WATERMARK |
-                                          SBSDIO_MESBUSYCTRL_ENAB, &err);
+                                          CY_4373_F1_MESBUSYCTRL, &err);
                        break;
                case SDIO_DEVICE_ID_CYPRESS_43012:
                        brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
--
2.25.0


This message and any attachments may contain confidential information from Cypress or its subsidiaries. If it has been received in error, please advise the sender and immediately delete this message.

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 2/5] brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode
  2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 1/5] brcmfmac: set F2 blocksize for 4373 Chi-Hsien Lin
@ 2020-05-21  3:48 ` Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 3/5] brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO Chi-Hsien Lin
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-21  3:48 UTC (permalink / raw)
  To: linux-wireless
  Cc: brcm80211-dev-list, brcm80211-dev-list, Arend van Spriel,
	Franky Lin, Hante Meuleman, Wright Feng, Kalle Valo, Double Lo,
	Chi-hsien Lin

From: Double Lo <double.lo@cypress.com>

This patch fixes 4339 CRC error while running Tput test with
suspend/resume test script.

The continuous failure messages before system crash:
brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84
brcmfmac: brcmf_sdio_rxglom: glom read of 25600 bytes failed: -5
brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame
brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84
brcmfmac: brcmf_sdio_rxglom: glom read of 24576 bytes failed: -5
brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame

Signed-off-by: Double Lo <double.lo@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
---
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index dce22cd2279d..491b635e72b1 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -43,6 +43,10 @@
 #define CY_4373_F2_WATERMARK    0x40
 #define CY_4373_F1_MESBUSYCTRL  (CY_4373_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
 #define CY_43012_F2_WATERMARK    0x60
+#define CY_4339_F2_WATERMARK    48
+#define CY_4339_MES_WATERMARK  80
+#define CY_4339_MESBUSYCTRL    (CY_4339_MES_WATERMARK | \
+                                SBSDIO_MESBUSYCTRL_ENAB)
 #define CY_4359_F2_WATERMARK   0x40
 #define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)

@@ -4209,6 +4213,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_4339:
+                       brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes for 4339\n",
+                                 CY_4339_F2_WATERMARK);
+                       brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
+                                          CY_4339_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_4339_MESBUSYCTRL, &err);
+                       break;
                case SDIO_DEVICE_ID_BROADCOM_4359:
                        brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
                                  CY_4359_F2_WATERMARK);
--
2.25.0


This message and any attachments may contain confidential information from Cypress or its subsidiaries. If it has been received in error, please advise the sender and immediately delete this message.

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 3/5] brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO
  2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 1/5] brcmfmac: set F2 blocksize for 4373 Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 2/5] brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode Chi-Hsien Lin
@ 2020-05-21  3:48 ` Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 4/5] brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode Chi-Hsien Lin
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-21  3:48 UTC (permalink / raw)
  To: linux-wireless
  Cc: brcm80211-dev-list, brcm80211-dev-list, Arend van Spriel,
	Franky Lin, Hante Meuleman, Wright Feng, Kalle Valo, Frank Kao,
	Chi-Hsien Lin

From: Frank Kao <frank.kao@cypress.com>

Set F2 blocksize to 256 bytes and watermark to 0x40 for 4354/4356 SDIO.
Also enable and configure F1 MesBusyCtrl. It would resolve random driver
crash issue.

Signed-off-by: Frank Kao <frank.kao@cypress.com>
Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@cypress.com>
---
 .../broadcom/brcm80211/brcmfmac/bcmsdh.c         |  8 ++++++--
 .../wireless/broadcom/brcm80211/brcmfmac/sdio.c  | 16 ++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index bb3196cba683..b1a66320ba54 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -44,7 +44,7 @@
 #define SDIO_FUNC1_BLOCKSIZE           64
 #define SDIO_FUNC2_BLOCKSIZE           512
 #define SDIO_4373_FUNC2_BLOCKSIZE      256
-#define SDIO_4359_FUNC2_BLOCKSIZE      256
+#define SDIO_435X_FUNC2_BLOCKSIZE      256
 /* Maximum milliseconds to wait for F2 to come up */
 #define SDIO_WAIT_F2RDY        3000

@@ -916,7 +916,11 @@ static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
                f2_blksz = SDIO_4373_FUNC2_BLOCKSIZE;
                break;
        case SDIO_DEVICE_ID_BROADCOM_4359:
-               f2_blksz = SDIO_4359_FUNC2_BLOCKSIZE;
+               /* fallthrough */
+       case SDIO_DEVICE_ID_BROADCOM_4354:
+               /* fallthrough */
+       case SDIO_DEVICE_ID_BROADCOM_4356:
+               f2_blksz = SDIO_435X_FUNC2_BLOCKSIZE;
                break;
        default:
                break;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 491b635e72b1..037a4efef924 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -47,9 +47,9 @@
 #define CY_4339_MES_WATERMARK  80
 #define CY_4339_MESBUSYCTRL    (CY_4339_MES_WATERMARK | \
                                 SBSDIO_MESBUSYCTRL_ENAB)
-#define CY_4359_F2_WATERMARK   0x40
-#define CY_4359_F1_MESBUSYCTRL (CY_4359_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
-
+#define CY_435X_F2_WATERMARK   0x40
+#define CY_435X_F1_MESBUSYCTRL (CY_435X_F2_WATERMARK | \
+                                SBSDIO_MESBUSYCTRL_ENAB)
 #ifdef DEBUG

 #define BRCMF_TRAP_INFO_SIZE   80
@@ -4227,17 +4227,21 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
                                           CY_4339_MESBUSYCTRL, &err);
                        break;
                case SDIO_DEVICE_ID_BROADCOM_4359:
+                       /* fallthrough */
+               case SDIO_DEVICE_ID_BROADCOM_4354:
+                       /* fallthrough */
+               case SDIO_DEVICE_ID_BROADCOM_4356:
                        brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes\n",
-                                 CY_4359_F2_WATERMARK);
+                                 CY_435X_F2_WATERMARK);
                        brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
-                                          CY_4359_F2_WATERMARK, &err);
+                                          CY_435X_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);
+                                          CY_435X_F1_MESBUSYCTRL, &err);
                        break;
                default:
                        brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
--
2.25.0


This message and any attachments may contain confidential information from Cypress or its subsidiaries. If it has been received in error, please advise the sender and immediately delete this message.

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 4/5] brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode
  2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
                   ` (2 preceding siblings ...)
  2020-05-21  3:48 ` [PATCH 3/5] brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO Chi-Hsien Lin
@ 2020-05-21  3:48 ` Chi-Hsien Lin
  2020-05-21  3:48 ` [PATCH 5/5] brcmfmac: 43012 Update MES Watermark Chi-Hsien Lin
  2020-05-22 10:37 ` [PATCH 0/5] brcmfmac: SDIO parameter change series Kalle Valo
  5 siblings, 0 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-21  3:48 UTC (permalink / raw)
  To: linux-wireless
  Cc: brcm80211-dev-list, brcm80211-dev-list, Arend van Spriel,
	Franky Lin, Hante Meuleman, Wright Feng, Kalle Valo,
	Chi-hsien Lin

From: Wright Feng <wright.feng@cypress.com>

This patch fixes 43455 CRC error while running throughput test with
suspend/resume stress test.

The continuous failure messages before system crash:
brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84
brcmfmac: brcmf_sdio_rxglom: glom read of 25600 bytes failed: -5
brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame
brcmfmac: brcmf_sdiod_sglist_rw: CMD53 sg block read failed -84
brcmfmac: brcmf_sdio_rxglom: glom read of 24576 bytes failed: -5
brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame

Signed-off-by: Wright Feng <wright.feng@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
---
 .../broadcom/brcm80211/brcmfmac/sdio.c         | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 037a4efef924..58d9f0b90ad3 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -47,9 +47,14 @@
 #define CY_4339_MES_WATERMARK  80
 #define CY_4339_MESBUSYCTRL    (CY_4339_MES_WATERMARK | \
                                 SBSDIO_MESBUSYCTRL_ENAB)
+#define CY_43455_F2_WATERMARK  0x60
+#define CY_43455_MES_WATERMARK 0x50
+#define CY_43455_MESBUSYCTRL   (CY_43455_MES_WATERMARK | \
+                                SBSDIO_MESBUSYCTRL_ENAB)
 #define CY_435X_F2_WATERMARK   0x40
 #define CY_435X_F1_MESBUSYCTRL (CY_435X_F2_WATERMARK | \
                                 SBSDIO_MESBUSYCTRL_ENAB)
+
 #ifdef DEBUG

 #define BRCMF_TRAP_INFO_SIZE   80
@@ -4226,6 +4231,19 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
                        brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,
                                           CY_4339_MESBUSYCTRL, &err);
                        break;
+               case SDIO_DEVICE_ID_BROADCOM_43455:
+                       brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes for 43455\n",
+                                 CY_43455_F2_WATERMARK);
+                       brcmf_sdiod_writeb(sdiod, SBSDIO_WATERMARK,
+                                          CY_43455_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_43455_MESBUSYCTRL, &err);
+                       break;
                case SDIO_DEVICE_ID_BROADCOM_4359:
                        /* fallthrough */
                case SDIO_DEVICE_ID_BROADCOM_4354:
--
2.25.0


This message and any attachments may contain confidential information from Cypress or its subsidiaries. If it has been received in error, please advise the sender and immediately delete this message.

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH 5/5] brcmfmac: 43012 Update MES Watermark
  2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
                   ` (3 preceding siblings ...)
  2020-05-21  3:48 ` [PATCH 4/5] brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode Chi-Hsien Lin
@ 2020-05-21  3:48 ` Chi-Hsien Lin
  2020-05-22 10:37 ` [PATCH 0/5] brcmfmac: SDIO parameter change series Kalle Valo
  5 siblings, 0 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-21  3:48 UTC (permalink / raw)
  To: linux-wireless
  Cc: brcm80211-dev-list, brcm80211-dev-list, Arend van Spriel,
	Franky Lin, Hante Meuleman, Wright Feng, Kalle Valo, Double Lo,
	Chi-hsien Lin

From: Double Lo <double.lo@cypress.com>

Set MES watermark size to 0x50 for 43012. It fixes SDIO bus hang issue
when running at high throughput.

Signed-off-by: Double Lo <double.lo@cypress.com>
Signed-off-by: Chi-hsien Lin <chi-hsien.lin@cypress.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 58d9f0b90ad3..760b7737e745 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -43,6 +43,9 @@
 #define CY_4373_F2_WATERMARK    0x40
 #define CY_4373_F1_MESBUSYCTRL  (CY_4373_F2_WATERMARK | SBSDIO_MESBUSYCTRL_ENAB)
 #define CY_43012_F2_WATERMARK    0x60
+#define CY_43012_MES_WATERMARK  0x50
+#define CY_43012_MESBUSYCTRL    (CY_43012_MES_WATERMARK | \
+                                SBSDIO_MESBUSYCTRL_ENAB)
 #define CY_4339_F2_WATERMARK    48
 #define CY_4339_MES_WATERMARK  80
 #define CY_4339_MESBUSYCTRL    (CY_4339_MES_WATERMARK | \
@@ -4217,6 +4220,8 @@ static void brcmf_sdio_firmware_callback(struct device *dev, int err,
                        devctl |= SBSDIO_DEVCTL_F2WM_ENAB;
                        brcmf_sdiod_writeb(sdiod, SBSDIO_DEVICE_CTL, devctl,
                                           &err);
+                       brcmf_sdiod_writeb(sdiod, SBSDIO_FUNC1_MESBUSYCTRL,
+                                          CY_43012_MESBUSYCTRL, &err);
                        break;
                case SDIO_DEVICE_ID_BROADCOM_4339:
                        brcmf_dbg(INFO, "set F2 watermark to 0x%x*4 bytes for 4339\n",
--
2.25.0


This message and any attachments may contain confidential information from Cypress or its subsidiaries. If it has been received in error, please advise the sender and immediately delete this message.

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/5] brcmfmac: SDIO parameter change series
  2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
                   ` (4 preceding siblings ...)
  2020-05-21  3:48 ` [PATCH 5/5] brcmfmac: 43012 Update MES Watermark Chi-Hsien Lin
@ 2020-05-22 10:37 ` Kalle Valo
  2020-05-22 11:24   ` Chi-Hsien Lin
  5 siblings, 1 reply; 8+ messages in thread
From: Kalle Valo @ 2020-05-22 10:37 UTC (permalink / raw)
  To: Chi-Hsien Lin
  Cc: linux-wireless, brcm80211-dev-list, brcm80211-dev-list,
	Arend van Spriel, Franky Lin, Hante Meuleman, Wright Feng

Chi-Hsien Lin <chi-hsien.lin@cypress.com> writes:

> Set F2 blocksize and watermark for several chips to fix bus error during
> stress tests.
>
>
> Double Lo (2):
>   brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode
>   brcmfmac: 43012 Update MES Watermark
>
> Frank Kao (1):
>   brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO
>
> Wright Feng (2):
>   brcmfmac: set F2 blocksize for 4373
>   brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode
>
>  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      | 22 ++++++-
>  .../broadcom/brcm80211/brcmfmac/sdio.c        | 58 ++++++++++++++++---
>  2 files changed, 70 insertions(+), 10 deletions(-)
>
> --
> 2.25.0
>
>
> This message and any attachments may contain confidential information
> from Cypress or its subsidiaries. If it has been received in error,
> please advise the sender and immediately delete this message.

If you want me to apply something don't include disclaimers like this.
These kind of emails go immeadiately to /dev/null.

-- 
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/5] brcmfmac: SDIO parameter change series
  2020-05-22 10:37 ` [PATCH 0/5] brcmfmac: SDIO parameter change series Kalle Valo
@ 2020-05-22 11:24   ` Chi-Hsien Lin
  0 siblings, 0 replies; 8+ messages in thread
From: Chi-Hsien Lin @ 2020-05-22 11:24 UTC (permalink / raw)
  To: Kalle Valo
  Cc: linux-wireless, brcm80211-dev-list, brcm80211-dev-list,
	Arend van Spriel, Franky Lin, Hante Meuleman, Wright Feng



On 05/22/2020 6:37, Kalle Valo wrote:
> Chi-Hsien Lin <chi-hsien.lin@cypress.com> writes:
> 
>> Set F2 blocksize and watermark for several chips to fix bus error during
>> stress tests.
>>
>>
>> Double Lo (2):
>>    brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode
>>    brcmfmac: 43012 Update MES Watermark
>>
>> Frank Kao (1):
>>    brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO
>>
>> Wright Feng (2):
>>    brcmfmac: set F2 blocksize for 4373
>>    brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode
>>
>>   .../broadcom/brcm80211/brcmfmac/bcmsdh.c      | 22 ++++++-
>>   .../broadcom/brcm80211/brcmfmac/sdio.c        | 58 ++++++++++++++++---
>>   2 files changed, 70 insertions(+), 10 deletions(-)
>>
>> --
>> 2.25.0
>>
>>
>> This message and any attachments may contain confidential information
>> from Cypress or its subsidiaries. If it has been received in error,
>> please advise the sender and immediately delete this message.
> 
> If you want me to apply something don't include disclaimers like this.
> These kind of emails go immeadiately to /dev/null.

Thanks for the feedback. This is added by our mail server by default 
without showing to us. Looks like a recent git upgrade caused the 
previous exception rule to fail. I'll fix it with IT and submit a V2.


> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-05-22 11:24 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-21  3:48 [PATCH 0/5] brcmfmac: SDIO parameter change series Chi-Hsien Lin
2020-05-21  3:48 ` [PATCH 1/5] brcmfmac: set F2 blocksize for 4373 Chi-Hsien Lin
2020-05-21  3:48 ` [PATCH 2/5] brcmfmac: fix 4339 CRC error under SDIO 3.0 SDR104 mode Chi-Hsien Lin
2020-05-21  3:48 ` [PATCH 3/5] brcmfmac: set F2 blocksize and watermark for 4354/4356 SDIO Chi-Hsien Lin
2020-05-21  3:48 ` [PATCH 4/5] brcmfmac: fix 43455 CRC error under SDIO 3.0 SDR104 mode Chi-Hsien Lin
2020-05-21  3:48 ` [PATCH 5/5] brcmfmac: 43012 Update MES Watermark Chi-Hsien Lin
2020-05-22 10:37 ` [PATCH 0/5] brcmfmac: SDIO parameter change series Kalle Valo
2020-05-22 11:24   ` Chi-Hsien Lin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.