| Message ID | 20240626024257.709460-1-quic_ramess@quicinc.com |
|---|---|
| State | New |
| Headers | show |
| Series | wifi: ath12k: Allow driver initialization for WoW unsupported devices | expand |
Rameshkumar Sundaram <quic_ramess@quicinc.com> writes: > Currently during driver initialization, mac registration is allowed > only for devices that advertise WMI_TLV_SERVICE_WOW, but QCN9274 > doesn't support WoW and hence mac registration is aborted and driver > is de-initialized. I changed the title and this paragraph to describe more that we are fixing a regression here. > Allow mac registration to proceed without WoW Support for devices > that don't advertise WMI_TLV_SERVICE_WOW. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Cc: stable@vger.kernel.org > Fixes: 4a3c212eee0e ("wifi: ath12k: add basic WoW functionalities") Luckily commit 4a3c212eee0e is only in ath-next, and not in any other tree yet, so no need to cc stable. We need to cc stable when the bug is in any of the official releases (v6.10 etc). So I dropped it. Please check: https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=dbe2f0503e5fa9394e6b4e4f442adae89cec4cc7
On 6/27/2024 12:09 AM, Kalle Valo wrote: > Rameshkumar Sundaram <quic_ramess@quicinc.com> writes: > >> Currently during driver initialization, mac registration is allowed >> only for devices that advertise WMI_TLV_SERVICE_WOW, but QCN9274 >> doesn't support WoW and hence mac registration is aborted and driver >> is de-initialized. > > I changed the title and this paragraph to describe more that we are > fixing a regression here. > >> Allow mac registration to proceed without WoW Support for devices >> that don't advertise WMI_TLV_SERVICE_WOW. >> >> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >> >> Cc: stable@vger.kernel.org >> Fixes: 4a3c212eee0e ("wifi: ath12k: add basic WoW functionalities") > > Luckily commit 4a3c212eee0e is only in ath-next, and not in any other > tree yet, so no need to cc stable. We need to cc stable when the bug is > in any of the official releases (v6.10 etc). So I dropped it. > > Please check: > > https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git/commit/?h=pending&id=dbe2f0503e5fa9394e6b4e4f442adae89cec4cc7 > Looks fine for me, thanks!
Rameshkumar Sundaram <quic_ramess@quicinc.com> wrote: > Commit 4a3c212eee0e ("wifi: ath12k: add basic WoW functionalities") broke > driver initialization, now mac registration is allowed only for devices that > advertise WMI_TLV_SERVICE_WOW, but QCN9274 doesn't support WoW and hence mac > registration is aborted and driver is de-initialized. > > Allow mac registration to proceed without WoW Support for devices > that don't advertise WMI_TLV_SERVICE_WOW. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > > Fixes: 4a3c212eee0e ("wifi: ath12k: add basic WoW functionalities") > Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com> > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. 9783e0407421 wifi: ath12k: fix driver initialization for WoW unsupported devices
diff --git a/drivers/net/wireless/ath/ath12k/wow.c b/drivers/net/wireless/ath/ath12k/wow.c index 685e8e98d845..c5cba825a84a 100644 --- a/drivers/net/wireless/ath/ath12k/wow.c +++ b/drivers/net/wireless/ath/ath12k/wow.c @@ -1001,8 +1001,8 @@ int ath12k_wow_op_resume(struct ieee80211_hw *hw) int ath12k_wow_init(struct ath12k *ar) { - if (WARN_ON(!test_bit(WMI_TLV_SERVICE_WOW, ar->wmi->wmi_ab->svc_map))) - return -EINVAL; + if (!test_bit(WMI_TLV_SERVICE_WOW, ar->wmi->wmi_ab->svc_map)) + return 0; ar->wow.wowlan_support = ath12k_wowlan_support;
Currently during driver initialization, mac registration is allowed only for devices that advertise WMI_TLV_SERVICE_WOW, but QCN9274 doesn't support WoW and hence mac registration is aborted and driver is de-initialized. Allow mac registration to proceed without WoW Support for devices that don't advertise WMI_TLV_SERVICE_WOW. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 Cc: stable@vger.kernel.org Fixes: 4a3c212eee0e ("wifi: ath12k: add basic WoW functionalities") Signed-off-by: Rameshkumar Sundaram <quic_ramess@quicinc.com> --- drivers/net/wireless/ath/ath12k/wow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: dadc1101eabb54ace51aa6fc58c902bf43ac0ed7