From nobody Sun Nov 10 23:24:45 2024 X-Original-To: dev-commits-ports-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 4Xmpg20tVBz5cQmX; Sun, 10 Nov 2024 23:24:46 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xmpg166tVz4shB; Sun, 10 Nov 2024 23:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731281085; 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=rEeaplh5lDpgCcFwSo2mHWF6T159M+rvbU3GSFj9HiI=; b=tHPkduh1Aj1p1asxZHwwkLXfDZQeOhRdVwSFHMp3ZT9c/qytQIuFyaqEn3O4r74p1ra7gv 0zECqT3/GUTTAwUkB47kP7NWq1mhDfKEmZi3G2F9QwPw4NSGZYwHvgD16pqC3Ou2VZbpUb Y+4KkvHEirFINlnFJXdozqnw/Ox6xkbcRdyfPZxOYWp+NlvZAQqJTNpWjAgZcJgi4usQ7q j+zES3HbF1rYv5n62H9QUekXnti/bdkWMw8s6v29xLhs4CXcqMBqJlHH39ogbRn3Yci60l wwwHh4KDXfJn89A5Gcu+7R9jt1t8NlgkZWqE/s+4AQOFrzL8eTrcNCSP6B9Tew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731281085; 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=rEeaplh5lDpgCcFwSo2mHWF6T159M+rvbU3GSFj9HiI=; b=VGw8B80oDrHZCbZl9pmcEhMZ18NPMDlPZrL9+Kao3LSfDXax4x3Y9Nl5Dacqu/YKSioiR+ 4XmzZP/DFeKEtTlGjfltVSy17JMrqpmkd3OZxHmWivkWoPKwmWfhkxxiM+4nyXHnLN4Tie Yj6CzmCkg1M67PYvBAvLnIX9dd/NbF3bSgeftxBzoPqupNs1metfaALVcBgz43Vaoly+FP JII7zWYUrblb2Et6FnZ5DX59msYpyGPrVtzgPjkUBZktSOTvpKzWwLZw0eEE9qnXfIlzpf cN/6Uw6As3V5S92OAuRST/MEu0AxyyLmbAG2yyTuSzTmwvKA/Gd97wPUp8l3hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731281085; a=rsa-sha256; cv=none; b=W/PXhrYLFgxsg+CFYpvG3nq3NpXcDzd6QeashSbPBELdxc3fSCETBgqC9n+YZoJYe8QOfY p/eCd250629RtETxdYKfZ0EJIRVQ4yY/GFCRrQ/c/uVOsAyoPQwlOHXt+frUQbfQxtpMd9 gb9lGUAABrEn9M7q1awDbno3Z5OKcWNHlh0h0jff62R2MPphYYpzotqnKK1EUeHgovqIZT bwsolGB1FzL8Jumluo6CjqTMK7h+zGzBXIp92DsfVRCOZWSQOfTj7P4/8JjuD3CN4EBkMF YIprHgpt4UpDksEuwwjZMCrsOUlqXEnBRt824E+Lm/mtIHsb5D0MZsg50XFxMA== 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 4Xmpg15b4Nz12Rs; Sun, 10 Nov 2024 23:24:45 +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 4AANOjRn054321; Sun, 10 Nov 2024 23:24:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AANOjjk054318; Sun, 10 Nov 2024 23:24:45 GMT (envelope-from git) Date: Sun, 10 Nov 2024 23:24:45 GMT Message-Id: <202411102324.4AANOjjk054318@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: bfacf538c04e - 2024Q4 - net/wifi-firmware-*: add support to set loader tunable List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q4 X-Git-Reftype: branch X-Git-Commit: bfacf538c04ee2e988bbc83d479c33fd23ba21ce Auto-Submitted: auto-generated The branch 2024Q4 has been updated by bz: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfacf538c04ee2e988bbc83d479c33fd23ba21ce commit bfacf538c04ee2e988bbc83d479c33fd23ba21ce Author: Bjoern A. Zeeb AuthorDate: 2024-11-07 22:37:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-11-10 23:23:31 +0000 net/wifi-firmware-*: add support to set loader tunable For drivers which currently need to set the compat.linuxkpi.skb.mem_limit tunable add an option to the build to create it automatically for each FLAVOR. There is no harm if it is there multiple times setting it to the same value (apart from file including and parsing overhead in loader -- however that works). Add the option to the rtw88 and rtw89 wifi-firmware Makefile. Having it with the firmware package has multiple advantages: - the user does not have to do any manual configuration anymore - we do not have to configure setting it into the release builds - bsdinstall does not need to know about it to set for the installed system (depending on driver). Bump PORTREVISION. Sponsored by: The FreeBSD Foundation X-MFC for: releng 14.2 Differential Revision: https://reviews.freebsd.org/D47481 (cherry picked from commit be7bdd6616c0980dfa2f8e91bd52d7f3b5f969e1) --- net/wifi-firmware-kmod/Makefile.inc | 18 +++++++++++++++++- net/wifi-firmware-rtw88-kmod/Makefile | 2 ++ net/wifi-firmware-rtw89-kmod/Makefile | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/net/wifi-firmware-kmod/Makefile.inc b/net/wifi-firmware-kmod/Makefile.inc index f592ac252d75..c8de13d05776 100644 --- a/net/wifi-firmware-kmod/Makefile.inc +++ b/net/wifi-firmware-kmod/Makefile.inc @@ -1,5 +1,6 @@ PORTNAME= wifi-firmware-${FWDRV}-kmod PORTVERSION= ${FWDRV_VERSION} +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/ \ https://ams.source.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/ \ @@ -84,6 +85,8 @@ USES= uidfix # OSVERSION seems to not add the _USES_install bits from kmod.mk. USES+= kmod +BOOT_LOADERCONFD= /boot/loader.conf.d + .include .if (${OSVERSION} >= 1500014) || (${OSVERSION} < 1500000 && ${OSVERSION} >= 1402000) @@ -106,6 +109,12 @@ post-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/WHENCE${DISTURL_SUFFIX} ${WRKSRC}/WHENCE.in @${SED} -e "s@%%XXX%%@${WHENCE_REGEX:Q}@g" ${FILESDIR}/WHENCE.awk.in > ${WRKSRC}/WHENCE.awk @${AWK} -f ${WRKSRC}/WHENCE.awk ${WRKSRC}/WHENCE.in > ${WRKSRC}/WHENCE + # Do we need to set a tunable? +.if defined(COMPAT_LINUXKPI_SKB_MEM_LIMIT) && ${COMPAT_LINUXKPI_SKB_MEM_LIMIT} > 0 + @${MKDIR} ${WRKSRC}/${BOOT_LOADERCONFD} + @${ECHO_CMD} "compat.linuxkpi.skb.mem_limit=${COMPAT_LINUXKPI_SKB_MEM_LIMIT}" > ${WRKSRC}/${BOOT_LOADERCONFD}/${FLAVOR}.conf + @${ECHO_CMD} "${BOOT_LOADERCONFD}/${FLAVOR}.conf" >> ${PLIST} +.endif ################################################################################ .if (${OSVERSION} >= 1500014) || (${OSVERSION} < 1500000 && ${OSVERSION} >= 1402000) .for _f in ${DISTFILES_${FLAVOR}} @@ -117,7 +126,7 @@ post-extract: (cd ${WRKSRC}/fw/ && ${FIND} . -type d -mindepth 1 | \ ${AWK} -vB="${BOOTFWDIR}/" '{ sub("^./", "@dir "B); print; }') >> ${PLIST}.tmp # Remove possibly duplicate @dir entries - @${SORT} -u ${PLIST}.tmp > ${PLIST} + @${SORT} -u ${PLIST}.tmp >> ${PLIST} .else ################################################################################ # Build kernel modules. @@ -157,4 +166,11 @@ do-install: (cd ${WRKSRC}/fw/ && ${COPYTREE_SHARE} . ${STAGEDIR}/${BOOTFWDIR}) .endif +.if defined(COMPAT_LINUXKPI_SKB_MEM_LIMIT) && ${COMPAT_LINUXKPI_SKB_MEM_LIMIT} > 0 +post-install: + @${MKDIR} ${STAGEDIR}/${BOOT_LOADERCONFD} + @${INSTALL_DATA} ${WRKSRC}/${BOOT_LOADERCONFD}/${FLAVOR}.conf ${STAGEDIR}/${BOOT_LOADERCONFD}/${FLAVOR}.conf +.endif + + .include diff --git a/net/wifi-firmware-rtw88-kmod/Makefile b/net/wifi-firmware-rtw88-kmod/Makefile index 5c855868ae36..dfd374718937 100644 --- a/net/wifi-firmware-rtw88-kmod/Makefile +++ b/net/wifi-firmware-rtw88-kmod/Makefile @@ -13,6 +13,8 @@ LICENSE_NAME= Realtek firmware license (${FWDRV}) WHENCE_REGEX= rtw88 -.* +COMPAT_LINUXKPI_SKB_MEM_LIMIT= 1 + # The flavor/firmware lists below are generated by a script # also helping to generate the fwget(8) definitions. # { sys/contrib/dev/rtw88/zzz_fw_ports_fwget.sh } diff --git a/net/wifi-firmware-rtw89-kmod/Makefile b/net/wifi-firmware-rtw89-kmod/Makefile index 83e77567b43b..abe723dfd687 100644 --- a/net/wifi-firmware-rtw89-kmod/Makefile +++ b/net/wifi-firmware-rtw89-kmod/Makefile @@ -10,6 +10,8 @@ LICENSE_NAME= Realtek firmware license (${FWDRV}) WHENCE_REGEX= rtw89 -.* +COMPAT_LINUXKPI_SKB_MEM_LIMIT= 1 + # The flavor/firmware lists below are generated by a script # also helping to generate the fwget(8) definitions. # { sys/contrib/dev/rtw89/zzz_fw_ports_fwget.sh }