From nobody Wed May 7 11:50:28 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zstqn0WPkz5wBKq; Wed, 07 May 2025 11:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zstqm4xZ6z3VcV; Wed, 07 May 2025 11:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plRddll6YYNaK4pyugMEUMxI/Sv4Bz4vxdZ923CrIec=; b=JQ0FaF9wdvAC8X/ctYx1FtsOiKVYPsW5X1wbDdD+DJc12Jl1LmqSqF9vjymsT2TEpN7XF3 YaLAMRRO3TYu7gAatkjdcHHtuTVsqD9ORtnRJW0OeE6C/F6EVsa0ZqIxL7jmak3Sry6Pz6 j/KxOXid4PmJpki2r3xNhpFLDWp4hVC2rlcKNnO/Adu66KNNs4gwiw4jlIPuwifaLcLjOl rY8gAZhp1woOskAkXzEkqu7W3wPxHiL8UvFA8W2GxutkFT6/SqS68ki+Wl/BPVvjRdeITV /g2Ho4LlzSdFAATebpzafvhFrHwJctntqf4sFzYOFtcRGIL4RKcSoeV3CDwPvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746618628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=plRddll6YYNaK4pyugMEUMxI/Sv4Bz4vxdZ923CrIec=; b=szFWAHEBYIWdjFZe39EGdk+lSc7Vy9mcWeh7azCfUcWd+HK3zygF7HZOFS2omIc5F69uBz +OZPxNcKz/193OFWI34jEV9ChUr7JFYxqIbbN/PTgAQ6L8ZekNpO3snMWzqSx6AnFMlFrN ioT4NxYsVhqsjRNvestSe7NFhcpMEcXQCcEhapSxo5tybqm+gRwMZWtghWmHD04cgJnlhn iBBGM4nt5AzkE+Xbr53P0RI5er1NAMu+99BwtBUo9sOVBV2Z1cQomHWjuDkvUf1a/5NzEa kw0VWsdDMHUJCyygyc0SXC/lM5bquSBppYQLW0p+jlv2Uu0xsus/7ESLCeAQyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746618628; a=rsa-sha256; cv=none; b=kfPkWDaum/jUFE7JkB8uJbMI7bm+wPeZs4BsZMqo6IqbHh1W2iVCl5Yqtqy0A1sTYVqpHR u6yEdBICy0JLkNPlTB4AhfO4NnBVffDrZ3OgZZnVlAq6FwHI7C0Z8NYY+9dhg9Lneyz+0A ylGFic0tdKNhEhZDR9peTi7nEjNDO+1y/E1QwGmXRZ+2wcUhLlnCEYLxY43ZdZ1IjzH4C4 TWivuTqupQ+6pW8uejCeXzAG5+kqdEYEgiEkdln5e1ihQUZgaGoZCk4TaUE39suXFkXH+m oEExawguX7ahMj+iDXcNSDcNAIdZqnJh3hqi4WcUvwJNn8DUvNrd06srRT5ADw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zstqm4GVbzCXp; Wed, 07 May 2025 11:50:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 547BoS8W089115; Wed, 7 May 2025 11:50:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 547BoSfN089112; Wed, 7 May 2025 11:50:28 GMT (envelope-from git) Date: Wed, 7 May 2025 11:50:28 GMT Message-Id: <202505071150.547BoSfN089112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 5eb9006e6aa8 - stable/14 - fwget / mt76: update script to extra firmware and update fget(8) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5eb9006e6aa8eaecaeb8dbdd70bea6c605c19d50 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5eb9006e6aa8eaecaeb8dbdd70bea6c605c19d50 commit 5eb9006e6aa8eaecaeb8dbdd70bea6c605c19d50 Author: Bjoern A. Zeeb AuthorDate: 2025-05-05 00:09:46 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-05-07 08:51:53 +0000 fwget / mt76: update script to extra firmware and update fget(8) Update the script to support all the sub-drivers we compile now. Some minor polishing as well. Update fwget(8) as more IDs were added. Sponsored by: The FreeBSD Foundation (cherry picked from commit 91f53f4e062715d869f2cb7e957707255390b704) --- sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh | 14 ++++++++------ usr.sbin/fwget/pci/pci_network_mediatek | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh index 8747daeba35f..fa836b4b500d 100644 --- a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh @@ -2,7 +2,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause # -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2025 The FreeBSD Foundation # # This software was developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -14,8 +14,8 @@ # USAGE: please check out the correct tag/hash for ports in the # linux-firmware.git repository you point this script to. # -# Valid flavors: mt7915 mt792x {for the drivers with x=[15]} mt7996 -# To add a new one you need to add the mappings in the help functions. +# Valid flavors: mt7615 mt7915 mt792x {for the drivers with x=[15]} mt7996 +# To add a new one you need to add the mappings in the helper functions. # set -e @@ -51,9 +51,10 @@ fi get_device_ids_by_flav() { - for d in mt7915 mt7921 mt7925 mt7996; do + for d in mt7615 mt7915 mt7921 mt7925 mt7996; do case ${d} in + mt7615) flav=${d} ;; mt7915) flav=${d} ;; mt7921) flav=mt792x ;; mt7925) flav=mt792x ;; @@ -79,9 +80,10 @@ get_device_ids_by_flav() get_firmwares_by_flavor() { - for h in mt7915/mt7915.h mt792x.h mt7996/mt7996.h; do + for h in mt7615/mt7615.h mt7915/mt7915.h mt792x.h mt7996/mt7996.h; do case ${h} in + mt7615/mt7615.h) flav=mt7615 ;; mt7915/mt7915.h) flav=mt7915 ;; mt792x.h) flav=mt792x ;; mt7996/mt7996.h) flav=mt7996 ;; @@ -287,6 +289,6 @@ if test ${fn} -gt 0; then done fi -printf "INFO: fwget pci_network_qca %s template at %s\n" ${DRIVER} ${fwgetfile} >&2 +printf "INFO: fwget pci_network_mediatek %s template at %s\n" ${DRIVER} ${fwgetfile} >&2 # end diff --git a/usr.sbin/fwget/pci/pci_network_mediatek b/usr.sbin/fwget/pci/pci_network_mediatek index 3ed6c8b95b47..653c87c410eb 100644 --- a/usr.sbin/fwget/pci/pci_network_mediatek +++ b/usr.sbin/fwget/pci/pci_network_mediatek @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-2-Clause # # Copyright 2023 Bjoern A. Zeeb -# Copyright (c) 2024 The FreeBSD Foundation +# Copyright (c) 2024-2025 The FreeBSD Foundation # # Portions of this software were developed by Björn Zeeb # under sponsorship from the FreeBSD Foundation. @@ -41,10 +41,14 @@ pci_network_mediatek_mt76() 0x0608) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x0616) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x0717) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; + 0x7611) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; + 0x7615) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; + 0x7663) addpkg "wifi-firmware-mediatek-kmod-mt7615"; return 1 ;; 0x7906) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; 0x790a) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; 0x7915) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; 0x7916) addpkg "wifi-firmware-mediatek-kmod-mt7915"; return 1 ;; + 0x7920) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x7922) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x7925) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;; 0x7961) addpkg "wifi-firmware-mediatek-kmod-mt792x"; return 1 ;;