From 4ac7e379973700017cfd9ed6ecbbaeb59884970482dfb909a981a7510fc5dec6 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 15 Dec 2021 09:02:47 +0000 Subject: [PATCH] Accepting request 940674 from home:mbrugger:branches:hardware - Introduce firmware files for Raspberry Pi Zero 2 W support (jsc#SLE-23064). - Update BCM4345C0.hcd to fix Spectra for CYW43455 (CVE-2020-10370) - Change source file links from branch master to branch buster. OBS-URL: https://build.opensuse.org/request/show/940674 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=46 --- .gitattributes | 2 + BCM4345C0.hcd | 2 +- bcm43xx-firmware.changes | 7 +++ bcm43xx-firmware.spec | 22 +++++++-- brcmfmac43436-sdio.bin | 3 ++ brcmfmac43436-sdio.clm_blob | 3 ++ brcmfmac43436-sdio.txt | 89 +++++++++++++++++++++++++++++++++++++ 7 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 brcmfmac43436-sdio.bin create mode 100644 brcmfmac43436-sdio.clm_blob create mode 100644 brcmfmac43436-sdio.txt diff --git a/.gitattributes b/.gitattributes index bd16a53..38b09cb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -25,5 +25,7 @@ BCM43430A1.hcd filter=lfs diff=lfs merge=lfs -text BCM4345C0.hcd filter=lfs diff=lfs merge=lfs -text BCM4345C5.hcd filter=lfs diff=lfs merge=lfs -text +brcmfmac43436-sdio.bin filter=lfs diff=lfs merge=lfs -text +brcmfmac43436-sdio.clm_blob filter=lfs diff=lfs merge=lfs -text brcmfmac43456-sdio.bin filter=lfs diff=lfs merge=lfs -text brcmfmac43456-sdio.clm_blob filter=lfs diff=lfs merge=lfs -text diff --git a/BCM4345C0.hcd b/BCM4345C0.hcd index 4c5ffc6..aa0ecad 100644 --- a/BCM4345C0.hcd +++ b/BCM4345C0.hcd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6946f2d6f01b06ae037e6508dd9af67c63b9c7dc9a9cf7e4f9fff019edd1c86 +oid sha256:c723c903655086c9f3a1de94a291f495a0f087f1ee6d3ee7bc4c558497aae7bc size 57622 diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 1293988..f62bab3 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 15 08:26:03 UTC 2021 - Matthias Brugger + +- Introduce firmware files for Raspberry Pi Zero 2 W support (jsc#SLE-23064). +- Update BCM4345C0.hcd to fix Spectra for CYW43455 (CVE-2020-10370) +- Change source file links from branch master to branch buster. + ------------------------------------------------------------------- Fri Apr 9 11:20:00 UTC 2021 - Nicolas Patricio Saenz Julienne diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index 3a84032..702bd03 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -47,11 +47,15 @@ Source4309: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom # https://chromium.googlesource.com/chromiumos/third_party/linux-firmware/+/f151f016b4fe656399f199e28cabf8d658bcb52b/brcm/brcmfmac4356-pcie.txt Source4356: brcmfmac4356-pcie.txt #BCM43456 -Source4561: https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.bin -Source4562: https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.clm_blob -Source4563: https://github.com/RPi-Distro/firmware-nonfree/raw/master/brcm/brcmfmac43456-sdio.txt +Source4561: https://github.com/RPi-Distro/firmware-nonfree/raw/buster/brcm/brcmfmac43456-sdio.bin +Source4562: https://github.com/RPi-Distro/firmware-nonfree/raw/buster/brcm/brcmfmac43456-sdio.clm_blob +Source4563: https://github.com/RPi-Distro/firmware-nonfree/raw/buster/brcm/brcmfmac43456-sdio.txt Source4564: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C5.hcd Source4559: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd +#BCM43436 aka BCM43430b0 +Source4600: https://github.com/RPi-Distro/firmware-nonfree/raw/buster/brcm/brcmfmac43436-sdio.bin +Source4601: https://github.com/RPi-Distro/firmware-nonfree/raw/buster/brcm/brcmfmac43436-sdio.clm_blob +Source4602: https://github.com/RPi-Distro/firmware-nonfree/raw/buster/brcm/brcmfmac43436-sdio.txt # Owns /lib/firmware/brcm and potentially conflicts BuildRequires: kernel-firmware-brcm # Owns /etc/modprobe.d @@ -86,7 +90,13 @@ install -c -m 0644 %{SOURCE4356} %{buildroot}%{_firmwaredir}/brcm/ install -c -m 0644 %{SOURCE4561} %{buildroot}%{_firmwaredir}/brcm/ install -c -m 0644 %{SOURCE4562} %{buildroot}%{_firmwaredir}/brcm/ install -c -m 0644 %{SOURCE4563} %{buildroot}%{_firmwaredir}/brcm/ +install -c -m 0644 %{SOURCE4600} %{buildroot}%{_firmwaredir}/brcm/ +install -c -m 0644 %{SOURCE4601} %{buildroot}%{_firmwaredir}/brcm/ +install -c -m 0644 %{SOURCE4602} %{buildroot}%{_firmwaredir}/brcm/ ln -s brcmfmac43456-sdio.txt %{buildroot}%{_firmwaredir}/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +ln -s brcmfmac43436-sdio.bin %{buildroot}%{_firmwaredir}/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin +ln -s brcmfmac43436-sdio.txt %{buildroot}%{_firmwaredir}/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt +ln -s brcmfmac43436-sdio.clm_blob %{buildroot}%{_firmwaredir}/brcm/brcmfmac43430b0-sdio.clm_blob # We have conflicting versions of CM4's brcmfmac configuration, some # pre-release dev versions depend on 43456 whereas store bought ones depend on # 43455. Let's keep both for now. @@ -115,6 +125,12 @@ ln -s brcm/BCM43430A1.hcd %{buildroot}%{_firmwaredir}/BCM43430A1.hcd %{_firmwaredir}/brcm/brcmfmac4330-sdio.solidrun,cubox-i-q.txt %{_firmwaredir}/brcm/brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt %{_firmwaredir}/brcm/brcmfmac43362-sdio.sinovoip,bpi-m2.txt +%{_firmwaredir}/brcm/brcmfmac43430b0-sdio.clm_blob +%{_firmwaredir}/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.bin +%{_firmwaredir}/brcm/brcmfmac43430b0-sdio.raspberrypi,model-zero-2-w.txt +%{_firmwaredir}/brcm/brcmfmac43436-sdio.bin +%{_firmwaredir}/brcm/brcmfmac43436-sdio.clm_blob +%{_firmwaredir}/brcm/brcmfmac43436-sdio.txt %{_firmwaredir}/brcm/brcmfmac4356-pcie.txt %{_firmwaredir}/brcm/brcmfmac43456-sdio.bin %{_firmwaredir}/brcm/brcmfmac43456-sdio.clm_blob diff --git a/brcmfmac43436-sdio.bin b/brcmfmac43436-sdio.bin new file mode 100644 index 0000000..d1f5b0e --- /dev/null +++ b/brcmfmac43436-sdio.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dc7b3b53a1b69637a9e10e675e73ef56ca689d5bd279b78bd2f2719970cb80b +size 413934 diff --git a/brcmfmac43436-sdio.clm_blob b/brcmfmac43436-sdio.clm_blob new file mode 100644 index 0000000..cf9956c --- /dev/null +++ b/brcmfmac43436-sdio.clm_blob @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fce7cbb62ffa6a5a65ca97b13f6fbf28d06c02d986c2072d65bf72164755fc34 +size 11209 diff --git a/brcmfmac43436-sdio.txt b/brcmfmac43436-sdio.txt new file mode 100644 index 0000000..79cc8dc --- /dev/null +++ b/brcmfmac43436-sdio.txt @@ -0,0 +1,89 @@ +# NVRAM file for BCM943430WLPTH, Bx Chip +# 2.4 GHz, 20 MHz BW mode +# $ Copyright Broadcom $ +# +# +# <> + +# The following parameter values are just placeholders, need to be updated. +manfid=0x2d0 +prodid=0x0727 +vendid=0x14e4 +devid=0x43e2 +boardtype=0x0727 +boardrev=0x1331 +boardnum=22 +macaddr=00:90:4c:c5:12:38 +sromrev=11 +boardflags=0x00404201 +boardflags3=0x08000000 +xtalfreq=37400 +nocrc=1 +ag0=255 +aa2g=1 +ccode=ALL + +pa0itssit=0x20 +extpagain2g=0 + +#PA parameters for 2.4GHz, measured at CHIP OUTPUT +pa2ga0=-203,6150,-732 + +#PA parameters for 2.4GHz, measured at CELL_BLOCK_PORT output +#pa2ga0=-191,6027,-713 + +#PA parameters for 2.4GHz, measured at LTE_BLOCK_PORT output +#pa2ga0=-161,5458,-639 + + +AvVmid_c0=0x0,0xc8 +cckpwroffset0=5 + +# PPR params +maxp2ga0=78 +txpwrbckof=6 +cckbw202gpo=0 +legofdmbw202gpo=0x66111111 +mcsbw202gpo=0x76611111 +propbw202gpo=0xcc + +# OFDM IIR : +ofdmdigfilttype=18 +ofdmdigfilttypebe=18 +# PAPD mode: +papdmode=1 +pacalidx2g=42 +papdepsoffset=-22 +papdendidx=58 + +# LTECX flags +#ltecxmux=0 +#ltecxpadnum=0x0102 +#ltecxfnsel=0x44 +#ltecxgcigpio=0x01 + +il0macaddr=00:90:4c:c5:12:38 +wl0id=0x431b + +deadman_to=0xffffffff +# muxenab: 0x1 for UART enable, 0x2 for GPIOs, 0x8 for JTAG, 0x10 for OOB +muxenab=0x10 +# CLDO PWM voltage settings - 0x4 - 1.1 volt +#cldo_pwm=0x4 + +#VCO freq 326.4MHz +spurconfig=0x3 + +AvVmidIQcal=0x2,0xa8 + +#SW based desense - Enable by default +#i.e using glitich statistcs as critria to change crsmin +glitch_based_crsmin=1 + +#/* EDTHRESH default value */ +edonthd20l=-62 +edoffthd20ul=-68 +#/* EDTHRESH adjust offset once ACI active */ +edonthd20l_adj=2 +edoffthd20ul_adj=2 +