From nobody Wed Jan 14 18:09:56 2026 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 4drvKJ5lXgz6Nkb7 for ; Wed, 14 Jan 2026 18:09:56 +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 4drvKJ1b5nz3bQs for ; Wed, 14 Jan 2026 18:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768414196; 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=ZIJE1X9UgB+aD/tpv3cS8JJiEqpsVCOYIri+deW6YQE=; b=JiShVtPkZcRNMquAt/5qfgYio8Om2BaBsPLSvwzw6zjZjK0h0SSFxE2Yy9lsWN7iDr1bFT MuEPIMnxSlW1tQhwUIpI6RHuEwEfcJBh2Atfa4XO6qk+/tv7KpB+vAXyrYnULwfxJgs/Rx Jj4gKT1BihhJahIfDiUJL16mA4azyvxCjuEiaecmqnCDmV9VGwXiqcCMV/H2d8iMzHCKHn VJuKOP++V+TVvPUpjMuGdRfSRzxRMl2pUmO1M9SGJwf4cZO37nk7y6eORWU4EVCH/kKzIp u/GRcidY9PaAaAkDptUW4ue/b/SuQqZ9iAHtkKQZF0mrDVqzc26WPzCYRz7GQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768414196; 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=ZIJE1X9UgB+aD/tpv3cS8JJiEqpsVCOYIri+deW6YQE=; b=iY0DyndaY8b3LLHT5dQ3tntRD9ndMYmW6ayrS1Yd849eyjXRHVtA0XIynd1v6XlpZKWlPw ymlghMhVsW5QtF51iciMshIc9td1lWqVE5ycYiFwSatP2cPPvyotwjljA7UUtGmY4QrWoD Z+tizgnjzj33mAP9ngZQQvZb7S5Nvvt10Vy491Qb45BXasFDhy2AyxloQY3InO7trhrPrK xYu/5rsM5rx76QpVFApsNDkYxwtsijuzhc0JEkc3bOQscD0jPlhuDETSbm+SM8elDriZCk YIbCqJCyjip8MwGrQeIgMICge8f+L0L7n83hMpM54fmbRvhjQS5JQATd6iVwkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768414196; a=rsa-sha256; cv=none; b=ua6Nxc0IV66YpW00fbGQnoXCzcQfazHGU/vqYNg4w5O6avUCHbVXXKSACzbUMFss3TCc0l QCP3/UQU8KnlvcrA8aFwHX3j6kf8QUN5XMq4eIU4R25wo4wZu+iLIDapCzKBxF1sEl5EQe tDD24Z3pRskbIfLp+6NsIBM9dbnyvmQoCVv//hNA45/kUCXWle7R8QqYhiFq2zZUGDc5cp CH5IcssKRncc4x1EHCDu+3EbsTkunJhbPvY48fL6NSDXT5k+ZNXg7ey6JELztJPbAtHwQF 1G2uAbpoKnAT56ca+/Z/vqOpMH80bHWpkxas+TXvFgY1kqWX9q2GrPiA8pkf4g== 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 4drvKJ13SFz1814 for ; Wed, 14 Jan 2026 18:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33e72 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 14 Jan 2026 18:09:56 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bjoern A. Zeeb Subject: git: f5a77dc8f8df - main - iwlwifi/rtw89: improve module Makefile dependency on ACPI 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: f5a77dc8f8df09a907c2a2bdf86802513b1ebb15 Auto-Submitted: auto-generated Date: Wed, 14 Jan 2026 18:09:56 +0000 Message-Id: <6967dbf4.33e72.190cd6a3@gitrepo.freebsd.org> The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f5a77dc8f8df09a907c2a2bdf86802513b1ebb15 commit f5a77dc8f8df09a907c2a2bdf86802513b1ebb15 Author: Bjoern A. Zeeb AuthorDate: 2026-01-13 21:09:51 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-14 18:08:39 +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 MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D54694 --- 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 6fe64a611900..39b4a48497b4 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}