summaryrefslogtreecommitdiff
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorAlexander Wilhelm <alexander.wilhelm@westermo.com>2026-07-03 09:35:38 +0200
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>2026-07-22 09:02:19 -0700
commit6c90f68f97de591e0413f7d2de59449a0388bbab (patch)
treecb7072b25e27e0b1439eceb39dc7f7b9853f60f9 /drivers/net/wireless
parent6fe2dddf59bbb2a96be0fcf23a205807b25ac173 (diff)
downloadlinux-next-6c90f68f97de591e0413f7d2de59449a0388bbab.tar.gz
linux-next-6c90f68f97de591e0413f7d2de59449a0388bbab.zip
wifi: ath12k: fix scan command endianness on big endian
ath12k_wmi_scan_req_arg stores scan parameters in CPU-native byte order, while ath12k_wmi_send_scan_start_cmd() writes them into a WMI command buffer whose contents must be in little-endian format. The existing code copies the channel list and writes s_ssid and hint_bssid related values to the command buffer without endian conversion. As a result, scan requests contain invalid parameters on big-endian systems and fail. Convert the channel list as well as the s_ssid and hint_bssid related values to little-endian before writing them to the WMI command buffer. This preserves the existing behaviour on little-endian systems while fixing scan requests on big-endian architectures. Signed-off-by: Alexander Wilhelm <alexander.wilhelm@westermo.com> Reviewed-by: Rameshkumar Sundaram <rameshkumar.sundaram@oss.qualcomm.com> Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com> Link: https://patch.msgid.link/20260703-fix-channel-list-copy-v2-1-372c39306d79@westermo.com Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath12k/wmi.c20
-rw-r--r--drivers/net/wireless/ath/ath12k/wmi.h10
2 files changed, 22 insertions, 8 deletions
diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index f16ec3d21242..672eae237ac6 100644
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -2639,9 +2639,10 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,
struct wmi_tlv *tlv;
void *ptr;
int i, ret, len;
- u32 *tmp_ptr, extraie_len_with_pad = 0;
- struct ath12k_wmi_hint_short_ssid_arg *s_ssid = NULL;
- struct ath12k_wmi_hint_bssid_arg *hint_bssid = NULL;
+ __le32 *tmp_ptr;
+ u32 extraie_len_with_pad = 0;
+ struct ath12k_wmi_hint_short_ssid_params *s_ssid = NULL;
+ struct ath12k_wmi_hint_bssid_params *hint_bssid = NULL;
len = sizeof(*cmd);
@@ -2724,9 +2725,10 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,
tlv = ptr;
tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, len);
ptr += TLV_HDR_SIZE;
- tmp_ptr = (u32 *)ptr;
+ tmp_ptr = (__le32 *)ptr;
- memcpy(tmp_ptr, arg->chan_list, arg->num_chan * 4);
+ for (i = 0; i < arg->num_chan; i++)
+ tmp_ptr[i] = cpu_to_le32(arg->chan_list[i]);
ptr += len;
@@ -2782,8 +2784,10 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,
ptr += TLV_HDR_SIZE;
s_ssid = ptr;
for (i = 0; i < arg->num_hint_s_ssid; ++i) {
- s_ssid->freq_flags = arg->hint_s_ssid[i].freq_flags;
- s_ssid->short_ssid = arg->hint_s_ssid[i].short_ssid;
+ s_ssid->freq_flags =
+ cpu_to_le32(arg->hint_s_ssid[i].freq_flags);
+ s_ssid->short_ssid =
+ cpu_to_le32(arg->hint_s_ssid[i].short_ssid);
s_ssid++;
}
ptr += len;
@@ -2797,7 +2801,7 @@ int ath12k_wmi_send_scan_start_cmd(struct ath12k *ar,
hint_bssid = ptr;
for (i = 0; i < arg->num_hint_bssid; ++i) {
hint_bssid->freq_flags =
- arg->hint_bssid[i].freq_flags;
+ cpu_to_le32(arg->hint_bssid[i].freq_flags);
ether_addr_copy(&hint_bssid->bssid.addr[0],
&arg->hint_bssid[i].bssid.addr[0]);
hint_bssid++;
diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h
index c813b2848b5b..83103fdefafc 100644
--- a/drivers/net/wireless/ath/ath12k/wmi.h
+++ b/drivers/net/wireless/ath/ath12k/wmi.h
@@ -3558,6 +3558,16 @@ struct ath12k_wmi_hint_bssid_arg {
struct ath12k_wmi_mac_addr_params bssid;
};
+struct ath12k_wmi_hint_short_ssid_params {
+ __le32 freq_flags;
+ __le32 short_ssid;
+};
+
+struct ath12k_wmi_hint_bssid_params {
+ __le32 freq_flags;
+ struct ath12k_wmi_mac_addr_params bssid;
+};
+
struct ath12k_wmi_scan_req_arg {
u32 scan_id;
u32 scan_req_id;