]> git.proxmox.com Git - mirror_linux-firmware.git/commitdiff
Merge branch 'robot/pr-0-1697570762' into 'main'
authorMario Limonciello <superm1@gmail.com>
Tue, 17 Oct 2023 19:25:23 +0000 (19:25 +0000)
committerMario Limonciello <superm1@gmail.com>
Tue, 17 Oct 2023 19:25:23 +0000 (19:25 +0000)
robot/pr-0-1697570762

See merge request kernel-firmware/linux-firmware!32

51 files changed:
.gitlab-ci.yml
LICENSE.amd_pmf [new file with mode: 0644]
LICENSE.amlogic [new file with mode: 0644]
Makefile
WHENCE
amd-ucode/README
amdtee/773bd96f-b83f-4d52-b12dc529b13d8543.bin [new file with mode: 0644]
amlogic/bluetooth/w2_bt_fw_uart.bin [new file with mode: 0755]
build_packages.py [new file with mode: 0755]
check_whence.py
contrib/templates/debian.changelog [new file with mode: 0644]
contrib/templates/debian.control [new file with mode: 0644]
contrib/templates/debian.copyright [new file with mode: 0644]
contrib/templates/rpm.spec [new file with mode: 0644]
i915/mtl_dmc.bin
i915/mtl_huc_gsc.bin
intel/ibt-0040-0041.sfi
intel/ibt-0040-4150.sfi
intel/ibt-0041-0041.sfi
intel/ibt-0080-0041.ddc [new file with mode: 0644]
intel/ibt-0080-0041.sfi [new file with mode: 0644]
intel/ibt-1040-0041.sfi
intel/ibt-1040-4150.sfi
intel/ibt-17-16-1.sfi
intel/ibt-17-2.sfi
intel/ibt-18-16-1.sfi
intel/ibt-18-2.sfi
iwlwifi-Qu-b0-hr-b0-77.ucode
iwlwifi-Qu-b0-jf-b0-77.ucode
iwlwifi-Qu-c0-hr-b0-77.ucode
iwlwifi-Qu-c0-jf-b0-77.ucode
iwlwifi-QuZ-a0-hr-b0-77.ucode
iwlwifi-cc-a0-77.ucode
iwlwifi-gl-c0-fm-c0-83.ucode [new file with mode: 0644]
iwlwifi-gl-c0-fm-c0.pnvm [new file with mode: 0644]
iwlwifi-ma-b0-gf-a0-83.ucode [new file with mode: 0644]
iwlwifi-ma-b0-gf-a0.pnvm [new file with mode: 0644]
iwlwifi-ma-b0-gf4-a0-83.ucode [new file with mode: 0644]
iwlwifi-ma-b0-gf4-a0.pnvm [new file with mode: 0644]
iwlwifi-ma-b0-hr-b0-83.ucode [new file with mode: 0644]
iwlwifi-so-a0-gf-a0-84.ucode [new file with mode: 0644]
iwlwifi-so-a0-gf-a0.pnvm
iwlwifi-so-a0-gf4-a0-84.ucode [new file with mode: 0644]
iwlwifi-so-a0-gf4-a0.pnvm
iwlwifi-so-a0-hr-b0-83.ucode [new file with mode: 0644]
iwlwifi-so-a0-hr-b0-84.ucode [new file with mode: 0644]
iwlwifi-ty-a0-gf-a0-84.ucode [new file with mode: 0644]
iwlwifi-ty-a0-gf-a0.pnvm
mrvl/pcie8997_wlan_v4.bin
mrvl/pcieusb8997_combo_v4.bin
rtl_bt/rtl8851bu_fw.bin

index efd8f90baec2fa01c519150bfdfc6ec95d8e2c79..4d19ab3e0847aadc3a0b2aaffad400eff7822981 100644 (file)
@@ -1,3 +1,12 @@
+.debcommon: &debcommon
+  - apt update
+  - apt install build-essential debhelper git python3-jinja2 -y
+  - make deb
+
+.rpmcommon: &rpmcommon
+  - dnf install make git python3-jinja2 rpmdevtools -y
+  - make rpm
+
 check-commits:
   stage: test
   image: registry.gitlab.com/kernel-firmware/linux-firmware
@@ -9,9 +18,59 @@ check-commits:
 pre-commit:
   stage: test
   image: registry.gitlab.com/kernel-firmware/linux-firmware
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
     - pre-commit run --all-files
 
+rpm:
+  stage: test
+  image: fedora
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+  script:
+    - *rpmcommon
+
+deb:
+  stage: test
+  image: debian
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+    - if: $CI_COMMIT_TAG
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+  script:
+    - *debcommon
+
+deb-release:
+  stage: deploy
+  image: debian
+  rules:
+    - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+      when: never
+    - if: $RELEASE_TOKEN
+  artifacts:
+    paths:
+      - dist/*
+  script:
+    - *debcommon
+
+rpm-release:
+  stage: deploy
+  image: fedora
+  rules:
+    - if: $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
+      when: never
+    - if: $RELEASE_TOKEN
+  artifacts:
+    paths:
+      - dist/*
+  script:
+    - *rpmcommon
+
 release:
   stage: deploy
   rules:
diff --git a/LICENSE.amd_pmf b/LICENSE.amd_pmf
new file mode 100644 (file)
index 0000000..349e207
--- /dev/null
@@ -0,0 +1,51 @@
+Copyright (C) 2023  Advanced Micro Devices, Inc. All rights reserved.
+
+REDISTRIBUTION: Permission is hereby granted, free of any license fees,
+to any person obtaining a copy of this microcode (the "Software"), to
+install, reproduce, copy and distribute copies, in binary form only, of
+the Software and to permit persons to whom the Software is provided to
+do the same, provided that the following conditions are met:
+
+No reverse engineering, decompilation, or disassembly of this Software
+is permitted.
+
+Redistributions must reproduce the above copyright notice, this
+permission notice, and the following disclaimers and notices in the
+Software documentation and/or other materials provided with the
+Software.
+
+DISCLAIMER: THE USE OF THE SOFTWARE IS AT YOUR SOLE RISK.  THE SOFTWARE
+IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND AND COPYRIGHT
+HOLDER AND ITS LICENSORS EXPRESSLY DISCLAIM ALL WARRANTIES, EXPRESS AND
+IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+COPYRIGHT HOLDER AND ITS LICENSORS DO NOT WARRANT THAT THE SOFTWARE WILL
+MEET YOUR REQUIREMENTS, OR THAT THE OPERATION OF THE SOFTWARE WILL BE
+UNINTERRUPTED OR ERROR-FREE.  THE ENTIRE RISK ASSOCIATED WITH THE USE OF
+THE SOFTWARE IS ASSUMED BY YOU.  FURTHERMORE, COPYRIGHT HOLDER AND ITS
+LICENSORS DO NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING THE USE
+OR THE RESULTS OF THE USE OF THE SOFTWARE IN TERMS OF ITS CORRECTNESS,
+ACCURACY, RELIABILITY, CURRENTNESS, OR OTHERWISE.
+
+DISCLAIMER: UNDER NO CIRCUMSTANCES INCLUDING NEGLIGENCE, SHALL COPYRIGHT
+HOLDER AND ITS LICENSORS OR ITS DIRECTORS, OFFICERS, EMPLOYEES OR AGENTS
+("AUTHORIZED REPRESENTATIVES") BE LIABLE FOR ANY INCIDENTAL, INDIRECT,
+SPECIAL OR CONSEQUENTIAL DAMAGES (INCLUDING DAMAGES FOR LOSS OF BUSINESS
+PROFITS, BUSINESS INTERRUPTION, LOSS OF BUSINESS INFORMATION, AND THE
+LIKE) ARISING OUT OF THE USE, MISUSE OR INABILITY TO USE THE SOFTWARE,
+BREACH OR DEFAULT, INCLUDING THOSE ARISING FROM INFRINGEMENT OR ALLEGED
+INFRINGEMENT OF ANY PATENT, TRADEMARK, COPYRIGHT OR OTHER INTELLECTUAL
+PROPERTY RIGHT EVEN IF COPYRIGHT HOLDER AND ITS AUTHORIZED
+REPRESENTATIVES HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  IN
+NO EVENT SHALL COPYRIGHT HOLDER OR ITS AUTHORIZED REPRESENTATIVES TOTAL
+LIABILITY FOR ALL DAMAGES, LOSSES, AND CAUSES OF ACTION (WHETHER IN
+CONTRACT, TORT (INCLUDING NEGLIGENCE) OR OTHERWISE) EXCEED THE AMOUNT OF
+US$10.
+
+Notice:  The Software is subject to United States export laws and
+regulations.  You agree to comply with all domestic and international
+export laws and regulations that apply to the Software, including but
+not limited to the Export Administration Regulations administered by the
+U.S. Department of Commerce and International Traffic in Arm Regulations
+administered by the U.S. Department of State.  These laws include
+restrictions on destinations, end users and end use.
diff --git a/LICENSE.amlogic b/LICENSE.amlogic
new file mode 100644 (file)
index 0000000..b66f293
--- /dev/null
@@ -0,0 +1,15 @@
+---------------------------------------------------------------------
+Amlogic Co., Inc. grants permission to use and redistribute
+aforementioned firmware files for the use with devices containing
+Amlogic chipsets, but not as part of the Linux kernel or in any other
+form which would require these files themselves to be covered by the
+terms of the GNU General Public License or the GNU Lesser General
+Public License.
+
+These firmware files are distributed in the hope that they will be
+useful, but are provided WITHOUT ANY WARRANTY, INCLUDING BUT NOT
+LIMITED TO IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+Amlogic Contact: Yang Li <Yang.Li@amlogic.com>
+---------------------------------------------------------------------
index b8ac3be82f3058abeeee6463a37e770236816cde..1d28d8aa87a8c1eee71749b9da67a1f6664bcfaa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,12 @@ dist:
        echo "Created dist/$${TARGET}"
        @rm -rf release
 
+deb:
+       ./build_packages.py --deb
+
+rpm:
+       ./build_packages.py --rpm
+
 install:
        install -d $(DESTDIR)$(FIRMWAREDIR)
        ./copy-firmware.sh $(DESTDIR)$(FIRMWAREDIR)
diff --git a/WHENCE b/WHENCE
index 5d5f56c13a4434726d515d4112f4bb9a1ed78bb0..1174e4c2d37698ba1c8273e57d68a4d2af028835 100644 (file)
--- a/WHENCE
+++ b/WHENCE
@@ -726,10 +726,10 @@ File: mrvl/pcieuart8997_combo_v4.bin
 Version: W16.68.1.p179
 
 File: mrvl/pcieusb8997_combo_v4.bin
-Version: W16.68.1.p195
+Version: W16.68.10.p159.1
 
 File: mrvl/pcie8997_wlan_v4.bin
-Version: W16.68.1.p195
+Version: W16.68.10.p159.1
 
 File: mrvl/usbusb8997_combo_v4.bin
 Version: W16.68.1.p183
@@ -1017,22 +1017,22 @@ File: iwlwifi-so-a0-jf-b0-74.ucode
 Version: 74.a5e9588b.0
 
 File: iwlwifi-cc-a0-77.ucode
-Version: 74.2df8986f.0
+Version: 74.bd067429.0
 
 File: iwlwifi-Qu-b0-hr-b0-77.ucode
-Version: 74.2df8986f.0
+Version: 74.bd067429.0
 
 File: iwlwifi-Qu-b0-jf-b0-77.ucode
-Version: 74.2df8986f.0
+Version: 74.bd067429.0
 
 File: iwlwifi-Qu-c0-hr-b0-77.ucode
-Version: 74.2df8986f.0
+Version: 74.bd067429.0
 
 File: iwlwifi-Qu-c0-jf-b0-77.ucode
-Version: 74.2df8986f.0
+Version: 74.bd067429.0
 
 File: iwlwifi-QuZ-a0-hr-b0-77.ucode
-Version: 74.2df8986f.0
+Version: 74.bd06742.0
 
 File: iwlwifi-QuZ-a0-jf-b0-77.ucode
 Version: 74.206b0184.0
@@ -1052,6 +1052,9 @@ Version: 78.31fc9ae6.0
 File: iwlwifi-ty-a0-gf-a0-83.ucode
 Version: 80.e8f84e98.0
 
+File: iwlwifi-ty-a0-gf-a0-84.ucode
+Version: 81.8e5c544c.0
+
 File: iwlwifi-so-a0-gf4-a0-77.ucode
 Version: 74.f92b5fed.0
 
@@ -1067,6 +1070,9 @@ Version: 78.31fc9ae6.0
 File: iwlwifi-so-a0-gf4-a0-83.ucode
 Version: 80.e8f84e98.0
 
+File: iwlwifi-so-a0-gf4-a0-84.ucode
+Version: 81.8e5c544c.0
+
 File: iwlwifi-so-a0-gf-a0-77.ucode
 Version: 74.f92b5fed.0
 
@@ -1082,6 +1088,9 @@ Version: 78.31fc9ae6.0
 File: iwlwifi-so-a0-gf-a0-83.ucode
 Version: 80.e8f84e98.0
 
+File: iwlwifi-so-a0-gf-a0-84.ucode
+Version: 81.8e5c544c.0
+
 File: iwlwifi-so-a0-hr-b0-77.ucode
 Version: 74.f92b5fed.0
 
@@ -1091,11 +1100,35 @@ Version: 75.27f1c37b.0
 File: iwlwifi-so-a0-hr-b0-81.ucode
 Version: 78.31fc9ae6.0
 
+File: iwlwifi-so-a0-hr-b0-83.ucode
+Version: 80.e8f84e98.0
+
+File: iwlwifi-so-a0-hr-b0-84.ucode
+Version: 81.8e5c544c.0
+
 File: iwlwifi-so-a0-jf-b0-77.ucode
 Version: 74.f92b5fed.0
 
 File: iwlwifi-ty-a0-gf-a0.pnvm
 
+File: iwlwifi-gl-c0-fm-c0-83.ucode
+Version: 80.d24e06ed.0
+
+File: iwlwifi-gl-c0-fm-c0.pnvm
+
+File: iwlwifi-ma-b0-gf-a0-83.ucode
+Version: 80.d24e06ed.0
+
+File: iwlwifi-ma-b0-gf-a0.pnvm
+
+File: iwlwifi-ma-b0-gf4-a0-83.ucode
+Version: 80.d24e06ed.0
+
+File: iwlwifi-ma-b0-gf4-a0.pnvm
+
+File: iwlwifi-ma-b0-hr-b0-83.ucode
+Version: 80.d24e06ed.0
+
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
 Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
@@ -2445,6 +2478,17 @@ Licence: Redistributable. See LICENSE.amdgpu for details.
 
 --------------------------------------------------------------------------
 
+--------------------------------------------------------------------------
+
+Driver: amd_pmf - AMD Platform Management Framework TA
+
+File: amdtee/773bd96f-b83f-4d52-b12dc529b13d8543.bin
+Link: amdtee/amd_pmf_v3.bin -> 773bd96f-b83f-4d52-b12dc529b13d8543.bin
+
+Licence: Redistributable. See LICENSE.amd_pmf for details.
+
+--------------------------------------------------------------------------
+
 Driver: s2255drv
 
 File: f2255usb.bin
@@ -2716,6 +2760,7 @@ Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt -> brcmfmac43430-sdio.AP6
 Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt -> brcmfmac43430-sdio.AP6212.txt
 Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt -> brcmfmac43430-sdio.AP6212.txt
 Link: brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt -> brcmfmac43430-sdio.AP6212.txt
+Link: brcm/brcmfmac43430-sdio.sinovoip,bananapi-m64.txt -> brcmfmac43430-sdio.AP6212.txt
 Link: brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt -> brcmfmac43430-sdio.AP6212.txt
 Link: brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt -> brcmfmac43430-sdio.AP6212.txt
 Link: brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt -> brcmfmac43430-sdio.AP6212.txt
@@ -3665,13 +3710,13 @@ Version: BT_WindStormPeak_REL1299
 File: intel/ibt-12-16.sfi
 Version: BT_WindStormPeak_REL1299
 File: intel/ibt-17-16-1.sfi
-Version: BT_JeffersonPeak_B0_B0_REL20332
+Version: BT_JeffersonPeak_B0_B0_REL20379
 File: intel/ibt-17-16-1.ddc
-Version: BT_JeffersonPeak_B0_B0_REL20332
+Version: BT_JeffersonPeak_B0_B0_REL20379
 File: intel/ibt-17-2.sfi
-Version: BT_JeffersonPeak_B0_B0_REL20332
+Version: BT_JeffersonPeak_B0_B0_REL20379
 File: intel/ibt-17-2.ddc
-Version: BT_JeffersonPeak_B0_B0_REL20332
+Version: BT_JeffersonPeak_B0_B0_REL20379
 File: intel/ibt-17-0-1.sfi
 Version: BT_JeffersonPeak_A0_B0_REL0201
 File: intel/ibt-17-0-1.ddc
@@ -3681,13 +3726,13 @@ Version: BT_JeffersonPeak_A0_B0_REL0201
 File: intel/ibt-17-1.ddc
 Version: BT_JeffersonPeak_A0_B0_REL0201
 File: intel/ibt-18-16-1.sfi
-Version: BT_ThunderPeak_B0_B0_REL20182
+Version: BT_ThunderPeak_B0_B0_REL20379
 File: intel/ibt-18-16-1.ddc
-Version: BT_ThunderPeak_B0_B0_REL20182
+Version: BT_ThunderPeak_B0_B0_REL20379
 File: intel/ibt-18-2.sfi
-Version: BT_ThunderPeak_B0_B0_REL20182
+Version: BT_ThunderPeak_B0_B0_REL20379
 File: intel/ibt-18-2.ddc
-Version: BT_ThunderPeak_B0_B0_REL20182
+Version: BT_ThunderPeak_B0_B0_REL20379
 File: intel/ibt-18-0-1.sfi
 Version: BT_ThunderPeak_A0_B0_REL0201
 File: intel/ibt-18-0-1.ddc
@@ -3749,17 +3794,21 @@ Version: BT_HarrisonPeak_REL53497
 File:intel/ibt-19-240-4.ddc
 Version: BT_HarrisonPeak_REL53497
 File:intel/ibt-0041-0041.sfi
-Version: BT_TyphoonPeak_REL68350
+Version: BT_TyphoonPeak_REL70976
 File:intel/ibt-0041-0041.ddc
-Version: BT_TyphoonPeak_REL68350
+Version: BT_TyphoonPeak_REL70976
 File:intel/ibt-0040-0041.sfi
-Version: BT_Solar_GfP2_REL68350
+Version: BT_Solar_GfP2_REL70976
 File:intel/ibt-0040-0041.ddc
-Version: BT_Solar_GfP2_REL68350
+Version: BT_Solar_GfP2_REL70976
 File:intel/ibt-1040-0041.sfi
-Version: BT_SolarF_GfP2_REL68350
+Version: BT_SolarF_GfP2_REL70976
 File:intel/ibt-1040-0041.ddc
-Version: BT_SolarF_GfP2_REL68350
+Version: BT_SolarF_GfP2_REL70976
+File:intel/ibt-0080-0041.sfi
+Version: BT_Magnetar_REL88938
+File:intel/ibt-0080-0041.ddc
+Version: BT_Magnetar_REL88938
 
 File:intel/ibt-0040-1020.sfi
 Version: BT_Solar_JfP1_REL59564
@@ -3780,13 +3829,13 @@ File:intel/ibt-1040-2120.ddc
 Version: BT_SolarF_JfP2_REL59564
 
 File:intel/ibt-0040-4150.sfi
-Version: BT_Solar_JnP2_REL68350
+Version: BT_Solar_JnP2_REL70976
 File:intel/ibt-0040-4150.ddc
-Version: BT_Solar_JnP2_REL68350
+Version: BT_Solar_JnP2_REL70976
 File:intel/ibt-1040-4150.sfi
-Version: BT_SolarF_JnP2_REL68350
+Version: BT_SolarF_JnP2_REL70976
 File:intel/ibt-1040-4150.ddc
-Version: BT_SolarF_JnP2_REL68350
+Version: BT_SolarF_JnP2_REL70976
 
 Licence: Redistributable. See LICENCE.ibt_firmware for details
 
@@ -4719,13 +4768,13 @@ File: i915/mtl_dmc_ver2_10.bin
 Version: DMC API/APB ver 2 release 10 for Meteorlake
 
 File: i915/mtl_dmc.bin
-Version: DMC API/APB ver 2 release 16 for Meteorlake
+Version: DMC API/APB ver 2 release 17 for Meteorlake
 
 File: i915/mtl_guc_70.bin
 Version: GuC API/APB ver 70.8.0 for Meteorlake
 
 File: i915/mtl_huc_gsc.bin
-Version: HuC API/APB ver 8.5.1 for Meteorlake
+Version: HuC API/APB ver 8.5.4 for Meteorlake
 
 File: i915/mtl_gsc_1.bin
 Version: GSC API/APB v1.0, release 102.0.0.1655, SVN 1 for Meteorlake
@@ -6633,3 +6682,11 @@ Version: v0.1.0
 Licence: Redistributable. See LICENCE.linaro for details
 Originates from https://git.linaro.org/people/srinivas.kandagatla/audioreach-topology.git
 --------------------------------------------------------------------------
+
+Driver: amlogic - Amlogic SoC Firmware
+File: amlogic/bluetooth/w2_bt_fw_uart.bin
+Version: date = 38.01, number = 0xa914
+
+Licence: Redistributable. See LICENSE.amlogic for details
+
+--------------------------------------------------------------------------
\ No newline at end of file
index fac11524e62e00d6772c1476f736143b221994c9..f47743c1c3ba602d223f75987c623feb49503135 100644 (file)
@@ -53,3 +53,12 @@ a32b0f0db3f3 ("x86/microcode/AMD: Load late on both threads too")
 When late loading the patches for Genoa or Bergamo, there may be one spurious
 NMI observed per physical core. These NMIs are benign and don't cause any
 functional issue but will result in kernel messages being logged.
+
+NOTE: When running 5.19+ kernels on Genoa or Bergamo systems, some microcode
+patches are known to trigger warnings in the PMI handler. The following are
+the required minimum patch levels to address this problem:
+
+  Family=0x19 Model=0x11 Stepping=0x01: Patch=0x0a10113e
+  Family=0x19 Model=0x11 Stepping=0x02: Patch=0x0a10123e
+  Family=0x19 Model=0xa0 Stepping=0x01: Patch=0x0aa00116
+  Family=0x19 Model=0xa0 Stepping=0x02: Patch=0x0aa00212
diff --git a/amdtee/773bd96f-b83f-4d52-b12dc529b13d8543.bin b/amdtee/773bd96f-b83f-4d52-b12dc529b13d8543.bin
new file mode 100644 (file)
index 0000000..6b454bf
Binary files /dev/null and b/amdtee/773bd96f-b83f-4d52-b12dc529b13d8543.bin differ
diff --git a/amlogic/bluetooth/w2_bt_fw_uart.bin b/amlogic/bluetooth/w2_bt_fw_uart.bin
new file mode 100755 (executable)
index 0000000..e325c18
Binary files /dev/null and b/amlogic/bluetooth/w2_bt_fw_uart.bin differ
diff --git a/build_packages.py b/build_packages.py
new file mode 100755 (executable)
index 0000000..516e90d
--- /dev/null
@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+
+import argparse
+import datetime
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+from jinja2 import Environment, FileSystemLoader
+
+
+def version_str() -> str:
+    try:
+        return subprocess.check_output(["git", "describe"]).strip().decode("utf-8")
+    except subprocess.CalledProcessError:
+        return "0"
+
+
+def prep_tree(package) -> tuple:
+    tmpdir = tempfile.mkdtemp()
+    builddir = os.path.join(tmpdir, package)
+    fwdir = os.path.join(builddir, "updates")
+    targetdir = "dist"
+
+    os.makedirs(targetdir, exist_ok=True)
+    os.makedirs(builddir, exist_ok=False)
+    os.makedirs(fwdir, exist_ok=False)
+
+    subprocess.check_output(["./copy-firmware.sh", fwdir])
+    shutil.copy("WHENCE", os.path.join(builddir, "WHENCE"))
+
+    return (tmpdir, builddir, fwdir, targetdir)
+
+
+def build_deb_package(package, builddir) -> None:
+    env = Environment(loader=FileSystemLoader(os.path.join("contrib", "templates")))
+
+    d = {
+        "package": package,
+        "date": datetime.datetime.now()
+        .astimezone()
+        .strftime("%a, %d %b %Y %H:%M:%S %z"),
+        "version": version_str(),
+    }
+
+    templates = {
+        "debian.control": "control",
+        "debian.changelog": "changelog",
+        "debian.copyright": "copyright",
+    }
+
+    os.makedirs(os.path.join(builddir, "debian"))
+    for f in templates:
+        template = env.get_template(f)
+        with open(os.path.join(builddir, "debian", templates[f]), "w") as w:
+            w.write(template.render(d))
+
+    with open(os.path.join(builddir, "debian", "install"), "w") as w:
+        w.write("updates lib/firmware\n")
+
+    with open(os.path.join(builddir, "debian", "docs"), "w") as w:
+        w.write("WHENCE\n")
+
+    with open(os.path.join(builddir, "debian", "rules"), "w") as w:
+        w.write("#!/usr/bin/make -f\n")
+        w.write("%:\n")
+        w.write("\tdh $@\n")
+    os.chmod(os.path.join(builddir, "debian", "rules"), 0o755)
+
+    os.mkdir(os.path.join(builddir, "debian", "source"))
+    with open(os.path.join(builddir, "debian", "source", "format"), "w") as w:
+        w.write("3.0 (native)\n")
+
+    # build the package
+    os.environ["DEB_BUILD_OPTIONS"] = "nostrip"
+    subprocess.check_output(["dpkg-buildpackage", "-us", "-uc", "-b"], cwd=builddir)
+
+    # result is in tmpdir (not builddir!)
+    return os.path.join(
+        "..",
+        "{package}_{version}_all.deb".format(package=package, version=version_str()),
+    )
+
+
+def build_rpm_package(package, builddir) -> None:
+
+    v = version_str().replace("-", "_")
+    env = Environment(loader=FileSystemLoader(os.path.join("contrib", "templates")))
+
+    d = {
+        "package": package,
+        "version": v,
+        "cwd": builddir,
+    }
+
+    template = env.get_template("rpm.spec")
+    with open(os.path.join(builddir, "package.spec"), "wt") as w:
+        w.write(template.render(d))
+    cmd = ["rpmbuild", "-bb", "--build-in-place", "package.spec"]
+    subprocess.check_call(cmd, cwd=builddir, stderr=subprocess.STDOUT)
+
+    # result is in ~/rpmbuild/RPMS/noarch/
+    for root, dirs, files in os.walk(
+        os.path.join(os.getenv("HOME"), "rpmbuild", "RPMS", "noarch")
+    ):
+        for f in files:
+            if f.startswith(package) and f.endswith(".rpm") and v in f:
+                return os.path.join(root, f)
+    raise FileNotFoundError("RPM package not found")
+
+
+def parse_args():
+    parser = argparse.ArgumentParser("Build upstream packages using Jinja2 templates")
+    parser.add_argument("--deb", help="Build DEB package", action="store_true")
+    parser.add_argument("--rpm", help="Build RPM package", action="store_true")
+    parser.add_argument("--debug", help="Enable debug output", action="store_true")
+    args = parser.parse_args()
+
+    if not (args.rpm or args.deb) or (args.rpm and args.deb):
+        parser.print_help()
+        sys.exit(1)
+
+    return args
+
+
+if __name__ == "__main__":
+    args = parse_args()
+
+    package = "linux-firmware-upstream"
+    tmpdir, builddir, fwdir, targetdir = prep_tree(package)
+
+    try:
+        if args.deb:
+            result = build_deb_package(package, builddir)
+        elif args.rpm:
+            result = build_rpm_package(package, builddir)
+        shutil.copy(os.path.join(builddir, result), targetdir)
+        print(
+            "Built package: {}".format(
+                os.path.join(targetdir, os.path.basename(result))
+            )
+        )
+    finally:
+        if not args.debug:
+            shutil.rmtree(tmpdir)
index 7e0a04f964dabb415edb4545bd03253af78accf1..d824b3ef405c7065413bce47fdb346551853294f 100755 (executable)
@@ -76,6 +76,7 @@ def main():
             ".codespell.cfg",
             ".gitlab-ci.yml",
             ".pre-commit-config.yaml",
+            "build_packages.py",
             "check_whence.py",
             "configure",
             "Makefile",
@@ -83,6 +84,10 @@ def main():
             "copy-firmware.sh",
             "WHENCE",
             "Dockerfile",
+            "contrib/templates/debian.changelog",
+            "contrib/templates/debian.control",
+            "contrib/templates/debian.copyright",
+            "contrib/templates/rpm.spec",
         ]
     )
     known_prefixes = set(name for name in whence_list if name.endswith("/"))
diff --git a/contrib/templates/debian.changelog b/contrib/templates/debian.changelog
new file mode 100644 (file)
index 0000000..66a14e8
--- /dev/null
@@ -0,0 +1,5 @@
+{{package}} ({{version}}) unstable; urgency=medium
+
+  * Automated release
+
+ -- Linux Firmware <linux-firmware@kernel.org>  {{ date }}
diff --git a/contrib/templates/debian.control b/contrib/templates/debian.control
new file mode 100644 (file)
index 0000000..a1c0564
--- /dev/null
@@ -0,0 +1,18 @@
+Source: {{package}}
+Section: unknown
+Priority: optional
+Maintainer: Linux Firmware <linux-firmware@kernel.org>
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.6.0
+Homepage: https://gitlab.com/kernel-firmware/linux-firmware
+Vcs-Browser: https://gitlab.com/kernel-firmware/linux-firmware
+Vcs-Git: https://gitlab.com/kernel-firmware/linux-firmware
+Rules-Requires-Root: no
+
+Package: {{package}}
+Architecture: all
+Depends: ${misc:Depends}
+Description: Upstream snapshot of linux-firmware package
+ Monolithic snapshot of upstream linux-firmware package, intended to
+ to validate upstream firmware without conflicts to the distribution
+ package.
diff --git a/contrib/templates/debian.copyright b/contrib/templates/debian.copyright
new file mode 100644 (file)
index 0000000..bc2d550
--- /dev/null
@@ -0,0 +1,28 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: {{ package }}
+Upstream-Contact: linux-firmware@kernel.org
+Source: https://gitlab.com/kernel-firmware/linux-firmware
+
+Files: *
+Copyright: Various
+License: Various
+ License for all firmware is described in /usr/share/doc/{{ package }}/WHENCE.gz
+
+Files: debian/*
+Copyright: 2023 Linux Firmware <firmware@kernel.org>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/contrib/templates/rpm.spec b/contrib/templates/rpm.spec
new file mode 100644 (file)
index 0000000..862a3b9
--- /dev/null
@@ -0,0 +1,31 @@
+Name:           {{ package }}
+Version:        {{ version }}
+Release:        1%{?dist}
+Summary:        Linux Firmware (upstream)
+License:        Redistributable, no modification permitted
+URL:            http://gitlab.com/kernel-firmware/linux-firmware
+Source:         /dev/null
+BuildArch:      noarch
+
+%description
+Monolithic snapshot of upstream linux-firmware package, intended to
+to validate upstream firmware without conflicts to the distribution
+package.
+
+%prep
+%setup -q
+
+%build
+
+%install
+%define __strip /bin/true
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/lib/firmware
+cp -aR {{ cwd }}/updates %{buildroot}/lib/firmware
+
+%files
+%defattr(-,root,root,-)
+/lib/firmware/updates/*
+
+%post
+dracut -fp --regenerate-all
index caaa070948cf409ba9cafda486da0af0ad24cfb3..690dd544c58e2b00031bd806f722029dd92a3247 100644 (file)
Binary files a/i915/mtl_dmc.bin and b/i915/mtl_dmc.bin differ
index 98c1f4b59f8f77f7178b8f0a3ac9179b6059ab96..2210d6d2456c0f462704be31fbbdc4b9d9c2b6e7 100755 (executable)
Binary files a/i915/mtl_huc_gsc.bin and b/i915/mtl_huc_gsc.bin differ
index 8ab76cd84460607877bb6e8d7bab3f12da956e27..19116d91895cbd4b3585cee3d31abe532736ae7c 100644 (file)
Binary files a/intel/ibt-0040-0041.sfi and b/intel/ibt-0040-0041.sfi differ
index 2744759257289bb15905741ca0e34b3d8aacda03..4f196d0ee4a94e043e09084996958415ff5d1813 100644 (file)
Binary files a/intel/ibt-0040-4150.sfi and b/intel/ibt-0040-4150.sfi differ
index e02893afef1943b79b79ada7d38e4e1c7b0d1ed6..1a4ac1c07db3007828166a0e37083705c5f15d36 100644 (file)
Binary files a/intel/ibt-0041-0041.sfi and b/intel/ibt-0041-0041.sfi differ
diff --git a/intel/ibt-0080-0041.ddc b/intel/ibt-0080-0041.ddc
new file mode 100644 (file)
index 0000000..6e06779
Binary files /dev/null and b/intel/ibt-0080-0041.ddc differ
diff --git a/intel/ibt-0080-0041.sfi b/intel/ibt-0080-0041.sfi
new file mode 100644 (file)
index 0000000..dc2609e
Binary files /dev/null and b/intel/ibt-0080-0041.sfi differ
index c1c0704bfab893df853c38e989921a21118a40fc..fc28c45685ce46364804c567bf2e5d575b3c2b40 100644 (file)
Binary files a/intel/ibt-1040-0041.sfi and b/intel/ibt-1040-0041.sfi differ
index 48f7736ae4623311cfdc442394beca312f7d40bd..c38052770f00e0563c30af9c1b902ae7b5ff66ae 100644 (file)
Binary files a/intel/ibt-1040-4150.sfi and b/intel/ibt-1040-4150.sfi differ
index ff02f05e0be2f38475a013a6eda64e2ccf4e3620..fcb75ee14efdada56adf3b77fd2a47aceef5d79d 100644 (file)
Binary files a/intel/ibt-17-16-1.sfi and b/intel/ibt-17-16-1.sfi differ
index ff02f05e0be2f38475a013a6eda64e2ccf4e3620..fcb75ee14efdada56adf3b77fd2a47aceef5d79d 100644 (file)
Binary files a/intel/ibt-17-2.sfi and b/intel/ibt-17-2.sfi differ
index ff02f05e0be2f38475a013a6eda64e2ccf4e3620..fcb75ee14efdada56adf3b77fd2a47aceef5d79d 100644 (file)
Binary files a/intel/ibt-18-16-1.sfi and b/intel/ibt-18-16-1.sfi differ
index ff02f05e0be2f38475a013a6eda64e2ccf4e3620..fcb75ee14efdada56adf3b77fd2a47aceef5d79d 100644 (file)
Binary files a/intel/ibt-18-2.sfi and b/intel/ibt-18-2.sfi differ
index de6cd8b98985762a1ea9d915bf53ca346cf71a25..bee6e0081ab1abc310e2c7ce33d79e4e2863bb1b 100644 (file)
Binary files a/iwlwifi-Qu-b0-hr-b0-77.ucode and b/iwlwifi-Qu-b0-hr-b0-77.ucode differ
index ad87490d470b5884d114e2e502ad713d145a7766..76b624df5aed2ab2b8cb90e832769caee12259ab 100644 (file)
Binary files a/iwlwifi-Qu-b0-jf-b0-77.ucode and b/iwlwifi-Qu-b0-jf-b0-77.ucode differ
index 37e1c7af3f160648752bc75e42513558ccfa756d..5422172fe91d9ba83c275194cca653905082cc8e 100644 (file)
Binary files a/iwlwifi-Qu-c0-hr-b0-77.ucode and b/iwlwifi-Qu-c0-hr-b0-77.ucode differ
index bd0b2b249894959cb709c47b55188c3790b63140..305e4bd3ee893a5f37dcf6e1370ba576e8c411b3 100644 (file)
Binary files a/iwlwifi-Qu-c0-jf-b0-77.ucode and b/iwlwifi-Qu-c0-jf-b0-77.ucode differ
index 256997390af678fd967fc8962d8f1ea6c82ee28b..e095f8325877a57eae94db20fae12d8bbb17f86f 100644 (file)
Binary files a/iwlwifi-QuZ-a0-hr-b0-77.ucode and b/iwlwifi-QuZ-a0-hr-b0-77.ucode differ
index d138e34af24d40291671c4fbb7e1e99ce7ecec58..624b897582f1d7bdcd5737ba3c1bb1b189f69de8 100644 (file)
Binary files a/iwlwifi-cc-a0-77.ucode and b/iwlwifi-cc-a0-77.ucode differ
diff --git a/iwlwifi-gl-c0-fm-c0-83.ucode b/iwlwifi-gl-c0-fm-c0-83.ucode
new file mode 100644 (file)
index 0000000..a1444ba
Binary files /dev/null and b/iwlwifi-gl-c0-fm-c0-83.ucode differ
diff --git a/iwlwifi-gl-c0-fm-c0.pnvm b/iwlwifi-gl-c0-fm-c0.pnvm
new file mode 100644 (file)
index 0000000..b39ee8a
Binary files /dev/null and b/iwlwifi-gl-c0-fm-c0.pnvm differ
diff --git a/iwlwifi-ma-b0-gf-a0-83.ucode b/iwlwifi-ma-b0-gf-a0-83.ucode
new file mode 100644 (file)
index 0000000..67bfeec
Binary files /dev/null and b/iwlwifi-ma-b0-gf-a0-83.ucode differ
diff --git a/iwlwifi-ma-b0-gf-a0.pnvm b/iwlwifi-ma-b0-gf-a0.pnvm
new file mode 100644 (file)
index 0000000..d25c8bf
Binary files /dev/null and b/iwlwifi-ma-b0-gf-a0.pnvm differ
diff --git a/iwlwifi-ma-b0-gf4-a0-83.ucode b/iwlwifi-ma-b0-gf4-a0-83.ucode
new file mode 100644 (file)
index 0000000..bcc5b86
Binary files /dev/null and b/iwlwifi-ma-b0-gf4-a0-83.ucode differ
diff --git a/iwlwifi-ma-b0-gf4-a0.pnvm b/iwlwifi-ma-b0-gf4-a0.pnvm
new file mode 100644 (file)
index 0000000..7af11bf
Binary files /dev/null and b/iwlwifi-ma-b0-gf4-a0.pnvm differ
diff --git a/iwlwifi-ma-b0-hr-b0-83.ucode b/iwlwifi-ma-b0-hr-b0-83.ucode
new file mode 100644 (file)
index 0000000..bac1a2c
Binary files /dev/null and b/iwlwifi-ma-b0-hr-b0-83.ucode differ
diff --git a/iwlwifi-so-a0-gf-a0-84.ucode b/iwlwifi-so-a0-gf-a0-84.ucode
new file mode 100644 (file)
index 0000000..53b97d8
Binary files /dev/null and b/iwlwifi-so-a0-gf-a0-84.ucode differ
index 9dad35a1f5f5e8d551f29be8ebc81d881e9e182e..ca762036b98177d8e7c63f65926afacd8bcd899d 100644 (file)
Binary files a/iwlwifi-so-a0-gf-a0.pnvm and b/iwlwifi-so-a0-gf-a0.pnvm differ
diff --git a/iwlwifi-so-a0-gf4-a0-84.ucode b/iwlwifi-so-a0-gf4-a0-84.ucode
new file mode 100644 (file)
index 0000000..799f74a
Binary files /dev/null and b/iwlwifi-so-a0-gf4-a0-84.ucode differ
index 86b9a7c63776436332deef543f46e093d0df2eb6..cd665cba7375b843b82eda524da4a1ab4d92a2c6 100644 (file)
Binary files a/iwlwifi-so-a0-gf4-a0.pnvm and b/iwlwifi-so-a0-gf4-a0.pnvm differ
diff --git a/iwlwifi-so-a0-hr-b0-83.ucode b/iwlwifi-so-a0-hr-b0-83.ucode
new file mode 100644 (file)
index 0000000..aafd0ad
Binary files /dev/null and b/iwlwifi-so-a0-hr-b0-83.ucode differ
diff --git a/iwlwifi-so-a0-hr-b0-84.ucode b/iwlwifi-so-a0-hr-b0-84.ucode
new file mode 100644 (file)
index 0000000..b0d2f63
Binary files /dev/null and b/iwlwifi-so-a0-hr-b0-84.ucode differ
diff --git a/iwlwifi-ty-a0-gf-a0-84.ucode b/iwlwifi-ty-a0-gf-a0-84.ucode
new file mode 100644 (file)
index 0000000..c871a44
Binary files /dev/null and b/iwlwifi-ty-a0-gf-a0-84.ucode differ
index 68b8668df93db361d26f14cba907ff1deb3b6172..e6a1622110d01a49216c4002d06c2a48fc220ebb 100644 (file)
Binary files a/iwlwifi-ty-a0-gf-a0.pnvm and b/iwlwifi-ty-a0-gf-a0.pnvm differ
index eec7465d5ae26dc059737868bb10f0ca2574a8b8..f7444e2a7cd7dd870d26783c3245ba72c4e65302 100644 (file)
Binary files a/mrvl/pcie8997_wlan_v4.bin and b/mrvl/pcie8997_wlan_v4.bin differ
index 158d2067bc4b2cde717b90e3a21e787741bcadaa..439f8af4ecf91fb061d808bafa8e5b3ba052690f 100644 (file)
Binary files a/mrvl/pcieusb8997_combo_v4.bin and b/mrvl/pcieusb8997_combo_v4.bin differ
index 046fab7ee7460b2bb66cd1a72c087148e3b3a8a8..6bcd03bb19f845fffb828ad30d0500d125b6819a 100644 (file)
Binary files a/rtl_bt/rtl8851bu_fw.bin and b/rtl_bt/rtl8851bu_fw.bin differ