From nobody Sun Feb 18 21:11:26 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 4TdJHy5xGBz5BmRZ; Sun, 18 Feb 2024 21:11:26 +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 4TdJHy37T9z42QB; Sun, 18 Feb 2024 21:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290686; 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=2QjYzLVHnUPT1Htkc5Wbqo1YPMEAcoalGyeP+7t7Sog=; b=qS1hiEDCusLrQg9yW7hRwAWYWHmabYIdcpnz+ocMtGavNKrpPVzUEcUCvxle3CAB+UI1wb kcZkmsD7GvEQXIGGmDHpCinP15AivPfiJYHyXtWkmaAiXYGq3CfNby6tH/dl0zolY86Rzy r35nKJc1z107hKxk9/wKcRJEsVz3E4J24TJ+kdfi1nIkvY/IRJjiBsvlfhhR7IZXZ7Y8qM GxTpP4VZMvS1CcLQgwTPqBQ2TMerFdiHeEEmZ/Bd0f5Vh38thd29DllX3qfvbbADBfNxwc uPQkaBtoqbzjeaNFF+I+DHzB2YS8AkyXT8RKkhvoBmU+f6HN3S4OsrBmtj2hHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708290686; 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=2QjYzLVHnUPT1Htkc5Wbqo1YPMEAcoalGyeP+7t7Sog=; b=W4v+6yuu3hUoZ2gmay16x1et6+5hGJncdIMIZYC328PwNmHk3HWTPZX+HG+2tneoHBB8oY WWigmO5sm7oSjCsY298q3AYfK1DWm79o38khN0n8KCoe7Tk9ZMpVvzD38m+NLqr+fe2STE 9qj8uCYeyBi7i3LkgJptbZMnIHCgagKubQew8y3znYfhwVikvxQPLid2h4DBEzJAWmIRIR J6opuaOuDtKM3sCzPx5iz4oYnSWS3vBXR7Q7CBRJvTbLqJapelwifr4+eVrxq/Wp2h5Chq NMeA880+Tfi8OA0RPq5LD5ofFdq0Oc5ECukHmM1DevCRtK/wx7CQSWQy1dD8lQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708290686; a=rsa-sha256; cv=none; b=mAIDtTvMDRpnDUZ34Xs0SEesCw5BBsq73WqbEl+nlK0liQmT1DqCUULY8DpNXrRxggRAFA azOzz5JKlpOe5xitONUpk1VTTTW7KfoZqLuYZvNCVWVR06PU8Zd7BHt+BQPJ6gvIfUs/ek 4Urc5H6ankT4vd1YUCB0tbFqNp1tURFuN1F/475ERkFxa+qvR4TqPmViUPGB53XmzYOjZp gMMQRm2JPColgzdTC/jXB64f/zdBfojL9OBy7QQRc+qoRDgxV5nU0dywwhiQmWi/zFpCRq +JH0438ZDrv2C0r4MAJ2sLn1n+qMWA8vp+yH+4M+r8lvgawANcPTJaYz1xG2jA== 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 4TdJHy2CMrz16Z4; Sun, 18 Feb 2024 21:11:26 +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 41ILBQ63015841; Sun, 18 Feb 2024 21:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41ILBQ63015839; Sun, 18 Feb 2024 21:11:26 GMT (envelope-from git) Date: Sun, 18 Feb 2024 21:11:26 GMT Message-Id: <202402182111.41ILBQ63015839@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: 491e4f5c86f3 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 491e4f5c86f3d5155b8b22b23d1aa22a4e2e1422 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=491e4f5c86f3d5155b8b22b23d1aa22a4e2e1422 commit 491e4f5c86f3d5155b8b22b23d1aa22a4e2e1422 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 12:51:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-18 18:31:16 +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) Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43647 (cherry picked from commit 8f7c32a41a6a6d88e36ce2f588489274193c2c9a) --- 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