Merge branch 'wip/whence2yaml' into 'main'

Draft: RFC: Add whence2yaml.py and helper library

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

WHENCE

@@ -1355,6 +1355,10 @@ File: intel/iwlwifi/iwlwifi-ma-b0-hr-b0-89.ucode
 Link: iwlwifi-ma-b0-hr-b0-89.ucode -> intel/iwlwifi/iwlwifi-ma-b0-hr-b0-89.ucode
 Version: 86.7207fc64.0
 
+File: intel/iwlwifi/iwlwifi-sc-a0-wh-b0-101.ucode
+Link: iwlwifi-sc-a0-wh-b0-101.ucode -> intel/iwlwifi/iwlwifi-sc-a0-wh-b0-101.ucode
+Version: 98.80584591.0
+
 Licence: Redistributable. See LICENCE.iwlwifi_firmware for details
 
 Also available from http://wireless.kernel.org/en/users/Drivers/iwlwifi#Firmware
@@ -4863,6 +4867,39 @@ Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt
 
 --------------------------------------------------------------------------
 
+Driver: qca - Qualcomm Atheros Bluetooth support for WCN685x uart interface chips
+
+File: qca/wcnhpbtfw21.tlv
+Version: BTFW.HSP.2.1.0-00660-USB_UART_PATCHZ-6
+File: qca/wcnhpnv21.bin
+File: qca/wcnhpnv21g.bin
+File: qca/wcnhpnv21.b8c
+File: qca/wcnhpnv21.b9f
+File: qca/wcnhpnv21.ba0
+File: qca/wcnhpnv21.ba1
+File: qca/wcnhpnv21.ba2
+File: qca/wcnhpnv21.ba3
+File: qca/wcnhpnv21.ba4
+File: qca/wcnhpnv21.baa
+File: qca/wcnhpnv21.bb8
+File: qca/wcnhpnv21.b10c
+File: qca/wcnhpnv21.b111
+File: qca/wcnhpnv21g.b8c
+File: qca/wcnhpnv21g.b9f
+File: qca/wcnhpnv21g.ba0
+File: qca/wcnhpnv21g.ba1
+File: qca/wcnhpnv21g.ba2
+File: qca/wcnhpnv21g.ba3
+File: qca/wcnhpnv21g.ba4
+File: qca/wcnhpnv21g.baa
+File: qca/wcnhpnv21g.bb8
+File: qca/wcnhpnv21g.b10c
+File: qca/wcnhpnv21g.b111
+
+Licence: Redistributable. See LICENSE.QualcommAtheros_ath10k and qca/NOTICE.txt for details
+
+--------------------------------------------------------------------------
+
 Driver: qca - Qualcomm Atheros Bluetooth support for QCA2066 chips
 
 File: qca/hpbtfw21.tlv
@@ -5360,7 +5397,7 @@ File: xe/lnl_huc.bin
 Version: HuC API/APB ver 9.4.13 for Lunarlake
 
 File: xe/bmg_guc_70.bin
-Version: GuC API/APB ver 70.53.0 for Battlemage
+Version: GuC API/APB ver 70.54.0 for Battlemage
 
 File: xe/bmg_huc.bin
 Version: HuC API/APB ver 8.2.10 for Battlemage
@@ -5369,7 +5406,7 @@ File: xe/fan_control_8086_e20b_8086_1100.bin
 Version: fan_control ver 203.0.0.0 for Battlemage
 
 File: xe/ptl_guc_70.bin
-Version: GuC API/APB ver 70.53.0 for Pantherlake
+Version: GuC API/APB ver 70.54.0 for Pantherlake
 
 File: xe/ptl_huc.bin
 Version: HuC API/APB ver 10.3.3 for Pantherlake
@@ -6181,9 +6218,9 @@ Licence: Redistributable. See LICENCE.mediatek for details.
 Driver: mt7925 - MediaTek MT7925 Wireless MACs
 
 File: mediatek/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin
-Version: 20251015212927a
+Version: 20251124092925a
 File: mediatek/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin
-Version: 20251015212814
+Version: 20251124092846
 
 Licence: Redistributable. See LICENCE.mediatek for details.
 
@@ -6192,7 +6229,7 @@ Licence: Redistributable. See LICENCE.mediatek for details.
 Driver: mt7925 - MediaTek MT7925 bluetooth chipset
 
 File: mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin
-Version: 20251015213201
+Version: 20251124093155
 
 Licence: Redistributable. See LICENCE.mediatek for details.
 
@@ -6419,11 +6456,7 @@ Version: VIDEO.VE.5.2-00023-PROD-2
 File: qcom/venus-5.4/venus.mbn
 Link: qcom/venus-5.4/venus.mdt -> venus.mbn
 
-Version: VIDEO.VE.5.4-00059-PROD-1
-
-File: qcom/venus-5.4/venus_s2.mbn
-
-Version: VIDEO.VE.5.4-00060-PROD-1
+Version: VIDEO.VE.5.4-00062-PROD-1
 
 File: qcom/venus-6.0/venus.mbn
 
@@ -6438,7 +6471,7 @@ File: qcom/vpu/vpu20_p4.mbn
 Link: qcom/vpu-1.0/venus.mbn -> ../vpu/vpu20_p4.mbn
 Link: qcom/vpu-1.0/venus.mdt -> ../vpu/vpu20_p4.mbn
 
-Version: VIDEO.VPU.1.0-00119-PROD-1
+Version: VIDEO.VPU.1.0-00119
 
 Licence: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 
@@ -6456,7 +6489,7 @@ Version: VIDEO.VPU.2.4.2-00025
 File: qcom/vpu/vpu30_p4_s7.mbn
 Link: qcom/vpu/vpu30_p4.mbn -> vpu30_p4_s7.mbn
 
-Version: VIDEO.VPU.3.1-0096
+Version: VIDEO.VPU.3.1-0095
 
 File: qcom/vpu/vpu30_p4_s6.mbn
 
@@ -6638,6 +6671,11 @@ Version: ADSP.HT.5.5.c8-00217-KODIAK-1
 RawFile: qcom/qcs6490/radxa/dragon-q6a/adspr.jsn
 RawFile: qcom/qcs6490/radxa/dragon-q6a/adsps.jsn
 RawFile: qcom/qcs6490/radxa/dragon-q6a/adspua.jsn
+File: qcom/qcs6490/Thundercomm/RubikPi3/adsp.mbn
+Version: ADSP.HT.5.5.c8-00217-KODIAK-1
+RawFile: qcom/qcs6490/Thundercomm/RubikPi3/adspr.jsn
+RawFile: qcom/qcs6490/Thundercomm/RubikPi3/adsps.jsn
+RawFile: qcom/qcs6490/Thundercomm/RubikPi3/adspua.jsn
 File: qcom/qcs615/adsp.mbn
 Version: ADSP.VT.5.2.c6-00059-SM6150-1
 RawFile: qcom/qcs615/adspr.jsn
@@ -6694,13 +6732,6 @@ File: qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn
 Version: video-firmware.1.1-b158087140355883dc40b004032856a8feb5d565
 File: qcom/x1e80100/LENOVO/21N1/qcvss8380.mbn
 Version: vfw-3.1:rel0085-070fa3311d9ef968015fee7fea07198d7eb208a1
-File: qcom/x1e80100/adsp.mbn
-File: qcom/x1e80100/adsp_dtb.mbn
-Version: ADSP.HT.5.9-00796-HAMOA-1
-RawFile: qcom/x1e80100/adspr.jsn
-RawFile: qcom/x1e80100/adsps.jsn
-RawFile: qcom/x1e80100/adspua.jsn
-RawFile: qcom/x1e80100/battmgr.jsn
 RawFile: qcom/x1e80100/LENOVO/21N1/adspua.jsn
 File: qcom/x1e80100/cdsp.mbn
 File: qcom/x1e80100/cdsp_dtb.mbn
@@ -6764,6 +6795,15 @@ File: qcom/kaanapali/soccp.mbn
 File: qcom/kaanapali/soccp_dtb.mbn
 Version: SOCCP.FW.2.1-00204-KAANAPALI_SOCCP_PACK-1
 RawFile: qcom/kaanapali/soccpr.jsn
+File: qcom/qcs8300/adsp.mbn
+Version: DSP.AT.1.0.1-00163-LEMANS-1
+RawFile: qcom/qcs8300/adspr.jsn
+RawFile: qcom/qcs8300/adspua.jsn
+File: qcom/qcs8300/cdsp0.mbn
+Version: DSP.AT.1.0.1-00163-LEMANS-1
+RawFile: qcom/qcs8300/cdspr.jsn
+File: qcom/qcs8300/gpdsp0.mbn
+Version: DSP.AT.1.0.1-00163-LEMANS-1
 File: qcom/sa8775p/adsp.mbn
 Version: DSP.AT.1.0.1-00163-LEMANS-1
 RawFile: qcom/sa8775p/adspr.jsn
@@ -6779,16 +6819,6 @@ File: qcom/sa8775p/gpdsp1.mbn
 Version: DSP.AT.1.0.1-00163-LEMANS-1
 RawFile: qcom/sa8775p/gpdsp1r.jsn
 RawFile: qcom/sa8775p/gpdspr.jsn
-File: qcom/qcs8300/adsp.mbn
-Version: DSP.AT.1.0.1-00163-LEMANS-1
-RawFile: qcom/qcs8300/adspr.jsn
-RawFile: qcom/qcs8300/adspua.jsn
-File: qcom/qcs8300/cdsp0.mbn
-Version: DSP.AT.1.0.1-00163-LEMANS-1
-RawFile: qcom/qcs8300/cdspr.jsn
-File: qcom/qcs8300/gpdsp0.mbn
-Version: DSP.AT.1.0.1-00163-LEMANS-1
-
 File: qcom/sm8750/adsp.mbn
 File: qcom/sm8750/adsp_dtb.mbn
 Version: LPAIDSP.HT.1.2.c1-00379-PAKALA-1
@@ -6800,6 +6830,13 @@ File: qcom/sm8750/cdsp.mbn
 File: qcom/sm8750/cdsp_dtb.mbn
 Version: CDSP.HT.3.1-00883-PAKALA-1
 RawFile: qcom/sm8750/cdspr.jsn
+File: qcom/x1e80100/adsp.mbn
+File: qcom/x1e80100/adsp_dtb.mbn
+Version: ADSP.HT.5.9-00828-HAMOA-1
+RawFile: qcom/x1e80100/adspr.jsn
+RawFile: qcom/x1e80100/adsps.jsn
+RawFile: qcom/x1e80100/adspua.jsn
+RawFile: qcom/x1e80100/battmgr.jsn
 
 Licence: Redistributable. See LICENSE.qcom-2 and qcom/NOTICE.txt for details
 
@@ -8983,11 +9020,11 @@ License: Redistributable. See LICENSE.qcom and qcom/NOTICE.txt for details
 Driver: intel_vpu - Intel NPU driver
 
 File: intel/vpu/vpu_37xx_v1.bin
-Version: 20250723*MTL_CLIENT_SILICON-NVR+NN-deployment*52e7ebee50a93a07d14a1f162226cd55ad3999f0*52e7ebee50a93a07d14a1f162226cd55ad3999f0*52e7ebee50a
+Version: 20251016*MTL_CLIENT_SILICON-release*1600*ci_tag_ud202544_vpu_rc_20251016_1600*74b0ef77ba8
 Link: intel/vpu/vpu_37xx_v0.0.bin -> vpu_37xx_v1.bin
 
 File: intel/vpu/vpu_40xx_v1.bin
-Version: Jul 23 2025*NPU40xx*build/ci/npu-fw-ci-main-20250721_233537-27032-2-g52e7ebee50a*52e7ebee50a93a07d14a1f162226cd55ad3999f0
+Version: Oct 16 2025*NPU40xx*ci_tag_ud202544_vpu_rc_20251016_1600*74b0ef77ba8227e491c299e8efa1d23a86c250ea
 Link: intel/vpu/vpu_40xx_v0.0.bin -> vpu_40xx_v1.bin
 
 License: Redistributable. See LICENSE.intel_vpu for details

check_whence.py

@@ -89,10 +89,12 @@ def main():
             "build_packages.py",
             "check_whence.py",
             "contrib/process_linux_firmware.py",
+            "contrib/pylib/whence.py",
             "contrib/templates/debian.changelog",
             "contrib/templates/debian.control",
             "contrib/templates/debian.copyright",
             "contrib/templates/rpm.spec",
+            "contrib/whence2yaml.py",
             "copy-firmware.sh",
             "dedup-firmware.sh",
         ]
@@ -106,6 +108,7 @@ def main():
             "carl9170fw/autogen.sh",
             "check_whence.py",
             "contrib/process_linux_firmware.py",
+            "contrib/whence2yaml.py",
             "copy-firmware.sh",
             "dedup-firmware.sh",
         ]

contrib/pylib/whence.py

@@ -0,0 +1,179 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0
+#
+# WHENCE data classes
+#
+
+import json
+import re
+from dataclasses import asdict, dataclass, field
+from pathlib import Path
+
+from ruamel.yaml import YAML
+
+
+def strip(obj: list) -> list:
+    """Remove leading and trailing empty strings from a list of strings"""
+    if obj:
+        while obj[0] == "":
+            obj = obj[1:]
+        while obj[-1] == "":
+            obj = obj[:-1]
+    return obj
+
+
+@dataclass
+class BaseWhence:
+    """Base WHENCE data class"""
+
+    def __str__(self):
+        return json.dumps(asdict(self), indent=2)
+
+
+@dataclass
+class Entry(BaseWhence):
+    """WHENCE file/link entry class"""
+
+    type: str = ""  # File or RawFile or Link
+    path: str = ""  # Firmware file or link
+    target: str = ""  # Link target
+    sources: list[str] = field(default_factory=list)  # List of source files
+    version: str = ""
+    info: str = ""
+    origin: str = ""
+
+
+@dataclass
+class Section(BaseWhence):
+    """WHENCE driver section class"""
+
+    driver: str = ""
+    module: str = ""
+    description: str = ""
+    licence: list[str] = field(default_factory=list)
+    licence_file: str = ""
+    notes: list[str] = field(default_factory=list)
+    entries: list[Entry] = field(default_factory=list)
+
+
+@dataclass
+class Whence(BaseWhence):
+    """Main WHENCE data class"""
+
+    header: list[str] = field(default_factory=list)
+    sections: list[Section] = field(default_factory=list)
+
+    def load_whence(self, whence_file: Path) -> None:
+        """Load data from a WHENCE file"""
+        self.sections = []
+
+        HEADER = 0
+        SECTION = 1
+        NOTES = 2
+        LICENCE = 3
+
+        with open(whence_file, encoding="utf-8") as fh:
+            whence_type = HEADER
+            for line in fh:
+                line = line.rstrip()
+
+                if ":" in line:
+                    key, val = line.split(":", 1)
+                    val = val.strip()
+                else:
+                    key = None
+                    val = None
+
+                if line.startswith("----------"):
+                    whence_type = SECTION
+                    section = Section()
+                    self.sections.append(section)
+                    continue
+
+                if key == "Driver":
+                    section.driver = val
+                    if " " in val:
+                        module, desc = val.split(" ", 1)
+                        desc = desc.strip(" -")
+                    else:
+                        module = val
+                        desc = ""
+                    section.module = module
+                    section.description = desc
+                    continue
+
+                if key in ("File", "RawFile"):
+                    entry = Entry(type=key, path=val)
+                    section.entries.append(entry)
+                    continue
+
+                if key == "Version":
+                    entry.version = val
+                    continue
+
+                if key == "Link":
+                    path, _, target = val.partition(" -> ")
+                    entry = Entry(type=key, path=path, target=target)
+                    section.entries.append(entry)
+                    continue
+
+                if key == "Source":
+                    entry.sources.append(val)
+                    continue
+
+                if key == "Info":
+                    entry.info = val
+                    continue
+
+                if key == "Origin":
+                    entry.origin = val
+                    continue
+
+                if key in ("Licence", "License"):
+                    whence_type = LICENCE
+                    section.licence.append(val or "--")
+                    m = re.search(r"(LICEN[CS]E\.[^ ]+) for details", line)
+                    if m:
+                        section.licence_file = m.group(1)
+                    continue
+
+                if whence_type == HEADER:
+                    self.header.append(line)
+                    continue
+
+                if whence_type == NOTES or (whence_type == SECTION and line):
+                    whence_type = NOTES
+                    section.notes.append(line)
+                    continue
+
+                if whence_type == LICENCE:
+                    section.licence.append(line)
+                    continue
+
+                if line:
+                    raise Exception(f"Failed to parse line: {line}")
+
+        # Strip leading and trailing empty lines
+        self.header = strip(self.header)
+        for s in self.sections:
+            s.licence = strip(s.licence)
+            s.notes = strip(s.notes)
+
+    def save_yaml(self, whence_yaml: Path, remove_empty: bool = False) -> None:
+        """Save the WHENCE data to a YAML file"""
+        d = asdict(self)
+
+        if remove_empty:
+            # Hack: Remove empty items to reduce clutter
+            for s in d["sections"]:
+                for key in list(s):
+                    if not s[key]:
+                        del s[key]
+                for e in s["entries"]:
+                    for key in list(e):
+                        if not e[key]:
+                            del e[key]
+
+        with open(whence_yaml, mode="w", encoding="utf-8") as fh:
+            yaml = YAML()
+            yaml.dump(d, fh)

contrib/whence2yaml.py

@@ -0,0 +1,12 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0
+#
+# Convert WHENCE to YAML format
+#
+
+from pylib.whence import Whence
+
+whence = Whence()
+whence.load_whence("WHENCE")
+whence.save_yaml("WHENCE.yaml", remove_empty=True)
+print("WHENCE data converted to YAML and saved to WHENCE.yaml")

qcom/qcs6490/Thundercomm/RubikPi3/adspr.jsn

@@ -0,0 +1,22 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "adsp",
+        "subdomain": "root_pd",
+        "qmi_instance_id": 74
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0,
+            "dcomment": "data can be used to configure ACK timeout.Make data_valid 1 as well.Unit is second"
+        }
+    ]
+}

qcom/qcs6490/Thundercomm/RubikPi3/adsps.jsn

@@ -0,0 +1,22 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "adsp",
+        "subdomain": "sensor_pd",
+        "qmi_instance_id": 74
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0,
+            "dcomment": "data can be used to configure ACK timeout.Make data_valid 1 as well.Unit is second"
+        }
+    ]
+}

qcom/qcs6490/Thundercomm/RubikPi3/adspua.jsn

@@ -0,0 +1,29 @@
+{
+    "sr_version": {
+        "major": 1,
+        "minor": 1,
+        "patch": 1
+    },
+    "sr_domain": {
+        "soc": "msm",
+        "domain": "adsp",
+        "subdomain": "audio_pd",
+        "qmi_instance_id": 74
+    },
+    "sr_service": [
+        {
+            "provider": "tms",
+            "service": "servreg",
+            "service_data_valid": 0,
+            "service_data": 0,
+            "dcomment": "data can be used to configure ACK timeout.Make data_valid 1 as well.Unit is second"
+        },
+        {
+            "provider": "avs",
+            "service": "audio",
+            "service_data_valid": 0,
+            "service_data": 0,
+            "dcomment": "No comment"
+        }
+    ]
+}