From nobody Fri Jul 4 05:23:24 2025 X-Original-To: dev-commits-src-main@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 4bYMVN5w0yz60m6J; Fri, 04 Jul 2025 05:23:24 +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 4bYMVN4kh9z44QY; Fri, 04 Jul 2025 05:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751606604; 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=ZQJMRTXnm4nvCO7/0Gdly3LZtI/oWfjhaxKbCAGlrjc=; b=Xnm3uUhp26YK6djpljmhihqrhAhPzgSFRaVB+cEvgkS8e9F8mmcFk+HvJW79R2Xjmrlv/M 5BQS4KPNemD5HYu/+Ngfd2tCiA5cA4mnoRNyvAbIOkcgG500Avw4Ko7IST/hrn6ooFG4n7 DHzZgJBUTMdpu2/KCk9Da2XznVNV0lkWGvcp9YGfIu3rU0w0bhC4hr4e8iRFpTzgpjkrR4 1lI6Ll++R3vFfz2xiMc+5xpja1bMXtokLiZdRivfHHRG7JY+CwVCh90XbeJRGPTPiwuwyK F+e1F6WJE/XtH13wWvyYx1xJpuYpuIyKFdJBJcvCJ78ufXJuYazoXXiYF5Hlsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751606604; 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=ZQJMRTXnm4nvCO7/0Gdly3LZtI/oWfjhaxKbCAGlrjc=; b=HIvj/DSm3Ya6579KD4DUWSv+njZ8JVyu4+gF4Y/B9JM/OKWDqK7QcxL1frR4BNjQAgs+0A aoAN7FcQUc4WFMrDeVZIp1nnofsQTBw2NjUk46OXiDUvUIOahphETs0vG/mWlH+ZCnwOFM PMzguxvsqStVKYY0kTotN0lt2vXf4DqVXtJoWJxnfWj+R3u/lFUYIGY1FcqZK8QPoa/HJM I5V4NHkqXVJ9OaKEaQnlc03u90cj8G8mhazS+3EdoAOy3nM4kJl2oxqCy9jnGaLca1Svl4 /90vJY2lqN4S23jhqoC+oNoFPX93jdMN3fpLdG0kJYxVHRYhEHnKoKqyYxPYcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751606604; a=rsa-sha256; cv=none; b=h2/NiM8oDRPbvg4I9wujYYSF1johhlEV+re7hx/qwDrKM9r5Hk0i4+VapX0S1DA2A3wPkr T3t+6rRBuSqC70RlAdxqWFqmEvHQBXo8k5QCCNgqoEtnY2PrcTqDKYVnR0GRGxMuQnL89Y iDnplAWFF8OIGZGQjQ/bAh6LOR7BNt0A8ffJoqc/GNV2OitUfF9uNyOpLV4ZUz5PJfXPJt OafzDhSbTw9iItM8eRePwBuLcWzfFEThjmRM9bKjmIb2rRxxhDjR6Ypmj3wWa/qbL3Q3Oc JCAYwWz4L5+VuLA5LFsPqFZPIhEt4ba8euGHzIhZ36bg4eXkykGPmK9Hhi+SNQ== 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 4bYMVN3yLxzcr2; Fri, 04 Jul 2025 05:23:24 +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 5645NOnt005865; Fri, 4 Jul 2025 05:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5645NOsU005862; Fri, 4 Jul 2025 05:23:24 GMT (envelope-from git) Date: Fri, 4 Jul 2025 05:23:24 GMT Message-Id: <202507040523.5645NOsU005862@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: 228b43c258d2 - main - iwlwifi: compile in ACPI support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 228b43c258d24c293b135ae94c120e7ccf0a7aea Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=228b43c258d24c293b135ae94c120e7ccf0a7aea commit 228b43c258d24c293b135ae94c120e7ccf0a7aea Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:46:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-04 05:22:22 +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 MFC after: 3 days --- 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 6e0fea6efc3a..9774c3da61ee 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -4,6 +4,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi WITH_CONFIG_PM= 0 WITH_DEBUGFS= 1 +WITH_CONFIG_ACPI= 1 KMOD= if_iwlwifi @@ -40,6 +41,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 @@ -56,7 +63,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