From 7239828fb1dd7c4958b70e8590d34b984e240bd23cf84d0ec12e801996585252 Mon Sep 17 00:00:00 2001 From: Michal Suchanek Date: Fri, 27 Nov 2020 18:38:01 +0000 Subject: [PATCH 1/4] Accepting request 851369 from home:nsaenzjulienne:branches:hardware - Introduce firmware files for RPi400: * brcmfmac43456-sdio.bin * brcmfmac43456-sdio.clm_blob * brcmfmac43456-sdio.txt OBS-URL: https://build.opensuse.org/request/show/851369 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=33 --- .gitattributes | 2 + bcm43xx-firmware.changes | 8 +++ bcm43xx-firmware.spec | 10 ++++ brcmfmac43456-sdio.bin | 3 ++ brcmfmac43456-sdio.clm_blob | 3 ++ brcmfmac43456-sdio.txt | 97 +++++++++++++++++++++++++++++++++++++ 6 files changed, 123 insertions(+) create mode 100644 brcmfmac43456-sdio.bin create mode 100644 brcmfmac43456-sdio.clm_blob create mode 100644 brcmfmac43456-sdio.txt diff --git a/.gitattributes b/.gitattributes index a978aff..6c40313 100644 --- a/.gitattributes +++ b/.gitattributes @@ -24,3 +24,5 @@ ## Specific LFS patterns BCM43430A1.hcd filter=lfs diff=lfs merge=lfs -text BCM4345C0.hcd 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/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index e8d0a89..5019a1d 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 27 16:16:32 UTC 2020 - Nicolas Patricio Saenz Julienne + +- Introduce firmware files for RPi400: + * brcmfmac43456-sdio.bin + * brcmfmac43456-sdio.clm_blob + * brcmfmac43456-sdio.txt + ------------------------------------------------------------------- Tue Sep 15 07:23:29 UTC 2020 - Fabian Vogt diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index 98b06db..9f578fe 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -42,6 +42,10 @@ Source4309: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom #brcmfmac4356-pcie.txt is taken from ChromeOS repo # 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 Source4559: https://github.com/RPi-Distro/bluez-firmware/raw/master/broadcom/BCM4345C0.hcd # Owns /lib/firmware/brcm and potentially conflicts BuildRequires: kernel-firmware-brcm @@ -74,6 +78,9 @@ install -c -m 0644 %{SOURCE301} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE391} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE3622} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4356} %{buildroot}/lib/firmware/brcm/ +install -c -m 0644 %{SOURCE4561} %{buildroot}/lib/firmware/brcm/ +install -c -m 0644 %{SOURCE4562} %{buildroot}/lib/firmware/brcm/ +install -c -m 0644 %{SOURCE4563} %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt # Used by bluez (hciattach) install -c -m 0644 %{SOURCE4309} %{buildroot}/lib/firmware/ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/ @@ -87,5 +94,8 @@ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/ /lib/firmware/brcm/brcmfmac4339-sdio.tronsmart,vega-s95-telos.txt /lib/firmware/brcm/brcmfmac43362-sdio.sinovoip,bpi-m2.txt /lib/firmware/brcm/brcmfmac4356-pcie.txt +/lib/firmware/brcm/brcmfmac43456-sdio.bin +/lib/firmware/brcm/brcmfmac43456-sdio.clm_blob +/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt %changelog diff --git a/brcmfmac43456-sdio.bin b/brcmfmac43456-sdio.bin new file mode 100644 index 0000000..99337a8 --- /dev/null +++ b/brcmfmac43456-sdio.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ddf83f2100885b166be52d21c8966db164fdd4e1d816aca2acc67ee9cc28d726 +size 495898 diff --git a/brcmfmac43456-sdio.clm_blob b/brcmfmac43456-sdio.clm_blob new file mode 100644 index 0000000..dcd91f7 --- /dev/null +++ b/brcmfmac43456-sdio.clm_blob @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:375a167fd236baf898e7dcc73b1ef624caf46e2752a6d4010805c9afeac02309 +size 10855 diff --git a/brcmfmac43456-sdio.txt b/brcmfmac43456-sdio.txt new file mode 100644 index 0000000..02d5e3f --- /dev/null +++ b/brcmfmac43456-sdio.txt @@ -0,0 +1,97 @@ +# Cloned from bcm94345wlpagb_p2xx.txt +NVRAMRev=$Rev: 498373 $ +sromrev=11 +vendid=0x14e4 +devid=0x43ab +manfid=0x2d0 +prodid=0x06e4 +#macaddr=00:90:4c:c5:12:38 +macaddr=b8:27:eb:74:f2:6c +nocrc=1 +boardtype=0x6e4 +boardrev=0x1304 + +#XTAL 37.4MHz +xtalfreq=37400 + +btc_mode=1 +#------------------------------------------------------ +#boardflags: 5GHz eTR switch by default +# 2.4GHz eTR switch by default +# bit1 for btcoex +boardflags=0x00480201 +boardflags2=0x40800000 +boardflags3=0x44200100 +phycal_tempdelta=15 +rxchain=1 +txchain=1 +aa2g=1 +aa5g=1 +tssipos5g=1 +tssipos2g=1 +femctrl=0 +AvVmid_c0=0,157,1,126,1,126,1,126,1,126 +pa2ga0=-170,5896,-680 +pa2ga1=-156,4032,-547 +pa5ga0=-150,5547,-628,-150,5583,-640,-158,5608,-649,-160,5757,-673 +pa5ga1=-109,3831,-519,-88,3821,-512,-125,3731,-528,-103,3829,-516 +itrsw=1 +pdoffsetcckma0=2 +pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0 +pdoffset2g40ma0=16 +pdoffset40ma0=0x8888 +pdoffset80ma0=0x8888 +extpagain5g=2 +extpagain2g=2 +tworangetssi2g=1 +tworangetssi5g=1 +# LTECX flags +# WCI2 +ltecxmux=0 +ltecxpadnum=0x0504 +ltecxfnsel=0x22 +ltecxgcigpio=0x32 + +maxp2ga0=80 +ofdmlrbw202gpo=0x0022 +dot11agofdmhrbw202gpo=0x4442 +mcsbw202gpo=0x98444422 +mcsbw402gpo=0x98444422 +maxp5ga0=82,82,82,82 +mcsbw205glpo=0xb9555000 +mcsbw205gmpo=0xb9555000 +mcsbw205ghpo=0xb9555000 +mcsbw405glpo=0xb9555000 +mcsbw405gmpo=0xb9555000 +mcsbw405ghpo=0xb9555000 +mcsbw805glpo=0xb9555000 +mcsbw805gmpo=0xb9555000 +mcsbw805ghpo=0xb9555000 + +swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff +swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe +swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3 +swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3 + +vcodivmode=1 +deadman_to=481500000 + +ed_thresh2g=-54 +ed_thresh5g=-54 +eu_edthresh2g=-54 +eu_edthresh5g=-54 +ldo1=4 +rawtempsense=0x1ff +cckPwrIdxCorr=3 +cckTssiDelay=150 +ofdmTssiDelay=150 +txpwr2gAdcScale=1 +txpwr5gAdcScale=1 +dot11b_opts=0x3aa85 +cbfilttype=1 +fdsslevel_ch11=6 + +# Improved Bluetooth coexistence parameters from Cypress +btc_mode=1 +btc_params8=0x4e20 +btc_params1=0x7530 From e605e32050f30bea743806dc4bcaaf8e755071e5b40a9e35fe19d396087e2d73 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 1 Dec 2020 08:17:17 +0000 Subject: [PATCH 2/4] Accepting request 851929 from home:nsaenzjulienne:branches:hardware - Introduce firmware file for RPi Compute Module 4 - Update BCM4345C0.hcd - Update brcmfmac43456-sdio.clm_blob OBS-URL: https://build.opensuse.org/request/show/851929 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=34 --- BCM4345C0.hcd | 4 ++-- bcm43xx-firmware.changes | 7 +++++++ bcm43xx-firmware.spec | 6 +++++- brcmfmac43456-sdio.clm_blob | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/BCM4345C0.hcd b/BCM4345C0.hcd index 5cfe9af..4c5ffc6 100644 --- a/BCM4345C0.hcd +++ b/BCM4345C0.hcd @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f6b79a28b181e8e7ec9b04ef430a48d1f74e07321d386330594815e13544e96 -size 57602 +oid sha256:a6946f2d6f01b06ae037e6508dd9af67c63b9c7dc9a9cf7e4f9fff019edd1c86 +size 57622 diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 5019a1d..0b21c9c 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Nov 30 10:29:24 UTC 2020 - Nicolas Patricio Saenz Julienne + +- Introduce firmware file for RPi Compute Module 4 +- Update BCM4345C0.hcd +- Update brcmfmac43456-sdio.clm_blob + ------------------------------------------------------------------- Fri Nov 27 16:16:32 UTC 2020 - Nicolas Patricio Saenz Julienne diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index 9f578fe..1bbd6ac 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -80,7 +80,9 @@ install -c -m 0644 %{SOURCE3622} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4356} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4561} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4562} %{buildroot}/lib/firmware/brcm/ -install -c -m 0644 %{SOURCE4563} %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +install -c -m 0644 %{SOURCE4563} %{buildroot}/lib/firmware/brcm/ +ln -s %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.txt %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +ln -s %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.txt %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt # Used by bluez (hciattach) install -c -m 0644 %{SOURCE4309} %{buildroot}/lib/firmware/ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/ @@ -96,6 +98,8 @@ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/ /lib/firmware/brcm/brcmfmac4356-pcie.txt /lib/firmware/brcm/brcmfmac43456-sdio.bin /lib/firmware/brcm/brcmfmac43456-sdio.clm_blob +/lib/firmware/brcm/brcmfmac43456-sdio.txt /lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt %changelog diff --git a/brcmfmac43456-sdio.clm_blob b/brcmfmac43456-sdio.clm_blob index dcd91f7..57953a4 100644 --- a/brcmfmac43456-sdio.clm_blob +++ b/brcmfmac43456-sdio.clm_blob @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:375a167fd236baf898e7dcc73b1ef624caf46e2752a6d4010805c9afeac02309 -size 10855 +oid sha256:2dbd7d22fc9af0eb560ceab45b19646d211bc7b34a1dd00c6bfac5dd6ba25e8a +size 7163 From e164e9bce8a55943c18bd480d1f1c3e3fc1152e98bac1779cfdef7b3417077fb Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 1 Dec 2020 12:39:02 +0000 Subject: [PATCH 3/4] Accepting request 852332 from home:nsaenzjulienne:branches:hardware Add bugzilla references to be on par wit SLE's package. OBS-URL: https://build.opensuse.org/request/show/852332 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=35 --- bcm43xx-firmware.changes | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bcm43xx-firmware.changes b/bcm43xx-firmware.changes index 0b21c9c..e5268de 100644 --- a/bcm43xx-firmware.changes +++ b/bcm43xx-firmware.changes @@ -16,7 +16,7 @@ Fri Nov 27 16:16:32 UTC 2020 - Nicolas Patricio Saenz Julienne -- Update bluetooth firmware to address Sweyntooth and Spectra issues: +- Update bluetooth firmware to address Sweyntooth and Spectra issues (bsc#1176631): * BCM43430A1.hcd * BCM4345C0.hcd @@ -33,7 +33,7 @@ Thu Aug 20 10:30:53 UTC 2020 - Matthias Brugger ------------------------------------------------------------------- Tue Jul 21 14:54:44 UTC 2020 - Matthias Brugger -- brcmfmac driver loads file depending on compatible. Rename files correspondingly. +- brcmfmac driver loads file depending on compatible. Rename files correspondingly (bsc#1169094). - delete modprobe config file and install-brcmfmac.sh as no longer needed. ------------------------------------------------------------------- @@ -45,7 +45,7 @@ Mon Feb 3 07:52:50 UTC 2020 - Adrian Schröter Wed Jan 1 21:41:37 UTC 2020 - Manu Maier - Dropped brcmfmac43455-sdio.raspberrypi,4-model-b.txt (in - kernel-firmware 20191218 (git commit c4586ffaac0c)) + kernel-firmware 20191218 (git commit c4586ffaac0c)) (bsc#1163237) ------------------------------------------------------------------- Wed Nov 27 15:37:52 UTC 2019 - Guillaume GARDET From a714cd7bd1dcd9434271127e16d91143d3f7c72abcad8a6d670599bca890d3a7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 1 Dec 2020 18:21:33 +0000 Subject: [PATCH 4/4] Accepting request 852418 from home:nsaenzjulienne:branches:hardware Fix previous request. The symbolic links have to be created relative to the original file location. Otherwise, the link contains absolute paths which traverse into the build machine tree. OBS-URL: https://build.opensuse.org/request/show/852418 OBS-URL: https://build.opensuse.org/package/show/hardware/bcm43xx-firmware?expand=0&rev=36 --- bcm43xx-firmware.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bcm43xx-firmware.spec b/bcm43xx-firmware.spec index 1bbd6ac..f6ca095 100644 --- a/bcm43xx-firmware.spec +++ b/bcm43xx-firmware.spec @@ -81,8 +81,8 @@ install -c -m 0644 %{SOURCE4356} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4561} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4562} %{buildroot}/lib/firmware/brcm/ install -c -m 0644 %{SOURCE4563} %{buildroot}/lib/firmware/brcm/ -ln -s %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.txt %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt -ln -s %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.txt %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt +ln -s brcmfmac43456-sdio.txt %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,400.txt +ln -s brcmfmac43456-sdio.txt %{buildroot}/lib/firmware/brcm/brcmfmac43456-sdio.raspberrypi,4-compute-module.txt # Used by bluez (hciattach) install -c -m 0644 %{SOURCE4309} %{buildroot}/lib/firmware/ install -c -m 0644 %{SOURCE4559} %{buildroot}/lib/firmware/