From nobody Mon Feb 19 08:07:54 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 4TdZsR3Mkcz5B2ml; Mon, 19 Feb 2024 08:07:55 +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 4TdZsR0d2Zz4Kgg; Mon, 19 Feb 2024 08:07:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330075; 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=nAdW4SITYbNCrUH/x4l9sLfDCM0xOOiZq24OUXOImBw=; b=dD9l6xKGRdjYWax2nHls/lbFXg61gseRJn70Yy67y3O6ClQy7xCazn6ZGft15mAUeyVtJe kT2ACfgqFcUeJSKeZ97JPJXeKNPF1w6iGHtqXiEGEgLXupsd0TE8x1I9uBqoD+8+DN+Kj8 m0RNxcaW5Crc/T9etzbtHnv9m2XCqxhzBDbT5uTmkoepbWCuKvjMSsKspeSq7Ek8CZiGGX dj5SnIqC67z7wJnqFxmcZU6bv2VY9N+wRMOAoouY8Fd21ztnZAzcjtLHSYnRNENeUpPLy2 loyEBCTDv5n92i1KCsNKI7UJA2TCGqG17UofY6EI6+8FKSr0IQgHGQe8qOCUHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708330075; 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=nAdW4SITYbNCrUH/x4l9sLfDCM0xOOiZq24OUXOImBw=; b=gbdmyZYc3CiGXJPj+/Z2fe2X5Ub4dKYH4CozWeXdWTr/PDzcgxqPcH0dzgMUYivAuPa2ps qQll4TI6UCUqOQMBmhBYOfQmA6BfouB8sTmx/9epufXUEDcjemIk45zBHyBvpnLMQBNVyx nG1mYLaHOfczIaLcK9LIxB6Dt4YZ88WMpfuZ9URw+zDHa/dj8Qn+aEt4wJlaxC9Fwx6yfS GlKNKXuu0QUI+45OB/tR417gpcdcd4OUM9BMYoQ9aofqbDQ8DbL0c8rl9FvPUHbtI6svnA Sp7kTCz4goxGkyMln1mKq57otiKy4193xFVjhwDyO3vlKsSjAKwpVhWl6iCu8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708330075; a=rsa-sha256; cv=none; b=gb3t5DIbyzDzPsHUrUskfLnAYWJGLShncNIOiv/d1KMZMhDJimPZnd8VOVKnM6RFGgFrgY gb7TcOtmHlAuGnwSihpa6Vgnc65JoA6AvNUUs2CoXcri4+ZyAm9gHV8LkhYs5xv0VL8FnO /MhyoKhyy8U7xTbIF3DMcDP7VOKxVjKrDYdJQh0Tu154B4sw2A58c2QBVQqlQHbdbC9L2G 4q6DMHGJbx9RisS/W5DHXS3Ni9Vs0sxiUWJ5t+PZ158uoIwu3L9YQb2nmd2PvUSgS/9d+I wPY3LSS5cwo2Ywr993p94AYKSsfYW88vI0DhccRTk1wimWLrs0oyWVqGWbbCLw== 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 4TdZsQ6pqXzRGh; Mon, 19 Feb 2024 08:07:54 +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 41J87scv016086; Mon, 19 Feb 2024 08:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J87ssU016083; Mon, 19 Feb 2024 08:07:54 GMT (envelope-from git) Date: Mon, 19 Feb 2024 08:07:54 GMT Message-Id: <202402190807.41J87ssU016083@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: 3da00e4c110f - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3da00e4c110fcf8505eb4764eef884bbac806191 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3da00e4c110fcf8505eb4764eef884bbac806191 commit 3da00e4c110fcf8505eb4764eef884bbac806191 Author: Bjoern A. Zeeb AuthorDate: 2024-01-29 12:51:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-19 08:02:01 +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