From nobody Tue May 23 23:41:57 2023 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 4QQrSj3j8Tz4TCDj; Tue, 23 May 2023 23:41:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QQrSj3Frnz4Cjd; Tue, 23 May 2023 23:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684885317; 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=KGT8J0cOso2209ls30OdplK8M0n5fxAblydv6XxWqy4=; b=WoQnhAGyFm609IbkqPErane+SNIILmFU5xNESzQ3OrAp0d3azPRQC4si/SGAbNbCvanlho Urt0kCuPVNHCcOruDn1I2Fqvi6hP0yCqiO81ggcLsyGqaY3V+upCE0WZZzQsteRTxMj+qS 2qyORhYCDKtXFKO3/G6TGLfwFaHxHXaiSZ71NpVYhWF18mcmyFJQoeRtOr97AsEZ+L9paA BFFnr/KHymrdSpDiAjgLq6mTbSx0AAcWsapZX1B7skQNhQbHlg+1hkoMFKHcESGCbpUykJ dRdM+tPeWfBm/jly2L2B1PZc8cjWHZQxYlH+86KQtgidUR5buZucZdvaxBLMEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684885317; 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=KGT8J0cOso2209ls30OdplK8M0n5fxAblydv6XxWqy4=; b=MIRjFmerdGdKY379OGCgdlGusTLCOYPdtSlAR1zcywCY311YLYlEB8+7guUUakCUVXLbog IO8JBLmiZgnz8bCyBvyhYJeM9DgTiXTGS+BSkneXTvHXBMVdrnVgdXGtfe3Os5K6ufldrf SCicv5K00atFYcP/NbU9GLyNz9woz6+Dr6n4x3Kx3J0v/GTF6CaQ6LpHMsshwLshWs+rH2 r8BXhbSckf85S3xDFe6+8rSUwKxlfr+WSndLsgA/mkbWqACptu/7RCYF16CkO4cybEAqPc tsnR8I2UM6oTSVvSY98DzIhY95b8kacy1MsqR7p121892s9ZKJGecaV92jw+yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684885317; a=rsa-sha256; cv=none; b=tcsa0/N0CpqiY7DQG+3GVuxukTpOEB/+/IIMEFmLUFk7CvkPsktTLDePwV7TEpEFZQ8F84 xLY7koGE12gS7Bz3tu3oy7wqnGx5H4NLa2yYnQJk5WUHAkO58Mscee1P/7bEZKat0u7JLP PUmGwZ0BFrYdJUR2buU8FVcPCnob0pMV1T41w3h9JoSHV0lbN5nLKl4m1fRHebf9YykLu9 Gcgk+2zCrUE4DzvMXw3ZkwoH5rdKWuZnCcV9jeixNz+al+jFRCe9ihMxm2vLxc0CGZdrNg aLFujCuPOqfvmcy26oGLLTYSdGTRfr3lB4I9DRm0PfuPbGEadCTV70qldbQogw== 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 4QQrSj2KfXzLBW; Tue, 23 May 2023 23:41:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34NNfvjr033848; Tue, 23 May 2023 23:41:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34NNfvbC033832; Tue, 23 May 2023 23:41:57 GMT (envelope-from git) Date: Tue, 23 May 2023 23:41:57 GMT Message-Id: <202305232341.34NNfvbC033832@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: 0be82d56b44f - main - fwget: update pci_network_mediatek for mt7996 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 0be82d56b44fbe157d4bf1c125eca6625486d17f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0be82d56b44fbe157d4bf1c125eca6625486d17f commit 0be82d56b44fbe157d4bf1c125eca6625486d17f Author: Bjoern A. Zeeb AuthorDate: 2023-05-23 23:40:05 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-05-23 23:41:24 +0000 fwget: update pci_network_mediatek for mt7996 Add support for another chipset and fix mt7915 to not match on all IDs. --- usr.sbin/fwget/pci/pci_network_mediatek | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/usr.sbin/fwget/pci/pci_network_mediatek b/usr.sbin/fwget/pci/pci_network_mediatek index 5de31e6661eb..5e4d2af9eb26 100644 --- a/usr.sbin/fwget/pci/pci_network_mediatek +++ b/usr.sbin/fwget/pci/pci_network_mediatek @@ -29,13 +29,11 @@ pci_network_mediatek_mt7915() { - # awk '/PCI_DEVICE\(PCI_VENDOR_ID_MEDIATEK,/ { gsub(").*", "", $3); printf "%s)\taddpkg \"wifi-firmware-mt76-kmod\"; return 1 ;;\n", tolower($3) }' *.c + # awk 'BEGIN { x = 0; } { if (/mt7915_pci_device_table/) { x=1 }; if (/^\};/) { x=0 }; if (x==1 && /PCI_DEVICE\(PCI_VENDOR_ID_MEDIATEK,/) { gsub(").*", "", $3); printf "%s)\taddpkg \"wifi-firmware-mt76-kmod\"; return 1 ;;\n", tolower($3) } }' *.c case "$1" in 0x7915) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; 0x7906) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; - 0x7916) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; - 0x790a) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; esac } @@ -43,7 +41,7 @@ pci_network_mediatek_mt7915() pci_network_mediatek_mt7921() { - # awk '/PCI_DEVICE\(PCI_VENDOR_ID_MEDIATEK,/ { gsub(").*", "", $3); printf "%s)\taddpkg \"wifi-firmware-mt76-kmod\"; return 1 ;;\n", tolower($3) }' *.c + # awk 'BEGIN { x = 0; } { if (/mt7921_pci_device_table/) { x=1 }; if (/^\};/) { x=0 }; if (x==1 && /PCI_DEVICE\(PCI_VENDOR_ID_MEDIATEK,/) { gsub(").*", "", $3); printf "%s)\taddpkg \"wifi-firmware-mt76-kmod\"; return 1 ;;\n", tolower($3) } }' *.c case "$1" in 0x7961) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; 0x7922) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; @@ -52,11 +50,20 @@ pci_network_mediatek_mt7921() esac } +# mt7996 +pci_network_mediatek_mt7996() +{ + + # awk 'BEGIN { x = 0; } { if (/mt7996_pci_device_table/) { x=1 }; if (/^\};/) { x=0 }; if (x==1 && /PCI_DEVICE\(PCI_VENDOR_ID_MEDIATEK,/) { gsub(").*", "", $3); printf "%s)\taddpkg \"wifi-firmware-mt76-kmod\"; return 1 ;;\n", tolower($3) } }' *.c + case "$1" in + 0x7990) addpkg "wifi-firmware-mt76-kmod"; return 1 ;; + esac +} pci_network_mediatek() { - for _drv in mt7915 mt7921; do + for _drv in mt7915 mt7921 mt7996; do pci_network_mediatek_${_drv} "$1" case $? in 1) break ;;