wifi: ath12k: Set up MLO after SSR
PATCH 1/1 wifi: ath12k: Set up MLO after SSR
From: Ramya Gnanasekar <[email protected]>
During recovery of an MLO setup from a core reset, ATH12K_GROUP_FLAG_REGISTERED is set because ath12k_mac_unregister is not called during core reset. So, when an MLO setup is recovering from a core reset, ath12k_core_mlo_setup() is skipped. Hence, the firmware will not have information about partner links. This makes MLO association fail after recovery.
To resolve this, call ath12k_core_mlo_setup() during recovery, to set up MLO. Also, if MLO setup fails during recovery, call ath12k_mac_unregister() and ath12k_mac_destroy() to unregister mac and then tear down the mac structures.
Also, initiate MLO teardown in the hardware group stop sequence to align with the hardware group start sequence.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01181-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath12k/core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/ath12k/core.c +9 -1
@@ -1017,6 +1017,8 @@ static void ath12k_core_hw_group_stop(struct ath12k_hw_group *ag)ath12k_mac_unregister (ag); +ath12k_mac_mlo_teardown (ag); +for (i = ag->num_devices -1 ; i >=0 ; i--) { ab = ag->ab[i];if (!ab)
@@ -1134,8 +1136,14 @@ static int ath12k_core_hw_group_start(struct ath12k_hw_group *ag)lockdep_assert_held (&ag->mutex); -if (test_bit (ATH12K_GROUP_FLAG_REGISTERED , &ag->flags)) +if (test_bit (ATH12K_GROUP_FLAG_REGISTERED , &ag->flags)) { + ret =ath12k_core_mlo_setup (ag); +if (WARN_ON (ret)) { +ath12k_mac_unregister (ag); + goto err_mac_destroy; + } goto core_pdev_create; + } ret =ath12k_mac_allocate (ag);if (WARN_ON (ret))
base-commit: 20ad0d58517073b3b683ff786c65dd3142321707
Signature · 1 line
2.43.0
Quoted 14 lines · Roopni Devanathan
From: Ramya Gnanasekar <[email protected]>
During recovery of an MLO setup from a core reset,
ATH12K_GROUP_FLAG_REGISTEREDis set becauseath12k_mac_unregisteris not called during core reset. So, when an MLO setup is recovering from a core reset,ath12k_core_mlo_setup()is skipped. Hence, the firmware will not have information about partner links. This makes MLO association fail after recovery.To resolve this, call
ath12k_core_mlo_setup()during recovery, to set up MLO. Also, if MLO setup fails during recovery, callath12k_mac_unregister()andath12k_mac_destroy()to unregister mac and then tear down the mac structures.
Quoted 7 lines
Also, initiate MLO teardown in the hardware group stop sequence to align with the hardware group start sequence.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01181-QCAHKSWPL_SILICONZ-1
Signed-off-by Ramya Gnanasekar <[email protected]>Signed-off-by Roopni Devanathan <[email protected]>
Quoted 55 lines · Roopni Devanathan
From: Ramya Gnanasekar <[email protected]>
During recovery of an MLO setup from a core reset,
ATH12K_GROUP_FLAG_REGISTEREDis set becauseath12k_mac_unregisteris not called during core reset. So, when an MLO setup is recovering from a core reset,ath12k_core_mlo_setup()is skipped. Hence, the firmware will not have information about partner links. This makes MLO association fail after recovery.To resolve this, call
ath12k_core_mlo_setup()during recovery, to set up MLO. Also, if MLO setup fails during recovery, callath12k_mac_unregister()andath12k_mac_destroy()to unregister mac and then tear down the mac structures.Also, initiate MLO teardown in the hardware group stop sequence to align with the hardware group start sequence.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.6-01181-QCAHKSWPL_SILICONZ-1
Signed-off-by Ramya Gnanasekar <[email protected]>Signed-off-by Roopni Devanathan <[email protected]>--- drivers/net/wireless/ath/ath12k/core.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/net/wireless/ath/ath12k/core.c +9
-1@@ -1017,6 +1017,8 @@ static void ath12k_core_hw_group_stop(struct ath12k_hw_group *ag)ath12k_mac_unregister (ag); +ath12k_mac_mlo_teardown (ag); +for (i = ag->num_devices -1 ; i >=0 ; i--) { ab = ag->ab[i];if (!ab)@@ -1134,8 +1136,14 @@ static int ath12k_core_hw_group_start(struct ath12k_hw_group *ag)lockdep_assert_held (&ag->mutex); -if (test_bit (ATH12K_GROUP_FLAG_REGISTERED , &ag->flags)) +if (test_bit (ATH12K_GROUP_FLAG_REGISTERED , &ag->flags)) { + ret =ath12k_core_mlo_setup (ag); +if (WARN_ON (ret)) { +ath12k_mac_unregister (ag); + goto err_mac_destroy; + } goto core_pdev_create; + } ret =ath12k_mac_allocate (ag);if (WARN_ON (ret))
Quoted 1 line
base-commit:
20ad0d58517073b3b683ff786c65dd3142321707
Jeff Johnson
AppliedQuoted 8 lines · Roopni Devanathan
During recovery of an MLO setup from a core reset,
ATH12K_GROUP_FLAG_REGISTEREDis set becauseath12k_mac_unregisteris not called during core reset. So, when an MLO setup is recovering from a core reset,ath12k_core_mlo_setup()is skipped. Hence, the firmware will not have information about partner links. This makes MLO association fail after recovery.[...]
Applied, thanks!
[1/1] wifi: ath12k: Set up MLO after SSR
commit: f33a8e41826831fc8ceb5f62833488cd9388ed59
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>