From nobody Tue May 13 00:05:47 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 4ZxGvw2MyTz5w2p0; Tue, 13 May 2025 00:05:48 +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 4ZxGvv5XTTz3Dxf; Tue, 13 May 2025 00:05:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747094747; 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=QFvjVYM1I4yFAo6aFd5TnTBF0kKsygP01abPqA9XFRc=; b=lSrqwQWIQak8f4Z9eQYoozDsjYvN4qlUj2YuVGXolGiAwNLDL7w9Ws4SZaUniaVlVJKhBU eA5rnYrWWAmQH+O2Rm0mJJfIHQl2taNGznNWH1xZYf9gH0/w092JYpd+tvOxGu7CuE8UCP gIUTW4Je+BtgATCXfwZFRfoUbv/xoV1fmm2GfR639uVs/mD8F2IzTFmdmSf6dU4609ks8b LPMKcskBRyCLY5zHVfcapADQVhCUO7PwgChuFWUDuaVCRClm4fhT6JgW6jyUpdI+RP8xd3 7p04Prb6tvtPbpoXbKDzOZKeUGHj+gILnAGDUjB+b4ns/YSbRv2wkowZNKt82w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747094747; 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=QFvjVYM1I4yFAo6aFd5TnTBF0kKsygP01abPqA9XFRc=; b=AVjq2l8n/3E6BfMw6JvzLYxKZKifHmYQ0yZVz7wrOhxVdi91MvvJF5zG+gq7gbkuPrn2hH +pOR4BX180ejII6ybBIlUQTcQqxbTFaFE8quMk7re+Qgd9wWyd8JPbgqyvFm2yY9LANoBS ZRRLiuD9yMDJ6VpaQebWfBDfJabOjxWoPB4g+E4fbp9k2pjOdthdrp99OnT1ZjCQ04pTC8 qzXitOYx3YhIoAQbj3s85dFMmPM0lb7XtTU6JpmOXi7nIEF3e7mrvGsyE03pFhMyGzIIZV RR/i/GOoMUtGTwoQ3tkn00tPjCYf1v2QGkAXRLYo7fdnp4N73HgueMuK7mtv9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747094747; a=rsa-sha256; cv=none; b=h3kmB9JVkMNQJeW7Si+aarwfg3bch2e9Z+MmCKUu0gRMAMjzjn+40FdE3SjjU6C3kqwrUl yujm35Rua5AUWqdylY8tEBY7zhkEqFNI3a6ha8V5e7zMV4iB/UO498DVmhAxkrH7qdXxrd uptuBS2+v3Uc+kP/9mIFFW4n9z0VWsoHKnWy/lqWHWfWY1ZJq0jJuCPwWwntKvHmcVoXrf yJ+Kl1wutk1QOWuUSX4eT3Fw5cZ0y8Ortyq8zxxWHtHEtY1PCWZcEVtIDPTxLW9suQxRx7 JGJtPruBXIjVvaf9JapYwA2l18ARS9wGniD10j78tswgNDyXTNzfKIw1W+s7iw== 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 4ZxGvv4Vrjz7Kx; Tue, 13 May 2025 00:05:47 +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 54D05lvk048650; Tue, 13 May 2025 00:05:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54D05lqj048647; Tue, 13 May 2025 00:05:47 GMT (envelope-from git) Date: Tue, 13 May 2025 00:05:47 GMT Message-Id: <202505130005.54D05lqj048647@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: fc40f4ca62ba - main - iwlwifi: update script to extract firmware/chipset generations/flavors/.. 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/main X-Git-Reftype: branch X-Git-Commit: fc40f4ca62ba91bef40f4a8712443617052b2cec Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=fc40f4ca62ba91bef40f4a8712443617052b2cec commit fc40f4ca62ba91bef40f4a8712443617052b2cec Author: Bjoern A. Zeeb AuthorDate: 2025-05-13 00:02:40 +0000 Commit: Bjoern A. Zeeb 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?