Intel 9000 series WiFi/Bluetooth, Marvell WiFi (USB8801), cxgb4, amdgpu, RPI NVRAM updates for BT co-existence

This commit is contained in:
Peter Robinson 2019-01-22 07:07:33 +00:00
parent e0aa2adf05
commit e3fd30d913
5 changed files with 94 additions and 151 deletions

View File

@ -0,0 +1,25 @@
From 94ee3042ad924d2ef8383dcde511a99660c23732 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 21 Jan 2019 07:41:41 +0000
Subject: [PATCH 1/2] brcm: Raspberry Pi 3A+ WiFi NVRAM support
The Raspberry Pi 3A+ uses the same WiFi module as the 3B+ so we
just symlink the expected NVRAM file to the 3B+ one.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt | 1 +
1 file changed, 1 insertion(+)
create mode 120000 brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
new file mode 120000
index 0000000..36b5530
--- /dev/null
+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
@@ -0,0 +1 @@
+brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
\ No newline at end of file
--
2.20.1

View File

@ -1,145 +0,0 @@
From 82cdbd74cade63930104feb8f30c828305cbf052 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Sat, 13 Oct 2018 16:32:48 +0100
Subject: [PATCH] brcm: add nvram for the Raspberry Pi 3B and 3B+
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
...cmfmac43430-sdio.raspberrypi,3-model-b.txt | 39 ++++++++++
...c43455-sdio.raspberrypi,3-model-b-plus.txt | 78 +++++++++++++++++++
2 files changed, 117 insertions(+)
create mode 100644 brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
create mode 100644 brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
diff --git a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
new file mode 100644
index 0000000..99ba068
--- /dev/null
+++ b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
@@ -0,0 +1,39 @@
+aa2g=1
+ag0=255
+AvVmid_c0=0x0,0xc8
+boardflags=0x00404201
+boardflags3=0x08000000
+boardnum=22
+boardrev=0x1202
+boardtype=0x0726
+cckbw202gpo=0
+cckpwroffset0=5
+ccode=X2
+deadman_to=0xffffffff
+devid=0x43e2
+extpagain2g=0
+il0macaddr=00:90:4c:c5:12:38
+legofdmbw202gpo=0x66111111
+macaddr=00:90:4c:c5:12:38
+manfid=0x2d0
+maxp2ga0=84
+mcsbw202gpo=0x77711111
+muxenab=0x1
+nocrc=1
+ofdmdigfilttype=18
+ofdmdigfilttypebe=18
+pa0itssit=0x20
+pa2ga0=-168,7161,-820
+pacalidx2g=32
+papdendidx=61
+papdepsoffset=-36
+papdmode=1
+papdvalidtest=1
+prodid=0x0726
+propbw202gpo=0xdd
+spurconfig=0x3
+sromrev=11
+txpwrbckof=6
+vendid=0x14e4
+wl0id=0x431b
+xtalfreq=37400
diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
new file mode 100644
index 0000000..5faf34a
--- /dev/null
+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
@@ -0,0 +1,78 @@
+aa2g=1
+aa5g=1
+AvVmid_c0=1,165,2,100,2,100,2,100,2,100
+boardflags=0x00480201
+boardflags2=0x40800000
+boardflags3=0x48200100
+boardrev=0x1304
+boardtype=0x6e4
+btc_mode=1
+cbfilttype=1
+cckPwrIdxCorr=3
+cckTssiDelay=150
+ccode=X2
+deadman_to=481500000
+devid=0x43ab
+dot11agofdmhrbw202gpo=0x4442
+dot11b_opts=0x3aa85
+ed_thresh2g=-54
+ed_thresh5g=-54
+eu_edthresh2g=-54
+eu_edthresh5g=-54
+extpagain2g=2
+extpagain5g=2
+fdsslevel_ch11=6
+femctrl=0
+il0macaddr=00:90:4c:c5:12:38
+itrsw=1
+ldo1=4
+ltecxfnsel=0x22
+ltecxgcigpio=0x32
+ltecxmux=0
+ltecxpadnum=0x0504
+macaddr=00:90:4c:c5:12:38
+manfid=0x2d0
+maxp2ga0=80
+maxp5ga0=82,82,82,82
+mcsbw202gpo=0x98444422
+mcsbw205ghpo=0xb9555000
+mcsbw205glpo=0xb9555000
+mcsbw205gmpo=0xb9555000
+mcsbw402gpo=0x98444422
+mcsbw405ghpo=0xb9555000
+mcsbw405glpo=0xb9555000
+mcsbw405gmpo=0xb9555000
+mcsbw805ghpo=0xb9555000
+mcsbw805glpo=0xb9555000
+mcsbw805gmpo=0xb9555000
+nocrc=1
+ofdmlrbw202gpo=0x0022
+ofdmTssiDelay=150
+pa2ga0=-129,6525,-718
+pa2ga1=-149,4408,-601
+pa5ga0=-185,6836,-815,-186,6838,-815,-184,6859,-815,-184,6882,-818
+pa5ga1=-202,4285,-574,-201,4312,-578,-196,4391,-586,-201,4294,-575
+pdoffset2g40ma0=16
+pdoffset2gperchan=0,-2,1,0,1,0,1,1,1,0,0,-1,-1,0
+pdoffset40ma0=0x8888
+pdoffset80ma0=0x8888
+pdoffsetcckma0=2
+phycal_tempdelta=15
+prodid=0x06e4
+rawtempsense=0x1ff
+rxchain=1
+sromrev=11
+swctrlmap_2g=0x00000000,0x00000000,0x00000000,0x010000,0x3ff
+swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010000,0x3fe
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+tssipos2g=1
+tssipos5g=1
+tworangetssi2g=1
+tworangetssi5g=1
+txchain=1
+txpwr2gAdcScale=1
+txpwr5gAdcScale=1
+vcodivmode=1
+vendid=0x14e4
+xtalfreq=37400
--
2.19.1

View File

@ -0,0 +1,57 @@
From 46e39557221d5eec381c99b9002f9208f71f7128 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Mon, 21 Jan 2019 08:12:49 +0000
Subject: [PATCH 2/2] brcm: Raspberry Pi: Update ccode to X2
As per the docs [1] the X2 ccode allows the use of channels above
11 if the firmware detects appropriate other traffic on those
channels. The ALL option appears to restrict the use to the US
channel options without passively checking so X2 is overall better.
Also fix a trailling space in the config while we're at it.
[1] https://wireless.wiki.kernel.org/en/users/Drivers/brcm80211#regulatory_implementation_for_brcmsmac
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
---
brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt | 4 ++--
brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
index 732c19b..38a99db 100644
--- a/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+++ b/brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
@@ -15,7 +15,7 @@ btc_params1=0x7530
btc_params8=0x4e20
cckbw202gpo=0
cckpwroffset0=5
-ccode=ALL
+ccode=X2
# cldo_pwm is not set
deadman_to=0xffffffff
devid=0x43e2
@@ -39,7 +39,7 @@ papdmode=1
papdvalidtest=1
prodid=0x0726
propbw202gpo=0xdd
-spurconfig=0x3
+spurconfig=0x3
sromrev=11
txpwrbckof=6
vendid=0x14e4
diff --git a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
index ba94f54..8d01fcf 100644
--- a/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+++ b/brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
@@ -16,6 +16,7 @@ btc_params8=0x4e20
cbfilttype=1
cckPwrIdxCorr=3
cckTssiDelay=150
+ccode=X2
deadman_to=481500000
devid=0x43ab
dot11agofdmhrbw202gpo=0x4442
--
2.20.1

View File

@ -1,11 +1,11 @@
%global checkout 0f22c852
%global firmware_release 90
%global checkout a8b75cac
%global firmware_release 91
%global _firmwarepath /usr/lib/firmware
%define _binaries_in_noarch_packages_terminate_build 0
Name: linux-firmware
Version: 20181219
Version: 20190118
Release: %{firmware_release}.git%{checkout}%{?dist}
Summary: Firmware files used by the Linux kernel
License: GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
@ -15,7 +15,8 @@ BuildArch: noarch
# git archive --format=tar --prefix=linux-firmware-%{checkout}/ %{checkout} | xz > linux-firmware-%{version}.tar.xz
Source0: %{name}-%{version}.tar.xz
Patch1: 0001-brcm-add-nvram-for-the-Raspberry-Pi-3B-and-3B.patch
Patch1: 0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch
Patch2: 0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch
Provides: kernel-firmware = %{version} xorg-x11-drv-ati-firmware = 7.0
Obsoletes: kernel-firmware < %{version} xorg-x11-drv-ati-firmware < 6.13.0-0.22
@ -384,7 +385,12 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
%license WHENCE LICENCE.* LICENSE.*
%changelog
* Wed Dec 19 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 20191219-89.git0f22c852
* Tue Jan 22 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190118-91.gita8b75cac
- Latest Intel 9000 series WiFi/Bluetooth firmware
- Marvell WiFi (USB8801), cxgb4, amdgpu updates
- Raspberrp Pi 3-series NMRAM updates
* Wed Dec 19 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 20181219-89.git0f22c852
- Latest upstream snapshot
* Fri Oct 12 2018 Peter Robinson <pbrobinson@fedoraproject.org> 20181008-88.gitc6b6265d

View File

@ -1 +1 @@
SHA512 (linux-firmware-20181219.tar.xz) = ba92c89e00092589c83a677ab344035736128f968d4b56184138d97147b20c1b3e4b3dad25e4b7cdcc5ac4749d8f7a07e1df08edd2374b2fc89c7ccb74e57b19
SHA512 (linux-firmware-20190118.tar.xz) = 3b2a66e69ee8070a88ec4b754a3ed4f6e856bf3702084788c644dad4f530a0fd6dfc55bf45b43a4140aa4d7a9a716abec6f535b4eed6e987a2b794292f570365