| Message ID | 20240403042056.1504209-2-quic_periyasa@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 58e8ecda692ecf9d29287c477e0db307cef35f44 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath12k: refactor the link capable flag | expand |
On 4/2/2024 9:20 PM, Karthikeyan Periyasamy wrote: > Link capability categorized as Single Link Operation (SLO) and Multi Link > Operation (MLO). > > - Intra-device SLO/MLO refers to links present within a device > - Inter-device SLO/MLO refers to links present across multiple devices > > Currently, driver uses a boolean variable to represent intra-device SLO/MLO > capability. To accommodate inter-device SLO/MLO capabilities within the > same variable, modify the existing variable name and type. Define a new > enumeration for the link capabilities to accommodate both intra-device > and inter-device scenarios. Populate the enum based on the supported > capabilities. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1 > > Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> writes: > Link capability categorized as Single Link Operation (SLO) and Multi Link > Operation (MLO). > > - Intra-device SLO/MLO refers to links present within a device > - Inter-device SLO/MLO refers to links present across multiple devices > > Currently, driver uses a boolean variable to represent intra-device SLO/MLO > capability. To accommodate inter-device SLO/MLO capabilities within the > same variable, modify the existing variable name and type. Define a new > enumeration for the link capabilities to accommodate both intra-device > and inter-device scenarios. Populate the enum based on the supported > capabilities. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1 > > Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com> [...] > +enum ath12k_link_capable_flags { > + ATH12k_INTRA_DEVICE_MLO_SUPPORT = BIT(0), > + ATH12k_INTER_DEVICE_MLO_SUPPORT = BIT(1), > +}; I did s/ATH12k/ATH12K/ on this patch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c15ec7e3397e7a400b2a6a3cb232f95a94c95989 We have also another similar typo in ath12k: dp.c:1350: spt_idx = u32_get_bits(cookie, ATH12k_DP_CC_COOKIE_SPT); dp.c:1368: spt_idx = u32_get_bits(cookie, ATH12k_DP_CC_COOKIE_SPT); dp.h:248:#define ATH12k_DP_CC_COOKIE_SPT GENMASK(8, 0) Patches welcome.
Karthikeyan Periyasamy <quic_periyasa@quicinc.com> wrote: > Link capability categorized as Single Link Operation (SLO) and Multi Link > Operation (MLO). > > - Intra-device SLO/MLO refers to links present within a device > - Inter-device SLO/MLO refers to links present across multiple devices > > Currently, driver uses a boolean variable to represent intra-device SLO/MLO > capability. To accommodate inter-device SLO/MLO capabilities within the > same variable, modify the existing variable name and type. Define a new > enumeration for the link capabilities to accommodate both intra-device > and inter-device scenarios. Populate the enum based on the supported > capabilities. > > Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1 > > Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com> > Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 2 patches applied to ath-next branch of ath.git, thanks. 58e8ecda692e wifi: ath12k: extend the link capable flag b34389c3978c wifi: ath12k: fix link capable flags
diff --git a/drivers/net/wireless/ath/ath12k/core.c b/drivers/net/wireless/ath/ath12k/core.c index 391b6fb2bd42..942a4274fda1 100644 --- a/drivers/net/wireless/ath/ath12k/core.c +++ b/drivers/net/wireless/ath/ath12k/core.c @@ -1227,7 +1227,7 @@ struct ath12k_base *ath12k_core_alloc(struct device *dev, size_t priv_size, ab->dev = dev; ab->hif.bus = bus; ab->qmi.num_radios = U8_MAX; - ab->slo_capable = true; + ab->mlo_capable_flags = ATH12k_INTRA_DEVICE_MLO_SUPPORT; return ab; diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h index 97e5a0ccd233..e4eabd0f6e0e 100644 --- a/drivers/net/wireless/ath/ath12k/core.h +++ b/drivers/net/wireless/ath/ath12k/core.h @@ -688,6 +688,21 @@ struct ath12k_soc_dp_stats { struct ath12k_soc_dp_tx_err_stats tx_err; }; +/** + * enum ath12k_link_capable_flags - link capable flags + * + * Single/Multi link capability information + * + * @ATH12k_INTRA_DEVICE_MLO_SUPPORT: SLO/MLO form between the radio, where all + * the links (radios) present within a device. + * @ATH12k_INTER_DEVICE_MLO_SUPPORT: SLO/MLO form between the radio, where all + * the links (radios) present across the devices. + */ +enum ath12k_link_capable_flags { + ATH12k_INTRA_DEVICE_MLO_SUPPORT = BIT(0), + ATH12k_INTER_DEVICE_MLO_SUPPORT = BIT(1), +}; + /* Master structure to hold the hw data which may be used in core module */ struct ath12k_base { enum ath12k_hw_rev hw_rev; @@ -843,10 +858,12 @@ struct ath12k_base { const struct hal_rx_ops *hal_rx_ops; - /* slo_capable denotes if the single/multi link operation - * is supported within the same chip (SoC). + /* mlo_capable_flags denotes the single/multi link operation + * capabilities of the Device. + * + * See enum ath12k_link_capable_flags */ - bool slo_capable; + u8 mlo_capable_flags; /* must be last */ u8 drv_priv[] __aligned(sizeof(void *)); diff --git a/drivers/net/wireless/ath/ath12k/mhi.c b/drivers/net/wireless/ath/ath12k/mhi.c index adb8c3ec1950..fd519c87ae24 100644 --- a/drivers/net/wireless/ath/ath12k/mhi.c +++ b/drivers/net/wireless/ath/ath12k/mhi.c @@ -385,7 +385,7 @@ int ath12k_mhi_register(struct ath12k_pci *ab_pci) "failed to read board id\n"); } else if (board_id & OTP_VALID_DUALMAC_BOARD_ID_MASK) { dualmac = true; - ab->slo_capable = false; + ab->mlo_capable_flags = 0; ath12k_dbg(ab, ATH12K_DBG_BOOT, "dualmac fw selected for board id: %x\n", board_id); } diff --git a/drivers/net/wireless/ath/ath12k/qmi.c b/drivers/net/wireless/ath/ath12k/qmi.c index 92845ffff44a..3f0d2b99127a 100644 --- a/drivers/net/wireless/ath/ath12k/qmi.c +++ b/drivers/net/wireless/ath/ath12k/qmi.c @@ -2124,7 +2124,7 @@ static void ath12k_qmi_phy_cap_send(struct ath12k_base *ab) struct qmi_txn txn; int ret; - if (!ab->slo_capable) + if (!ab->mlo_capable_flags) goto out; ret = qmi_txn_init(&ab->qmi.handle, &txn,
Link capability categorized as Single Link Operation (SLO) and Multi Link Operation (MLO). - Intra-device SLO/MLO refers to links present within a device - Inter-device SLO/MLO refers to links present across multiple devices Currently, driver uses a boolean variable to represent intra-device SLO/MLO capability. To accommodate inter-device SLO/MLO capabilities within the same variable, modify the existing variable name and type. Define a new enumeration for the link capabilities to accommodate both intra-device and inter-device scenarios. Populate the enum based on the supported capabilities. Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.1.1-00188-QCAHKSWPL_SILICONZ-1 Signed-off-by: Karthikeyan Periyasamy <quic_periyasa@quicinc.com> --- drivers/net/wireless/ath/ath12k/core.c | 2 +- drivers/net/wireless/ath/ath12k/core.h | 23 ++++++++++++++++++++--- drivers/net/wireless/ath/ath12k/mhi.c | 2 +- drivers/net/wireless/ath/ath12k/qmi.c | 2 +- 4 files changed, 23 insertions(+), 6 deletions(-)