From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout.web.de (mout.web.de [212.227.15.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D871E254879 for ; Tue, 25 Mar 2025 10:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=212.227.15.4 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742899217; cv=none; b=f0m88FEnb+jZLyHYYR0ZzPPeSct3hRi0iwYD6w3xo38lX8a89z+GTOaYC2pf8/yNwJcmq351achsXBBH4AZzFyY+MsRsoplW2RpX1lmb6UsOIXXH4OQPeX/ZpPzOTe2pEZ9336i/iomVq9awmruA0ddxuZsdaNIYPzy+bCeRpbo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742899217; c=relaxed/simple; bh=fifPgtMPSZHOKbgZwARyXeDKW9MFucgGaY/8cyMJBgE=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=azn8ErEZr8BR7DetWjlRoDZxwOC6tqL7woUUVQbRaypTjY4xrufGR9w+aYWSaLVOch6AdKEBbZjjmQEgiuuRJ4L3Y/5HG5MwrzzgAbevxfQpD0cwD1Ziv7QHOuqrMosEnH45B0ng+6/+ccPjv0venxQ41HJNP+B5Yf1gpRd5kNk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de; spf=pass smtp.mailfrom=web.de; dkim=pass (2048-bit key) header.d=web.de header.i=jwollrath@web.de header.b=Chls3jCf; arc=none smtp.client-ip=212.227.15.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=web.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=web.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=web.de header.i=jwollrath@web.de header.b="Chls3jCf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1742899211; x=1743504011; i=jwollrath@web.de; bh=e9CquLRoYM0hQWzImTIkM0BZhIPqMDInitdndu1q9d4=; h=X-UI-Sender-Class:Date:From:To:Cc:Subject:Message-ID:In-Reply-To: References:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=Chls3jCff6K8MryzOG5ZnvyH9JLlvPSBBMGCybJHBvMDjr8jRn6Fca41nIo2fkB9 m775leCdmg0F0Tvqrfr/z7Fj+9OIM/yEmQINam6YR+W+MvJr/7yy/96QtMuXKvMgM Bd1UsKRtGsvqIytzHamP6+8a0dg2hfuVmDYLTUVuYFRzI87EUT7+lL8Icb0t4jNKl QkK5hcstk9GGxA4AydQxPx1y7rc8mHhmZmRHJRZxS6hQ9EtVHLPpafkcj9VWMtUrI SupCADxFGxY4mSkLdPZIb09oKu/fGx/NkHjHfmwNoGH7rdmSnHIxoAF2cZmMePG7z KqXGYAZebE0fM1X1xA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from schienar ([194.12.189.238]) by smtp.web.de (mrweb005 [213.165.67.108]) with ESMTPSA (Nemesis) id 1MHVen-1tsxFC325B-0091It; Tue, 25 Mar 2025 11:40:11 +0100 Date: Tue, 25 Mar 2025 11:40:04 +0100 From: Julian Wollrath To: Baochen Qiang Cc: , Subject: Re: [PATCH ath-next 1/5] wifi: ath11k: determine PM policy based on machine model Message-ID: <20250325114004.101a7c10@schienar> In-Reply-To: <20250320023003.65028-2-quic_bqiang@quicinc.com> References: <20250320023003.65028-1-quic_bqiang@quicinc.com> <20250320023003.65028-2-quic_bqiang@quicinc.com> Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:CUH06FBuzWW1hp6rPWi/b884Z3drhSfHFp1gkav2R7dOfeFDjB/ o1JGHyM/ODUy83tT0MlMNbj0zhTHHnnRVZ0YR1vzoCO88xWYa3TxIS2UYhaenXtLri5BfIX J+kB8NuAzuBVqEdLmU56thWaQe7iqVyUMWOXu1q/GOA55spwp++uGSdiBDC/hVZN5K8HnXp MUNlfdUr2aornRgDDCYPA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:Ir+mLwPSpRs=;fmh1N1+Tc4KpaJcrJexUtn6ucGv ieY3jG3maPF/G91P6ijPFAqZ55yldT7oX4wZPAJ8DsDll6svj8kr4l9IPicQnv7Onbec34s1/ tmI9BkenJ9y0iBP057+QS5KW6weJYKbM0Ivu3PcJopDV/wvs54ezxjM4yY3bgqvfa7YuMRXB+ IqQ0RaNhqJKSNFRJnXVYTV0Xo9cg1U30XzQCVjPAyvUQra8wtKNMBgO7XlwsI46zVysqZed1y BMJg90GraOu104qQLNrDIewMD+HH+Z0tZwFNNGwSgVuivp+f+3xBCPwIzcP/spe/GxQe5urje kzQIxMAWSe2yU9CLNWQYfWoTqIoHPnSNW/adFgYCUBmubOw++b8Ydc12/MIvuXpmrKwmp4C1h zD+fvRUhaqITzuxynMkYbGByPHHl/FVvWDjW/rvjnpH0N3sTAY7JYw7gE/hz+Nti9UrVHBSZE Qn6T1y3KpDW2Hk/R+QXDjNcOWMvT7Z11dNyRMnfFiaGtO+/sxLnLhHAr0lVDn0jD54TMNcr9I A3mfp9vcAcvSjPbwaIMAkDCUfVtmVVQjXIMHTN80ENg2l/3JPw20cFzLJ1uSMwksVtQD3Bawf 54fa3UQ1KIovHtt5QgKUmhJtvjxfIgf67R0fpECp3ztw9W0l+QA52wmRX2zat9j21wN8TYstV 4UHjSeUQk6wo4GM2CySIPwIY1n61+nAkvuGoQMpDqJLH/UDNCSNiTSFFGEg2fpzw4lR3XnC3P UVU5QNfs8QXHR7UK+GltkXRhsh2KBDcG2BdYXHzntuPvjeLgmCXADiz/f1Rt1ulOqh+N2DBk3 Cl8+va1+nNQC4Sq/6BmTaRpfA7xGdiet2J++f2HgI+AoKf2FSoZzASNiInNSVjzEUuJiuLOfK hzlO0wxmsLNtEpWRT8YG4Spsw9m7b13YB3sm7NqhDsJl1FSoJmqAZwYJ4xiNYzUg4J01aVyvM srYCoibSnGiyj9ErqO1ykoyxsMVjdV14PtLBzqT5Nh89UVqhpB1qt4zeICMp1hbCOJSyuI/Yo JcgjAAHo+5FSsz+jsg3VmXQ1EFHOHsZwBeR9kvk202IUP359aj3G2k4Mt3J265LoSg2FNNdnq pGue+WoF81ssLLWW+Zz1z/jblFaAc1bfRXdZr97WtuZeaoGTM1BBaTzXlQSasYbhxD7aw9sIF Gk0shHMHS6J/+KXuOY+Jvsqau0PjLMrYgvJC+r3JROO939eJUjuuWY7cL3DfSPPKKQipDzlit BU3m9NgkaIqZLcvmPV8z1K1xkd5tTnvQXBVUGOOST6Y1lryUUsi9TsEEIIznb7I1/L37wM4yc h5Teeq3vFy5iNFqEJcr6xh/YGsI/xqiLH+8gqB7l1ma1g/hAtjLXCf2HlHrkesFZrJHAdABj+ hba6xJfmnct/jkS7lH5EbeIteNh35C7BdQVf3lnWXlbY/1YpoMFjfvq5drCVw8k8IyG4zWz3K LK0IOu6yvn1ag5n9xeI7LVD797TM= Hi, Am Do, 20 M=C3=A4r 2025 10:29:59 +0800 schrieb Baochen Qiang : > To handle the Lenovo unexpected wakeup issue [1], previously we revert > commit 166a490f59ac ("wifi: ath11k: support hibernation"). So > currently WLAN target is put into WoWLAN mode during suspend. This is > a temporary solution as it does not work on machines where WLAN power > is cut off. >=20 > The thought here is that we do WoWLAN suspend on Lenovo machines while > do non-WoWLAN suspend (which is done in the reverted commit) on other > machines. This requires us to identify Lenovo machines from others. > For that purpose, read board vendor and product name from DMI > interface, match it against all known affected machines. If there is > a match, choose WoWLAN suspend mode, else choose non-WoWLAN mode. > Save the mode in ab for later reference. >=20 > [1] https://bugzilla.kernel.org/show_bug.cgi?id=3D219196 >=20 > Tested-on: WCN6855 hw2.0 PCI > WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30 >=20 > Signed-off-by: Baochen Qiang > --- > drivers/net/wireless/ath/ath11k/core.c | 55 > ++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/core.h | > 7 ++++ 2 files changed, 62 insertions(+) >=20 > diff --git a/drivers/net/wireless/ath/ath11k/core.c > b/drivers/net/wireless/ath/ath11k/core.c index > 3d39ff85ba94..8657e735bf16 100644 --- > a/drivers/net/wireless/ath/ath11k/core.c +++ > b/drivers/net/wireless/ath/ath11k/core.c @@ -907,6 +907,52 @@ static > const struct ath11k_hw_params ath11k_hw_params[] =3D { }, > }; > =20 > +static const struct dmi_system_id ath11k_pm_quirk_table[] =3D { > + { > + .driver_data =3D (void *)ATH11K_PM_WOW, > + .matches =3D { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21J4"), > + }, > + }, > + { > + .driver_data =3D (void *)ATH11K_PM_WOW, > + .matches =3D { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21K4"), > + }, > + }, including the quirk for 21K4 is not needed (at least for my machine) but causes the interface to not come up again after putting the system into hibernation. Cheers, Julian > + { > + .driver_data =3D (void *)ATH11K_PM_WOW, > + .matches =3D { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21K6"), > + }, > + }, > + { > + .driver_data =3D (void *)ATH11K_PM_WOW, > + .matches =3D { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21K8"), > + }, > + }, > + { > + .driver_data =3D (void *)ATH11K_PM_WOW, > + .matches =3D { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21KA"), > + }, > + }, > + { > + .driver_data =3D (void *)ATH11K_PM_WOW, > + .matches =3D { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21F9"), > + }, > + }, > + {} > +}; > + > static inline struct ath11k_pdev *ath11k_core_get_single_pdev(struct > ath11k_base *ab) { > WARN_ON(!ab->hw_params.single_pdev_only); > @@ -2327,8 +2373,17 @@ EXPORT_SYMBOL(ath11k_core_pre_init); > =20 > int ath11k_core_init(struct ath11k_base *ab) > { > + const struct dmi_system_id *dmi_id; > int ret; > =20 > + dmi_id =3D dmi_first_match(ath11k_pm_quirk_table); > + if (dmi_id) > + ab->pm_policy =3D (enum > ath11k_pm_policy)dmi_id->driver_data; > + else > + ab->pm_policy =3D ATH11K_PM_DEFAULT; > + > + ath11k_dbg(ab, ATH11K_DBG_BOOT, "pm policy %u\n", > ab->pm_policy); + > ret =3D ath11k_core_soc_create(ab); > if (ret) { > ath11k_err(ab, "failed to create soc core: %d\n", > ret); diff --git a/drivers/net/wireless/ath/ath11k/core.h > b/drivers/net/wireless/ath/ath11k/core.h index > 1a3d0de4afde..df2b0cb2f0b5 100644 --- > a/drivers/net/wireless/ath/ath11k/core.h +++ > b/drivers/net/wireless/ath/ath11k/core.h @@ -892,6 +892,11 @@ struct > ath11k_msi_config { u16 hw_rev; > }; > =20 > +enum ath11k_pm_policy { > + ATH11K_PM_DEFAULT, > + ATH11K_PM_WOW, > +}; > + > /* Master structure to hold the hw data which may be used in core > module */ struct ath11k_base { > enum ath11k_hw_rev hw_rev; > @@ -1058,6 +1063,8 @@ struct ath11k_base { > } testmode; > #endif > =20 > + enum ath11k_pm_policy pm_policy; > + > /* must be last */ > u8 drv_priv[] __aligned(sizeof(void *)); > }; --=20 () ascii ribbon campaign - against html e-mail=20 /\ - against proprietary attachments