Patch "wifi: ath12k: fix and enable AP mode for WCN7850" has been added to the 6.6-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    wifi: ath12k: fix and enable AP mode for WCN7850

to the 6.6-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     wifi-ath12k-fix-and-enable-ap-mode-for-wcn7850.patch
and it can be found in the queue-6.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 67057e6b4fbd402c60ce2920024ed83a961581eb
Author: Kang Yang <quic_kangyang@xxxxxxxxxxx>
Date:   Fri Dec 1 18:09:48 2023 +0200

    wifi: ath12k: fix and enable AP mode for WCN7850
    
    [ Upstream commit ed7e818a7b501012038d6bc6fedadaf7375a380a ]
    
    For AP mode, the peer is created earlier in ath12k_mac_op_add_interface() but
    ath12k_mac_op_assign_vif_chanctx() will try to create peer again.  Then an
    error will return which makes AP mode startup fail.
    
    Kernel log:
    
    [ 5017.665006] ath12k_pci 0000:04:00.0: failed to create peer after vdev start delay: -22
    
    wpa_supplicant log:
    
    Failed to set beacon parameters
    Interface initialization failed
    wls1: interface state UNINITIALIZED->DISABLED
    wls1: AP-DISABLED
    wls1: Unable to setup interface.
    Failed to initialize AP interface
    wls1: interface state DISABLED->DISABLED
    wls1: AP-DISABLED
    
    So fix this check and enable AP mode for WCN7850, as now AP mode works normally.
    
    Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0-03427-QCAHMTSWPL_V1.0_V2.0_SILICONZ-1.15378.4
    
    Signed-off-by: Kang Yang <quic_kangyang@xxxxxxxxxxx>
    Acked-by: Jeff Johnson <quic_jjohnson@xxxxxxxxxxx>
    Signed-off-by: Kalle Valo <quic_kvalo@xxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20231121022459.17209-1-quic_kangyang@xxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/net/wireless/ath/ath12k/hw.c b/drivers/net/wireless/ath/ath12k/hw.c
index 5991cc91cd00..c1dcdd849f9d 100644
--- a/drivers/net/wireless/ath/ath12k/hw.c
+++ b/drivers/net/wireless/ath/ath12k/hw.c
@@ -942,7 +942,8 @@ static const struct ath12k_hw_params ath12k_hw_params[] = {
 		.rx_mac_buf_ring = true,
 		.vdev_start_delay = true,
 
-		.interface_modes = BIT(NL80211_IFTYPE_STATION),
+		.interface_modes = BIT(NL80211_IFTYPE_STATION) |
+				   BIT(NL80211_IFTYPE_AP),
 		.supports_monitor = false,
 
 		.idle_ps = true,
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 88346e66bb75..5434883eaf96 100644
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -6196,8 +6196,8 @@ ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
 	}
 
 	if (ab->hw_params->vdev_start_delay &&
-	    (arvif->vdev_type == WMI_VDEV_TYPE_AP ||
-	    arvif->vdev_type == WMI_VDEV_TYPE_MONITOR)) {
+	    arvif->vdev_type != WMI_VDEV_TYPE_AP &&
+	    arvif->vdev_type != WMI_VDEV_TYPE_MONITOR) {
 		param.vdev_id = arvif->vdev_id;
 		param.peer_type = WMI_PEER_TYPE_DEFAULT;
 		param.peer_addr = ar->mac_addr;