From nobody Sun Jul 13 19:31:15 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 4bgFtX1vT8z61NDT; Sun, 13 Jul 2025 19:31:16 +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 4bgFtW4CjWz3kFb; Sun, 13 Jul 2025 19:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435075; 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=FKVjsgYwyrwlag79XXVebkIO1ntYJI2S4FvCljdOocM=; b=KoQJEyi1m0yVHIPsvs3SAbGE3tzxzsLzVP8fJZUa/8INb8UgeltMofRRRkpgwogn6D9M1n 1GSXT3nQR3L4lL6lrfNYORdjU2XANw7diBQP3A0aeYwRSUpjL/rDGKZPpgorz+vVRvj4hi EAYEHr200UOMQBUU5Y6qnXUoeWPg5khxRMuSmEMXMebJP9xUvDmbqIteFGKMk25k3R8ITs Bjw+TP/XO1lHH8L4gybvO5+g1fTzby1h/9vsLKOMM85XKTxggiUA430eZ7l9vFTWkGvOpp IARs7vGWCCWQ6QQOLAYUvJ9BOz6rA3Rh3H6PDanAxmCXzb4N4qrTo79YxzaX6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435075; 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=FKVjsgYwyrwlag79XXVebkIO1ntYJI2S4FvCljdOocM=; b=kvgpP0WX/fYx4sh0Fur38bFQ33hff4kaybrDZjtyjmUKlI2F5D70P1AEzHQu+Qrmndf2AC Vk/aJCioMloNduNI4b6PTq5jvqCSy3U0tjQVRbFeXL71t0D2RZVKO4H4EAReZDUfF1yXW1 1x7Y3K+2NM+gKU2mFz5/IXdAhKUPO0QIEfGn0R6aCjHm6ZOXjnzgl3/lSPAuEx7W/hAP0x 367HOWxUzRrXyXXrj9paqgOMjo1bB02DZO5Snkz+lFMcJFwUkvAP+MxMjE7eT1isv2BkQ/ ehMH8CGAPDRo88TrsVM6Saa9W7mAr3vWrxFkvTkUiYAAwtxayimK/vbAxRPhOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435075; a=rsa-sha256; cv=none; b=MnZPfu8+Z0iGUKAI+fHN/MArz8R9DamINxcL3pdSusmIfq3sDkNb3/PQg4siCIxrdE6HcG NVKldglLrm1fc4yPXSWa9d884ObviqWFtgCoH4l12SHYZmE0/LqmZNMnAir4bNsEE8HaQ8 w9r81ljMXQdxNkN1OInC1VbDAiUFiiLyCziZ3UdtL73qmJ1ZvCn0KMlhUhShGa+lwSS1Jx EoLUA8OnG0SkaYhpWiws7ErA/eoMewsGTZXQWnbMnXujubgQssPT4aOJCzAVphEMulrQ3e RH3Mj7UtWzBwdHUh5HX1WHKJDnl7I/Qnei1NUPMb4aDeZ4XnVisAyRanVZIU9Q== 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 4bgFtW2CYWz6B4; Sun, 13 Jul 2025 19:31:15 +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 56DJVFxR071848; Sun, 13 Jul 2025 19:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJVFJl071845; Sun, 13 Jul 2025 19:31:15 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:15 GMT Message-Id: <202507131931.56DJVFJl071845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c4496f82680c - stable/14 - iwlwifi: compile in ACPI support 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/stable/14 X-Git-Reftype: branch X-Git-Commit: c4496f82680c5edb0820598817ea22e322250317 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c4496f82680c5edb0820598817ea22e322250317 commit c4496f82680c5edb0820598817ea22e322250317 Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:46:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:26:25 +0000 iwlwifi: compile in ACPI support Now that LinuxKPI supports the lower case Linux ACPI spellings under LINUXKPI_WANT_LINUX_ACPI we only need to provide the debug macro to allow us to compile in ACPI support. This ties into regulatory and will be used, e.g., for 11ax, 11be, and Per Platform Antenna Gain (PPAG) settings. Sponsored by: The FreeBSD Foundation (cherry picked from commit 228b43c258d24c293b135ae94c120e7ccf0a7aea) --- sys/contrib/dev/iwlwifi/iwl-debug.h | 4 +++- sys/modules/iwlwifi/Makefile | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h b/sys/contrib/dev/iwlwifi/iwl-debug.h index 43288a5a8d74..7b3b402766b4 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.h +++ b/sys/contrib/dev/iwlwifi/iwl-debug.h @@ -47,7 +47,7 @@ enum iwl_dl { IWL_DL_DROP = 0x00000010, IWL_DL_EEPROM = 0x00000020, IWL_DL_FW = 0x00000040, - /* = 0x00000080, */ + IWL_DL_DEV_RADIO = 0x00000080, IWL_DL_HC = 0x00000100, IWL_DL_HT = 0x00000200, IWL_DL_INFO = 0x00000400, @@ -195,6 +195,8 @@ void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...); IWL_DPRINTF(_subsys, IWL_DL_WEP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_WOWLAN(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_WOWLAN, _fmt, ##__VA_ARGS__) +#define IWL_DEBUG_DEV_RADIO(_dev, _fmt, ...) \ + IWL_DPRINTF_DEV((_dev), IWL_DL_DEV_RADIO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_PCI_RW(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_PCI_RW, _fmt, ##__VA_ARGS__) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index fd11e670b540..7f4ef7d8d32d 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -5,6 +5,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi WITH_CONFIG_PM= 0 WITH_DEBUGFS= 1 +WITH_CONFIG_ACPI= 1 KMOD= if_iwlwifi @@ -41,6 +42,12 @@ CFLAGS+= -DCONFIG_PM CFLAGS+= -DCONFIG_PM_SLEEP .endif +.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 +SRCS+= fw/acpi.c +CFLAGS+= -DCONFIG_ACPI +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI +.endif + SRCS+= iwl-devtrace.c # Other @@ -57,7 +64,6 @@ CFLAGS+= -DCONFIG_IWLMVM=1 # Helpful after fresh imports. #CFLAGS+= -ferror-limit=0 -#CFLAGS+= -DCONFIG_ACPI=1 #CFLAGS+= -DCONFIG_INET=1 # Need LKPI TSO implementation. #CFLAGS+= -DCONFIG_IPV6=1 CFLAGS+= -DCONFIG_IWLWIFI_DEBUG=1