linux-firmware package update

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>

SOURCES/0001-brcm-Raspberry-Pi-3A-WiFi-NVRAM-support.patch

@@ -0,0 +1,24 @@
+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

SOURCES/0002-brcm-Raspberry-Pi-Update-ccode-to-X2.patch

@@ -0,0 +1,56 @@
+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

SPECS/linux-firmware.spec

@@ -1,22 +1,27 @@
-%global checkout c6b6265d
+# global checkout 710963fe
-%global firmware_release 88
+%global firmware_release 96
 
 %global _firmwarepath	/usr/lib/firmware
 %define _binaries_in_noarch_packages_terminate_build 0
 
 Name:		linux-firmware
-Version:	20181008
+Version:	20190514
-Release:	%{firmware_release}.git%{checkout}%{?dist}
+Release:	%{firmware_release}%{?dist}
 Summary:	Firmware files used by the Linux kernel
 License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
 URL:		http://www.kernel.org/
 BuildArch:	noarch
 
+# We use upstream tarballs now.  Leave this in case we need to do a git
+# snapshot for some reason to remind us how they were generated.
 # git archive --format=tar --prefix=linux-firmware-%{checkout}/ %{checkout}  | xz > linux-firmware-%{version}.tar.xz
-Source0:	%{name}-%{version}.tar.xz
+#Source0:	%{name}-%{version}.tar.xz
+Source0:	https://www.kernel.org/pub/linux/kernel/firmware/%{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
 
+Requires:	linux-firmware-whence
 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
 Obsoletes:	ueagle-atm4-firmware < 1.0-5
@@ -35,11 +40,18 @@ Conflicts:	microcode_ctl < 2.1-0
 This package includes firmware files required for some devices to
 operate.
 
+%package whence
+Summary:	WHENCE License file
+License:	GPL+ and GPLv2+ and MIT and Redistributable, no modification permitted
+%description whence
+This package contains the WHENCE license file which documents the vendor license details.
+
 %package -n iwl100-firmware
 Summary:	Firmware for Intel(R) Wireless WiFi Link 100 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	39.31.5.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl100-firmware < 39.31.5.1-4
 %description -n iwl100-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -52,6 +64,7 @@ Summary:	Firmware for Intel(R) Centrino Wireless-N 105 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 %description -n iwl105-firmware
 This package contains the firmware required by the Intel wireless drivers
 for Linux to support the iwl105 hardware.  Usage of the firmware
@@ -63,6 +76,7 @@ Summary:	Firmware for Intel(R) Centrino Wireless-N 135 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 %description -n iwl135-firmware
 This package contains the firmware required by the Intel wireless drivers
 for Linux to support the iwl135 hardware.  Usage of the firmware
@@ -75,6 +89,7 @@ License:	Redistributable, no modification permitted
 Version:	39.31.5.1
 Epoch:		1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl1000-firmware < 1:39.31.5.1-3
 %description -n iwl1000-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -87,6 +102,7 @@ Summary:	Firmware for Intel(R) Centrino Wireless-N 2000 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 %description -n iwl2000-firmware
 This package contains the firmware required by the Intel wireless drivers
 for Linux to support the iwl2000 hardware.  Usage of the firmware
@@ -98,6 +114,7 @@ Summary:	Firmware for Intel(R) Centrino Wireless-N 2030 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 %description -n iwl2030-firmware
 This package contains the firmware required by the Intel wireless drivers
 for Linux to support the iwl2030 hardware.  Usage of the firmware
@@ -110,6 +127,7 @@ License:	Redistributable, no modification permitted
 Epoch:		1
 Version:	25.30.13.0
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 %description -n iwl3160-firmware
 This package contains the firmware required by the Intel wireless drivers
 for Linux.  Usage of the firmware is subject to the terms and conditions
@@ -120,6 +138,7 @@ Summary:	Firmware for Intel® PRO/Wireless 3945 A/B/G network adaptors
 License:	Redistributable, no modification permitted
 Version:	15.32.2.9
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl3945-firmware < 15.32.2.9-7
 %description -n iwl3945-firmware
 This package contains the firmware required by the iwl3945 driver
@@ -131,6 +150,7 @@ Summary:	Firmware for Intel® PRO/Wireless 4965 A/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	228.61.2.24
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl4965-firmware < 228.61.2.24-5
 %description -n iwl4965-firmware
 This package contains the firmware required by the iwl4965 driver
@@ -142,6 +162,7 @@ Summary:	Firmware for Intel® PRO/Wireless 5000 A/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	8.83.5.1_1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl5000-firmware < 8.83.5.1_1-3
 %description -n iwl5000-firmware
 This package contains the firmware required by the iwl5000 driver
@@ -153,6 +174,7 @@ Summary:	Firmware for Intel® PRO/Wireless 5150 A/G/N network adaptors
 License:	Redistributable, no modification permitted
 Version:	8.24.2.2
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl5150-firmware < 8.24.2.2-4
 %description -n iwl5150-firmware
 This package contains the firmware required by the iwl5150 driver
@@ -164,6 +186,7 @@ Summary:	Firmware for Intel(R) Wireless WiFi Link 6000 AGN Adapter
 License:	Redistributable, no modification permitted
 Version:	9.221.4.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl6000-firmware < 9.221.4.1-4
 %description -n iwl6000-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -175,6 +198,7 @@ Summary:	Firmware for Intel(R) Wireless WiFi Link 6005 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl6000g2a-firmware < 17.168.5.3-3
 %description -n iwl6000g2a-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -186,6 +210,7 @@ Summary:	Firmware for Intel(R) Wireless WiFi Link 6030 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	18.168.6.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl6000g2b-firmware < 17.168.5.2-3
 %description -n iwl6000g2b-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -197,6 +222,7 @@ Summary:	Firmware for Intel(R) Wireless WiFi Link 6050 Series Adapters
 License:	Redistributable, no modification permitted
 Version:	41.28.5.1
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 Obsoletes:	iwl6050-firmware < 41.28.5.1-5
 %description -n iwl6050-firmware
 This package contains the firmware required by the Intel wireless drivers
@@ -209,6 +235,7 @@ License:	Redistributable, no modification permitted
 Epoch:		1
 Version:	25.30.13.0
 Release:	%{firmware_release}%{?dist}
+Requires:	linux-firmware-whence
 %description -n iwl7260-firmware
 This package contains the firmware required by the Intel wireless drivers
 for Linux.  Usage of the firmware is subject to the terms and conditions
@@ -218,6 +245,7 @@ contained inside the provided LICENSE file. Please read it carefully.
 Summary:	Firmware for Marvell Libertas USB 8388 Network Adapter
 License:	Redistributable, no modification permitted
 Epoch:		2 
+Requires:	linux-firmware-whence
 Obsoletes:	libertas-usb8388-firmware < 2:5.110.22.p23-8
 %description -n libertas-usb8388-firmware
 Firmware for Marvell Libertas USB 8388 Network Adapter
@@ -225,6 +253,7 @@ Firmware for Marvell Libertas USB 8388 Network Adapter
 %package -n libertas-usb8388-olpc-firmware
 Summary:	OLPC firmware for Marvell Libertas USB 8388 Network Adapter
 License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
 %description -n libertas-usb8388-olpc-firmware
 Firmware for Marvell Libertas USB 8388 Network Adapter with OLPC mesh network
 support.
@@ -232,6 +261,7 @@ support.
 %package -n libertas-sd8686-firmware
 Summary:	Firmware for Marvell Libertas SD 8686 Network Adapter
 License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
 Obsoletes:	libertas-sd8686-firmware < 9.70.20.p0-4
 %description -n libertas-sd8686-firmware
 Firmware for Marvell Libertas SD 8686 Network Adapter
@@ -239,11 +269,26 @@ Firmware for Marvell Libertas SD 8686 Network Adapter
 %package -n libertas-sd8787-firmware
 Summary:	Firmware for Marvell Libertas SD 8787 Network Adapter
 License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
 %description -n libertas-sd8787-firmware
 Firmware for Marvell Libertas SD 8787 Network Adapter
 
+%package -n liquidio-firmware
+Summary:	Firmware for Cavium LiquidIO Intelligent Server Adapter
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n liquidio-firmware
+Firmware for Cavium LiquidIO Intelligent Server Adapter
+
+%package -n netronome-firmware
+Summary:	Firmware for Netronome Smart NICs
+License:	Redistributable, no modification permitted
+Requires:	linux-firmware-whence
+%description -n netronome-firmware
+Firmware for Netronome Smart NICs
+
 %prep
-%autosetup -p1 -n linux-firmware-%{checkout}
+%autosetup -p1
 
 %build
 # Remove firmware shipped in separate packages already
@@ -282,74 +327,80 @@ sed -i -e '/^iwlwifi/d' \
 	-i -e '/^libertas\/sd8686/d' \
 	-i -e '/^libertas\/usb8388/d' \
 	-i -e '/^mrvl\/sd8787/d' \
+	-i -e '/^liquidio/d' \
+	-i -e '/^netronome/d' \
 	linux-firmware.files
 sed -i -e 's!^!/usr/lib/firmware/!' linux-firmware.{files,dirs}
+sed -i -e 's/^/"/;s/$/"/' linux-firmware.files
 sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 
 
+%files whence
+%license WHENCE
+
 %files -n iwl100-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-100-5.ucode
 
 %files -n iwl105-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-105-*.ucode
 
 %files -n iwl135-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-135-*.ucode
 
 %files -n iwl1000-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-1000-*.ucode
 
 %files -n iwl2000-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-2000-*.ucode
 
 %files -n iwl2030-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-2030-*.ucode
 
 %files -n iwl3160-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-3160-*.ucode
 %{_firmwarepath}/iwlwifi-3168-*.ucode
 
 %files -n iwl3945-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-3945-*.ucode
 
 %files -n iwl4965-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-4965-*.ucode
 
 %files -n iwl5000-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-5000-*.ucode
 
 %files -n iwl5150-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-5150-*.ucode
 
 %files -n iwl6000-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6000-*.ucode
 
 %files -n iwl6000g2a-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6000g2a-*.ucode
 
 %files -n iwl6000g2b-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6000g2b-*.ucode
 
 %files -n iwl6050-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-6050-*.ucode
 
 %files -n iwl7260-firmware
-%license WHENCE LICENCE.iwlwifi_firmware
+%license LICENCE.iwlwifi_firmware
 %{_firmwarepath}/iwlwifi-7260-*.ucode
 %{_firmwarepath}/iwlwifi-7265-*.ucode
 %{_firmwarepath}/iwlwifi-7265D-*.ucode
@@ -357,32 +408,72 @@ sed -e 's/^/%%dir /' linux-firmware.dirs >> linux-firmware.files
 %{_firmwarepath}/iwlwifi-8265-*.ucode
 %{_firmwarepath}/iwlwifi-9000-*.ucode
 %{_firmwarepath}/iwlwifi-9260-*.ucode
+%{_firmwarepath}/iwlwifi-cc-a0-*.ucode
 
 %files -n libertas-usb8388-firmware
-%license WHENCE LICENCE.Marvell
+%license LICENCE.Marvell
 %dir %{_firmwarepath}/libertas
 %{_firmwarepath}/libertas/usb8388_v9.bin
 
 %files -n libertas-usb8388-olpc-firmware
-%license WHENCE LICENCE.Marvell
+%license LICENCE.Marvell
 %dir %{_firmwarepath}/libertas
 %{_firmwarepath}/libertas/usb8388_olpc.bin
 
 %files -n libertas-sd8686-firmware
-%license WHENCE LICENCE.Marvell
+%license LICENCE.Marvell
 %dir %{_firmwarepath}/libertas
 %{_firmwarepath}/libertas/sd8686*
 
 %files -n libertas-sd8787-firmware
-%license WHENCE LICENCE.Marvell
+%license LICENCE.Marvell
 %dir %{_firmwarepath}/mrvl
 %{_firmwarepath}/mrvl/sd8787*
 
 %files -f linux-firmware.files
 %dir %{_firmwarepath}
-%license WHENCE LICENCE.* LICENSE.*
+%license LICENCE.* LICENSE.*
+
+%files -n liquidio-firmware
+%license LICENCE.cavium_liquidio
+%dir %{_firmwarepath}/liquidio
+%{_firmwarepath}/liquidio/*
+
+%files -n netronome-firmware
+%license LICENCE.Netronome
+%dir %{_firmwarepath}/netronome
+%{_firmwarepath}/netronome/*
 
 %changelog
+* Tue May 14 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190514-96
+- Update to upstream 20190514 release
+
+* Tue Apr 16 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190416-95
+- Update to upstream 20190416 release
+
+* Wed Mar 13 2019 Josh Boyer <jwboyer@fedoraproject.org> 20190312-94
+- Update to upstream 20190312 release
+- amgpug, rtl, AMD SEV, and other various updates
+
+* Thu Feb 14 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190213-93.git710963fe
+- ath10k updates for QCA6174/QCA9888/QCA988X/QCA9984
+- Marvell updates for SD8977/SD8897-B0/PCIe-USB8997
+- amdgpu: add firmware for vega20 from 18.50
+- nvidia: add TU10x typec controller firmware
+- bnx2x: Add FW 7.13.11.0
+
+* Thu Feb  7 2019 Peter Robinson <pbrobinson@fedoraproject.org> 20190118-92.gita8b75cac
+- Split out LiquidIO and Netronome firmware to their own package
+- Ship just one copy of WHENCE
+
+* 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
 - update BT firmwares for QCA ROME, TI CC2560(A), mt7668u
 - Update WiFi firmware for Marvell SD8997, iwlwifi 7000, 8000 and 9000 series, Realtek rtw88