| Message ID | 20240129065724.2310207-2-quic_rajkbhag@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6925eba532e1e9a30ae0f6807dba07f596ba0cd6 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: QCN9274 dualmac bring up | expand |
On 1/28/2024 10:57 PM, Raj Kumar Bhagat wrote: > From: Sriram R <quic_srirrama@quicinc.com> > > When any VDEV is started, MBSSID flags are passed to firmware to > indicate if its a MBSSID/EMA AP vdev. If the interface is not an AP > or if the AP doesn't support MBSSID, the vdev needs to be brought up > as a non MBSSID vdev. Set these flags as a non MBSSID AP by default > which can be updated as and when MBSSID support is added in ath12k. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1 > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > Signed-off-by: Sriram R <quic_srirrama@quicinc.com> > Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Raj Kumar Bhagat <quic_rajkbhag@quicinc.com> wrote: > When any VDEV is started, MBSSID flags are passed to firmware to > indicate if its a MBSSID/EMA AP vdev. If the interface is not an AP > or if the AP doesn't support MBSSID, the vdev needs to be brought up > as a non MBSSID vdev. Set these flags as a non MBSSID AP by default > which can be updated as and when MBSSID support is added in ath12k. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1 > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 > Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 > > Signed-off-by: Sriram R <quic_srirrama@quicinc.com> > Signed-off-by: Raj Kumar Bhagat <quic_rajkbhag@quicinc.com> > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 13 patches applied to ath-next branch of ath.git, thanks. 6925eba532e1 wifi: ath12k: indicate NON MBSSID vdev by default during vdev start 9f06911998ca wifi: ath12k: fetch correct pdev id from WMI_SERVICE_READY_EXT_EVENTID 287033810990 wifi: ath12k: add support for peer meta data version 902700d55d4a wifi: ath12k: fix fetching MCBC flag for QCN9274 94e8235c679d wifi: ath12k: Add logic to write QRTR node id to scratch 664a1c96b297 wifi: ath12k: fix firmware assert during insmod in memory segment mode f7019c2fcdf6 wifi: ath12k: split hal_ops to support RX TLVs word mask compaction 3cf1a9f7a1b2 wifi: ath12k: remove hal_desc_sz from hw params 419927ec8438 wifi: ath12k: subscribe required word mask from rx tlv 57c8b5c332e5 wifi: ath12k: add MAC id support in WBM error path afeee629e72e wifi: ath12k: fix PCI read and write af9bc78d14fb wifi: ath12k: Read board id to support split-PHY QCN9274 2d3a7384b9c8 wifi: ath12k: disable QMI PHY capability learn in split-phy QCN9274
diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c index a27480a69b27..672c9d347097 100644 --- a/drivers/net/wireless/ath/ath12k/mac.c +++ b/drivers/net/wireless/ath/ath12k/mac.c @@ -6153,6 +6153,11 @@ ath12k_mac_vdev_start_restart(struct ath12k_vif *arvif, arg.pref_tx_streams = ar->num_tx_chains; arg.pref_rx_streams = ar->num_rx_chains; + /* Fill the MBSSID flags to indicate AP is non MBSSID by default + * Corresponding flags would be updated with MBSSID support. + */ + arg.mbssid_flags = WMI_VDEV_MBSSID_FLAGS_NON_MBSSID_AP; + if (arvif->vdev_type == WMI_VDEV_TYPE_AP) { arg.ssid = arvif->u.ap.ssid; arg.ssid_len = arvif->u.ap.ssid_len; diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c index 2fa724e5851a..5f1cce16589f 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.c +++ b/drivers/net/wireless/ath/ath12k/wmi.c @@ -1024,6 +1024,7 @@ int ath12k_wmi_vdev_start(struct ath12k *ar, struct wmi_vdev_start_req_arg *arg, cmd->regdomain = cpu_to_le32(arg->regdomain); cmd->he_ops = cpu_to_le32(arg->he_ops); cmd->punct_bitmap = cpu_to_le32(arg->punct_bitmap); + cmd->mbssid_flags = cpu_to_le32(arg->mbssid_flags); if (!restart) { if (arg->ssid) { diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h index 06e5b9b4049b..d8481c710021 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.h +++ b/drivers/net/wireless/ath/ath12k/wmi.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_WMI_H @@ -2764,6 +2764,10 @@ struct ath12k_wmi_ssid_params { #define ATH12K_VDEV_SETUP_TIMEOUT_HZ (5 * HZ) +enum wmi_vdev_mbssid_flags { + WMI_VDEV_MBSSID_FLAGS_NON_MBSSID_AP = BIT(0), +}; + struct wmi_vdev_start_request_cmd { __le32 tlv_header; __le32 vdev_id; @@ -2782,7 +2786,7 @@ struct wmi_vdev_start_request_cmd { __le32 cac_duration_ms; __le32 regdomain; __le32 min_data_rate; - __le32 mbssid_flags; + __le32 mbssid_flags; /* uses enum wmi_vdev_mbssid_flags */ __le32 mbssid_tx_vdev_id; __le32 eht_ops; __le32 punct_bitmap;