[PATCH ath-next v5 02/11] wifi: ath12k: skip hw link id match for devices without hw link id support
Baochen Qiang
baochen.qiang at oss.qualcomm.com
Mon Nov 9 22:40:23 PST 2026
ath12k_dp_link_peer_assign()/unassign() maintain an address-keyed
rhashtable of link peers. To handle the split PHY and roaming scenario,
where two pdevs share the same rhashtable and an address may still be
present under a different hw link, both functions compare the stored
hw_link_id against the one being assigned to decide whether the existing
entry belongs to this link before adding or removing it.
hw_link_id is only used by QCN9274, IPQ5332 and IPQ5424, QCN6432; WCN7850
and QCC2072 do not use it and rely on the logical link id instead. Also
such devices are single pdev and never hit the split PHY/roaming case, so
the disambiguation is unnecessary; keeping it would also break the logical
link id support added in subsequent patches.
Add a support_hw_link_id hardware parameter and, for devices that do not
support hw_link_id, add or remove the rhashtable entry directly. Devices
supporting hw_link_id are not affected.
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.1.c7-00108-QCAHMTSWPL_V1.0_V2.0_SILICONZ_UPSTREAM-3
Tested-on: QCC2072 hw1.0 PCI WLAN.COL.1.0.c2-00068-QCACOLSWPL_V1_TO_SILICONZ-1
Tested-by: Burke Cates <burke.cates at gmail.com> # ASUS Zenbook A16 (UX3607OA)
Signed-off-by: Baochen Qiang <baochen.qiang at oss.qualcomm.com>
---
drivers/net/wireless/ath/ath12k/dp_peer.c | 48 +++++++++++++++++-------------
drivers/net/wireless/ath/ath12k/hw.h | 2 ++
drivers/net/wireless/ath/ath12k/wifi7/hw.c | 14 +++++++++
3 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/drivers/net/wireless/ath/ath12k/dp_peer.c b/drivers/net/wireless/ath/ath12k/dp_peer.c
index 100b398cf868..102e67109ab0 100644
--- a/drivers/net/wireless/ath/ath12k/dp_peer.c
+++ b/drivers/net/wireless/ath/ath12k/dp_peer.c
@@ -557,25 +557,29 @@ int ath12k_dp_link_peer_assign(struct ath12k_dp *dp, struct ath12k_dp_hw *dp_hw,
spin_unlock_bh(&dp_hw->peer_lock);
- /*
- * In case of Split PHY and roaming scenario, pdev idx
- * might differ but both the pdev will share same rhash
- * table. In that case update the rhash table if link_peer is
- * already present
- */
- temp_peer = ath12k_dp_link_peer_find_by_addr(dp, addr);
- if (temp_peer && temp_peer->hw_link_id != hw_link_id)
- ath12k_dp_link_peer_rhash_delete(dp, temp_peer);
-
- ret = ath12k_dp_link_peer_rhash_add(dp, peer);
- if (ret) {
+ if (dp->hw_params->support_hw_link_id) {
/*
- * If new entry addition failed, add back old entry
- * If old entry addition also fails, then nothing
- * can be done, simply proceed
+ * In case of Split PHY and roaming scenario, pdev idx
+ * might differ but both the pdev will share same rhash
+ * table. In that case update the rhash table if link_peer is
+ * already present
*/
- if (temp_peer)
- ath12k_dp_link_peer_rhash_add(dp, temp_peer);
+ temp_peer = ath12k_dp_link_peer_find_by_addr(dp, addr);
+ if (temp_peer && temp_peer->hw_link_id != hw_link_id)
+ ath12k_dp_link_peer_rhash_delete(dp, temp_peer);
+
+ ret = ath12k_dp_link_peer_rhash_add(dp, peer);
+ if (ret) {
+ /*
+ * If new entry addition failed, add back old entry
+ * If old entry addition also fails, then nothing
+ * can be done, simply proceed
+ */
+ if (temp_peer)
+ ath12k_dp_link_peer_rhash_add(dp, temp_peer);
+ }
+ } else {
+ ret = ath12k_dp_link_peer_rhash_add(dp, peer);
}
spin_unlock_bh(&dp->dp_lock);
@@ -621,10 +625,14 @@ void ath12k_dp_link_peer_unassign(struct ath12k_dp *dp, struct ath12k_dp_hw *dp_
spin_unlock_bh(&dp_hw->peer_lock);
- /* To handle roaming and split phy scenario */
- temp_peer = ath12k_dp_link_peer_find_by_addr(dp, addr);
- if (temp_peer && temp_peer->hw_link_id == hw_link_id)
+ if (dp->hw_params->support_hw_link_id) {
+ /* To handle roaming and split phy scenario */
+ temp_peer = ath12k_dp_link_peer_find_by_addr(dp, addr);
+ if (temp_peer && temp_peer->hw_link_id == hw_link_id)
+ ath12k_dp_link_peer_rhash_delete(dp, peer);
+ } else {
ath12k_dp_link_peer_rhash_delete(dp, peer);
+ }
spin_unlock_bh(&dp->dp_lock);
diff --git a/drivers/net/wireless/ath/ath12k/hw.h b/drivers/net/wireless/ath/ath12k/hw.h
index fb807d5a6ae4..41dca4cc6d4f 100644
--- a/drivers/net/wireless/ath/ath12k/hw.h
+++ b/drivers/net/wireless/ath/ath12k/hw.h
@@ -246,6 +246,8 @@ struct ath12k_hw_params {
* Example: QCN6432 (PCIe device attached to Q6, registered as AHB).
*/
bool hybrid_bus_type;
+
+ bool support_hw_link_id;
};
struct ath12k_hw_ops {
diff --git a/drivers/net/wireless/ath/ath12k/wifi7/hw.c b/drivers/net/wireless/ath/ath12k/wifi7/hw.c
index 67c6fa79f859..76f40073e002 100644
--- a/drivers/net/wireless/ath/ath12k/wifi7/hw.c
+++ b/drivers/net/wireless/ath/ath12k/wifi7/hw.c
@@ -499,6 +499,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = true,
.advertise_iface_mac_pool = false,
.hybrid_bus_type = false,
+
+ .support_hw_link_id = true,
},
{
.name = "wcn7850 hw2.0",
@@ -596,6 +598,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = false,
.advertise_iface_mac_pool = true,
.hybrid_bus_type = false,
+
+ .support_hw_link_id = false,
},
{
.name = "qcn9274 hw2.0",
@@ -689,6 +693,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = true,
.advertise_iface_mac_pool = false,
.hybrid_bus_type = false,
+
+ .support_hw_link_id = true,
},
{
.name = "ipq5332 hw1.0",
@@ -776,6 +782,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = true,
.advertise_iface_mac_pool = false,
.hybrid_bus_type = false,
+
+ .support_hw_link_id = true,
},
{
.name = "qcc2072 hw1.0",
@@ -874,6 +882,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = false,
.advertise_iface_mac_pool = true,
.hybrid_bus_type = false,
+
+ .support_hw_link_id = false,
},
{
.name = "ipq5424 hw1.0",
@@ -964,6 +974,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = true,
.advertise_iface_mac_pool = false,
.hybrid_bus_type = false,
+
+ .support_hw_link_id = true,
},
{
.name = "qcn6432 hw1.0",
@@ -1051,6 +1063,8 @@ static const struct ath12k_hw_params ath12k_wifi7_hw_params[] = {
.host_alloc_ml_id = true,
.advertise_iface_mac_pool = false,
.hybrid_bus_type = true,
+
+ .support_hw_link_id = true,
},
};
--
2.25.1
More information about the ath12k
mailing list