| Message ID | 20250320023003.65028-1-quic_bqiang@quicinc.com |
|---|---|
| Headers | show |
| Series | wifi: ath11k: bring hibernation support back | expand |
On 3/19/2025 7:29 PM, Baochen Qiang wrote: > 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. > > 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. > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=219196 > > Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.30 > > Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com> > --- > drivers/net/wireless/ath/ath11k/core.c | 55 ++++++++++++++++++++++++++ > drivers/net/wireless/ath/ath11k/core.h | 7 ++++ > 2 files changed, 62 insertions(+) > > 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[] = { > }, > }; > > +static const struct dmi_system_id ath11k_pm_quirk_table[] = { > + { > + .driver_data = (void *)ATH11K_PM_WOW, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21J4"), > + }, > + }, > + { > + .driver_data = (void *)ATH11K_PM_WOW, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21K4"), > + }, > + }, > + { > + .driver_data = (void *)ATH11K_PM_WOW, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21K6"), > + }, > + }, > + { > + .driver_data = (void *)ATH11K_PM_WOW, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21K8"), > + }, > + }, > + { > + .driver_data = (void *)ATH11K_PM_WOW, > + .matches = { > + DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"), > + DMI_MATCH(DMI_PRODUCT_NAME, "21KA"), > + }, > + }, > + { > + .driver_data = (void *)ATH11K_PM_WOW, > + .matches = { > + 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); > > int ath11k_core_init(struct ath11k_base *ab) > { > + const struct dmi_system_id *dmi_id; > int ret; > > + dmi_id = dmi_first_match(ath11k_pm_quirk_table); > + if (dmi_id) > + ab->pm_policy = (enum ath11k_pm_policy)dmi_id->driver_data; Cast via (kernel_ulong_t) to address the kernel test robot issue > + else > + ab->pm_policy = ATH11K_PM_DEFAULT; > + > + ath11k_dbg(ab, ATH11K_DBG_BOOT, "pm policy %u\n", ab->pm_policy); > + > ret = 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; > }; > > +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 > > + enum ath11k_pm_policy pm_policy; > + > /* must be last */ > u8 drv_priv[] __aligned(sizeof(void *)); > };
On 3/20/25 7:29 AM, Baochen Qiang wrote: > To handle the Lenovo unexpected wakeup issue [1], previously we revert > commit 166a490f59ac ("wifi: ath11k: support hibernation"). However we > need to bring it back, of course with additional changes such that Lenovo > machines would not break. > > As those machines work well in Non-WoWLAN suspend mode, 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 machine info from DMI interface, match it against all known affected > machines. If there is a match, choose WoWLAN suspend mode, else choose > non-WoWLAN mode. > > [1] https://bugzilla.kernel.org/show_bug.cgi?id=219196 I've tested the series and it works. Feel free to add my tag to the series. Let me know any more help with testing is required. Tested-on: QCNFA765 WLAN.HSP.1.1-03926.13-QCAHSPSWPL_V2_SILICONZ_CE-2.52297.6 Tested-by: Muhammad Usama Anjum <usama.anjum@collabora.com> > > Baochen Qiang (5): > wifi: ath11k: determine PM policy based on machine model > wifi: ath11k: introduce ath11k_core_continue_suspend_resume() > wifi: ath11k: refactor ath11k_core_suspend/_resume() > wifi: ath11k: support non-WoWLAN mode suspend as well > Reapply "wifi: ath11k: restore country code during resume" > > drivers/net/wireless/ath/ath11k/ahb.c | 4 +- > drivers/net/wireless/ath/ath11k/core.c | 245 +++++++++++++++++++++++-- > drivers/net/wireless/ath/ath11k/core.h | 11 ++ > drivers/net/wireless/ath/ath11k/hif.h | 14 +- > drivers/net/wireless/ath/ath11k/mhi.c | 14 +- > drivers/net/wireless/ath/ath11k/mhi.h | 5 +- > drivers/net/wireless/ath/ath11k/pci.c | 44 ++++- > drivers/net/wireless/ath/ath11k/qmi.c | 4 +- > 8 files changed, 301 insertions(+), 40 deletions(-) > > > base-commit: b6f473c96421b8b451a8df8ccb620bcd71d4b3f4
To handle the Lenovo unexpected wakeup issue [1], previously we revert commit 166a490f59ac ("wifi: ath11k: support hibernation"). However we need to bring it back, of course with additional changes such that Lenovo machines would not break. As those machines work well in Non-WoWLAN suspend mode, 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 machine info from DMI interface, match it against all known affected machines. If there is a match, choose WoWLAN suspend mode, else choose non-WoWLAN mode. [1] https://bugzilla.kernel.org/show_bug.cgi?id=219196 Baochen Qiang (5): wifi: ath11k: determine PM policy based on machine model wifi: ath11k: introduce ath11k_core_continue_suspend_resume() wifi: ath11k: refactor ath11k_core_suspend/_resume() wifi: ath11k: support non-WoWLAN mode suspend as well Reapply "wifi: ath11k: restore country code during resume" drivers/net/wireless/ath/ath11k/ahb.c | 4 +- drivers/net/wireless/ath/ath11k/core.c | 245 +++++++++++++++++++++++-- drivers/net/wireless/ath/ath11k/core.h | 11 ++ drivers/net/wireless/ath/ath11k/hif.h | 14 +- drivers/net/wireless/ath/ath11k/mhi.c | 14 +- drivers/net/wireless/ath/ath11k/mhi.h | 5 +- drivers/net/wireless/ath/ath11k/pci.c | 44 ++++- drivers/net/wireless/ath/ath11k/qmi.c | 4 +- 8 files changed, 301 insertions(+), 40 deletions(-) base-commit: b6f473c96421b8b451a8df8ccb620bcd71d4b3f4