Failed WiFi (bcm4334) due to Upstream Kernel Changes

[li-sky]

Hi,

I've got a x96x4 tv box (a HK1 Rbox X4), and disassembly revealed a HK6334Q WiFi module. Boot stage showed some error & kernel panic (listed below)

[    7.841100] brcmfmac: brcmf_chip_cores_check: CPU core not detected
[    7.842803] brcmfmac: brcmf_sdio_probe_attach: brcmf_chip_attach failed!
[    7.843361] brcmfmac: brcmf_sdio_probe: brcmf_sdio_probe_attach failed
[    7.846895] Unable to handle kernel NULL pointer dereference at virtual address 000000000000033c
[    7.853295] Mem abort info:
[    7.854928]   ESR = 0x0000000096000004
[    7.856451]   EC = 0x25: DABT (current EL), IL = 32 bits
[    7.856461]   SET = 0, FnV = 0
[    7.856464]   EA = 0, S1PTW = 0
[    7.856467]   FSC = 0x04: level 0 translation fault
[    7.856470] Data abort info:
[    7.856473]   ISV = 0, ISS = 0x00000004, ISS2 = 0x00000000
[    7.856476]   CM = 0, WnR = 0, TnD = 0, TagAccess = 0
[    7.856479]   GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0
[    7.856483] user pgtable: 4k pages, 48-bit VAs, pgdp=0000000001058000
[    7.856487] [000000000000033c] pgd=0000000000000000, p4d=0000000000000000
[    7.856498] Internal error: Oops: 0000000096000004 [#1]  SMP
[    7.856504] Modules linked in: brcmfmac(+) snd_soc_hdmi_codec snd_soc_core snd_pcm_dmaengine snd_pcm brcmutil hid_logitech_hidpp(+) snd_timer snd soundcore evdev mousedev input_leds joydev dw_hdmi_i2s_audio hid_logitech_dj cfg80211 rfkill fuse nfnetlink ipv6 crc_ccitt
[    7.856566] CPU: 1 UID: 0 PID: 212 Comm: (udev-worker) Not tainted 6.18.10-meson64 #26 PREEMPT 
[    7.856574] Hardware name: Amlogic SC2 AH212 Development Board 100M (DT)
[    7.856579] pstate: 20400009 (nzCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--)
[    7.856585] pc : brcmf_sdio_remove+0x18/0x16c [brcmfmac]
[    7.856644] lr : brcmf_sdiod_remove+0x24/0xa4 [brcmfmac]
[    7.856684] sp : ffff800083553640
[    7.856687] x29: ffff800083553640 x28: ffff800083553b50 x27: ffff800079aac0a8
[    7.856696] x26: ffff800079aa4858 x25: ffff800081184000 x24: 61c8864680b583eb
[    7.856704] x23: ffff000000d58808 x22: ffff800079aaf108 x21: ffff000000d58800
[    7.856713] x20: ffff00000c7c2800 x19: ffffffffffffffcc x18: ffff0000084f7000
[    7.856722] x17: 00000000ffffffff x16: ffff800083553068 x15: 00000000000003b6
[    7.889159] x14: ffff000001926a00 x13: 0000000002e1d4c2 x12: 0000000000000000
[    7.889170] x11: 00000000a369cfb6 x10: ffff000001926a00 x9 : 0000000000000000
[    7.889179] x8 : ffff800083553560 x7 : 0000000000000000 x6 : 000000000000003f
[    7.893190] x5 : ffff800079a9b9d8 x4 : fffffdffc0004c20 x3 : 000000008010000f
[    7.893200] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffffffffffffcc
[    7.893209] Call trace:
[    7.893215]  brcmf_sdio_remove+0x18/0x16c [brcmfmac] (P)
[    7.899816]  brcmf_sdiod_remove+0x24/0xa4 [brcmfmac]
[    7.899877]  brcmf_sdiod_probe+0x14c/0x1ac [brcmfmac]
[    7.902515]  brcmf_ops_sdio_probe+0x138/0x21c [brcmfmac]
[    7.902569]  sdio_bus_probe+0x130/0x1dc
[    7.902584]  really_probe+0xc0/0x390
[    7.902595]  __driver_probe_device+0x7c/0x15c
[    7.902602]  driver_probe_device+0x3c/0x110
[    7.902608]  __driver_attach+0xf0/0x1f8
[    7.902614]  bus_for_each_dev+0x7c/0xe0
[    7.902621]  driver_attach+0x24/0x30
[    7.912505]  bus_add_driver+0x150/0x274
[    7.912526]  driver_register+0x5c/0x124
[    7.912534]  __sdio_register_driver+0x2c/0x38
[    7.912545]  brcmf_sdio_register+0x20/0x2c [brcmfmac]
[    7.917278]  brcmf_core_init+0x10/0xf18 [brcmfmac]
[    7.917330]  brcmfmac_module_init+0x6c/0xac [brcmfmac]
[    7.917373]  do_one_initcall+0x80/0x1c8
[    7.917386]  do_init_module+0x90/0x26c
[    7.917395]  load_module+0x1c40/0x1e50
[    7.917402]  init_module_from_file+0x88/0xcc
[    7.917408]  __arm64_sys_finit_module+0x25c/0x350
[    7.917415]  invoke_syscall.constprop.0+0x70/0xc4
[    7.917428]  do_el0_svc+0xa8/0xc4
[    7.917436]  el0_svc+0x3c/0x14c
[    7.917447]  el0t_64_sync_handler+0xa0/0xe4
[    7.917455]  el0t_64_sync+0x19c/0x1a0
[    7.917469] Code: a9be7bfd 910003fd f9000bf3 aa0003f3 (f941b801) 
[    7.917477] ---[ end trace 0000000000000000 ]---

I gave a quick look at udevadm, and it seems to be running a bcm4334 chip below. Related issues have been reported in CoreElec community. The device boots, however WiFi is not available.