From nobody Sat Feb 03 13:49:21 2024 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 4TRvBp1LTpz59Qp0; Sat, 3 Feb 2024 13:49:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TRvBp0p3Yz43V1; Sat, 3 Feb 2024 13:49:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968162; 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=u+nANbSKfomf1pjYRy3vFxOURI6e5FBq1cKlW1gWlFs=; b=Mg9Wr16vOe2f6J/kDvlBmX7U4d1JlBPQxPABrz9ND1PX6TSv6rfJ1XMExbVNTbUAN1Csjd V7tDrwcgFJqyNxl4rzVjpyhMlAS21e6by+u897Afhnl3rzVDFYC7847at2+6ZkJZvXGqnx t3+pW0W+fAwoOINDNgKqOKEKZ5yDcr8gOOE0+w4H0c7WKpW2up9SzF2x1hUfGs7CFLQtYa U+JXnf81/LfcJP8HnqaINVKZtYftZu6Gslv3K4gGxIsU9XFdJ4JJfCGcHuYCjew3B68ttz rc2RQVJcUDtkmNE5nuv6kkyMpA6pSRzdeKUSNQKHcCKrSBhv5jt7ZKErd1hfGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706968162; 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=u+nANbSKfomf1pjYRy3vFxOURI6e5FBq1cKlW1gWlFs=; b=ur5LiFvlApgLscQVMlkKBh2bZZA0IRpyFMt874AzT9de2TchxBr7RDRewmie/s8qT95Eek 4Yw8M1yg5abaUETevB8tCJY0s0OSHmXPiRkXYJfLYJcFr5foyWcodf00uAieunY6Rjbj5p PKIMmc5SB56dHUdV5EUWxn3SONSVNMWrYohMyj3bQjDs0a6kqTj1rPAENnoEhaAV/kQqDs 3Ccr7MK6RaBzklKIHnBiKv71ZaM9U9EzOeCndg9In1xUv+AO/QptYSdd9vKCICU+lQ8HlF joNKX8depHPMJBX9+Fd0LFS8BXBxC2AWd5HA9PIwExVAc3tmkheb6p8SbSQxjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706968162; a=rsa-sha256; cv=none; b=XJfVYqVvQlEs/PCc9CrAhuKMdoun/am2BEsFPmDpQPE22YugpvhmofOY2z9EgKXnYK28Qv AQSA1lnJK6IjKQ36bvqczokVBiZYU6FXSd/jmkTuCnecCmqfYvFxtgoVQ5jxIPmW3rhGrO I63IdOpQmJ/LrhCliqikoC5E1JAVjDJyDkS0hi64Wz2UPjPZAbp7M0KlG+VNlBrPELFagx nSyDGqWZD/npqQ4sicFpd6caeeXM3edPKkOT5aBpCtA7DW/AbPJBig21ULgZuZvTLP1luS cFmWXsIpQ/IL8ExiD2COEEZL1Jvfkii13uxU15Fpt+Fec0FX4dtpAUGQg7xoJg== 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 4TRvBn6zW0zG9k; Sat, 3 Feb 2024 13:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 413DnLRB039783; Sat, 3 Feb 2024 13:49:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 413DnLGK039780; Sat, 3 Feb 2024 13:49:21 GMT (envelope-from git) Date: Sat, 3 Feb 2024 13:49:21 GMT Message-Id: <202402031349.413DnLGK039780@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: 8f7c32a41a6a - main - iwlwifi: add the d3 (PM) bits to the Makefile (disabled) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 8f7c32a41a6a6d88e36ce2f588489274193c2c9a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7c32a41a6a6d88e36ce2f588489274193c2c9a commit 8f7c32a41a6a6d88e36ce2f588489274193c2c9a Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 12:51:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-03 13:48:27 +0000 iwlwifi: add the d3 (PM) bits to the Makefile (disabled) Add the logic to conditionally enable PM for iwlwifi. This should help suspend/resume in the future. For now leave it disabled until other preconditional problems are sorted. Sponsored by: The FreeBSD Foundation (2023) MFC after: 3 days Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43647 --- sys/modules/iwlwifi/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 679490fdf774..256e08282ad7 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -3,6 +3,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} +WITH_CONFIG_PM= 0 WITH_DEBUGFS= 0 KMOD= if_iwlwifi @@ -36,6 +37,11 @@ SRCS+= fw/debugfs.c mvm/debugfs.c mvm/debugfs-vif.c CFLAGS+= -DCONFIG_IWLWIFI_DEBUGFS=${WITH_DEBUGFS} CFLAGS+= -DCONFIG_MAC80211_DEBUGFS=${WITH_DEBUGFS} .endif +.if defined(WITH_CONFIG_PM) && ${WITH_CONFIG_PM} > 0 +SRCS+= mvm/d3.c +CFLAGS+= -DCONFIG_PM=${WITH_CONFIG_PM} +CFLAGS+= -DCONFIG_PM_SLEEP=${WITH_CONFIG_PM} +.endif SRCS+= iwl-devtrace.c @@ -61,8 +67,6 @@ CFLAGS+= -DCONFIG_IWLWIFI_DEBUG=1 CFLAGS+= -DCONFIG_IWLWIFI_DEVICE_TRACING=1 #CFLAGS+= -DCONFIG_LOCKDEP=1 #CFLAGS+= -DCONFIG_NL80211_TESTMODE=1 -#CFLAGS+= -DCONFIG_PM=1 -#CFLAGS+= -DCONFIG_PM_SLEEP=1 #CFLAGS+= -DCONFIG_THERMAL=1 #CFLAGS+= -DCONFIG_EFI=1