Date: Tue, 13 May 2025 00:05:47 GMT From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: fc40f4ca62ba - main - iwlwifi: update script to extract firmware/chipset generations/flavors/.. Message-ID: <202505130005.54D05lqj048647@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fc40f4ca62ba91bef40f4a8712443617052b2cec commit fc40f4ca62ba91bef40f4a8712443617052b2cec Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2025-05-13 00:02:40 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2025-05-13 00:04:46 +0000 iwlwifi: update script to extract firmware/chipset generations/flavors/.. Adjust the logic for using the sysctl vs. providing an input file (previously generated from the sysctl). Adjust template generation for iwlwififw.4 to also list the flavour for each chipset (if known) to help people manually building packages to figure out which port flavor they need. Sponsored by: The FreeBSD Foundation MFC after: 3 days --- sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh b/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh index 6b6798aae49e..afbd52b9fa40 100644 --- a/sys/contrib/dev/iwlwifi/zzz_fw_ports_fwget.sh +++ b/sys/contrib/dev/iwlwifi/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. @@ -48,18 +48,19 @@ if test ! -d ${LFWDIR} -o ! -e ${LFWDIR}/WHENCE; then exit 1 fi -kldstat -n if_iwlwifi.ko > /dev/null 2>&1 -rc=$? -case ${rc} in -0) ;; -*) printf "ERROR: please pre-load if_iwlwifi.ko (you do not need a device)\n" >&2 - exit 1 - ;; -esac - if test -r ${D_PCI_IDS_FILE}; then printf "NOTICE: using proovided ${D_PCI_IDS_FILE}\n" >&2 else + + kldstat -n if_iwlwifi.ko > /dev/null 2>&1 + rc=$? + case ${rc} in + 0) ;; + *) printf "ERROR: please pre-load if_iwlwifi.ko (you do not need a device)\n" >&2 + exit 1 + ;; + esac + sysctl -N compat.linuxkpi.iwlwifi_pci_ids_name > /dev/null 2>&1 rc=$? case ${rc} in @@ -327,11 +328,11 @@ awk ' # Sourt out duplicate lines. if (dup[$0]++) { next; } - # my ($ids, $name, $fw) = split /\t/; split($0, a, "\t"); ids=a[1]; name=a[2]; fw=a[3]; + flavor=a[5]; #my ($v, $d, $sv, $sd) = split("/", $ids); split(ids, i, "/"); @@ -342,9 +343,11 @@ awk ' if (name == "") { name="(unknown)"; } if (fw == "") { fw="(unknown)"; } + if (flavor == "") { flavor="iwlwifi"; } + if (flavor == "undefined") { flavor="iwlwifi"; } # iwlwififw.4 - printf ".It \"\"\n.It %s\n.It %s Ta %s Ta %s Ta %s Ta %s\n", name, i[1], i[2], i[3], i[4], fw; + printf ".It \"\"\n.It %s\n.It %s Ta %s Ta %s Ta %s Ta %s Ta %s\n", name, i[1], i[2], i[3], i[4], flavor, fw; # wiki # XXX TODO possibly quote some in `` to avoid automatic linking?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505130005.54D05lqj048647>