From nobody Sat Jan 17 13:09:12 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 4dtcVx0lj4z6NgrK for ; Sat, 17 Jan 2026 13:09:13 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dtcVw4PLmz3DXv for ; Sat, 17 Jan 2026 13:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768655352; 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=z1uM8+SGmmaN6DArg8t+c2PPBLiLPz03faAqD7U/cHQ=; b=Rt65gJYxe8QbXzrkPF/Cm01+6Tl1nVFOKHu/csmPQ+m9WphismcfWnA0V6+6AMlt0NRapY hCtT0atJPsNzSABvFQtNN/8xnx5JNiwWBKymTd8EpN4TmfDROuTXHbp3kSnTijy1Dr9ouY hL4wojTEv0Y7heLKqcBQCkRz5tFY+UXCe7jWPnevm6CzGOUUjCG5nnA8Bfh5cPxixNHYHc 73/K7LYYKQtE0IxdEsHodqHOpbUyQam5q6C23/PaBUlN1z3B/u2JQOOuqbmc8o6V6HMC/M S4JLJX2634BVGe0Ui3qxbE0/Jp7I/27Yllx+diOMqaO9b8Uyp4Ec1xaCNZ+HaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768655352; 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=z1uM8+SGmmaN6DArg8t+c2PPBLiLPz03faAqD7U/cHQ=; b=o3am2zLCpEb5QseqlAf/Chv3N3/ULgv8549gHRzS6Xqa2ldJmDU+QBGRnr0pkeVpwdY7mz U1jUya+o5rbq3p6UipoNMNqVA11KTS2xCTSbfeVrAczW5f471HxNmHaATaUTklPxdgnokR PUuWsGY7c4rp8KKZDSnl9a6HqmW8BA8aATn+ZCCSsPk4U4jHgpitEfbZhFvchHHHI+aS1W +CKvaQJfEIcvMNMOUyX/Z4+4kXG1f029yLUjIJQKfD4rmGbditZONGW4+Wi0mD3B5iuu41 Fc8yZtXbE7m5TtddecfVmDodNUApjA0zaNisKk9LIDksB2sV/CFCx/EQnWOLWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768655352; a=rsa-sha256; cv=none; b=XBOf18VfOmRAQ7PWteRmDdjg0daK/h/Ej2cX31K1TZwNmiAYgayB18f/p3/4uRWqkS0RxE dBui760go4xsrwb74KFUaXsvqRqarYgem722TrxkX2r8bP2P1EUYiIxXDV4+Z4J/hFfVQF JMrKtlgmDupNeI2YR+rYx2BaCkDTVYlHhgWLRo6OYmQYgUHAVoD2oRLalntfa9o3UmnBC3 IMCHB4jWAgeeYa0j6RRBbHl95c+jJxqeYfvd0XfulDaa8C5eELXcMCsOxYGaNAQwdGv2G4 DHIghov6Z3A7f17OaEQ42m1VXkgkJhHxREq15R/dvcTx+KMPIN4AifWVrzSvkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dtcVw3Pskz119b for ; Sat, 17 Jan 2026 13:09:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44881 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Jan 2026 13:09:12 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 4a56313c73eb - stable/15 - iwlwifi/rtw89: improve module Makefile dependency on ACPI 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 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: 4a56313c73eba3dcd33a8690aec502e40211b01b Auto-Submitted: auto-generated Date: Sat, 17 Jan 2026 13:09:12 +0000 Message-Id: <696b89f8.44881.113ad6b0@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4a56313c73eba3dcd33a8690aec502e40211b01b commit 4a56313c73eba3dcd33a8690aec502e40211b01b Author: Bjoern A. Zeeb AuthorDate: 2026-01-13 21:09:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-17 07:51:12 +0000 iwlwifi/rtw89: improve module Makefile dependency on ACPI In order to compile iwlwifi(4) and rtw89(4) on RISC-V [1] make the currently manually tracked ACPI support option automatic based on DEV_ACPI. rtw89(4) is missing proper CONFIG_ACPI checks in the driver (or the mandatory dependency on ACPI) even upstream it seems. We just added that check to the modules/Makefile until this is fixed. [1] https://mail-archive.freebsd.org/cgi/getmsg.cgi?fetch=5947+0+archive/2026/freebsd-wireless/20260112.freebsd-wireless Sponosred by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54694 (cherry picked from commit f5a77dc8f8df09a907c2a2bdf86802513b1ebb15) --- sys/modules/iwlwifi/Makefile | 7 +++++-- sys/modules/rtw89/Makefile | 13 +++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 5d4830537a0b..1d0c52276b84 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -4,7 +4,9 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 +.if ${KERN_OPTS:MDEV_ACPI} WITH_CONFIG_ACPI= 1 +.endif KMOD= if_iwlwifi @@ -60,10 +62,11 @@ CFLAGS+= -DCONFIG_PM_SLEEP .endif .if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 -SRCS+= fw/acpi.c +SRCS.DEV_ACPI+= fw/acpi.c CFLAGS+= -DCONFIG_ACPI -CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI .endif +# This needs to always stay on for the LinuxKPI header file. +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI # Other SRCS+= ${LINUXKPI_GENSRCS} diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 1307abf3d9b4..98174fff2a1b 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -4,13 +4,16 @@ DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 +.if ${KERN_OPTS:MDEV_ACPI} +WITH_CONFIG_ACPI= 1 +.endif KMOD= if_rtw89 SRCS= core.c SRCS+= pci.c pci_be.c SRCS+= chan.c mac80211.c mac.c mac_be.c phy.c phy_be.c fw.c -SRCS+= acpi.c cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c +SRCS+= cam.c efuse.c efuse_be.c regd.c sar.c coex.c ps.c ser.c SRCS+= util.c SRCS+= rtw8852a.c rtw8852a_rfk.c rtw8852a_rfk_table.c rtw8852a_table.c SRCS+= rtw8852ae.c @@ -26,6 +29,13 @@ SRCS+= rtw8852bte.c SRCS+= rtw8922a.c rtw8922a_rfk.c SRCS+= rtw8922ae.c +.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 +SRCS.DEV_ACPI+= acpi.c +CFLAGS+= -DCONFIG_ACPI +.endif +# This needs to always stay on for the LinuxKPI header file. +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI + # USB parts #SRCS+= rtw8851bu.c rtw8852bu.c #SRCS+= usb.c @@ -44,7 +54,6 @@ SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h CFLAGS+= -DKBUILD_MODNAME='"rtw89"' CFLAGS+= -DLINUXKPI_VERSION=61700 -CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI CFLAGS+= -I${DEVRTW89DIR} CFLAGS+= ${LINUXKPI_INCLUDES}