From nobody Fri Jul 31 20:29:17 2026 X-Original-To: dev-commits-src-branches@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 4hBd2j5Yjxz6nVmw for ; Fri, 31 Jul 2026 20:29:17 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hBd2j3bwFz3M2h for ; Fri, 31 Jul 2026 20:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785529757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IcRiBJ71QGQgENs+EtfhTPMibYA3yIE9meCVkdzyDw=; b=vFoYzErZB6acDPh5fSSUxPDIJ7CW6ytzmC4O42ex90dljdKW0wwrABQYxipbj19NEqeY2y Te6wT7rt2WX0HtPMfBhmO8tTat6lMOoXqwFr+rIx04vuR+WTjOZdhaAWsaEzuLU1sEO9NL M/3wecHxB+kny/lMElaiQk+1UWwJK9MQZYnTHwOVYjA7eYAWja3yR9A/gTMbJ0SeL+GLgN 2y0TyK3Fij6NDbM1BScJJMg0/dwUxw74ZPdA/FdWCLO+n+CnHFB6NeLQxMgTfh8LAbsApN c9ZjdwWCtZnuU943XhpyPZrbv6g1aulqd+7mm6y0TQVFXi5kTcHxQ2YjWkYIwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785529757; a=rsa-sha256; cv=none; b=d/USuOd+d2GD4YxoaPgyBV8Uwn04qh4va2LRP0hNeNwIMkKeqJ86bqwWvAJMdIflHs0k3j 7iaIV2wG3ewe//uCGpQlZUk/3KDzxN1DMKCGgeEi97Ym4OUcwIY/c6oWpBvYgGWL0Tlqih VZgqc9ZKRhiIJ8pFj5+Rm7DlK7JnSKDrYCgL+afA6oMN1jxZU9JEnZzZBFKIn1TGwHSfbM Qd04stPMuH7fwe6uXXy7tZ60KJnh5cwSxfu/38aFrbWRWNJYRuFVm6OTnjzgTqaNM82HiB hozZii4rVP8IE2WwU9hH2yLCRcv8FeYrG14OPZFdAS8g3SrNdcf5KfLcoAMYtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785529757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IcRiBJ71QGQgENs+EtfhTPMibYA3yIE9meCVkdzyDw=; b=IDKDREtKHuEh3tP7uFh/XfPO+zu224HImG2I+4tk/oqg940DSJfucfbaq25bNUsy3Cle2k hCYFkWXKMiW/1n+bMxhOhcE+XGFhhZPJTOASmbTVHVkUuzYrjF4jGIz6fZPTbphcqsPnsT /T1WQxBJyLlYwQmSgSacMGZEiUoJc7vaiS1jdKE27JYwHjgE5X620G+SMXzbAg80nbEkkc I2w5FcqKyUMrpITb/zjKBb69/C0LQsKH43WoNEpMleCiUdLJnELDD//UuDFbnqxwpSqpcx Laa+CJT9py8BgkX6lQztbkMTtOseO2grsbJ3iivVCMj4J/4PwZmWRICyDiVklQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hBd2j21xpz137 for ; Fri, 31 Jul 2026 20:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 27b12 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 31 Jul 2026 20:29:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jim Chen From: Bjoern A. Zeeb Subject: git: 42b89d49b7ab - stable/15 - mt76: update script to to deal with 7921 and 7925 flavors List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 42b89d49b7ab87054615b422518d53015953bc27 Auto-Submitted: auto-generated Date: Fri, 31 Jul 2026 20:29:17 +0000 Message-Id: <6a6d059d.27b12.2674cff5@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=42b89d49b7ab87054615b422518d53015953bc27 commit 42b89d49b7ab87054615b422518d53015953bc27 Author: Jim Chen AuthorDate: 2026-07-27 13:01:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-07-31 17:45:33 +0000 mt76: update script to to deal with 7921 and 7925 flavors Update the mt76/zzz_fw_ports_fwget.sh script to set fwget to download mt7921 and mt7925 rather than the these days non-existent mt792x flavor. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D57242 (cherry picked from commit b1f3726f7a677ae230135d19491ce97f2866e7c2) --- .../dev/mediatek/mt76/zzz_fw_ports_fwget.sh | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 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 fa836b4b500d..8f7e53c54f64 100644 --- a/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/mediatek/mt76/zzz_fw_ports_fwget.sh @@ -24,6 +24,11 @@ DRIVER=mt76 FWSUBDIR=mediatek CHECKFILE=mt792x.h +SYS=../../../.. +LINUXKPI_INCLUDES="-I${SYS}/compat/linuxkpi/common/include \ + -I${SYS}/compat/linuxkpi/dummy/include \ + -include ${SYS}/compat/linuxkpi/common/include/linux/kconfig.h" + ################################################################################ # # Check pre-reqs @@ -56,8 +61,8 @@ get_device_ids_by_flav() case ${d} in mt7615) flav=${d} ;; mt7915) flav=${d} ;; - mt7921) flav=mt792x ;; - mt7925) flav=mt792x ;; + mt7921) flav=${d} ;; + mt7925) flav=${d} ;; mt7996) flav=${d} ;; *) printf "ERROR: unsupported directory/flavor '%s'\n" ${d} >&2 exit 1 @@ -80,19 +85,22 @@ get_device_ids_by_flav() get_firmwares_by_flavor() { - for h in mt7615/mt7615.h mt7915/mt7915.h mt792x.h mt7996/mt7996.h; do + for h in mt7615/mt7615.h mt7915/mt7915.h mt7921/mt7921.h mt7925/mt7925.h mt7996/mt7996.h; do case ${h} in mt7615/mt7615.h) flav=mt7615 ;; mt7915/mt7915.h) flav=mt7915 ;; - mt792x.h) flav=mt792x ;; + mt7921/mt7921.h) flav=mt7921 ;; + mt7925/mt7925.h) flav=mt7925 ;; mt7996/mt7996.h) flav=mt7996 ;; *) printf "ERROR: unsupported header/flavor '%s'\n" ${h} >&2 exit 1 ;; esac - awk -v rege="${FWSUBDIR}/" -v flav=${flav} -F\" '{ if ($0 ~ rege) { printf "%s\t%s\n", tolower(flav), $2; } }' ${h} | \ + # Use preprocessor with a minimal include list to get #defines + cpp ${LINUXKPI_INCLUDES} -dM -M -MG -MF /dev/null ${h} 2> /dev/null | \ + awk -v rege="${FWSUBDIR}/" -v flav=${flav} -F\" '{ if ($0 ~ rege) { printf "%s\t%s\n", tolower(flav), $2; } }' | \ while read flav fwn; do if test ! -e ${LFWDIR}/${fwn}; then #printf "Firmware %s (for %s) does not exist; skipping\n" ${fwn} ${flav} >&2 @@ -253,12 +261,12 @@ if test ${fn} -gt 0; then # printf "===> did %s flav %s\n" ${did} ${flav} >&2 if test ${n} -eq 1; then - echo "${did} ${flav}" | awk -v drv=${FWSUBDIR} '{ + echo "${did} ${flav}" | awk -v drv=${DRIVER} '{ printf "\t%s)\taddpkg \"wifi-firmware-%s-kmod-%s\"; return 1 ;;\n", tolower($1), drv, tolower($2); }' >> ${fwgetfile} else - echo "${did} ${flav}" | awk -v drv=${FWSUBDIR} '{ + echo "${did} ${flav}" | awk -v drv=${DRIVER} '{ printf "\t%s)\taddpkg \"wifi-firmware-%s-kmod-%s\"\n", tolower($1), drv, tolower($2); }' >> ${fwgetfile} @@ -276,7 +284,7 @@ if test ${fn} -gt 0; then #printf "===> did %s flav %s\n" ${did} ${flav} >&2 - echo "${did} ${flav}" | awk -v drv=${FWSUBDIR} '{ + echo "${did} ${flav}" | awk -v drv=${DRIVER} '{ printf "\t\taddpkg \"wifi-firmware-%s-kmod-%s\"\n", drv, tolower($2); }' >> ${fwgetfile} @@ -290,5 +298,6 @@ if test ${fn} -gt 0; then fi printf "INFO: fwget pci_network_mediatek %s template at %s\n" ${DRIVER} ${fwgetfile} >&2 +printf "WARNING: make sure to check for PCI_VENDOR_ID_* other than Mediatek" # end