mbox series

[v2,0/9] brcmfmac: add support for BCM4359 SDIO chipset

Message ID 20191211235253.2539-1-smoch@web.de (mailing list archive)
Headers show
Series brcmfmac: add support for BCM4359 SDIO chipset | expand

Message

Soeren Moch Dec. 11, 2019, 11:52 p.m. UTC
Add support for the BCM4359 chipset with SDIO interface and RSDB support
to the brcmfmac wireless network driver in patches 1-7.

Enhance devicetree of the RockPro64 arm64/rockchip board to use an
AP6359SA based wifi/bt combo module with this chipset in patches 8-9.


Chung-Hsien Hsu (1):
  brcmfmac: set F2 blocksize and watermark for 4359

Soeren Moch (5):
  brcmfmac: fix rambase for 4359/9
  brcmfmac: make errors when setting roaming parameters non-fatal
  brcmfmac: add support for BCM4359 SDIO chipset
  arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
  arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0

Wright Feng (3):
  brcmfmac: reset two D11 cores if chip has two D11 cores
  brcmfmac: add RSDB condition when setting interface combinations
  brcmfmac: not set mbss in vif if firmware does not support MBSS

 .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
 .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68 +++++++++++++++----
 .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
 .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
 .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
 .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
 include/linux/mmc/sdio_ids.h                  |  2 +
 8 files changed, 176 insertions(+), 26 deletions(-)

---
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Heiko Stuebner <heiko@sntech.de>
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-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Cc: linux-kernel@vger.kernel.org

--
2.17.1

Comments

Kalle Valo Dec. 12, 2019, 9:42 a.m. UTC | #1
Soeren Moch <smoch@web.de> writes:

> Add support for the BCM4359 chipset with SDIO interface and RSDB support
> to the brcmfmac wireless network driver in patches 1-7.
>
> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
>
>
> Chung-Hsien Hsu (1):
>   brcmfmac: set F2 blocksize and watermark for 4359
>
> Soeren Moch (5):
>   brcmfmac: fix rambase for 4359/9
>   brcmfmac: make errors when setting roaming parameters non-fatal
>   brcmfmac: add support for BCM4359 SDIO chipset
>   arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>   arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>
> Wright Feng (3):
>   brcmfmac: reset two D11 cores if chip has two D11 cores
>   brcmfmac: add RSDB condition when setting interface combinations
>   brcmfmac: not set mbss in vif if firmware does not support MBSS
>
>  .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
>  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
>  .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68 +++++++++++++++----
>  .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
>  .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
>  .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
>  .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
>  include/linux/mmc/sdio_ids.h                  |  2 +
>  8 files changed, 176 insertions(+), 26 deletions(-)

Just to make sure we are on the same page, I will apply patches 1-7 to
wireless-drivers-next and patches 8-9 go to some other tree? And there
are no dependencies between the brcmfmac patches and dts patches?
Soeren Moch Dec. 12, 2019, 10:59 a.m. UTC | #2
On 12.12.19 10:42, Kalle Valo wrote:
> Soeren Moch <smoch@web.de> writes:
>
>> Add support for the BCM4359 chipset with SDIO interface and RSDB support
>> to the brcmfmac wireless network driver in patches 1-7.
>>
>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
>> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
>>
>>
>> Chung-Hsien Hsu (1):
>>   brcmfmac: set F2 blocksize and watermark for 4359
>>
>> Soeren Moch (5):
>>   brcmfmac: fix rambase for 4359/9
>>   brcmfmac: make errors when setting roaming parameters non-fatal
>>   brcmfmac: add support for BCM4359 SDIO chipset
>>   arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>>   arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>>
>> Wright Feng (3):
>>   brcmfmac: reset two D11 cores if chip has two D11 cores
>>   brcmfmac: add RSDB condition when setting interface combinations
>>   brcmfmac: not set mbss in vif if firmware does not support MBSS
>>
>>  .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
>>  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
>>  .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68 +++++++++++++++----
>>  .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
>>  .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
>>  .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
>>  .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
>>  include/linux/mmc/sdio_ids.h                  |  2 +
>>  8 files changed, 176 insertions(+), 26 deletions(-)
> Just to make sure we are on the same page, I will apply patches 1-7 to
> wireless-drivers-next and patches 8-9 go to some other tree? And there
> are no dependencies between the brcmfmac patches and dts patches?
>
Yes, this also is my understanding. I'm glad if you are fine with
patches 1-7.
Heiko will pick up patches 8-9 later for linux-rockchip independently.
And if we need another round of review for patches 8-9, I think we don't
need to bother linux-wireless with this.

Thanks,
Soeren
Soeren Moch Dec. 15, 2019, 9:24 p.m. UTC | #3
On 12.12.19 11:59, Soeren Moch wrote:
> On 12.12.19 10:42, Kalle Valo wrote:
>> Soeren Moch <smoch@web.de> writes:
>>
>>> Add support for the BCM4359 chipset with SDIO interface and RSDB support
>>> to the brcmfmac wireless network driver in patches 1-7.
>>>
>>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
>>> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
>>>
>>>
>>> Chung-Hsien Hsu (1):
>>>   brcmfmac: set F2 blocksize and watermark for 4359
>>>
>>> Soeren Moch (5):
>>>   brcmfmac: fix rambase for 4359/9
>>>   brcmfmac: make errors when setting roaming parameters non-fatal
>>>   brcmfmac: add support for BCM4359 SDIO chipset
>>>   arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>>>   arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>>>
>>> Wright Feng (3):
>>>   brcmfmac: reset two D11 cores if chip has two D11 cores
>>>   brcmfmac: add RSDB condition when setting interface combinations
>>>   brcmfmac: not set mbss in vif if firmware does not support MBSS
>>>
>>>  .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
>>>  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
>>>  .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68 +++++++++++++++----
>>>  .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
>>>  .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
>>>  .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
>>>  .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
>>>  include/linux/mmc/sdio_ids.h                  |  2 +
>>>  8 files changed, 176 insertions(+), 26 deletions(-)
>> Just to make sure we are on the same page, I will apply patches 1-7 to
>> wireless-drivers-next and patches 8-9 go to some other tree? And there
>> are no dependencies between the brcmfmac patches and dts patches?
>>
> Yes, this also is my understanding. I'm glad if you are fine with
> patches 1-7.
> Heiko will pick up patches 8-9 later for linux-rockchip independently.
> And if we need another round of review for patches 8-9, I think we don't
> need to bother linux-wireless with this.

Heiko,

is this OK for you when patches 1-7 are merged now in wireless-drivers,
and then I send a v3 for patches 8-9 only for you to merge in
linux-rockchip later? Or do you prefer a full v3 for the whole series
with only this pending clock name update in patch 9?

Thanks,
Soeren
Heiko Stübner Dec. 15, 2019, 11:43 p.m. UTC | #4
Hi Soeren,

Am Sonntag, 15. Dezember 2019, 22:24:10 CET schrieb Soeren Moch:
> On 12.12.19 11:59, Soeren Moch wrote:
> > On 12.12.19 10:42, Kalle Valo wrote:
> >> Soeren Moch <smoch@web.de> writes:
> >>
> >>> Add support for the BCM4359 chipset with SDIO interface and RSDB support
> >>> to the brcmfmac wireless network driver in patches 1-7.
> >>>
> >>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
> >>> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
> >>>
> >>>
> >>> Chung-Hsien Hsu (1):
> >>>   brcmfmac: set F2 blocksize and watermark for 4359
> >>>
> >>> Soeren Moch (5):
> >>>   brcmfmac: fix rambase for 4359/9
> >>>   brcmfmac: make errors when setting roaming parameters non-fatal
> >>>   brcmfmac: add support for BCM4359 SDIO chipset
> >>>   arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
> >>>   arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
> >>>
> >>> Wright Feng (3):
> >>>   brcmfmac: reset two D11 cores if chip has two D11 cores
> >>>   brcmfmac: add RSDB condition when setting interface combinations
> >>>   brcmfmac: not set mbss in vif if firmware does not support MBSS
> >>>
> >>>  .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
> >>>  .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
> >>>  .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68 +++++++++++++++----
> >>>  .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
> >>>  .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
> >>>  .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
> >>>  .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
> >>>  include/linux/mmc/sdio_ids.h                  |  2 +
> >>>  8 files changed, 176 insertions(+), 26 deletions(-)
> >> Just to make sure we are on the same page, I will apply patches 1-7 to
> >> wireless-drivers-next and patches 8-9 go to some other tree? And there
> >> are no dependencies between the brcmfmac patches and dts patches?
> >>
> > Yes, this also is my understanding. I'm glad if you are fine with
> > patches 1-7.
> > Heiko will pick up patches 8-9 later for linux-rockchip independently.
> > And if we need another round of review for patches 8-9, I think we don't
> > need to bother linux-wireless with this.
> 
> Heiko,
> 
> is this OK for you when patches 1-7 are merged now in wireless-drivers,
> and then I send a v3 for patches 8-9 only for you to merge in
> linux-rockchip later? Or do you prefer a full v3 for the whole series
> with only this pending clock name update in patch 9?

Nope, merging 1-7 from this v2 and then getting a v3 with only the dts
stuff is perfectly fine :-)

Heiko
Christian Hewitt Dec. 18, 2019, 11:55 a.m. UTC | #5
> On 12 Dec 2019, at 1:52 am, Soeren Moch <smoch@web.de> wrote:
> 
> Add support for the BCM4359 chipset with SDIO interface and RSDB support
> to the brcmfmac wireless network driver in patches 1-7.
> 
> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
> 
> 
> Chung-Hsien Hsu (1):
>  brcmfmac: set F2 blocksize and watermark for 4359
> 
> Soeren Moch (5):
>  brcmfmac: fix rambase for 4359/9
>  brcmfmac: make errors when setting roaming parameters non-fatal
>  brcmfmac: add support for BCM4359 SDIO chipset
>  arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>  arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
> 
> Wright Feng (3):
>  brcmfmac: reset two D11 cores if chip has two D11 cores
>  brcmfmac: add RSDB condition when setting interface combinations
>  brcmfmac: not set mbss in vif if firmware does not support MBSS

Thanks for posting this series, this chip is widely used by a large number of current Amlogic devices!

Patches 1-7 have been tested on Amlogic G12B (Khadas VIM3) hardware with 5.5-rc kernel and a LibreELEC (distro) colleague also tested with a Khadas Edge board (RK3399). The Ampak 6398S module on both boards are detected and can connect to networks to pass basic functional testing.

On the VIM3 board I do see the following warning splat:

[    7.987351] ------------[ cut here ]------------
[    7.987382] WARNING: CPU: 5 PID: 36 at drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:776 brcmf_sdiod_sgtable_alloc+0x130/0x138 [brcmfmac]
[    7.987384] Modules linked in: brcmfmac ecdh_generic brcmutil rtc_meson_vrtc videodev ecc cfg80211 gpio_pca953x rfkill ir_nec_decoder crct10dif_ce rc_khadas mali_kbase(O) meson_ir ao_cec_g12a mc rtc_hym8563 rc_core gpio_keys_polled adc_keys ipv6 nf_defrag_ipv6 crc_ccitt sch_fq_codel
[    7.987403] CPU: 5 PID: 36 Comm: kworker/5:0 Tainted: G           O      5.5.0-rc1 #1
[    7.987404] Hardware name: Khadas VIM3 (DT)
[    7.987417] Workqueue: events brcmf_driver_register [brcmfmac]
[    7.987420] pstate: 80000005 (Nzcv daif -PAN -UAO)
[    7.987432] pc : brcmf_sdiod_sgtable_alloc+0x130/0x138 [brcmfmac]
[    7.987443] lr : brcmf_sdio_probe+0x28c/0x890 [brcmfmac]
[    7.987444] sp : ffff80001017ba90
[    7.987445] x29: ffff80001017ba90 x28: 0000000000000000 
[    7.987447] x27: 0000000000000000 x26: ffff0000a8c09400 
[    7.987449] x25: ffff80000a24cb08 x24: ffff0000a3800400 
[    7.987451] x23: ffff800012c618c8 x22: ffff0000a675e000 
[    7.987453] x21: ffff0000a675e000 x20: 0000000000000023 
[    7.987454] x19: ffff0000a3800000 x18: ffff800013b25908 
[    7.987456] x17: ffff800013b25d0c x16: ffff800013b25104 
[    7.987457] x15: 00000000f0000000 x14: 000000000000000a 
[    7.987459] x13: 0000000000000000 x12: 0000000000000001 
[    7.987460] x11: 0000000000000005 x10: 0101010101010101 
[    7.987461] x9 : ffffffffffffffff x8 : 7f7f7f7f7f7f7f7f 
[    7.987463] x7 : 00000000000001ff x6 : 0000000000000080 
[    7.987464] x5 : 0000000000000600 x4 : 0000000000000003 
[    7.987466] x3 : ffff0000a5a3d880 x2 : 0000000000000021 
[    7.987467] x1 : 0000000000000003 x0 : ffff0000a675e000 
[    7.987469] Call trace:
[    7.987481]  brcmf_sdiod_sgtable_alloc+0x130/0x138 [brcmfmac]
[    7.987493]  brcmf_sdio_probe+0x28c/0x890 [brcmfmac]
[    7.987504]  brcmf_sdiod_probe+0xe0/0x1c0 [brcmfmac]
[    7.987516]  brcmf_ops_sdio_probe+0x16c/0x208 [brcmfmac]
[    7.987522]  sdio_bus_probe+0xe0/0x1c8
[    7.987526]  really_probe+0xd8/0x428
[    7.987529]  driver_probe_device+0xdc/0x130
[    7.987531]  device_driver_attach+0x6c/0x78
[    7.987533]  __driver_attach+0x9c/0x168
[    7.987535]  bus_for_each_dev+0x70/0xc0
[    7.987536]  driver_attach+0x20/0x28
[    7.987538]  bus_add_driver+0x190/0x220
[    7.987539]  driver_register+0x60/0x110
[    7.987541]  sdio_register_driver+0x24/0x30
[    7.987552]  brcmf_sdio_register+0x14/0x48 [brcmfmac]
[    7.987563]  brcmf_driver_register+0xc/0x20 [brcmfmac]
[    7.987567]  process_one_work+0x1e0/0x358
[    7.987569]  worker_thread+0x40/0x488
[    7.987571]  kthread+0x118/0x120
[    7.987573]  ret_from_fork+0x10/0x18
[    7.987575] ---[ end trace 808ac7e159d1fc33 ]---

I don’t see this on older Amlogic SoCs (GXL/GXM devices with various other BCM chips) or another Amlogic G12B device (same SoC with a different Ampak module) or some RK3399 devices, so it may be something board (Khadas VIM3) specific.

I also see some errors like:

[   71.046597] brcmfmac: brcmf_sdio_readframes: RXHEADER FAILED: -5
[   71.046652] brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame, send NAK
[  123.844863] brcmfmac: brcmf_sdio_bus_sleep: error while changing bus sleep state -5
[  124.678329] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
[  124.680226] mmc0: tuning execution failed: -5
[  124.708843] brcmfmac: brcmf_sdio_bus_sleep: error while changing bus sleep state -5
[  125.700765] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
[  125.880372] brcmfmac: mmc_submit_one: CMD53 sg block read failed -22
[  125.880393] brcmfmac: brcmf_sdio_rxglom: glom read of 512 bytes failed: -5
[  125.880401] brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame
[  125.881262] brcmfmac: brcmf_sdio_readframes: brcmf_sdio_readframes: glom superframe w/o descriptor!
[  125.881318] brcmfmac: brcmf_sdio_rxfail: terminate frame
[  131.844289] brcmfmac: mmc_submit_one: CMD53 sg block write failed -22
[  131.844302] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
[  131.844488] brcmfmac: mmc_submit_one: CMD53 sg block write failed -22
[  131.844494] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame

I’m not sure if that’s of any concern, but if yes, I’d be happy to apply any debugging patches you provide to generate output.

Thanks again for working on this chipset!

Christian
Soeren Moch Dec. 18, 2019, 11:04 p.m. UTC | #6
On 18.12.19 12:55, Christian Hewitt wrote:
>> On 12 Dec 2019, at 1:52 am, Soeren Moch <smoch@web.de> wrote:
>>
>> Add support for the BCM4359 chipset with SDIO interface and RSDB support
>> to the brcmfmac wireless network driver in patches 1-7.
>>
>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
>> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
>>
>>
>> Chung-Hsien Hsu (1):
>>  brcmfmac: set F2 blocksize and watermark for 4359
>>
>> Soeren Moch (5):
>>  brcmfmac: fix rambase for 4359/9
>>  brcmfmac: make errors when setting roaming parameters non-fatal
>>  brcmfmac: add support for BCM4359 SDIO chipset
>>  arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>>  arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>>
>> Wright Feng (3):
>>  brcmfmac: reset two D11 cores if chip has two D11 cores
>>  brcmfmac: add RSDB condition when setting interface combinations
>>  brcmfmac: not set mbss in vif if firmware does not support MBSS
> Thanks for posting this series, this chip is widely used by a large number of current Amlogic devices!
>
> Patches 1-7 have been tested on Amlogic G12B (Khadas VIM3) hardware with 5.5-rc kernel and a LibreELEC (distro) colleague also tested with a Khadas Edge board (RK3399). The Ampak 6398S module on both boards are detected and can connect to networks to pass basic functional testing.
Thanks for confirming that this series to add support for the BCM4359
SDIO chipset works on different boards.
>
> On the VIM3 board I do see the following warning splat:
>
> [    7.987351] ------------[ cut here ]------------
> [    7.987382] WARNING: CPU: 5 PID: 36 at drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c:776 brcmf_sdiod_sgtable_alloc+0x130/0x138 [brcmfmac]
> [    7.987384] Modules linked in: brcmfmac ecdh_generic brcmutil rtc_meson_vrtc videodev ecc cfg80211 gpio_pca953x rfkill ir_nec_decoder crct10dif_ce rc_khadas mali_kbase(O) meson_ir ao_cec_g12a mc rtc_hym8563 rc_core gpio_keys_polled adc_keys ipv6 nf_defrag_ipv6 crc_ccitt sch_fq_codel
> [    7.987403] CPU: 5 PID: 36 Comm: kworker/5:0 Tainted: G           O      5.5.0-rc1 #1
> [    7.987404] Hardware name: Khadas VIM3 (DT)
> [    7.987417] Workqueue: events brcmf_driver_register [brcmfmac]
> [    7.987420] pstate: 80000005 (Nzcv daif -PAN -UAO)
> [    7.987432] pc : brcmf_sdiod_sgtable_alloc+0x130/0x138 [brcmfmac]
> [    7.987443] lr : brcmf_sdio_probe+0x28c/0x890 [brcmfmac]
> [    7.987444] sp : ffff80001017ba90
> [    7.987445] x29: ffff80001017ba90 x28: 0000000000000000 
> [    7.987447] x27: 0000000000000000 x26: ffff0000a8c09400 
> [    7.987449] x25: ffff80000a24cb08 x24: ffff0000a3800400 
> [    7.987451] x23: ffff800012c618c8 x22: ffff0000a675e000 
> [    7.987453] x21: ffff0000a675e000 x20: 0000000000000023 
> [    7.987454] x19: ffff0000a3800000 x18: ffff800013b25908 
> [    7.987456] x17: ffff800013b25d0c x16: ffff800013b25104 
> [    7.987457] x15: 00000000f0000000 x14: 000000000000000a 
> [    7.987459] x13: 0000000000000000 x12: 0000000000000001 
> [    7.987460] x11: 0000000000000005 x10: 0101010101010101 
> [    7.987461] x9 : ffffffffffffffff x8 : 7f7f7f7f7f7f7f7f 
> [    7.987463] x7 : 00000000000001ff x6 : 0000000000000080 
> [    7.987464] x5 : 0000000000000600 x4 : 0000000000000003 
> [    7.987466] x3 : ffff0000a5a3d880 x2 : 0000000000000021 
> [    7.987467] x1 : 0000000000000003 x0 : ffff0000a675e000 
> [    7.987469] Call trace:
> [    7.987481]  brcmf_sdiod_sgtable_alloc+0x130/0x138 [brcmfmac]
> [    7.987493]  brcmf_sdio_probe+0x28c/0x890 [brcmfmac]
> [    7.987504]  brcmf_sdiod_probe+0xe0/0x1c0 [brcmfmac]
> [    7.987516]  brcmf_ops_sdio_probe+0x16c/0x208 [brcmfmac]
> [    7.987522]  sdio_bus_probe+0xe0/0x1c8
> [    7.987526]  really_probe+0xd8/0x428
> [    7.987529]  driver_probe_device+0xdc/0x130
> [    7.987531]  device_driver_attach+0x6c/0x78
> [    7.987533]  __driver_attach+0x9c/0x168
> [    7.987535]  bus_for_each_dev+0x70/0xc0
> [    7.987536]  driver_attach+0x20/0x28
> [    7.987538]  bus_add_driver+0x190/0x220
> [    7.987539]  driver_register+0x60/0x110
> [    7.987541]  sdio_register_driver+0x24/0x30
> [    7.987552]  brcmf_sdio_register+0x14/0x48 [brcmfmac]
> [    7.987563]  brcmf_driver_register+0xc/0x20 [brcmfmac]
> [    7.987567]  process_one_work+0x1e0/0x358
> [    7.987569]  worker_thread+0x40/0x488
> [    7.987571]  kthread+0x118/0x120
> [    7.987573]  ret_from_fork+0x10/0x18
> [    7.987575] ---[ end trace 808ac7e159d1fc33 ]---
>
> I don’t see this on older Amlogic SoCs (GXL/GXM devices with various other BCM chips) or another Amlogic G12B device (same SoC with a different Ampak module) or some RK3399 devices, so it may be something board (Khadas VIM3) specific.
Unfortunately I don't know this Khadas VIM3 board and special problems
to support brcmfmac on it.

On RockPro64 there are 2 board specific tweaks needed to get this
running (also see patch 8 in this series, and rk3399.dtsi):
- limit clock of the sdio0 port of rk3399
- enable sdio in-band irq, do not use out-of-band irq that the wifi
module supports.

I guess you need similar enhancements of the board device tree as in
patch 8 of this series for your VIM3 board.

Regards,
Soeren
>
> I also see some errors like:
>
> [   71.046597] brcmfmac: brcmf_sdio_readframes: RXHEADER FAILED: -5
> [   71.046652] brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame, send NAK
> [  123.844863] brcmfmac: brcmf_sdio_bus_sleep: error while changing bus sleep state -5
> [  124.678329] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
> [  124.680226] mmc0: tuning execution failed: -5
> [  124.708843] brcmfmac: brcmf_sdio_bus_sleep: error while changing bus sleep state -5
> [  125.700765] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
> [  125.880372] brcmfmac: mmc_submit_one: CMD53 sg block read failed -22
> [  125.880393] brcmfmac: brcmf_sdio_rxglom: glom read of 512 bytes failed: -5
> [  125.880401] brcmfmac: brcmf_sdio_rxfail: abort command, terminate frame
> [  125.881262] brcmfmac: brcmf_sdio_readframes: brcmf_sdio_readframes: glom superframe w/o descriptor!
> [  125.881318] brcmfmac: brcmf_sdio_rxfail: terminate frame
> [  131.844289] brcmfmac: mmc_submit_one: CMD53 sg block write failed -22
> [  131.844302] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
> [  131.844488] brcmfmac: mmc_submit_one: CMD53 sg block write failed -22
> [  131.844494] brcmfmac: brcmf_sdio_txfail: sdio error, abort command and terminate frame
>
> I’m not sure if that’s of any concern, but if yes, I’d be happy to apply any debugging patches you provide to generate output.
>
> Thanks again for working on this chipset!
>
> Christian
>
>
Christian Hewitt Dec. 22, 2019, 4:35 a.m. UTC | #7
> On 19 Dec 2019, at 2:04 am, Soeren Moch <smoch@web.de> wrote:
> 
> I guess you need similar enhancements of the board device tree as in
> patch 8 of this series for your VIM3 board.

Wider testing now points to a known SDIO issue (SoC bug) with Amlogic G12A/B hardware. The merged workaround for the bug was only tested with bcmdhd and brcmfmac may require tweaking as the same issue exhibits on an Amlogic G12B device with BCM4356 chip. Testing the series with Amlogic GXM (older) and SM1 (newer) hardware to exclude the SoC bug shows everything working as expected.

Christian
Arend Van Spriel Dec. 24, 2019, 9:01 a.m. UTC | #8
On 12/22/2019 5:35 AM, Christian Hewitt wrote:
> 
>> On 19 Dec 2019, at 2:04 am, Soeren Moch <smoch@web.de> wrote:
>>
>> I guess you need similar enhancements of the board device tree as in
>> patch 8 of this series for your VIM3 board.
> 
> Wider testing now points to a known SDIO issue (SoC bug) with Amlogic G12A/B hardware. The merged workaround for the bug was only tested with bcmdhd and brcmfmac may require tweaking as the same issue exhibits on an Amlogic G12B device with BCM4356 chip. Testing the series with Amlogic GXM (older) and SM1 (newer) hardware to exclude the SoC bug shows everything working as expected.

Hi Christian,

Can you elaborate on the "known SDIO issue"? Is it an issue with ADMA or 
something else. I am asking because there is a workaround in brcmfmac to 
avoid scatter-gather lists, which may or may not address the issue.

Regards,
Arend
Christian Hewitt Dec. 24, 2019, 9:44 a.m. UTC | #9
> On 24 Dec 2019, at 1:01 pm, Arend Van Spriel <arend.vanspriel@broadcom.com> wrote:
> 
> Can you elaborate on the "known SDIO issue"? Is it an issue with ADMA or something else. I am asking because there is a workaround in brcmfmac to avoid scatter-gather lists, which may or may not address the issue.

This describes the issue: https://patchwork.kernel.org/cover/10962975/

Below is the current workaround I’m using, which restricts the hack to Amlogic G12A and G12B devices that inherit “amlogic,dram-access-quirk” from a common SoC dtsi.

https://github.com/chewitt/linux/commit/187527747861b047c835f494fe3267d9b4959be1

Testing by Khadas staff found the max_segs/max_blk_count values and shows a performance impact (not a big surprise) but they appear to give a stable connection, which is better than a very unstable one. I’ve flagged things to linux-amlogic maintainer Neil Armstrong (on CC) and I expect he or colleagues will take a more scientific look in January.

NB: I’m happy to test other things. Just remember that I don’t code so you need to spoon-feed me with patches not suggestions.

Christian
Chi-Hsien Lin March 13, 2020, 11:03 a.m. UTC | #10
On 12/16/2019 7:43, Heiko Stübner wrote:
> Hi Soeren,
> 
> Am Sonntag, 15. Dezember 2019, 22:24:10 CET schrieb Soeren Moch:
>> On 12.12.19 11:59, Soeren Moch wrote:
>>> On 12.12.19 10:42, Kalle Valo wrote:
>>>> Soeren Moch <smoch@web.de> writes:
>>>>
>>>>> Add support for the BCM4359 chipset with SDIO interface and RSDB support
>>>>> to the brcmfmac wireless network driver in patches 1-7.
>>>>>
>>>>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
>>>>> AP6359SA based wifi/bt combo module with this chipset in patches 8-9.
>>>>>
>>>>>
>>>>> Chung-Hsien Hsu (1):
>>>>>    brcmfmac: set F2 blocksize and watermark for 4359
>>>>>
>>>>> Soeren Moch (5):
>>>>>    brcmfmac: fix rambase for 4359/9
>>>>>    brcmfmac: make errors when setting roaming parameters non-fatal
>>>>>    brcmfmac: add support for BCM4359 SDIO chipset
>>>>>    arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>>>>>    arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>>>>>
>>>>> Wright Feng (3):
>>>>>    brcmfmac: reset two D11 cores if chip has two D11 cores
>>>>>    brcmfmac: add RSDB condition when setting interface combinations
>>>>>    brcmfmac: not set mbss in vif if firmware does not support MBSS
>>>>>
>>>>>   .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
>>>>>   .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
>>>>>   .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68 +++++++++++++++----
>>>>>   .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
>>>>>   .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
>>>>>   .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
>>>>>   .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
>>>>>   include/linux/mmc/sdio_ids.h                  |  2 +
>>>>>   8 files changed, 176 insertions(+), 26 deletions(-)
>>>> Just to make sure we are on the same page, I will apply patches 1-7 to
>>>> wireless-drivers-next and patches 8-9 go to some other tree? And there
>>>> are no dependencies between the brcmfmac patches and dts patches?
>>>>
>>> Yes, this also is my understanding. I'm glad if you are fine with
>>> patches 1-7.
>>> Heiko will pick up patches 8-9 later for linux-rockchip independently.
>>> And if we need another round of review for patches 8-9, I think we don't
>>> need to bother linux-wireless with this.
>>
>> Heiko,
>>
>> is this OK for you when patches 1-7 are merged now in wireless-drivers,
>> and then I send a v3 for patches 8-9 only for you to merge in
>> linux-rockchip later? Or do you prefer a full v3 for the whole series
>> with only this pending clock name update in patch 9?
> 
> Nope, merging 1-7 from this v2 and then getting a v3 with only the dts
> stuff is perfectly fine :-)

Soeren,

I suppose patch 1-7 from this serious are all good for merging. Is that 
right? If so, could you please create a rebased V3?


Regards,
Chi-hsien Lin

> 
> Heiko
> 
> 
> .
>
Soeren Moch March 13, 2020, 1:17 p.m. UTC | #11
On 13.03.20 12:03, Chi-Hsien Lin wrote:
> On 12/16/2019 7:43, Heiko Stübner wrote:
>> Hi Soeren,
>>
>> Am Sonntag, 15. Dezember 2019, 22:24:10 CET schrieb Soeren Moch:
>>> On 12.12.19 11:59, Soeren Moch wrote:
>>>> On 12.12.19 10:42, Kalle Valo wrote:
>>>>> Soeren Moch <smoch@web.de> writes:
>>>>>
>>>>>> Add support for the BCM4359 chipset with SDIO interface and RSDB
>>>>>> support
>>>>>> to the brcmfmac wireless network driver in patches 1-7.
>>>>>>
>>>>>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
>>>>>> AP6359SA based wifi/bt combo module with this chipset in patches
>>>>>> 8-9.
>>>>>>
>>>>>>
>>>>>> Chung-Hsien Hsu (1):
>>>>>>    brcmfmac: set F2 blocksize and watermark for 4359
>>>>>>
>>>>>> Soeren Moch (5):
>>>>>>    brcmfmac: fix rambase for 4359/9
>>>>>>    brcmfmac: make errors when setting roaming parameters non-fatal
>>>>>>    brcmfmac: add support for BCM4359 SDIO chipset
>>>>>>    arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>>>>>>    arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>>>>>>
>>>>>> Wright Feng (3):
>>>>>>    brcmfmac: reset two D11 cores if chip has two D11 cores
>>>>>>    brcmfmac: add RSDB condition when setting interface combinations
>>>>>>    brcmfmac: not set mbss in vif if firmware does not support MBSS
>>>>>>
>>>>>>   .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
>>>>>>   .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
>>>>>>   .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68
>>>>>> +++++++++++++++----
>>>>>>   .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
>>>>>>   .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
>>>>>>   .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
>>>>>>   .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
>>>>>>   include/linux/mmc/sdio_ids.h                  |  2 +
>>>>>>   8 files changed, 176 insertions(+), 26 deletions(-)
>>>>> Just to make sure we are on the same page, I will apply patches
>>>>> 1-7 to
>>>>> wireless-drivers-next and patches 8-9 go to some other tree? And
>>>>> there
>>>>> are no dependencies between the brcmfmac patches and dts patches?
>>>>>
>>>> Yes, this also is my understanding. I'm glad if you are fine with
>>>> patches 1-7.
>>>> Heiko will pick up patches 8-9 later for linux-rockchip independently.
>>>> And if we need another round of review for patches 8-9, I think we
>>>> don't
>>>> need to bother linux-wireless with this.
>>>
>>> Heiko,
>>>
>>> is this OK for you when patches 1-7 are merged now in wireless-drivers,
>>> and then I send a v3 for patches 8-9 only for you to merge in
>>> linux-rockchip later? Or do you prefer a full v3 for the whole series
>>> with only this pending clock name update in patch 9?
>>
>> Nope, merging 1-7 from this v2 and then getting a v3 with only the dts
>> stuff is perfectly fine :-)
>
> Soeren,
>
> I suppose patch 1-7 from this serious are all good for merging. Is
> that right? If so, could you please create a rebased V3?
Chi-hsien,

Thanks for asking, but these patches are already merged in
torvalds/v5.6-rc1 as commits
1b8d2e0a9e42..2635853ce4ab

So everything already fine with this.

Thanks,
Soeren

>
>
> Regards,
> Chi-hsien Lin
>
>>
>> Heiko
>>
>>
>> .
>>
Chi-Hsien Lin March 15, 2020, 7:01 a.m. UTC | #12
On 03/13/2020 9:17, Soeren Moch wrote:
> 
> On 13.03.20 12:03, Chi-Hsien Lin wrote:
>> On 12/16/2019 7:43, Heiko Stübner wrote:
>>> Hi Soeren,
>>>
>>> Am Sonntag, 15. Dezember 2019, 22:24:10 CET schrieb Soeren Moch:
>>>> On 12.12.19 11:59, Soeren Moch wrote:
>>>>> On 12.12.19 10:42, Kalle Valo wrote:
>>>>>> Soeren Moch <smoch@web.de> writes:
>>>>>>
>>>>>>> Add support for the BCM4359 chipset with SDIO interface and RSDB
>>>>>>> support
>>>>>>> to the brcmfmac wireless network driver in patches 1-7.
>>>>>>>
>>>>>>> Enhance devicetree of the RockPro64 arm64/rockchip board to use an
>>>>>>> AP6359SA based wifi/bt combo module with this chipset in patches
>>>>>>> 8-9.
>>>>>>>
>>>>>>>
>>>>>>> Chung-Hsien Hsu (1):
>>>>>>>     brcmfmac: set F2 blocksize and watermark for 4359
>>>>>>>
>>>>>>> Soeren Moch (5):
>>>>>>>     brcmfmac: fix rambase for 4359/9
>>>>>>>     brcmfmac: make errors when setting roaming parameters non-fatal
>>>>>>>     brcmfmac: add support for BCM4359 SDIO chipset
>>>>>>>     arm64: dts: rockchip: RockPro64: enable wifi module at sdio0
>>>>>>>     arm64: dts: rockchip: RockPro64: hook up bluetooth at uart0
>>>>>>>
>>>>>>> Wright Feng (3):
>>>>>>>     brcmfmac: reset two D11 cores if chip has two D11 cores
>>>>>>>     brcmfmac: add RSDB condition when setting interface combinations
>>>>>>>     brcmfmac: not set mbss in vif if firmware does not support MBSS
>>>>>>>
>>>>>>>    .../boot/dts/rockchip/rk3399-rockpro64.dts    | 50 +++++++++++---
>>>>>>>    .../broadcom/brcm80211/brcmfmac/bcmsdh.c      |  8 ++-
>>>>>>>    .../broadcom/brcm80211/brcmfmac/cfg80211.c    | 68
>>>>>>> +++++++++++++++----
>>>>>>>    .../broadcom/brcm80211/brcmfmac/chip.c        | 54 ++++++++++++++-
>>>>>>>    .../broadcom/brcm80211/brcmfmac/chip.h        |  1 +
>>>>>>>    .../broadcom/brcm80211/brcmfmac/pcie.c        |  2 +-
>>>>>>>    .../broadcom/brcm80211/brcmfmac/sdio.c        | 17 +++++
>>>>>>>    include/linux/mmc/sdio_ids.h                  |  2 +
>>>>>>>    8 files changed, 176 insertions(+), 26 deletions(-)
>>>>>> Just to make sure we are on the same page, I will apply patches
>>>>>> 1-7 to
>>>>>> wireless-drivers-next and patches 8-9 go to some other tree? And
>>>>>> there
>>>>>> are no dependencies between the brcmfmac patches and dts patches?
>>>>>>
>>>>> Yes, this also is my understanding. I'm glad if you are fine with
>>>>> patches 1-7.
>>>>> Heiko will pick up patches 8-9 later for linux-rockchip independently.
>>>>> And if we need another round of review for patches 8-9, I think we
>>>>> don't
>>>>> need to bother linux-wireless with this.
>>>>
>>>> Heiko,
>>>>
>>>> is this OK for you when patches 1-7 are merged now in wireless-drivers,
>>>> and then I send a v3 for patches 8-9 only for you to merge in
>>>> linux-rockchip later? Or do you prefer a full v3 for the whole series
>>>> with only this pending clock name update in patch 9?
>>>
>>> Nope, merging 1-7 from this v2 and then getting a v3 with only the dts
>>> stuff is perfectly fine :-)
>>
>> Soeren,
>>
>> I suppose patch 1-7 from this serious are all good for merging. Is
>> that right? If so, could you please create a rebased V3?
> Chi-hsien,
> 
> Thanks for asking, but these patches are already merged in
> torvalds/v5.6-rc1 as commits
> 1b8d2e0a9e42..2635853ce4ab
> 
> So everything already fine with this.

Ahh... You're right. They're all good. Thanks a lot!!

> 
> Thanks,
> Soeren
> 
>>
>>
>> Regards,
>> Chi-hsien Lin
>>
>>>
>>> Heiko
>>>
>>>
>>> .
>>>
>