On big endian hosts the copy engine is configured with CE_ATTR_BYTE_SWAP_DATA, so that the hardware swaps the transferred data in 32 bit words. In addition, ath11k_ce_byte_swap() swaps selected byte array payloads back into their original order. The byte swapping in the copy engine does not work reliably. The root cause is unknown and the resulting byte order may differ between firmware versions, so data exchanged between host and firmware ends up corrupted. Relying on the CE byte swap therefore cannot provide working big endian support. Disable the CE byte swap and remove ath11k_ce_byte_swap(). Instead, endianness is handled in the driver itself by converting all structures shared with the firmware to __le types and using the appropriate accessors, as done in the following patches. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/ce.c | 19 ------------------- drivers/net/wireless/ath/ath11k/ce.h | 6 ------ drivers/net/wireless/ath/ath11k/wmi.c | 17 ----------------- 3 files changed, 42 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/ce.c b/drivers/net/wireless/ath/ath11k/ce.c index 1e08b0970b14..16f13d25baea 100644 --- a/drivers/net/wireless/ath/ath11k/ce.c +++ b/drivers/net/wireless/ath/ath11k/ce.c @@ -1050,25 +1050,6 @@ int ath11k_ce_alloc_pipes(struct ath11k_base *ab) } EXPORT_SYMBOL(ath11k_ce_alloc_pipes); -/* For Big Endian Host, Copy Engine byte_swap is enabled - * When Copy Engine does byte_swap, need to byte swap again for the - * Host to get/put buffer content in the correct byte order - */ -void ath11k_ce_byte_swap(void *mem, u32 len) -{ - int i; - - if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) { - if (!mem) - return; - - for (i = 0; i < (len / 4); i++) { - *(u32 *)mem = swab32(*(u32 *)mem); - mem += 4; - } - } -} - int ath11k_ce_get_attr_flags(struct ath11k_base *ab, int ce_id) { if (ce_id >= ab->hw_params.ce_count) diff --git a/drivers/net/wireless/ath/ath11k/ce.h b/drivers/net/wireless/ath/ath11k/ce.h index 308f425fcec0..b97eca14be7d 100644 --- a/drivers/net/wireless/ath/ath11k/ce.h +++ b/drivers/net/wireless/ath/ath11k/ce.h @@ -16,17 +16,11 @@ #define CE_ATTR_DIS_INTR 8 /* Host software's Copy Engine configuration. */ -#ifdef __BIG_ENDIAN -#define CE_ATTR_FLAGS CE_ATTR_BYTE_SWAP_DATA -#else #define CE_ATTR_FLAGS 0 -#endif /* Threshold to poll for tx completion in case of Interrupt disabled CE's */ #define ATH11K_CE_USAGE_THRESHOLD 32 -void ath11k_ce_byte_swap(void *mem, u32 len); - /* * Directions for interconnect pipe configuration. * These definitions may be used during configuration and are shared diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 82f85df481cb..08babb0cb534 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -700,8 +700,6 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, memcpy(frame_tlv->value, frame->data, buf_len); - ath11k_ce_byte_swap(frame_tlv->value, buf_len); - if (tx_params_valid) { params = (struct wmi_mgmt_send_params *)(skb->data + (len - sizeof(*params))); @@ -6016,8 +6014,6 @@ static int ath11k_pull_mgmt_rx_params_tlv(struct ath11k_base *ab, skb_pull(skb, frame - skb->data); skb_put(skb, hdr->buf_len); - ath11k_ce_byte_swap(skb->data, hdr->buf_len); - return 0; } @@ -9547,9 +9543,7 @@ int ath11k_wmi_wow_add_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id, FIELD_PREP(WMI_TLV_LEN, sizeof(*bitmap) - TLV_HDR_SIZE); memcpy(bitmap->patternbuf, pattern, pattern_len); - ath11k_ce_byte_swap(bitmap->patternbuf, roundup(pattern_len, 4)); memcpy(bitmap->bitmaskbuf, mask, pattern_len); - ath11k_ce_byte_swap(bitmap->bitmaskbuf, roundup(pattern_len, 4)); bitmap->pattern_offset = pattern_offset; bitmap->pattern_len = pattern_len; bitmap->bitmask_len = pattern_len; @@ -9697,8 +9691,6 @@ ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar, WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ; ether_addr_copy(cmd->mac_addr.addr, pno->mac_addr); ether_addr_copy(cmd->mac_mask.addr, pno->mac_addr_mask); - ath11k_ce_byte_swap(cmd->mac_addr.addr, 8); - ath11k_ce_byte_swap(cmd->mac_mask.addr, 8); } ptr += sizeof(*cmd); @@ -9722,8 +9714,6 @@ ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar, memcpy(nlo_list[i].ssid.ssid.ssid, pno->a_networks[i].ssid.ssid, nlo_list[i].ssid.ssid.ssid_len); - ath11k_ce_byte_swap(nlo_list[i].ssid.ssid.ssid, - roundup(nlo_list[i].ssid.ssid.ssid_len, 4)); if (pno->a_networks[i].rssi_threshold && pno->a_networks[i].rssi_threshold > -300) { @@ -9842,14 +9832,11 @@ static void ath11k_wmi_fill_ns_offload(struct ath11k *ar, memcpy(ns->target_ipaddr[0], offload->ipv6_addr[i], 16); memcpy(ns->solicitation_ipaddr, offload->self_ipv6_addr[i], 16); - ath11k_ce_byte_swap(ns->target_ipaddr[0], 16); - ath11k_ce_byte_swap(ns->solicitation_ipaddr, 16); if (offload->ipv6_type[i]) ns->flags |= WMI_NSOL_FLAGS_IS_IPV6_ANYCAST; memcpy(ns->target_mac.addr, offload->mac_addr, ETH_ALEN); - ath11k_ce_byte_swap(ns->target_mac.addr, 8); if (ns->target_mac.word0 != 0 || ns->target_mac.word1 != 0) { @@ -9893,7 +9880,6 @@ static void ath11k_wmi_fill_arp_offload(struct ath11k *ar, /* Copy the target ip addr and flags */ arp->flags = WMI_ARPOL_FLAGS_VALID; memcpy(arp->target_ipaddr, offload->ipv4_addr[i], 4); - ath11k_ce_byte_swap(arp->target_ipaddr, 4); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "arp offload address %pI4", arp->target_ipaddr); @@ -9988,14 +9974,11 @@ int ath11k_wmi_gtk_rekey_offload(struct ath11k *ar, /* the length in rekey_data and cmd is equal */ memcpy(cmd->kck, rekey_data->kck, sizeof(cmd->kck)); - ath11k_ce_byte_swap(cmd->kck, GTK_OFFLOAD_KEK_BYTES); memcpy(cmd->kek, rekey_data->kek, sizeof(cmd->kek)); - ath11k_ce_byte_swap(cmd->kek, GTK_OFFLOAD_KEK_BYTES); replay_ctr = cpu_to_le64(rekey_data->replay_ctr); memcpy(cmd->replay_ctr, &replay_ctr, sizeof(replay_ctr)); - ath11k_ce_byte_swap(cmd->replay_ctr, GTK_REPLAY_COUNTER_BYTES); } else { cmd->flags = GTK_OFFLOAD_DISABLE_OPCODE; } -- 2.53.0 The HTC header and control messages exchanged with the firmware are defined as little endian, but the corresponding structures use host endian u32 fields accessed with FIELD_PREP()/FIELD_GET(). On big endian hosts this results in wrong endpoint IDs, payload lengths and message IDs, so HTC setup with the firmware fails. Convert the HTC structures to __le32 and use le32_encode_bits(), le32_get_bits() and cpu_to_le32() for all accesses. Adjust the format specifiers in the debug and warning messages accordingly, since le32_get_bits() returns u32 instead of unsigned long. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/htc.c | 83 +++++++++++++++++++++++++++++++++++++++++------------------------------------------ drivers/net/wireless/ath/ath11k/htc.h | 30 +++++++++++++++--------------- 2 files changed, 56 insertions(+), 57 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/htc.c b/drivers/net/wireless/ath/ath11k/htc.c index 07fc959ed74c..99d4dd3fc5dd 100644 --- a/drivers/net/wireless/ath/ath11k/htc.c +++ b/drivers/net/wireless/ath/ath11k/htc.c @@ -58,16 +58,16 @@ static void ath11k_htc_prepare_tx_skb(struct ath11k_htc_ep *ep, hdr = (struct ath11k_htc_hdr *)skb->data; memset(hdr, 0, sizeof(*hdr)); - hdr->htc_info = FIELD_PREP(HTC_HDR_ENDPOINTID, ep->eid) | - FIELD_PREP(HTC_HDR_PAYLOADLEN, - (skb->len - sizeof(*hdr))); + hdr->htc_info = le32_encode_bits(ep->eid, HTC_HDR_ENDPOINTID) | + le32_encode_bits((skb->len - sizeof(*hdr)), + HTC_HDR_PAYLOADLEN); if (ep->tx_credit_flow_enabled) - hdr->htc_info |= FIELD_PREP(HTC_HDR_FLAGS, - ATH11K_HTC_FLAG_NEED_CREDIT_UPDATE); + hdr->htc_info |= le32_encode_bits(ATH11K_HTC_FLAG_NEED_CREDIT_UPDATE, + HTC_HDR_FLAGS); spin_lock_bh(&ep->htc->tx_lock); - hdr->ctrl_info = FIELD_PREP(HTC_HDR_CONTROLBYTES1, ep->seq_no++); + hdr->ctrl_info = le32_encode_bits(ep->seq_no++, HTC_HDR_CONTROLBYTES1); spin_unlock_bh(&ep->htc->tx_lock); } @@ -295,7 +295,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, hdr = (struct ath11k_htc_hdr *)skb->data; skb_pull(skb, sizeof(*hdr)); - eid = FIELD_GET(HTC_HDR_ENDPOINTID, hdr->htc_info); + eid = le32_get_bits(hdr->htc_info, HTC_HDR_ENDPOINTID); if (eid >= ATH11K_HTC_EP_COUNT) { ath11k_warn(ab, "HTC Rx: invalid eid %d\n", eid); @@ -304,7 +304,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, ep = &htc->endpoint[eid]; - payload_len = FIELD_GET(HTC_HDR_PAYLOADLEN, hdr->htc_info); + payload_len = le32_get_bits(hdr->htc_info, HTC_HDR_PAYLOADLEN); if (payload_len + sizeof(*hdr) > ATH11K_HTC_MAX_LEN) { ath11k_warn(ab, "HTC rx frame too long, len: %zu\n", @@ -319,7 +319,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, } /* get flags to check for trailer */ - trailer_present = (FIELD_GET(HTC_HDR_FLAGS, hdr->htc_info)) & + trailer_present = le32_get_bits(hdr->htc_info, HTC_HDR_FLAGS) & ATH11K_HTC_FLAG_TRAILER_PRESENT; ath11k_dbg(ab, ATH11K_DBG_HTC, "rx ep %d skb %p trailer_present %d\n", @@ -328,7 +328,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, if (trailer_present) { u8 *trailer; - trailer_len = FIELD_GET(HTC_HDR_CONTROLBYTES0, hdr->ctrl_info); + trailer_len = le32_get_bits(hdr->ctrl_info, HTC_HDR_CONTROLBYTES0); min_len = sizeof(struct ath11k_htc_record_hdr); if ((trailer_len < min_len) || @@ -357,7 +357,7 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, if (eid == ATH11K_HTC_EP_0) { struct ath11k_htc_msg *msg = (struct ath11k_htc_msg *)skb->data; - message_id = FIELD_GET(HTC_MSG_MESSAGEID, msg->msg_svc_id); + message_id = le32_get_bits(msg->msg_svc_id, HTC_MSG_MESSAGEID); ath11k_dbg(ab, ATH11K_DBG_HTC, "rx ep %d skb %p message_id %d\n", eid, skb, message_id); @@ -394,8 +394,8 @@ void ath11k_htc_rx_completion_handler(struct ath11k_base *ab, ath11k_htc_wakeup_from_suspend(ab); break; default: - ath11k_warn(ab, "ignoring unsolicited htc ep0 event %ld\n", - FIELD_GET(HTC_MSG_MESSAGEID, msg->msg_svc_id)); + ath11k_warn(ab, "ignoring unsolicited htc ep0 event %u\n", + le32_get_bits(msg->msg_svc_id, HTC_MSG_MESSAGEID)); break; } goto out; @@ -556,10 +556,10 @@ int ath11k_htc_wait_target(struct ath11k_htc *htc) } ready = (struct ath11k_htc_ready *)htc->control_resp_buffer; - message_id = FIELD_GET(HTC_MSG_MESSAGEID, ready->id_credit_count); - credit_count = FIELD_GET(HTC_READY_MSG_CREDITCOUNT, - ready->id_credit_count); - credit_size = FIELD_GET(HTC_READY_MSG_CREDITSIZE, ready->size_ep); + message_id = le32_get_bits(ready->id_credit_count, HTC_MSG_MESSAGEID); + credit_count = le32_get_bits(ready->id_credit_count, + HTC_READY_MSG_CREDITCOUNT); + credit_size = le32_get_bits(ready->size_ep, HTC_READY_MSG_CREDITSIZE); if (message_id != ATH11K_HTC_MSG_READY_ID) { ath11k_warn(ab, "Invalid HTC ready msg: 0x%x\n", message_id); @@ -635,8 +635,8 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, memset(skb->data, 0, length); req_msg = (struct ath11k_htc_conn_svc *)skb->data; - req_msg->msg_svc_id = FIELD_PREP(HTC_MSG_MESSAGEID, - ATH11K_HTC_MSG_CONNECT_SERVICE_ID); + req_msg->msg_svc_id = le32_encode_bits(ATH11K_HTC_MSG_CONNECT_SERVICE_ID, + HTC_MSG_MESSAGEID); flags |= FIELD_PREP(ATH11K_HTC_CONN_FLAGS_RECV_ALLOC, tx_alloc); @@ -653,9 +653,9 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, disable_credit_flow_ctrl = true; } - req_msg->flags_len = FIELD_PREP(HTC_SVC_MSG_CONNECTIONFLAGS, flags); - req_msg->msg_svc_id |= FIELD_PREP(HTC_SVC_MSG_SERVICE_ID, - conn_req->service_id); + req_msg->flags_len = le32_encode_bits(flags, HTC_SVC_MSG_CONNECTIONFLAGS); + req_msg->msg_svc_id |= le32_encode_bits(conn_req->service_id, + HTC_SVC_MSG_SERVICE_ID); reinit_completion(&htc->ctl_resp); @@ -675,9 +675,9 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, /* we controlled the buffer creation, it's aligned */ resp_msg = (struct ath11k_htc_conn_svc_resp *)htc->control_resp_buffer; - message_id = FIELD_GET(HTC_MSG_MESSAGEID, resp_msg->msg_svc_id); - service_id = FIELD_GET(HTC_SVC_RESP_MSG_SERVICEID, - resp_msg->msg_svc_id); + message_id = le32_get_bits(resp_msg->msg_svc_id, HTC_MSG_MESSAGEID); + service_id = le32_get_bits(resp_msg->msg_svc_id, + HTC_SVC_RESP_MSG_SERVICEID); if ((message_id != ATH11K_HTC_MSG_CONNECT_SERVICE_RESP_ID) || (htc->control_resp_len < sizeof(*resp_msg))) { @@ -686,13 +686,13 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, } ath11k_dbg(ab, ATH11K_DBG_HTC, - "service %s connect response status 0x%lx assigned ep 0x%lx\n", + "service %s connect response status 0x%x assigned ep 0x%x\n", htc_service_name(service_id), - FIELD_GET(HTC_SVC_RESP_MSG_STATUS, resp_msg->flags_len), - FIELD_GET(HTC_SVC_RESP_MSG_ENDPOINTID, resp_msg->flags_len)); + le32_get_bits(resp_msg->flags_len, HTC_SVC_RESP_MSG_STATUS), + le32_get_bits(resp_msg->flags_len, HTC_SVC_RESP_MSG_ENDPOINTID)); - conn_resp->connect_resp_code = FIELD_GET(HTC_SVC_RESP_MSG_STATUS, - resp_msg->flags_len); + conn_resp->connect_resp_code = le32_get_bits(resp_msg->flags_len, + HTC_SVC_RESP_MSG_STATUS); /* check response status */ if (conn_resp->connect_resp_code != ATH11K_HTC_CONN_SVC_STATUS_SUCCESS) { @@ -702,12 +702,11 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, return -EPROTO; } - assigned_eid = (enum ath11k_htc_ep_id)FIELD_GET( - HTC_SVC_RESP_MSG_ENDPOINTID, - resp_msg->flags_len); + assigned_eid = le32_get_bits(resp_msg->flags_len, + HTC_SVC_RESP_MSG_ENDPOINTID); - max_msg_size = FIELD_GET(HTC_SVC_RESP_MSG_MAXMSGSIZE, - resp_msg->flags_len); + max_msg_size = le32_get_bits(resp_msg->flags_len, + HTC_SVC_RESP_MSG_MAXMSGSIZE); setup: @@ -725,14 +724,14 @@ int ath11k_htc_connect_service(struct ath11k_htc *htc, /* return assigned endpoint to caller */ conn_resp->eid = assigned_eid; - conn_resp->max_msg_len = FIELD_GET(HTC_SVC_RESP_MSG_MAXMSGSIZE, - resp_msg->flags_len); + conn_resp->max_msg_len = le32_get_bits(resp_msg->flags_len, + HTC_SVC_RESP_MSG_MAXMSGSIZE); /* setup the endpoint */ ep->service_id = conn_req->service_id; ep->max_tx_queue_depth = conn_req->max_send_queue_depth; - ep->max_ep_message_len = FIELD_GET(HTC_SVC_RESP_MSG_MAXMSGSIZE, - resp_msg->flags_len); + ep->max_ep_message_len = le32_get_bits(resp_msg->flags_len, + HTC_SVC_RESP_MSG_MAXMSGSIZE); ep->tx_credits = tx_alloc; /* copy all the callbacks */ @@ -775,13 +774,13 @@ int ath11k_htc_start(struct ath11k_htc *htc) memset(skb->data, 0, skb->len); msg = (struct ath11k_htc_setup_complete_extended *)skb->data; - msg->msg_id = FIELD_PREP(HTC_MSG_MESSAGEID, - ATH11K_HTC_MSG_SETUP_COMPLETE_EX_ID); + msg->msg_id = le32_encode_bits(ATH11K_HTC_MSG_SETUP_COMPLETE_EX_ID, + HTC_MSG_MESSAGEID); if (ab->hw_params.credit_flow) ath11k_dbg(ab, ATH11K_DBG_HTC, "using tx credit flow control\n"); else - msg->flags |= ATH11K_GLOBAL_DISABLE_CREDIT_FLOW; + msg->flags |= cpu_to_le32(ATH11K_GLOBAL_DISABLE_CREDIT_FLOW); status = ath11k_htc_send(htc, ATH11K_HTC_EP_0, skb); if (status) { diff --git a/drivers/net/wireless/ath/ath11k/htc.h b/drivers/net/wireless/ath/ath11k/htc.h index 945c409bc08f..76a8fdb3d480 100644 --- a/drivers/net/wireless/ath/ath11k/htc.h +++ b/drivers/net/wireless/ath/ath11k/htc.h @@ -56,8 +56,8 @@ enum ath11k_htc_rx_flags { }; struct ath11k_htc_hdr { - u32 htc_info; - u32 ctrl_info; + __le32 htc_info; + __le32 ctrl_info; } __packed __aligned(4); enum ath11k_htc_msg_id { @@ -97,37 +97,37 @@ enum ath11k_htc_conn_svc_status { }; struct ath11k_htc_ready { - u32 id_credit_count; - u32 size_ep; + __le32 id_credit_count; + __le32 size_ep; } __packed; struct ath11k_htc_ready_extended { struct ath11k_htc_ready base; - u32 ver_bundle; + __le32 ver_bundle; } __packed; struct ath11k_htc_conn_svc { - u32 msg_svc_id; - u32 flags_len; + __le32 msg_svc_id; + __le32 flags_len; } __packed; struct ath11k_htc_conn_svc_resp { - u32 msg_svc_id; - u32 flags_len; - u32 svc_meta_pad; + __le32 msg_svc_id; + __le32 flags_len; + __le32 svc_meta_pad; } __packed; #define ATH11K_GLOBAL_DISABLE_CREDIT_FLOW BIT(1) struct ath11k_htc_setup_complete_extended { - u32 msg_id; - u32 flags; - u32 max_msgs_per_bundled_recv; + __le32 msg_id; + __le32 flags; + __le32 max_msgs_per_bundled_recv; } __packed; struct ath11k_htc_msg { - u32 msg_svc_id; - u32 flags_len; + __le32 msg_svc_id; + __le32 flags_len; } __packed __aligned(4); enum ath11k_htc_record_id { -- 2.53.0 The copy engine source, destination and destination status ring descriptors are read and written by the hardware in little endian byte order. However, the corresponding structures use host endian u32 fields accessed with FIELD_PREP()/FIELD_GET(). On big endian hosts this programs wrong buffer addresses and lengths into the CE rings and misinterprets the received length, breaking all host/firmware communication. Convert the HAL CE descriptor structures to __le32 and use cpu_to_le32(), le32_encode_bits() and le32_get_bits() for all accesses. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/hal.c | 26 +++++++++++++------------- drivers/net/wireless/ath/ath11k/hal_desc.h | 20 ++++++++++---------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/ath/ath11k/hal.c index 98bd9e3f0aae..a25f7bf57c07 100644 --- a/drivers/net/wireless/ath/ath11k/hal.c +++ b/drivers/net/wireless/ath/ath11k/hal.c @@ -574,25 +574,25 @@ void ath11k_hal_ce_src_set_desc(void *buf, dma_addr_t paddr, u32 len, u32 id, { struct hal_ce_srng_src_desc *desc = buf; - desc->buffer_addr_low = paddr & HAL_ADDR_LSB_REG_MASK; + desc->buffer_addr_low = cpu_to_le32(paddr & HAL_ADDR_LSB_REG_MASK); desc->buffer_addr_info = - FIELD_PREP(HAL_CE_SRC_DESC_ADDR_INFO_ADDR_HI, - ((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT)) | - FIELD_PREP(HAL_CE_SRC_DESC_ADDR_INFO_BYTE_SWAP, - byte_swap_data) | - FIELD_PREP(HAL_CE_SRC_DESC_ADDR_INFO_GATHER, 0) | - FIELD_PREP(HAL_CE_SRC_DESC_ADDR_INFO_LEN, len); - desc->meta_info = FIELD_PREP(HAL_CE_SRC_DESC_META_INFO_DATA, id); + le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT), + HAL_CE_SRC_DESC_ADDR_INFO_ADDR_HI) | + le32_encode_bits(byte_swap_data, + HAL_CE_SRC_DESC_ADDR_INFO_BYTE_SWAP) | + le32_encode_bits(0, HAL_CE_SRC_DESC_ADDR_INFO_GATHER) | + le32_encode_bits(len, HAL_CE_SRC_DESC_ADDR_INFO_LEN); + desc->meta_info = le32_encode_bits(id, HAL_CE_SRC_DESC_META_INFO_DATA); } void ath11k_hal_ce_dst_set_desc(void *buf, dma_addr_t paddr) { struct hal_ce_srng_dest_desc *desc = buf; - desc->buffer_addr_low = paddr & HAL_ADDR_LSB_REG_MASK; + desc->buffer_addr_low = cpu_to_le32(paddr & HAL_ADDR_LSB_REG_MASK); desc->buffer_addr_info = - FIELD_PREP(HAL_CE_DEST_DESC_ADDR_INFO_ADDR_HI, - ((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT)); + le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT), + HAL_CE_DEST_DESC_ADDR_INFO_ADDR_HI); } u32 ath11k_hal_ce_dst_status_get_length(void *buf) @@ -600,8 +600,8 @@ u32 ath11k_hal_ce_dst_status_get_length(void *buf) struct hal_ce_srng_dst_status_desc *desc = buf; u32 len; - len = FIELD_GET(HAL_CE_DST_STATUS_DESC_FLAGS_LEN, desc->flags); - desc->flags &= ~HAL_CE_DST_STATUS_DESC_FLAGS_LEN; + len = le32_get_bits(desc->flags, HAL_CE_DST_STATUS_DESC_FLAGS_LEN); + desc->flags &= ~cpu_to_le32(HAL_CE_DST_STATUS_DESC_FLAGS_LEN); return len; } diff --git a/drivers/net/wireless/ath/ath11k/hal_desc.h b/drivers/net/wireless/ath/ath11k/hal_desc.h index c8b01f6921c0..65529451425d 100644 --- a/drivers/net/wireless/ath/ath11k/hal_desc.h +++ b/drivers/net/wireless/ath/ath11k/hal_desc.h @@ -1310,10 +1310,10 @@ struct hal_tcl_status_ring { #define HAL_CE_SRC_DESC_FLAGS_LOOP_CNT HAL_SRNG_DESC_LOOP_CNT struct hal_ce_srng_src_desc { - u32 buffer_addr_low; - u32 buffer_addr_info; /* %HAL_CE_SRC_DESC_ADDR_INFO_ */ - u32 meta_info; /* %HAL_CE_SRC_DESC_META_INFO_ */ - u32 flags; /* %HAL_CE_SRC_DESC_FLAGS_ */ + __le32 buffer_addr_low; + __le32 buffer_addr_info; /* %HAL_CE_SRC_DESC_ADDR_INFO_ */ + __le32 meta_info; /* %HAL_CE_SRC_DESC_META_INFO_ */ + __le32 flags; /* %HAL_CE_SRC_DESC_FLAGS_ */ } __packed; /* @@ -1399,8 +1399,8 @@ struct hal_ce_srng_src_desc { #define HAL_CE_DEST_DESC_ADDR_INFO_LOOP_CNT HAL_SRNG_DESC_LOOP_CNT struct hal_ce_srng_dest_desc { - u32 buffer_addr_low; - u32 buffer_addr_info; /* %HAL_CE_DEST_DESC_ADDR_INFO_ */ + __le32 buffer_addr_low; + __le32 buffer_addr_info; /* %HAL_CE_DEST_DESC_ADDR_INFO_ */ } __packed; /* hal_ce_srng_dest_desc @@ -1454,10 +1454,10 @@ struct hal_ce_srng_dest_desc { #define HAL_CE_DST_STATUS_DESC_META_INFO_LOOP_CNT HAL_SRNG_DESC_LOOP_CNT struct hal_ce_srng_dst_status_desc { - u32 flags; /* %HAL_CE_DST_STATUS_DESC_FLAGS_ */ - u32 toeplitz_hash0; - u32 toeplitz_hash1; - u32 meta_info; /* HAL_CE_DST_STATUS_DESC_META_INFO_ */ + __le32 flags; /* %HAL_CE_DST_STATUS_DESC_FLAGS_ */ + __le32 toeplitz_hash0; + __le32 toeplitz_hash1; + __le32 meta_info; /* HAL_CE_DST_STATUS_DESC_META_INFO_ */ } __packed; /* hal_ce_srng_dst_status_desc -- 2.53.0 Apart from the copy engine descriptors, all other HAL ring descriptors (TCL, WBM, REO commands/status, RX buffer/link descriptors, monitor status TLVs) as well as the ring head/tail pointer shadow locations are accessed by the hardware in little endian byte order. On big endian hosts the driver enables the MSI, data TLV and ring pointer swap flags of the SRNG and relies on the hardware to swap the data. Remove the big endian SRNG swap flags and handle endianness in the driver instead. Convert the HAL descriptor structures and ring pointers to __le32 and use cpu_to_le32(), le32_to_cpu(), le32_encode_bits() and le32_get_bits() for all accesses. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/debugfs.c | 2 +- drivers/net/wireless/ath/ath11k/hal.c | 70 +++++------ drivers/net/wireless/ath/ath11k/hal.h | 8 +- drivers/net/wireless/ath/ath11k/hal_desc.h | 238 ++++++++++++++++++------------------ drivers/net/wireless/ath/ath11k/hal_rx.c | 712 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------- drivers/net/wireless/ath/ath11k/hal_rx.h | 14 +-- drivers/net/wireless/ath/ath11k/hal_tx.c | 106 ++++++++-------- drivers/net/wireless/ath/ath11k/hw.c | 9 +- 8 files changed, 591 insertions(+), 568 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/debugfs.c b/drivers/net/wireless/ath/ath11k/debugfs.c index 70922612d3fb..74f19ca4c464 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c @@ -81,7 +81,7 @@ void ath11k_debugfs_add_dbring_entry(struct ath11k *ar, if (dbr_data->entries) { entry = &dbr_data->entries[dbr_data->dbr_debug_idx]; entry->hp = srng->u.src_ring.hp; - entry->tp = *srng->u.src_ring.tp_addr; + entry->tp = le32_to_cpu(*srng->u.src_ring.tp_addr); entry->timestamp = jiffies; entry->event = event; diff --git a/drivers/net/wireless/ath/ath11k/hal.c b/drivers/net/wireless/ath/ath11k/hal.c index a25f7bf57c07..7d9f971f0c18 100644 --- a/drivers/net/wireless/ath/ath11k/hal.c +++ b/drivers/net/wireless/ath/ath11k/hal.c @@ -609,12 +609,14 @@ u32 ath11k_hal_ce_dst_status_get_length(void *buf) void ath11k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie, dma_addr_t paddr) { - desc->buf_addr_info.info0 = FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, - (paddr & HAL_ADDR_LSB_REG_MASK)); - desc->buf_addr_info.info1 = FIELD_PREP(BUFFER_ADDR_INFO1_ADDR, - ((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT)) | - FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, 1) | - FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, cookie); + desc->buf_addr_info.info0 = le32_encode_bits((paddr & HAL_ADDR_LSB_REG_MASK), + BUFFER_ADDR_INFO0_ADDR); + desc->buf_addr_info.info1 = le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT), + BUFFER_ADDR_INFO1_ADDR) | + le32_encode_bits(1, + BUFFER_ADDR_INFO1_RET_BUF_MGR) | + le32_encode_bits(cookie, + BUFFER_ADDR_INFO1_SW_COOKIE); } u32 *ath11k_hal_srng_dst_peek(struct ath11k_base *ab, struct hal_srng *srng) @@ -692,7 +694,7 @@ int ath11k_hal_srng_dst_num_free(struct ath11k_base *ab, struct hal_srng *srng, tp = srng->u.dst_ring.tp; if (sync_hw_ptr) { - hp = *srng->u.dst_ring.hp_addr; + hp = le32_to_cpu(*srng->u.dst_ring.hp_addr); srng->u.dst_ring.cached_hp = hp; } else { hp = srng->u.dst_ring.cached_hp; @@ -715,7 +717,7 @@ int ath11k_hal_srng_src_num_free(struct ath11k_base *ab, struct hal_srng *srng, hp = srng->u.src_ring.hp; if (sync_hw_ptr) { - tp = *srng->u.src_ring.tp_addr; + tp = le32_to_cpu(*srng->u.src_ring.tp_addr); srng->u.src_ring.cached_tp = tp; } else { tp = srng->u.src_ring.cached_tp; @@ -830,9 +832,9 @@ void ath11k_hal_srng_access_begin(struct ath11k_base *ab, struct hal_srng *srng) if (srng->ring_dir == HAL_SRNG_DIR_SRC) { srng->u.src_ring.cached_tp = - *(volatile u32 *)srng->u.src_ring.tp_addr; + le32_to_cpu(*(volatile __le32 *)srng->u.src_ring.tp_addr); } else { - hp = READ_ONCE(*srng->u.dst_ring.hp_addr); + hp = le32_to_cpu(READ_ONCE(*srng->u.dst_ring.hp_addr)); if (hp != srng->u.dst_ring.cached_hp) { srng->u.dst_ring.cached_hp = hp; @@ -861,24 +863,27 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng) */ if (srng->ring_dir == HAL_SRNG_DIR_SRC) { srng->u.src_ring.last_tp = - *(volatile u32 *)srng->u.src_ring.tp_addr; + le32_to_cpu(*(volatile __le32 *)srng->u.src_ring.tp_addr); /* Make sure descriptor is written before updating the * head pointer. */ dma_wmb(); - WRITE_ONCE(*srng->u.src_ring.hp_addr, srng->u.src_ring.hp); + WRITE_ONCE(*srng->u.src_ring.hp_addr, + cpu_to_le32(srng->u.src_ring.hp)); } else { - srng->u.dst_ring.last_hp = *srng->u.dst_ring.hp_addr; + srng->u.dst_ring.last_hp = + le32_to_cpu(*srng->u.dst_ring.hp_addr); /* Make sure descriptor is read before updating the * tail pointer. */ dma_mb(); - WRITE_ONCE(*srng->u.dst_ring.tp_addr, srng->u.dst_ring.tp); + WRITE_ONCE(*srng->u.dst_ring.tp_addr, + cpu_to_le32(srng->u.dst_ring.tp)); } } else { if (srng->ring_dir == HAL_SRNG_DIR_SRC) { srng->u.src_ring.last_tp = - *(volatile u32 *)srng->u.src_ring.tp_addr; + le32_to_cpu(*(volatile __le32 *)srng->u.src_ring.tp_addr); /* Assume implementation use an MMIO write accessor * which has the required wmb() so that the descriptor * is written before the updating the head pointer. @@ -888,7 +893,8 @@ void ath11k_hal_srng_access_end(struct ath11k_base *ab, struct hal_srng *srng) (unsigned long)ab->mem, srng->u.src_ring.hp); } else { - srng->u.dst_ring.last_hp = *srng->u.dst_ring.hp_addr; + srng->u.dst_ring.last_hp = + le32_to_cpu(*srng->u.dst_ring.hp_addr); /* Make sure descriptor is read before updating the * tail pointer. */ @@ -915,13 +921,11 @@ void ath11k_hal_setup_link_idle_list(struct ath11k_base *ab, link_addr = (void *)sbuf[0].vaddr + HAL_WBM_IDLE_SCATTER_BUF_SIZE; for (i = 1; i < nsbufs; i++) { - link_addr->info0 = sbuf[i].paddr & HAL_ADDR_LSB_REG_MASK; - link_addr->info1 = FIELD_PREP( - HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32, - (u64)sbuf[i].paddr >> HAL_ADDR_MSB_REG_SHIFT) | - FIELD_PREP( - HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_MATCH_TAG, - BASE_ADDR_MATCH_TAG_VAL); + link_addr->info0 = cpu_to_le32(sbuf[i].paddr & HAL_ADDR_LSB_REG_MASK); + link_addr->info1 = le32_encode_bits(((u64)sbuf[i].paddr >> HAL_ADDR_MSB_REG_SHIFT), + HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_39_32) | + le32_encode_bits(BASE_ADDR_MATCH_TAG_VAL, + HAL_WBM_SCATTERED_DESC_MSB_BASE_ADDR_MATCH_TAG); link_addr = (void *)sbuf[i].vaddr + HAL_WBM_IDLE_SCATTER_BUF_SIZE; @@ -1038,11 +1042,6 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type, memset(srng->ring_base_vaddr, 0, (srng->entry_size * srng->num_entries) << 2); - /* TODO: Add comments on these swap configurations */ - if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) - srng->flags |= HAL_SRNG_FLAGS_MSI_SWAP | HAL_SRNG_FLAGS_DATA_TLV_SWAP | - HAL_SRNG_FLAGS_RING_PTR_SWAP; - reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R2]; if (srng->ring_dir == HAL_SRNG_DIR_SRC) { @@ -1060,7 +1059,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type, } else { if (!ab->hw_params.supports_shadow_regs) srng->u.src_ring.hp_addr = - (u32 *)((unsigned long)ab->mem + reg_base); + (__le32 *)((unsigned long)ab->mem + reg_base); else ath11k_dbg(ab, ATH11K_DBG_HAL, "type %d ring_num %d reg_base 0x%x shadow 0x%lx\n", @@ -1093,7 +1092,7 @@ int ath11k_hal_srng_setup(struct ath11k_base *ab, enum hal_ring_type type, } else { if (!ab->hw_params.supports_shadow_regs) srng->u.dst_ring.tp_addr = - (u32 *)((unsigned long)ab->mem + reg_base + + (__le32 *)((unsigned long)ab->mem + reg_base + (HAL_REO1_RING_TP(ab) - HAL_REO1_RING_HP(ab))); else ath11k_dbg(ab, ATH11K_DBG_HAL, @@ -1136,10 +1135,10 @@ static void ath11k_hal_srng_update_hp_tp_addr(struct ath11k_base *ab, srng = &hal->srng_list[ring_id]; if (srng_config->ring_dir == HAL_SRNG_DIR_DST) - srng->u.dst_ring.tp_addr = (u32 *)(HAL_SHADOW_REG(ab, shadow_cfg_idx) + + srng->u.dst_ring.tp_addr = (__le32 *)(HAL_SHADOW_REG(ab, shadow_cfg_idx) + (unsigned long)ab->mem); else - srng->u.src_ring.hp_addr = (u32 *)(HAL_SHADOW_REG(ab, shadow_cfg_idx) + + srng->u.src_ring.hp_addr = (__le32 *)(HAL_SHADOW_REG(ab, shadow_cfg_idx) + (unsigned long)ab->mem); } @@ -1221,7 +1220,7 @@ void ath11k_hal_srng_shadow_update_hp_tp(struct ath11k_base *ab, * HP only when then ring isn't empty. */ if (srng->ring_dir == HAL_SRNG_DIR_SRC && - *srng->u.src_ring.tp_addr != srng->u.src_ring.hp) + le32_to_cpu(*srng->u.src_ring.tp_addr) != srng->u.src_ring.hp) ath11k_hal_srng_access_end(ab, srng); } @@ -1447,14 +1446,15 @@ void ath11k_hal_dump_srng_stats(struct ath11k_base *ab) "src srng id %u hp %u, reap_hp %u, cur tp %u, cached tp %u last tp %u napi processed before %ums\n", srng->ring_id, srng->u.src_ring.hp, srng->u.src_ring.reap_hp, - *srng->u.src_ring.tp_addr, srng->u.src_ring.cached_tp, + le32_to_cpu(*srng->u.src_ring.tp_addr), + srng->u.src_ring.cached_tp, srng->u.src_ring.last_tp, jiffies_to_msecs(jiffies - srng->timestamp)); else if (srng->ring_dir == HAL_SRNG_DIR_DST) ath11k_err(ab, "dst srng id %u tp %u, cur hp %u, cached hp %u last hp %u napi processed before %ums\n", srng->ring_id, srng->u.dst_ring.tp, - *srng->u.dst_ring.hp_addr, + le32_to_cpu(*srng->u.dst_ring.hp_addr), srng->u.dst_ring.cached_hp, srng->u.dst_ring.last_hp, jiffies_to_msecs(jiffies - srng->timestamp)); diff --git a/drivers/net/wireless/ath/ath11k/hal.h b/drivers/net/wireless/ath/ath11k/hal.h index 82603a389bb9..8a1872fefa8a 100644 --- a/drivers/net/wireless/ath/ath11k/hal.h +++ b/drivers/net/wireless/ath/ath11k/hal.h @@ -592,7 +592,7 @@ struct hal_srng { u32 tp; /* Shadow head pointer location to be updated by HW */ - volatile u32 *hp_addr; + volatile __le32 *hp_addr; /* Cached head pointer */ u32 cached_hp; @@ -601,7 +601,7 @@ struct hal_srng { * will be a register address and need not be * accessed through SW structure */ - u32 *tp_addr; + __le32 *tp_addr; /* Current SW loop cnt */ u32 loop_cnt; @@ -621,7 +621,7 @@ struct hal_srng { u32 reap_hp; /* Shadow tail pointer location to be updated by HW */ - u32 *tp_addr; + __le32 *tp_addr; /* Cached tail pointer */ u32 cached_tp; @@ -630,7 +630,7 @@ struct hal_srng { * will be a register address and need not be accessed * through SW structure */ - u32 *hp_addr; + __le32 *hp_addr; /* Low threshold - in number of ring entries */ u32 low_threshold; diff --git a/drivers/net/wireless/ath/ath11k/hal_desc.h b/drivers/net/wireless/ath/ath11k/hal_desc.h index 65529451425d..333d1e714914 100644 --- a/drivers/net/wireless/ath/ath11k/hal_desc.h +++ b/drivers/net/wireless/ath/ath11k/hal_desc.h @@ -15,8 +15,8 @@ #define BUFFER_ADDR_INFO1_SW_COOKIE GENMASK(31, 11) struct ath11k_buffer_addr { - u32 info0; - u32 info1; + __le32 info0; + __le32 info1; } __packed; /* ath11k_buffer_addr @@ -480,7 +480,7 @@ enum hal_tlv_tag { #define HAL_TLV_ALIGN 4 struct hal_tlv_hdr { - u32 tl; + __le32 tl; u8 value[]; } __packed; @@ -501,8 +501,8 @@ struct hal_tlv_hdr { #define RX_MPDU_DESC_META_DATA_PEER_ID GENMASK(15, 0) struct rx_mpdu_desc { - u32 info0; /* %RX_MPDU_DESC_INFO */ - u32 meta_data; + __le32 info0; /* %RX_MPDU_DESC_INFO */ + __le32 meta_data; } __packed; /* rx_mpdu_desc @@ -587,8 +587,8 @@ enum hal_rx_msdu_desc_reo_dest_ind { (FIELD_GET(RX_MSDU_DESC_INFO0_MSDU_LENGTH, (val))) struct rx_msdu_desc { - u32 info0; - u32 rsvd0; + __le32 info0; + __le32 rsvd0; } __packed; /* rx_msdu_desc @@ -693,16 +693,16 @@ struct hal_reo_dest_ring { struct ath11k_buffer_addr buf_addr_info; struct rx_mpdu_desc rx_mpdu_info; struct rx_msdu_desc rx_msdu_info; - u32 queue_addr_lo; - u32 info0; /* %HAL_REO_DEST_RING_INFO0_ */ - u32 info1; /* %HAL_REO_DEST_RING_INFO1_ */ - u32 rsvd0; - u32 rsvd1; - u32 rsvd2; - u32 rsvd3; - u32 rsvd4; - u32 rsvd5; - u32 info2; /* %HAL_REO_DEST_RING_INFO2_ */ + __le32 queue_addr_lo; + __le32 info0; /* %HAL_REO_DEST_RING_INFO0_ */ + __le32 info1; /* %HAL_REO_DEST_RING_INFO1_ */ + __le32 rsvd0; + __le32 rsvd1; + __le32 rsvd2; + __le32 rsvd3; + __le32 rsvd4; + __le32 rsvd5; + __le32 info2; /* %HAL_REO_DEST_RING_INFO2_ */ } __packed; /* hal_reo_dest_ring @@ -795,10 +795,10 @@ enum hal_reo_entr_rxdma_ecode { struct hal_reo_entrance_ring { struct ath11k_buffer_addr buf_addr_info; struct rx_mpdu_desc rx_mpdu_info; - u32 queue_addr_lo; - u32 info0; /* %HAL_REO_ENTR_RING_INFO0_ */ - u32 info1; /* %HAL_REO_ENTR_RING_INFO1_ */ - u32 info2; /* %HAL_REO_DEST_RING_INFO2_ */ + __le32 queue_addr_lo; + __le32 info0; /* %HAL_REO_ENTR_RING_INFO0_ */ + __le32 info1; /* %HAL_REO_ENTR_RING_INFO1_ */ + __le32 info2; /* %HAL_REO_DEST_RING_INFO2_ */ } __packed; @@ -875,15 +875,15 @@ struct hal_sw_monitor_ring { struct ath11k_buffer_addr buf_addr_info; struct rx_mpdu_desc rx_mpdu_info; struct ath11k_buffer_addr status_buf_addr_info; - u32 info0; - u32 info1; + __le32 info0; + __le32 info1; } __packed; #define HAL_REO_CMD_HDR_INFO0_CMD_NUMBER GENMASK(15, 0) #define HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED BIT(16) struct hal_reo_cmd_hdr { - u32 info0; + __le32 info0; } __packed; #define HAL_REO_GET_QUEUE_STATS_INFO0_QUEUE_ADDR_HI GENMASK(7, 0) @@ -891,9 +891,9 @@ struct hal_reo_cmd_hdr { struct hal_reo_get_queue_stats { struct hal_reo_cmd_hdr cmd; - u32 queue_addr_lo; - u32 info0; - u32 rsvd0[6]; + __le32 queue_addr_lo; + __le32 info0; + __le32 rsvd0[6]; } __packed; /* hal_reo_get_queue_stats @@ -933,9 +933,9 @@ struct hal_reo_get_queue_stats { struct hal_reo_flush_queue { struct hal_reo_cmd_hdr cmd; - u32 desc_addr_lo; - u32 info0; - u32 rsvd0[6]; + __le32 desc_addr_lo; + __le32 info0; + __le32 rsvd0[6]; } __packed; #define HAL_REO_FLUSH_CACHE_INFO0_CACHE_ADDR_HI GENMASK(7, 0) @@ -948,9 +948,9 @@ struct hal_reo_flush_queue { struct hal_reo_flush_cache { struct hal_reo_cmd_hdr cmd; - u32 cache_addr_lo; - u32 info0; - u32 rsvd0[6]; + __le32 cache_addr_lo; + __le32 info0; + __le32 rsvd0[6]; } __packed; #define HAL_TCL_DATA_CMD_INFO0_DESC_TYPE BIT(0) @@ -1025,11 +1025,11 @@ enum hal_wbm_htt_tx_comp_status { struct hal_tcl_data_cmd { struct ath11k_buffer_addr buf_addr_info; - u32 info0; - u32 info1; - u32 info2; - u32 info3; - u32 info4; + __le32 info0; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 info4; } __packed; /* hal_tcl_data_cmd @@ -1216,11 +1216,11 @@ enum hal_tcl_gse_ctrl { #define HAL_TCL_GSE_CMD_INFO1_LOOPING_COUNT GENMASK(31, 28) struct hal_tcl_gse_cmd { - u32 ctrl_buf_addr_lo; - u32 info0; - u32 meta_data[2]; - u32 rsvd0[2]; - u32 info1; + __le32 ctrl_buf_addr_lo; + __le32 info0; + __le32 meta_data[2]; + __le32 rsvd0[2]; + __le32 info1; } __packed; /* hal_tcl_gse_cmd @@ -1265,13 +1265,13 @@ enum hal_tcl_cache_op_res { #define HAL_TCL_STATUS_RING_INFO2_LOOPING_COUNT GENMASK(31, 28) struct hal_tcl_status_ring { - u32 info0; - u32 msdu_byte_count; - u32 msdu_timestamp; - u32 meta_data[2]; - u32 info1; - u32 rsvd0; - u32 info2; + __le32 info0; + __le32 msdu_byte_count; + __le32 msdu_timestamp; + __le32 meta_data[2]; + __le32 info1; + __le32 rsvd0; + __le32 info2; } __packed; /* hal_tcl_status_ring @@ -1558,8 +1558,8 @@ enum hal_tx_rate_stats_sgi { }; struct hal_tx_rate_stats { - u32 info0; - u32 tsf; + __le32 info0; + __le32 tsf; } __packed; struct hal_wbm_link_desc { @@ -1667,11 +1667,11 @@ enum hal_wbm_rel_bm_act { struct hal_wbm_release_ring { struct ath11k_buffer_addr buf_addr_info; - u32 info0; - u32 info1; - u32 info2; + __le32 info0; + __le32 info1; + __le32 info2; struct hal_tx_rate_stats rate_stats; - u32 info3; + __le32 info3; } __packed; /* hal_wbm_release_ring @@ -1893,7 +1893,7 @@ enum hal_desc_buf_type { #define HAL_DESC_HDR_INFO0_DBG_RESERVED GENMASK(31, 8) struct hal_desc_header { - u32 info0; + __le32 info0; } __packed; struct hal_rx_mpdu_link_ptr { @@ -1911,14 +1911,14 @@ struct hal_rx_msdu_details { struct hal_rx_msdu_link { struct hal_desc_header desc_hdr; struct ath11k_buffer_addr buf_addr_info; - u32 info0; - u32 pn[4]; + __le32 info0; + __le32 pn[4]; struct hal_rx_msdu_details msdu_link[6]; } __packed; struct hal_rx_reo_queue_ext { struct hal_desc_header desc_hdr; - u32 rsvd; + __le32 rsvd; struct hal_rx_mpdu_link_ptr mpdu_link[15]; } __packed; @@ -1981,23 +1981,23 @@ enum hal_rx_reo_queue_pn_size { struct hal_rx_reo_queue { struct hal_desc_header desc_hdr; - u32 rx_queue_num; - u32 info0; - u32 info1; - u32 pn[4]; - u32 last_rx_enqueue_timestamp; - u32 last_rx_dequeue_timestamp; - u32 next_aging_queue[2]; - u32 prev_aging_queue[2]; - u32 rx_bitmap[8]; - u32 info2; - u32 info3; - u32 info4; - u32 processed_mpdus; - u32 processed_msdus; - u32 processed_total_bytes; - u32 info5; - u32 rsvd[3]; + __le32 rx_queue_num; + __le32 info0; + __le32 info1; + __le32 pn[4]; + __le32 last_rx_enqueue_timestamp; + __le32 last_rx_dequeue_timestamp; + __le32 next_aging_queue[2]; + __le32 prev_aging_queue[2]; + __le32 rx_bitmap[8]; + __le32 info2; + __le32 info3; + __le32 info4; + __le32 processed_mpdus; + __le32 processed_msdus; + __le32 processed_total_bytes; + __le32 info5; + __le32 rsvd[3]; struct hal_rx_reo_queue_ext ext_desc[]; } __packed; @@ -2118,11 +2118,11 @@ struct hal_rx_reo_queue { struct hal_reo_update_rx_queue { struct hal_reo_cmd_hdr cmd; - u32 queue_addr_lo; - u32 info0; - u32 info1; - u32 info2; - u32 pn[4]; + __le32 queue_addr_lo; + __le32 info0; + __le32 info1; + __le32 info2; + __le32 pn[4]; } __packed; #define HAL_REO_UNBLOCK_CACHE_INFO0_UNBLK_CACHE BIT(0) @@ -2130,8 +2130,8 @@ struct hal_reo_update_rx_queue { struct hal_reo_unblock_cache { struct hal_reo_cmd_hdr cmd; - u32 info0; - u32 rsvd[7]; + __le32 info0; + __le32 rsvd[7]; } __packed; enum hal_reo_exec_status { @@ -2146,8 +2146,8 @@ enum hal_reo_exec_status { #define HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS GENMASK(27, 26) struct hal_reo_status_hdr { - u32 info0; - u32 timestamp; + __le32 info0; + __le32 timestamp; } __packed; /* hal_reo_status_hdr @@ -2189,19 +2189,19 @@ struct hal_reo_status_hdr { struct hal_reo_get_queue_stats_status { struct hal_reo_status_hdr hdr; - u32 info0; - u32 pn[4]; - u32 last_rx_enqueue_timestamp; - u32 last_rx_dequeue_timestamp; - u32 rx_bitmap[8]; - u32 info1; - u32 info2; - u32 info3; - u32 num_mpdu_frames; - u32 num_msdu_frames; - u32 total_bytes; - u32 info4; - u32 info5; + __le32 info0; + __le32 pn[4]; + __le32 last_rx_enqueue_timestamp; + __le32 last_rx_dequeue_timestamp; + __le32 rx_bitmap[8]; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 num_mpdu_frames; + __le32 num_msdu_frames; + __le32 total_bytes; + __le32 info4; + __le32 info5; } __packed; /* hal_reo_get_queue_stats_status @@ -2284,9 +2284,9 @@ struct hal_reo_get_queue_stats_status { struct hal_reo_flush_queue_status { struct hal_reo_status_hdr hdr; - u32 info0; - u32 rsvd0[21]; - u32 info1; + __le32 info0; + __le32 rsvd0[21]; + __le32 info1; } __packed; /* hal_reo_flush_queue_status @@ -2319,9 +2319,9 @@ struct hal_reo_flush_queue_status { struct hal_reo_flush_cache_status { struct hal_reo_status_hdr hdr; - u32 info0; - u32 rsvd0[21]; - u32 info1; + __le32 info0; + __le32 rsvd0[21]; + __le32 info1; } __packed; /* hal_reo_flush_cache_status @@ -2381,9 +2381,9 @@ struct hal_reo_flush_cache_status { struct hal_reo_unblock_cache_status { struct hal_reo_status_hdr hdr; - u32 info0; - u32 rsvd0[21]; - u32 info1; + __le32 info0; + __le32 rsvd0[21]; + __le32 info1; } __packed; /* hal_reo_unblock_cache_status @@ -2417,10 +2417,10 @@ struct hal_reo_unblock_cache_status { struct hal_reo_flush_timeout_list_status { struct hal_reo_status_hdr hdr; - u32 info0; - u32 info1; - u32 rsvd0[20]; - u32 info2; + __le32 info0; + __le32 info1; + __le32 rsvd0[20]; + __le32 info2; } __packed; /* hal_reo_flush_timeout_list_status @@ -2460,13 +2460,13 @@ struct hal_reo_flush_timeout_list_status { struct hal_reo_desc_thresh_reached_status { struct hal_reo_status_hdr hdr; - u32 info0; - u32 info1; - u32 info2; - u32 info3; - u32 info4; - u32 rsvd0[17]; - u32 info5; + __le32 info0; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 info4; + __le32 rsvd0[17]; + __le32 info5; } __packed; /* hal_reo_desc_thresh_reached_status diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.c b/drivers/net/wireless/ath/ath11k/hal_rx.c index 75f7b8d8a0d7..2d8b9a175ed7 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c @@ -14,11 +14,11 @@ static void ath11k_hal_reo_set_desc_hdr(struct hal_desc_header *hdr, u8 owner, u8 buffer_type, u32 magic) { - hdr->info0 = FIELD_PREP(HAL_DESC_HDR_INFO0_OWNER, owner) | - FIELD_PREP(HAL_DESC_HDR_INFO0_BUF_TYPE, buffer_type); + hdr->info0 = le32_encode_bits(owner, HAL_DESC_HDR_INFO0_OWNER) | + le32_encode_bits(buffer_type, HAL_DESC_HDR_INFO0_BUF_TYPE); /* Magic pattern in reserved bits for debugging */ - hdr->info0 |= FIELD_PREP(HAL_DESC_HDR_INFO0_DBG_RESERVED, magic); + hdr->info0 |= le32_encode_bits(magic, HAL_DESC_HDR_INFO0_DBG_RESERVED); } static int ath11k_hal_reo_cmd_queue_stats(struct hal_tlv_hdr *tlv, @@ -26,23 +26,23 @@ static int ath11k_hal_reo_cmd_queue_stats(struct hal_tlv_hdr *tlv, { struct hal_reo_get_queue_stats *desc; - tlv->tl = FIELD_PREP(HAL_TLV_HDR_TAG, HAL_REO_GET_QUEUE_STATS) | - FIELD_PREP(HAL_TLV_HDR_LEN, sizeof(*desc)); + tlv->tl = le32_encode_bits(HAL_REO_GET_QUEUE_STATS, HAL_TLV_HDR_TAG) | + le32_encode_bits(sizeof(*desc), HAL_TLV_HDR_LEN); desc = (struct hal_reo_get_queue_stats *)tlv->value; memset_startat(desc, 0, queue_addr_lo); - desc->cmd.info0 &= ~HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED; + desc->cmd.info0 &= ~cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED); if (cmd->flag & HAL_REO_CMD_FLG_NEED_STATUS) - desc->cmd.info0 |= HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED; + desc->cmd.info0 |= cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED); - desc->queue_addr_lo = cmd->addr_lo; - desc->info0 = FIELD_PREP(HAL_REO_GET_QUEUE_STATS_INFO0_QUEUE_ADDR_HI, - cmd->addr_hi); + desc->queue_addr_lo = cpu_to_le32(cmd->addr_lo); + desc->info0 = le32_encode_bits(cmd->addr_hi, + HAL_REO_GET_QUEUE_STATS_INFO0_QUEUE_ADDR_HI); if (cmd->flag & HAL_REO_CMD_FLG_STATS_CLEAR) - desc->info0 |= HAL_REO_GET_QUEUE_STATS_INFO0_CLEAR_STATS; + desc->info0 |= cpu_to_le32(HAL_REO_GET_QUEUE_STATS_INFO0_CLEAR_STATS); - return FIELD_GET(HAL_REO_CMD_HDR_INFO0_CMD_NUMBER, desc->cmd.info0); + return le32_get_bits(desc->cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER); } static int ath11k_hal_reo_cmd_flush_cache(struct ath11k_hal *hal, struct hal_tlv_hdr *tlv, @@ -58,37 +58,37 @@ static int ath11k_hal_reo_cmd_flush_cache(struct ath11k_hal *hal, struct hal_tlv hal->current_blk_index = avail_slot; } - tlv->tl = FIELD_PREP(HAL_TLV_HDR_TAG, HAL_REO_FLUSH_CACHE) | - FIELD_PREP(HAL_TLV_HDR_LEN, sizeof(*desc)); + tlv->tl = le32_encode_bits(HAL_REO_FLUSH_CACHE, HAL_TLV_HDR_TAG) | + le32_encode_bits(sizeof(*desc), HAL_TLV_HDR_LEN); desc = (struct hal_reo_flush_cache *)tlv->value; memset_startat(desc, 0, cache_addr_lo); - desc->cmd.info0 &= ~HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED; + desc->cmd.info0 &= ~cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED); if (cmd->flag & HAL_REO_CMD_FLG_NEED_STATUS) - desc->cmd.info0 |= HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED; + desc->cmd.info0 |= cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED); - desc->cache_addr_lo = cmd->addr_lo; - desc->info0 = FIELD_PREP(HAL_REO_FLUSH_CACHE_INFO0_CACHE_ADDR_HI, - cmd->addr_hi); + desc->cache_addr_lo = cpu_to_le32(cmd->addr_lo); + desc->info0 = le32_encode_bits(cmd->addr_hi, + HAL_REO_FLUSH_CACHE_INFO0_CACHE_ADDR_HI); if (cmd->flag & HAL_REO_CMD_FLG_FLUSH_FWD_ALL_MPDUS) - desc->info0 |= HAL_REO_FLUSH_CACHE_INFO0_FWD_ALL_MPDUS; + desc->info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FWD_ALL_MPDUS); if (cmd->flag & HAL_REO_CMD_FLG_FLUSH_BLOCK_LATER) { - desc->info0 |= HAL_REO_FLUSH_CACHE_INFO0_BLOCK_CACHE_USAGE; + desc->info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_BLOCK_CACHE_USAGE); desc->info0 |= - FIELD_PREP(HAL_REO_FLUSH_CACHE_INFO0_BLOCK_RESRC_IDX, - avail_slot); + le32_encode_bits(avail_slot, + HAL_REO_FLUSH_CACHE_INFO0_BLOCK_RESRC_IDX); } if (cmd->flag & HAL_REO_CMD_FLG_FLUSH_NO_INVAL) - desc->info0 |= HAL_REO_FLUSH_CACHE_INFO0_FLUSH_WO_INVALIDATE; + desc->info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FLUSH_WO_INVALIDATE); if (cmd->flag & HAL_REO_CMD_FLG_FLUSH_ALL) - desc->info0 |= HAL_REO_FLUSH_CACHE_INFO0_FLUSH_ALL; + desc->info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FLUSH_ALL); - return FIELD_GET(HAL_REO_CMD_HDR_INFO0_CMD_NUMBER, desc->cmd.info0); + return le32_get_bits(desc->cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER); } static int ath11k_hal_reo_cmd_update_rx_queue(struct hal_tlv_hdr *tlv, @@ -96,96 +96,97 @@ static int ath11k_hal_reo_cmd_update_rx_queue(struct hal_tlv_hdr *tlv, { struct hal_reo_update_rx_queue *desc; - tlv->tl = FIELD_PREP(HAL_TLV_HDR_TAG, HAL_REO_UPDATE_RX_REO_QUEUE) | - FIELD_PREP(HAL_TLV_HDR_LEN, sizeof(*desc)); + tlv->tl = le32_encode_bits(HAL_REO_UPDATE_RX_REO_QUEUE, + HAL_TLV_HDR_TAG) | + le32_encode_bits(sizeof(*desc), HAL_TLV_HDR_LEN); desc = (struct hal_reo_update_rx_queue *)tlv->value; memset_startat(desc, 0, queue_addr_lo); - desc->cmd.info0 &= ~HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED; + desc->cmd.info0 &= ~cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED); if (cmd->flag & HAL_REO_CMD_FLG_NEED_STATUS) - desc->cmd.info0 |= HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED; + desc->cmd.info0 |= cpu_to_le32(HAL_REO_CMD_HDR_INFO0_STATUS_REQUIRED); - desc->queue_addr_lo = cmd->addr_lo; + desc->queue_addr_lo = cpu_to_le32(cmd->addr_lo); desc->info0 = - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_QUEUE_ADDR_HI, - cmd->addr_hi) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RX_QUEUE_NUM, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_RX_QUEUE_NUM)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_VLD, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_VLD)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_ASSOC_LNK_DESC_CNT, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_ALDC)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_DIS_DUP_DETECTION, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_DIS_DUP_DETECTION)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SOFT_REORDER_EN, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_SOFT_REORDER_EN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_AC, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_AC)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BAR, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_BAR)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RETRY, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_RETRY)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_CHECK_2K_MODE, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_CHECK_2K_MODE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_OOR_MODE, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_OOR_MODE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BA_WINDOW_SIZE, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_BA_WINDOW_SIZE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_CHECK, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_CHECK)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_EVEN_PN, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_EVEN_PN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_UNEVEN_PN, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_UNEVEN_PN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_HANDLE_ENABLE, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_HANDLE_ENABLE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_SIZE, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_SIZE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_IGNORE_AMPDU_FLG, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_IGNORE_AMPDU_FLG)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SVLD, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_SVLD)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SSN, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_SSN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SEQ_2K_ERR, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_SEQ_2K_ERR)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_VALID, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_VALID)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN, - !!(cmd->upd0 & HAL_REO_CMD_UPD0_PN)); + le32_encode_bits(cmd->addr_hi, + HAL_REO_UPD_RX_QUEUE_INFO0_QUEUE_ADDR_HI) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_RX_QUEUE_NUM), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RX_QUEUE_NUM) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_VLD), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_VLD) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_ALDC), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_ASSOC_LNK_DESC_CNT) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_DIS_DUP_DETECTION), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_DIS_DUP_DETECTION) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_SOFT_REORDER_EN), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SOFT_REORDER_EN) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_AC), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_AC) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_BAR), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BAR) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_RETRY), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_RETRY) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_CHECK_2K_MODE), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_CHECK_2K_MODE) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_OOR_MODE), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_OOR_MODE) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_BA_WINDOW_SIZE), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_BA_WINDOW_SIZE) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_CHECK), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_CHECK) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_EVEN_PN), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_EVEN_PN) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_UNEVEN_PN), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_UNEVEN_PN) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_HANDLE_ENABLE), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_HANDLE_ENABLE) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_SIZE), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_SIZE) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_IGNORE_AMPDU_FLG), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_IGNORE_AMPDU_FLG) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_SVLD), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SVLD) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_SSN), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SSN) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_SEQ_2K_ERR), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_SEQ_2K_ERR) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_PN_VALID), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN_VALID) | + le32_encode_bits(!!(cmd->upd0 & HAL_REO_CMD_UPD0_PN), + HAL_REO_UPD_RX_QUEUE_INFO0_UPD_PN); desc->info1 = - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_RX_QUEUE_NUMBER, - cmd->rx_queue_num) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_VLD, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_VLD)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_ASSOC_LNK_DESC_COUNTER, - FIELD_GET(HAL_REO_CMD_UPD1_ALDC, cmd->upd1)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_DIS_DUP_DETECTION, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_DIS_DUP_DETECTION)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_SOFT_REORDER_EN, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_SOFT_REORDER_EN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_AC, - FIELD_GET(HAL_REO_CMD_UPD1_AC, cmd->upd1)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_BAR, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_BAR)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_CHECK_2K_MODE, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_CHECK_2K_MODE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_RETRY, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_RETRY)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_OOR_MODE, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_OOR_MODE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_PN_CHECK, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_PN_CHECK)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_EVEN_PN, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_EVEN_PN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_UNEVEN_PN, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_UNEVEN_PN)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_PN_HANDLE_ENABLE, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO1_IGNORE_AMPDU_FLG, - !!(cmd->upd1 & HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG)); + le32_encode_bits(cmd->rx_queue_num, + HAL_REO_UPD_RX_QUEUE_INFO1_RX_QUEUE_NUMBER) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_VLD), + HAL_REO_UPD_RX_QUEUE_INFO1_VLD) | + le32_encode_bits(FIELD_GET(HAL_REO_CMD_UPD1_ALDC, cmd->upd1), + HAL_REO_UPD_RX_QUEUE_INFO1_ASSOC_LNK_DESC_COUNTER) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_DIS_DUP_DETECTION), + HAL_REO_UPD_RX_QUEUE_INFO1_DIS_DUP_DETECTION) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_SOFT_REORDER_EN), + HAL_REO_UPD_RX_QUEUE_INFO1_SOFT_REORDER_EN) | + le32_encode_bits(FIELD_GET(HAL_REO_CMD_UPD1_AC, + cmd->upd1), HAL_REO_UPD_RX_QUEUE_INFO1_AC) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_BAR), + HAL_REO_UPD_RX_QUEUE_INFO1_BAR) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_CHECK_2K_MODE), + HAL_REO_UPD_RX_QUEUE_INFO1_CHECK_2K_MODE) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_RETRY), + HAL_REO_UPD_RX_QUEUE_INFO1_RETRY) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_OOR_MODE), + HAL_REO_UPD_RX_QUEUE_INFO1_OOR_MODE) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_PN_CHECK), + HAL_REO_UPD_RX_QUEUE_INFO1_PN_CHECK) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_EVEN_PN), + HAL_REO_UPD_RX_QUEUE_INFO1_EVEN_PN) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_UNEVEN_PN), + HAL_REO_UPD_RX_QUEUE_INFO1_UNEVEN_PN) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE), + HAL_REO_UPD_RX_QUEUE_INFO1_PN_HANDLE_ENABLE) | + le32_encode_bits(!!(cmd->upd1 & HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG), + HAL_REO_UPD_RX_QUEUE_INFO1_IGNORE_AMPDU_FLG); if (cmd->pn_size == 24) cmd->pn_size = HAL_RX_REO_QUEUE_PN_SIZE_24; @@ -201,19 +202,20 @@ static int ath11k_hal_reo_cmd_update_rx_queue(struct hal_tlv_hdr *tlv, cmd->ba_window_size++; desc->info2 = - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO2_BA_WINDOW_SIZE, - cmd->ba_window_size - 1) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO2_PN_SIZE, cmd->pn_size) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO2_SVLD, - !!(cmd->upd2 & HAL_REO_CMD_UPD2_SVLD)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO2_SSN, - FIELD_GET(HAL_REO_CMD_UPD2_SSN, cmd->upd2)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO2_SEQ_2K_ERR, - !!(cmd->upd2 & HAL_REO_CMD_UPD2_SEQ_2K_ERR)) | - FIELD_PREP(HAL_REO_UPD_RX_QUEUE_INFO2_PN_ERR, - !!(cmd->upd2 & HAL_REO_CMD_UPD2_PN_ERR)); - - return FIELD_GET(HAL_REO_CMD_HDR_INFO0_CMD_NUMBER, desc->cmd.info0); + le32_encode_bits(cmd->ba_window_size - 1, + HAL_REO_UPD_RX_QUEUE_INFO2_BA_WINDOW_SIZE) | + le32_encode_bits(cmd->pn_size, + HAL_REO_UPD_RX_QUEUE_INFO2_PN_SIZE) | + le32_encode_bits(!!(cmd->upd2 & HAL_REO_CMD_UPD2_SVLD), + HAL_REO_UPD_RX_QUEUE_INFO2_SVLD) | + le32_encode_bits(FIELD_GET(HAL_REO_CMD_UPD2_SSN, + cmd->upd2), HAL_REO_UPD_RX_QUEUE_INFO2_SSN) | + le32_encode_bits(!!(cmd->upd2 & HAL_REO_CMD_UPD2_SEQ_2K_ERR), + HAL_REO_UPD_RX_QUEUE_INFO2_SEQ_2K_ERR) | + le32_encode_bits(!!(cmd->upd2 & HAL_REO_CMD_UPD2_PN_ERR), + HAL_REO_UPD_RX_QUEUE_INFO2_PN_ERR); + + return le32_get_bits(desc->cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER); } int ath11k_hal_reo_cmd_send(struct ath11k_base *ab, struct hal_srng *srng, @@ -271,10 +273,10 @@ void ath11k_hal_rx_buf_addr_info_set(void *desc, dma_addr_t paddr, paddr_lo = lower_32_bits(paddr); paddr_hi = upper_32_bits(paddr); - binfo->info0 = FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, paddr_lo); - binfo->info1 = FIELD_PREP(BUFFER_ADDR_INFO1_ADDR, paddr_hi) | - FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, cookie) | - FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, manager); + binfo->info0 = le32_encode_bits(paddr_lo, BUFFER_ADDR_INFO0_ADDR); + binfo->info1 = le32_encode_bits(paddr_hi, BUFFER_ADDR_INFO1_ADDR) | + le32_encode_bits(cookie, BUFFER_ADDR_INFO1_SW_COOKIE) | + le32_encode_bits(manager, BUFFER_ADDR_INFO1_RET_BUF_MGR); } void ath11k_hal_rx_buf_addr_info_get(void *desc, dma_addr_t *paddr, @@ -283,10 +285,11 @@ void ath11k_hal_rx_buf_addr_info_get(void *desc, dma_addr_t *paddr, struct ath11k_buffer_addr *binfo = desc; *paddr = - (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, binfo->info1)) << 32) | - FIELD_GET(BUFFER_ADDR_INFO0_ADDR, binfo->info0); - *cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, binfo->info1); - *rbm = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR, binfo->info1); + (((u64)le32_get_bits(binfo->info1, + BUFFER_ADDR_INFO1_ADDR)) << 32) | + le32_get_bits(binfo->info0, BUFFER_ADDR_INFO0_ADDR); + *cookie = le32_get_bits(binfo->info1, BUFFER_ADDR_INFO1_SW_COOKIE); + *rbm = le32_get_bits(binfo->info1, BUFFER_ADDR_INFO1_RET_BUF_MGR); } void ath11k_hal_rx_msdu_link_info_get(void *link_desc, u32 *num_msdus, @@ -300,19 +303,19 @@ void ath11k_hal_rx_msdu_link_info_get(void *link_desc, u32 *num_msdus, *num_msdus = HAL_NUM_RX_MSDUS_PER_LINK_DESC; msdu = &link->msdu_link[0]; - *rbm = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR, - msdu->buf_addr_info.info1); + *rbm = le32_get_bits(msdu->buf_addr_info.info1, + BUFFER_ADDR_INFO1_RET_BUF_MGR); for (i = 0; i < *num_msdus; i++) { msdu = &link->msdu_link[i]; - if (!FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - msdu->buf_addr_info.info0)) { + if (!le32_get_bits(msdu->buf_addr_info.info0, + BUFFER_ADDR_INFO0_ADDR)) { *num_msdus = i; break; } - *msdu_cookies = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - msdu->buf_addr_info.info1); + *msdu_cookies = le32_get_bits(msdu->buf_addr_info.info1, + BUFFER_ADDR_INFO1_SW_COOKIE); msdu_cookies++; } } @@ -324,10 +327,10 @@ int ath11k_hal_desc_reo_parse_err(struct ath11k_base *ab, u32 *rx_desc, enum hal_reo_dest_ring_push_reason push_reason; enum hal_reo_dest_ring_error_code err_code; - push_reason = FIELD_GET(HAL_REO_DEST_RING_INFO0_PUSH_REASON, - desc->info0); - err_code = FIELD_GET(HAL_REO_DEST_RING_INFO0_ERROR_CODE, - desc->info0); + push_reason = le32_get_bits(desc->info0, + HAL_REO_DEST_RING_INFO0_PUSH_REASON); + err_code = le32_get_bits(desc->info0, + HAL_REO_DEST_RING_INFO0_ERROR_CODE); ab->soc_stats.reo_error[err_code]++; if (push_reason != HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED && @@ -337,7 +340,7 @@ int ath11k_hal_desc_reo_parse_err(struct ath11k_base *ab, u32 *rx_desc, return -EINVAL; } - if (FIELD_GET(HAL_REO_DEST_RING_INFO0_BUFFER_TYPE, desc->info0) != + if (le32_get_bits(desc->info0, HAL_REO_DEST_RING_INFO0_BUFFER_TYPE) != HAL_REO_DEST_RING_BUFFER_TYPE_LINK_DESC) { ath11k_warn(ab, "expected buffer type link_desc"); return -EINVAL; @@ -356,51 +359,50 @@ int ath11k_hal_wbm_desc_parse_err(struct ath11k_base *ab, void *desc, enum hal_wbm_rel_src_module rel_src; enum hal_rx_buf_return_buf_manager ret_buf_mgr; - type = FIELD_GET(HAL_WBM_RELEASE_INFO0_DESC_TYPE, - wbm_desc->info0); + type = le32_get_bits(wbm_desc->info0, HAL_WBM_RELEASE_INFO0_DESC_TYPE); /* We expect only WBM_REL buffer type */ if (type != HAL_WBM_REL_DESC_TYPE_REL_MSDU) { WARN_ON(1); return -EINVAL; } - rel_src = FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, - wbm_desc->info0); + rel_src = le32_get_bits(wbm_desc->info0, + HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE); if (rel_src != HAL_WBM_REL_SRC_MODULE_RXDMA && rel_src != HAL_WBM_REL_SRC_MODULE_REO) return -EINVAL; - ret_buf_mgr = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR, - wbm_desc->buf_addr_info.info1); + ret_buf_mgr = le32_get_bits(wbm_desc->buf_addr_info.info1, + BUFFER_ADDR_INFO1_RET_BUF_MGR); if (ret_buf_mgr != HAL_RX_BUF_RBM_SW1_BM && ret_buf_mgr != HAL_RX_BUF_RBM_SW3_BM) { ab->soc_stats.invalid_rbm++; return -EINVAL; } - rel_info->cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - wbm_desc->buf_addr_info.info1); + rel_info->cookie = le32_get_bits(wbm_desc->buf_addr_info.info1, + BUFFER_ADDR_INFO1_SW_COOKIE); rel_info->err_rel_src = rel_src; if (rel_src == HAL_WBM_REL_SRC_MODULE_REO) { rel_info->push_reason = - FIELD_GET(HAL_WBM_RELEASE_INFO0_REO_PUSH_REASON, - wbm_desc->info0); + le32_get_bits(wbm_desc->info0, + HAL_WBM_RELEASE_INFO0_REO_PUSH_REASON); rel_info->err_code = - FIELD_GET(HAL_WBM_RELEASE_INFO0_REO_ERROR_CODE, - wbm_desc->info0); + le32_get_bits(wbm_desc->info0, + HAL_WBM_RELEASE_INFO0_REO_ERROR_CODE); } else { rel_info->push_reason = - FIELD_GET(HAL_WBM_RELEASE_INFO0_RXDMA_PUSH_REASON, - wbm_desc->info0); + le32_get_bits(wbm_desc->info0, + HAL_WBM_RELEASE_INFO0_RXDMA_PUSH_REASON); rel_info->err_code = - FIELD_GET(HAL_WBM_RELEASE_INFO0_RXDMA_ERROR_CODE, - wbm_desc->info0); + le32_get_bits(wbm_desc->info0, + HAL_WBM_RELEASE_INFO0_RXDMA_ERROR_CODE); } - rel_info->first_msdu = FIELD_GET(HAL_WBM_RELEASE_INFO2_FIRST_MSDU, - wbm_desc->info2); - rel_info->last_msdu = FIELD_GET(HAL_WBM_RELEASE_INFO2_LAST_MSDU, - wbm_desc->info2); + rel_info->first_msdu = le32_get_bits(wbm_desc->info2, + HAL_WBM_RELEASE_INFO2_FIRST_MSDU); + rel_info->last_msdu = le32_get_bits(wbm_desc->info2, + HAL_WBM_RELEASE_INFO2_LAST_MSDU); return 0; } @@ -409,10 +411,12 @@ void ath11k_hal_rx_reo_ent_paddr_get(struct ath11k_base *ab, void *desc, { struct ath11k_buffer_addr *buff_addr = desc; - *paddr = ((u64)(FIELD_GET(BUFFER_ADDR_INFO1_ADDR, buff_addr->info1)) << 32) | - FIELD_GET(BUFFER_ADDR_INFO0_ADDR, buff_addr->info0); + *paddr = ((u64)(le32_get_bits(buff_addr->info1, + BUFFER_ADDR_INFO1_ADDR)) << 32) | + le32_get_bits(buff_addr->info0, BUFFER_ADDR_INFO0_ADDR); - *desc_bank = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, buff_addr->info1); + *desc_bank = le32_get_bits(buff_addr->info1, + BUFFER_ADDR_INFO1_SW_COOKIE); } void ath11k_hal_rx_msdu_link_desc_set(struct ath11k_base *ab, void *desc, @@ -423,11 +427,12 @@ void ath11k_hal_rx_msdu_link_desc_set(struct ath11k_base *ab, void *desc, struct hal_wbm_release_ring *src_desc = link_desc; dst_desc->buf_addr_info = src_desc->buf_addr_info; - dst_desc->info0 |= FIELD_PREP(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, - HAL_WBM_REL_SRC_MODULE_SW) | - FIELD_PREP(HAL_WBM_RELEASE_INFO0_BM_ACTION, action) | - FIELD_PREP(HAL_WBM_RELEASE_INFO0_DESC_TYPE, - HAL_WBM_REL_DESC_TYPE_MSDU_LINK); + dst_desc->info0 |= le32_encode_bits(HAL_WBM_REL_SRC_MODULE_SW, + HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE) | + le32_encode_bits(action, + HAL_WBM_RELEASE_INFO0_BM_ACTION) | + le32_encode_bits(HAL_WBM_REL_DESC_TYPE_MSDU_LINK, + HAL_WBM_RELEASE_INFO0_DESC_TYPE); } void ath11k_hal_reo_status_queue_stats(struct ath11k_base *ab, u32 *reo_desc, @@ -438,21 +443,21 @@ void ath11k_hal_reo_status_queue_stats(struct ath11k_base *ab, u32 *reo_desc, (struct hal_reo_get_queue_stats_status *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); ath11k_dbg(ab, ATH11K_DBG_HAL, "Queue stats status:\n"); ath11k_dbg(ab, ATH11K_DBG_HAL, "header: cmd_num %d status %d\n", status->uniform_hdr.cmd_num, status->uniform_hdr.cmd_status); - ath11k_dbg(ab, ATH11K_DBG_HAL, "ssn %ld cur_idx %ld\n", - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_SSN, - desc->info0), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_CUR_IDX, - desc->info0)); + ath11k_dbg(ab, ATH11K_DBG_HAL, "ssn %u cur_idx %u\n", + le32_get_bits(desc->info0, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_SSN), + le32_get_bits(desc->info0, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO0_CUR_IDX)); ath11k_dbg(ab, ATH11K_DBG_HAL, "pn = [%08x, %08x, %08x, %08x]\n", desc->pn[0], desc->pn[1], desc->pn[2], desc->pn[3]); ath11k_dbg(ab, ATH11K_DBG_HAL, @@ -464,36 +469,39 @@ void ath11k_hal_reo_status_queue_stats(struct ath11k_base *ab, u32 *reo_desc, desc->rx_bitmap[0], desc->rx_bitmap[1], desc->rx_bitmap[2], desc->rx_bitmap[3], desc->rx_bitmap[4], desc->rx_bitmap[5], desc->rx_bitmap[6], desc->rx_bitmap[7]); - ath11k_dbg(ab, ATH11K_DBG_HAL, "count: cur_mpdu %ld cur_msdu %ld\n", - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MPDU_COUNT, - desc->info1), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MSDU_COUNT, - desc->info1)); - ath11k_dbg(ab, ATH11K_DBG_HAL, "fwd_timeout %ld fwd_bar %ld dup_count %ld\n", - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_TIMEOUT_COUNT, - desc->info2), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_FDTB_COUNT, - desc->info2), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_DUPLICATE_COUNT, - desc->info2)); - ath11k_dbg(ab, ATH11K_DBG_HAL, "frames_in_order %ld bar_rcvd %ld\n", - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_FIO_COUNT, - desc->info3), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_BAR_RCVD_CNT, - desc->info3)); - ath11k_dbg(ab, ATH11K_DBG_HAL, "num_mpdus %d num_msdus %d total_bytes %d\n", + ath11k_dbg(ab, ATH11K_DBG_HAL, "count: cur_mpdu %u cur_msdu %u\n", + le32_get_bits(desc->info1, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MPDU_COUNT), + le32_get_bits(desc->info1, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO1_MSDU_COUNT)); + ath11k_dbg(ab, ATH11K_DBG_HAL, + "fwd_timeout %u fwd_bar %u dup_count %u\n", + le32_get_bits(desc->info2, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_TIMEOUT_COUNT), + le32_get_bits(desc->info2, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_FDTB_COUNT), + le32_get_bits(desc->info2, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO2_DUPLICATE_COUNT)); + ath11k_dbg(ab, ATH11K_DBG_HAL, "frames_in_order %u bar_rcvd %u\n", + le32_get_bits(desc->info3, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_FIO_COUNT), + le32_get_bits(desc->info3, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO3_BAR_RCVD_CNT)); + ath11k_dbg(ab, ATH11K_DBG_HAL, + "num_mpdus %d num_msdus %d total_bytes %d\n", desc->num_mpdu_frames, desc->num_msdu_frames, desc->total_bytes); - ath11k_dbg(ab, ATH11K_DBG_HAL, "late_rcvd %ld win_jump_2k %ld hole_cnt %ld\n", - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_LATE_RX_MPDU, - desc->info4), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_WINDOW_JMP2K, - desc->info4), - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_HOLE_COUNT, - desc->info4)); - ath11k_dbg(ab, ATH11K_DBG_HAL, "looping count %ld\n", - FIELD_GET(HAL_REO_GET_QUEUE_STATS_STATUS_INFO5_LOOPING_CNT, - desc->info5)); + ath11k_dbg(ab, ATH11K_DBG_HAL, + "late_rcvd %u win_jump_2k %u hole_cnt %u\n", + le32_get_bits(desc->info4, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_LATE_RX_MPDU), + le32_get_bits(desc->info4, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_WINDOW_JMP2K), + le32_get_bits(desc->info4, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO4_HOLE_COUNT)); + ath11k_dbg(ab, ATH11K_DBG_HAL, "looping count %u\n", + le32_get_bits(desc->info5, + HAL_REO_GET_QUEUE_STATS_STATUS_INFO5_LOOPING_CNT)); } int ath11k_hal_reo_process_status(u8 *reo_desc, u8 *status) @@ -502,9 +510,10 @@ int ath11k_hal_reo_process_status(u8 *reo_desc, u8 *status) struct hal_reo_status_hdr *hdr; hdr = (struct hal_reo_status_hdr *)tlv->value; - *status = FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, hdr->info0); + *status = le32_get_bits(hdr->info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); - return FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, hdr->info0); + return le32_get_bits(hdr->info0, HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); } void ath11k_hal_reo_flush_queue_status(struct ath11k_base *ab, u32 *reo_desc, @@ -515,14 +524,14 @@ void ath11k_hal_reo_flush_queue_status(struct ath11k_base *ab, u32 *reo_desc, (struct hal_reo_flush_queue_status *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); status->u.flush_queue.err_detected = - FIELD_GET(HAL_REO_FLUSH_QUEUE_INFO0_ERR_DETECTED, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_QUEUE_INFO0_ERR_DETECTED); } void ath11k_hal_reo_flush_cache_status(struct ath11k_base *ab, u32 *reo_desc, @@ -534,37 +543,37 @@ void ath11k_hal_reo_flush_cache_status(struct ath11k_base *ab, u32 *reo_desc, (struct hal_reo_flush_cache_status *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); status->u.flush_cache.err_detected = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_IS_ERR, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_IS_ERR); status->u.flush_cache.err_code = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_BLOCK_ERR_CODE, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_BLOCK_ERR_CODE); if (!status->u.flush_cache.err_code) hal->avail_blk_resource |= BIT(hal->current_blk_index); status->u.flush_cache.cache_controller_flush_status_hit = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_STATUS_HIT, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_STATUS_HIT); status->u.flush_cache.cache_controller_flush_status_desc_type = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_DESC_TYPE, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_DESC_TYPE); status->u.flush_cache.cache_controller_flush_status_client_id = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_CLIENT_ID, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_CLIENT_ID); status->u.flush_cache.cache_controller_flush_status_err = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_ERR, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_ERR); status->u.flush_cache.cache_controller_flush_status_cnt = - FIELD_GET(HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_COUNT, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_CACHE_STATUS_INFO0_FLUSH_COUNT); } void ath11k_hal_reo_unblk_cache_status(struct ath11k_base *ab, u32 *reo_desc, @@ -576,18 +585,18 @@ void ath11k_hal_reo_unblk_cache_status(struct ath11k_base *ab, u32 *reo_desc, (struct hal_reo_unblock_cache_status *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); status->u.unblock_cache.err_detected = - FIELD_GET(HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_IS_ERR, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_IS_ERR); status->u.unblock_cache.unblock_type = - FIELD_GET(HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_TYPE, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_UNBLOCK_CACHE_STATUS_INFO0_TYPE); if (!status->u.unblock_cache.err_detected && status->u.unblock_cache.unblock_type == @@ -604,25 +613,25 @@ void ath11k_hal_reo_flush_timeout_list_status(struct ath11k_base *ab, (struct hal_reo_flush_timeout_list_status *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); status->u.timeout_list.err_detected = - FIELD_GET(HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_IS_ERR, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_IS_ERR); status->u.timeout_list.list_empty = - FIELD_GET(HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_LIST_EMPTY, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_FLUSH_TIMEOUT_STATUS_INFO0_LIST_EMPTY); status->u.timeout_list.release_desc_cnt = - FIELD_GET(HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_REL_DESC_COUNT, - desc->info1); + le32_get_bits(desc->info1, + HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_REL_DESC_COUNT); status->u.timeout_list.fwd_buf_cnt = - FIELD_GET(HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_FWD_BUF_COUNT, - desc->info1); + le32_get_bits(desc->info1, + HAL_REO_FLUSH_TIMEOUT_STATUS_INFO1_FWD_BUF_COUNT); } void ath11k_hal_reo_desc_thresh_reached_status(struct ath11k_base *ab, @@ -634,31 +643,31 @@ void ath11k_hal_reo_desc_thresh_reached_status(struct ath11k_base *ab, (struct hal_reo_desc_thresh_reached_status *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->hdr.info0); + le32_get_bits(desc->hdr.info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); status->u.desc_thresh_reached.threshold_idx = - FIELD_GET(HAL_REO_DESC_THRESH_STATUS_INFO0_THRESH_INDEX, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_DESC_THRESH_STATUS_INFO0_THRESH_INDEX); status->u.desc_thresh_reached.link_desc_counter0 = - FIELD_GET(HAL_REO_DESC_THRESH_STATUS_INFO1_LINK_DESC_COUNTER0, - desc->info1); + le32_get_bits(desc->info1, + HAL_REO_DESC_THRESH_STATUS_INFO1_LINK_DESC_COUNTER0); status->u.desc_thresh_reached.link_desc_counter1 = - FIELD_GET(HAL_REO_DESC_THRESH_STATUS_INFO2_LINK_DESC_COUNTER1, - desc->info2); + le32_get_bits(desc->info2, + HAL_REO_DESC_THRESH_STATUS_INFO2_LINK_DESC_COUNTER1); status->u.desc_thresh_reached.link_desc_counter2 = - FIELD_GET(HAL_REO_DESC_THRESH_STATUS_INFO3_LINK_DESC_COUNTER2, - desc->info3); + le32_get_bits(desc->info3, + HAL_REO_DESC_THRESH_STATUS_INFO3_LINK_DESC_COUNTER2); status->u.desc_thresh_reached.link_desc_counter_sum = - FIELD_GET(HAL_REO_DESC_THRESH_STATUS_INFO4_LINK_DESC_COUNTER_SUM, - desc->info4); + le32_get_bits(desc->info4, + HAL_REO_DESC_THRESH_STATUS_INFO4_LINK_DESC_COUNTER_SUM); } void ath11k_hal_reo_update_rx_reo_queue_status(struct ath11k_base *ab, @@ -670,11 +679,11 @@ void ath11k_hal_reo_update_rx_reo_queue_status(struct ath11k_base *ab, (struct hal_reo_status_hdr *)tlv->value; status->uniform_hdr.cmd_num = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_STATUS_NUM, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_STATUS_HDR_INFO0_STATUS_NUM); status->uniform_hdr.cmd_status = - FIELD_GET(HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS, - desc->info0); + le32_get_bits(desc->info0, + HAL_REO_STATUS_HDR_INFO0_EXEC_STATUS); } u32 ath11k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid) @@ -710,12 +719,15 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size, HAL_DESC_REO_QUEUE_DESC, REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0); - qdesc->rx_queue_num = FIELD_PREP(HAL_RX_REO_QUEUE_RX_QUEUE_NUMBER, tid); + qdesc->rx_queue_num = le32_encode_bits(tid, + HAL_RX_REO_QUEUE_RX_QUEUE_NUMBER); qdesc->info0 = - FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_VLD, 1) | - FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_ASSOC_LNK_DESC_COUNTER, 1) | - FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_AC, ath11k_tid_to_ac(tid)); + le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_VLD) | + le32_encode_bits(1, + HAL_RX_REO_QUEUE_INFO0_ASSOC_LNK_DESC_COUNTER) | + le32_encode_bits(ath11k_tid_to_ac(tid), + HAL_RX_REO_QUEUE_INFO0_AC); if (ba_window_size < 1) ba_window_size = 1; @@ -724,10 +736,11 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size, ba_window_size++; if (ba_window_size == 1) - qdesc->info0 |= FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_RETRY, 1); + qdesc->info0 |= le32_encode_bits(1, + HAL_RX_REO_QUEUE_INFO0_RETRY); - qdesc->info0 |= FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_BA_WINDOW_SIZE, - ba_window_size - 1); + qdesc->info0 |= le32_encode_bits(ba_window_size - 1, + HAL_RX_REO_QUEUE_INFO0_BA_WINDOW_SIZE); switch (type) { case HAL_PN_TYPE_NONE: case HAL_PN_TYPE_WAPI_EVEN: @@ -735,22 +748,23 @@ void ath11k_hal_reo_qdesc_setup(void *vaddr, int tid, u32 ba_window_size, break; case HAL_PN_TYPE_WPA: qdesc->info0 |= - FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_PN_CHECK, 1) | - FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_PN_SIZE, - HAL_RX_REO_QUEUE_PN_SIZE_48); + le32_encode_bits(1, HAL_RX_REO_QUEUE_INFO0_PN_CHECK) | + le32_encode_bits(HAL_RX_REO_QUEUE_PN_SIZE_48, + HAL_RX_REO_QUEUE_INFO0_PN_SIZE); break; } /* TODO: Set Ignore ampdu flags based on BA window size and/or * AMPDU capabilities */ - qdesc->info0 |= FIELD_PREP(HAL_RX_REO_QUEUE_INFO0_IGNORE_AMPDU_FLG, 1); + qdesc->info0 |= le32_encode_bits(1, + HAL_RX_REO_QUEUE_INFO0_IGNORE_AMPDU_FLG); - qdesc->info1 |= FIELD_PREP(HAL_RX_REO_QUEUE_INFO1_SVLD, 0); + qdesc->info1 |= le32_encode_bits(0, HAL_RX_REO_QUEUE_INFO1_SVLD); if (start_seq <= 0xfff) - qdesc->info1 = FIELD_PREP(HAL_RX_REO_QUEUE_INFO1_SSN, - start_seq); + qdesc->info1 = le32_encode_bits(start_seq, + HAL_RX_REO_QUEUE_INFO1_SSN); if (tid == HAL_DESC_REO_NON_QOS_TID) return; @@ -801,7 +815,8 @@ void ath11k_hal_reo_init_cmd_ring(struct ath11k_base *ab, tlv = (struct hal_tlv_hdr *)entry; desc = (struct hal_reo_get_queue_stats *)tlv->value; desc->cmd.info0 = - FIELD_PREP(HAL_REO_CMD_HDR_INFO0_CMD_NUMBER, cmd_num++); + le32_encode_bits(cmd_num++, + HAL_REO_CMD_HDR_INFO0_CMD_NUMBER); entry += entry_size; } } @@ -825,11 +840,11 @@ ath11k_hal_rx_populate_byte_count(void *rx_tlv, void *ppduinfo, struct hal_rx_ppdu_end_user_stats *ppdu_end_user = rx_tlv; rx_user_status->mpdu_ok_byte_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_OK_BYTE_COUNT, - __le32_to_cpu(ppdu_end_user->info8)); + le32_get_bits(ppdu_end_user->info8, + HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_OK_BYTE_COUNT); rx_user_status->mpdu_err_byte_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO9_MPDU_ERR_BYTE_COUNT, - __le32_to_cpu(ppdu_end_user->info9)); + le32_get_bits(ppdu_end_user->info9, + HAL_RX_PPDU_END_USER_STATS_INFO9_MPDU_ERR_BYTE_COUNT); } static inline void @@ -886,8 +901,8 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, (struct hal_rx_ppdu_start *)tlv_data; ppdu_info->ppdu_id = - FIELD_GET(HAL_RX_PPDU_START_INFO0_PPDU_ID, - __le32_to_cpu(ppdu_start->info0)); + le32_get_bits(ppdu_start->info0, + HAL_RX_PPDU_START_INFO0_PPDU_ID); ppdu_info->chan_num = __le32_to_cpu(ppdu_start->chan_num); ppdu_info->ppdu_ts = __le32_to_cpu(ppdu_start->ppdu_start_ts); break; @@ -900,23 +915,23 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, info1 = __le32_to_cpu(eu_stats->info1); ppdu_info->ast_index = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX, - __le32_to_cpu(eu_stats->info2)); + le32_get_bits(eu_stats->info2, + HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX); ppdu_info->tid = - ffs(FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP, - __le32_to_cpu(eu_stats->info7))) - 1; + ffs(le32_get_bits(eu_stats->info7, + HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP)) - 1; ppdu_info->tcp_msdu_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT, - __le32_to_cpu(eu_stats->info4)); + le32_get_bits(eu_stats->info4, + HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT); ppdu_info->udp_msdu_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO4_UDP_MSDU_CNT, - __le32_to_cpu(eu_stats->info4)); + le32_get_bits(eu_stats->info4, + HAL_RX_PPDU_END_USER_STATS_INFO4_UDP_MSDU_CNT); ppdu_info->other_msdu_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO5_OTHER_MSDU_CNT, - __le32_to_cpu(eu_stats->info5)); + le32_get_bits(eu_stats->info5, + HAL_RX_PPDU_END_USER_STATS_INFO5_OTHER_MSDU_CNT); ppdu_info->tcp_ack_msdu_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO5_TCP_ACK_MSDU_CNT, - __le32_to_cpu(eu_stats->info5)); + le32_get_bits(eu_stats->info5, + HAL_RX_PPDU_END_USER_STATS_INFO5_TCP_ACK_MSDU_CNT); ppdu_info->preamble_type = FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO1_PKT_TYPE, info1); ppdu_info->num_mpdu_fcs_ok = @@ -957,12 +972,18 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, case HAL_RX_PPDU_END_USER_STATS_EXT: { struct hal_rx_ppdu_end_user_stats_ext *eu_stats = (struct hal_rx_ppdu_end_user_stats_ext *)tlv_data; - ppdu_info->userstats.mpdu_fcs_ok_bitmap[2] = eu_stats->info1; - ppdu_info->userstats.mpdu_fcs_ok_bitmap[3] = eu_stats->info2; - ppdu_info->userstats.mpdu_fcs_ok_bitmap[4] = eu_stats->info3; - ppdu_info->userstats.mpdu_fcs_ok_bitmap[5] = eu_stats->info4; - ppdu_info->userstats.mpdu_fcs_ok_bitmap[6] = eu_stats->info5; - ppdu_info->userstats.mpdu_fcs_ok_bitmap[7] = eu_stats->info6; + ppdu_info->userstats.mpdu_fcs_ok_bitmap[2] = + __le32_to_cpu(eu_stats->info1); + ppdu_info->userstats.mpdu_fcs_ok_bitmap[3] = + __le32_to_cpu(eu_stats->info2); + ppdu_info->userstats.mpdu_fcs_ok_bitmap[4] = + __le32_to_cpu(eu_stats->info3); + ppdu_info->userstats.mpdu_fcs_ok_bitmap[5] = + __le32_to_cpu(eu_stats->info4); + ppdu_info->userstats.mpdu_fcs_ok_bitmap[6] = + __le32_to_cpu(eu_stats->info5); + ppdu_info->userstats.mpdu_fcs_ok_bitmap[7] = + __le32_to_cpu(eu_stats->info6); break; } case HAL_PHYRX_HT_SIG: { @@ -1004,8 +1025,8 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, struct hal_rx_lsig_b_info *lsigb = (struct hal_rx_lsig_b_info *)tlv_data; - ppdu_info->rate = FIELD_GET(HAL_RX_LSIG_B_INFO_INFO0_RATE, - __le32_to_cpu(lsigb->info0)); + ppdu_info->rate = le32_get_bits(lsigb->info0, + HAL_RX_LSIG_B_INFO_INFO0_RATE); ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; break; } @@ -1013,8 +1034,8 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, struct hal_rx_lsig_a_info *lsiga = (struct hal_rx_lsig_a_info *)tlv_data; - ppdu_info->rate = FIELD_GET(HAL_RX_LSIG_A_INFO_INFO0_RATE, - __le32_to_cpu(lsiga->info0)); + ppdu_info->rate = le32_get_bits(lsiga->info0, + HAL_RX_LSIG_A_INFO_INFO0_RATE); ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; break; } @@ -1452,8 +1473,8 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, * PHYRX_OTHER_RECEIVE_INFO TLV. */ ppdu_info->rssi_comb = - FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB, - __le32_to_cpu(rssi->info0)); + le32_get_bits(rssi->info0, + HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB); if (db2dbm) { for (i = 0; i < ARRAY_SIZE(rssi->preamble); i++) { @@ -1475,8 +1496,8 @@ ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, struct hal_rx_ppdu_end_duration *ppdu_rx_duration = (struct hal_rx_ppdu_end_duration *)tlv_data; ppdu_info->rx_duration = - FIELD_GET(HAL_RX_PPDU_END_DURATION, - __le32_to_cpu(ppdu_rx_duration->info0)); + le32_get_bits(ppdu_rx_duration->info0, + HAL_RX_PPDU_END_DURATION); ppdu_info->tsft = __le32_to_cpu(ppdu_rx_duration->rsvd0[1]); ppdu_info->tsft = (ppdu_info->tsft << 32) | __le32_to_cpu(ppdu_rx_duration->rsvd0[0]); @@ -1508,9 +1529,9 @@ ath11k_hal_rx_parse_mon_status(struct ath11k_base *ab, do { tlv = (struct hal_tlv_hdr *)ptr; - tlv_tag = FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl); - tlv_len = FIELD_GET(HAL_TLV_HDR_LEN, tlv->tl); - tlv_userid = FIELD_GET(HAL_TLV_USR_ID, tlv->tl); + tlv_tag = le32_get_bits(tlv->tl, HAL_TLV_HDR_TAG); + tlv_len = le32_get_bits(tlv->tl, HAL_TLV_HDR_LEN); + tlv_userid = le32_get_bits(tlv->tl, HAL_TLV_USR_ID); ptr += sizeof(*tlv); /* The actual length of PPDU_END is the combined length of many PHY @@ -1544,20 +1565,20 @@ void ath11k_hal_rx_reo_ent_buf_paddr_get(void *rx_desc, dma_addr_t *paddr, rx_mpdu_desc_info_details = (struct rx_mpdu_desc *)&reo_ent_ring->rx_mpdu_info; - *msdu_cnt = FIELD_GET(RX_MPDU_DESC_INFO0_MSDU_COUNT, - rx_mpdu_desc_info_details->info0); + *msdu_cnt = le32_get_bits(rx_mpdu_desc_info_details->info0, + RX_MPDU_DESC_INFO0_MSDU_COUNT); buf_addr_info = (struct ath11k_buffer_addr *)&reo_ent_ring->buf_addr_info; - *paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, - buf_addr_info->info1)) << 32) | - FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - buf_addr_info->info0); + *paddr = (((u64)le32_get_bits(buf_addr_info->info1, + BUFFER_ADDR_INFO1_ADDR)) << 32) | + le32_get_bits(buf_addr_info->info0, + BUFFER_ADDR_INFO0_ADDR); - *sw_cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - buf_addr_info->info1); - *rbm = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR, - buf_addr_info->info1); + *sw_cookie = le32_get_bits(buf_addr_info->info1, + BUFFER_ADDR_INFO1_SW_COOKIE); + *rbm = le32_get_bits(buf_addr_info->info1, + BUFFER_ADDR_INFO1_RET_BUF_MGR); *pp_buf_addr = (void *)buf_addr_info; } @@ -1573,35 +1594,36 @@ ath11k_hal_rx_sw_mon_ring_buf_paddr_get(void *rx_desc, rx_mpdu_desc_info_details = &sw_mon_ring->rx_mpdu_info; - sw_mon_entries->msdu_cnt = FIELD_GET(RX_MPDU_DESC_INFO0_MSDU_COUNT, - rx_mpdu_desc_info_details->info0); + sw_mon_entries->msdu_cnt = le32_get_bits(rx_mpdu_desc_info_details->info0, + RX_MPDU_DESC_INFO0_MSDU_COUNT); buf_addr_info = &sw_mon_ring->buf_addr_info; status_buf_addr_info = &sw_mon_ring->status_buf_addr_info; - sw_mon_entries->mon_dst_paddr = (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, - buf_addr_info->info1)) << 32) | - FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - buf_addr_info->info0); + sw_mon_entries->mon_dst_paddr = (((u64)le32_get_bits(buf_addr_info->info1, + BUFFER_ADDR_INFO1_ADDR)) << 32) | + le32_get_bits(buf_addr_info->info0, + BUFFER_ADDR_INFO0_ADDR); sw_mon_entries->mon_status_paddr = - (((u64)FIELD_GET(BUFFER_ADDR_INFO1_ADDR, - status_buf_addr_info->info1)) << 32) | - FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - status_buf_addr_info->info0); + (((u64)le32_get_bits(status_buf_addr_info->info1, + BUFFER_ADDR_INFO1_ADDR)) << 32) | + le32_get_bits(status_buf_addr_info->info0, + BUFFER_ADDR_INFO0_ADDR); - sw_mon_entries->mon_dst_sw_cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - buf_addr_info->info1); + sw_mon_entries->mon_dst_sw_cookie = le32_get_bits(buf_addr_info->info1, + BUFFER_ADDR_INFO1_SW_COOKIE); - sw_mon_entries->mon_status_sw_cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - status_buf_addr_info->info1); + sw_mon_entries->mon_status_sw_cookie = le32_get_bits(status_buf_addr_info->info1, + BUFFER_ADDR_INFO1_SW_COOKIE); - sw_mon_entries->status_buf_count = FIELD_GET(HAL_SW_MON_RING_INFO0_STATUS_BUF_CNT, - sw_mon_ring->info0); + sw_mon_entries->status_buf_count = le32_get_bits(sw_mon_ring->info0, + HAL_SW_MON_RING_INFO0_STATUS_BUF_CNT); sw_mon_entries->dst_buf_addr_info = buf_addr_info; sw_mon_entries->status_buf_addr_info = status_buf_addr_info; sw_mon_entries->ppdu_id = - FIELD_GET(HAL_SW_MON_RING_INFO1_PHY_PPDU_ID, sw_mon_ring->info1); + le32_get_bits(sw_mon_ring->info1, + HAL_SW_MON_RING_INFO1_PHY_PPDU_ID); } diff --git a/drivers/net/wireless/ath/ath11k/hal_rx.h b/drivers/net/wireless/ath/ath11k/hal_rx.h index 475807b89a1a..e19d9fc92e99 100644 --- a/drivers/net/wireless/ath/ath11k/hal_rx.h +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h @@ -247,13 +247,13 @@ struct hal_rx_ppdu_end_user_stats { } __packed; struct hal_rx_ppdu_end_user_stats_ext { - u32 info0; - u32 info1; - u32 info2; - u32 info3; - u32 info4; - u32 info5; - u32 info6; + __le32 info0; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 info4; + __le32 info5; + __le32 info6; } __packed; #define HAL_RX_HT_SIG_INFO_INFO0_MCS GENMASK(6, 0) diff --git a/drivers/net/wireless/ath/ath11k/hal_tx.c b/drivers/net/wireless/ath/ath11k/hal_tx.c index b7e9b1cdd76a..d208322d4d21 100644 --- a/drivers/net/wireless/ath/ath11k/hal_tx.c +++ b/drivers/net/wireless/ath/ath11k/hal_tx.c @@ -40,40 +40,43 @@ void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd, struct hal_tcl_data_cmd *tcl_cmd = cmd; tcl_cmd->buf_addr_info.info0 = - FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, ti->paddr); + le32_encode_bits(ti->paddr, BUFFER_ADDR_INFO0_ADDR); tcl_cmd->buf_addr_info.info1 = - FIELD_PREP(BUFFER_ADDR_INFO1_ADDR, - ((uint64_t)ti->paddr >> HAL_ADDR_MSB_REG_SHIFT)); + le32_encode_bits(((uint64_t)ti->paddr >> HAL_ADDR_MSB_REG_SHIFT), + BUFFER_ADDR_INFO1_ADDR); tcl_cmd->buf_addr_info.info1 |= - FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, ti->rbm_id) | - FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, ti->desc_id); + le32_encode_bits(ti->rbm_id, BUFFER_ADDR_INFO1_RET_BUF_MGR) | + le32_encode_bits(ti->desc_id, BUFFER_ADDR_INFO1_SW_COOKIE); tcl_cmd->info0 = - FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_DESC_TYPE, ti->type) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE, ti->encap_type) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCRYPT_TYPE, - ti->encrypt_type) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_SEARCH_TYPE, - ti->search_type) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ADDR_EN, - ti->addr_search_flags) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_CMD_NUM, - ti->meta_data_flags); - - tcl_cmd->info1 = ti->flags0 | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_DATA_LEN, ti->data_len) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_PKT_OFFSET, ti->pkt_offset); - - tcl_cmd->info2 = ti->flags1 | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TID, ti->tid) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ti->lmac_id); - - tcl_cmd->info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, - ti->dscp_tid_tbl_idx) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_SEARCH_INDEX, - ti->bss_ast_idx) | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_CACHE_SET_NUM, - ti->bss_ast_hash); + le32_encode_bits(ti->type, HAL_TCL_DATA_CMD_INFO0_DESC_TYPE) | + le32_encode_bits(ti->encap_type, + HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE) | + le32_encode_bits(ti->encrypt_type, + HAL_TCL_DATA_CMD_INFO0_ENCRYPT_TYPE) | + le32_encode_bits(ti->search_type, + HAL_TCL_DATA_CMD_INFO0_SEARCH_TYPE) | + le32_encode_bits(ti->addr_search_flags, + HAL_TCL_DATA_CMD_INFO0_ADDR_EN) | + le32_encode_bits(ti->meta_data_flags, + HAL_TCL_DATA_CMD_INFO0_CMD_NUM); + + tcl_cmd->info1 = cpu_to_le32(ti->flags0) | + le32_encode_bits(ti->data_len, + HAL_TCL_DATA_CMD_INFO1_DATA_LEN) | + le32_encode_bits(ti->pkt_offset, + HAL_TCL_DATA_CMD_INFO1_PKT_OFFSET); + + tcl_cmd->info2 = cpu_to_le32(ti->flags1) | + le32_encode_bits(ti->tid, HAL_TCL_DATA_CMD_INFO2_TID) | + le32_encode_bits(ti->lmac_id, HAL_TCL_DATA_CMD_INFO2_LMAC_ID); + + tcl_cmd->info3 = le32_encode_bits(ti->dscp_tid_tbl_idx, + HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX) | + le32_encode_bits(ti->bss_ast_idx, + HAL_TCL_DATA_CMD_INFO3_SEARCH_INDEX) | + le32_encode_bits(ti->bss_ast_hash, + HAL_TCL_DATA_CMD_INFO3_CACHE_SET_NUM); tcl_cmd->info4 = 0; if (ti->enable_mesh) @@ -86,7 +89,7 @@ void ath11k_hal_tx_set_dscp_tid_map(struct ath11k_base *ab, int id) u32 addr; u8 hw_map_val[HAL_DSCP_TID_TBL_SIZE]; int i; - u32 value; + __le32 value; int cnt = 0; ctrl_reg_val = ath11k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG + @@ -103,28 +106,29 @@ void ath11k_hal_tx_set_dscp_tid_map(struct ath11k_base *ab, int id) * three bytes in an iteration. */ for (i = 0; i < DSCP_TID_MAP_TBL_ENTRY_SIZE; i += 8) { - value = FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP0, - dscp_tid_map[i]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP1, - dscp_tid_map[i + 1]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP2, - dscp_tid_map[i + 2]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP3, - dscp_tid_map[i + 3]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP4, - dscp_tid_map[i + 4]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP5, - dscp_tid_map[i + 5]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP6, - dscp_tid_map[i + 6]) | - FIELD_PREP(HAL_TCL1_RING_FIELD_DSCP_TID_MAP7, - dscp_tid_map[i + 7]); + value = le32_encode_bits(dscp_tid_map[i], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP0) | + le32_encode_bits(dscp_tid_map[i + 1], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP1) | + le32_encode_bits(dscp_tid_map[i + 2], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP2) | + le32_encode_bits(dscp_tid_map[i + 3], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP3) | + le32_encode_bits(dscp_tid_map[i + 4], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP4) | + le32_encode_bits(dscp_tid_map[i + 5], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP5) | + le32_encode_bits(dscp_tid_map[i + 6], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP6) | + le32_encode_bits(dscp_tid_map[i + 7], + HAL_TCL1_RING_FIELD_DSCP_TID_MAP7); memcpy(&hw_map_val[cnt], (u8 *)&value, 3); cnt += 3; } for (i = 0; i < HAL_DSCP_TID_TBL_SIZE; i += 4) { - ath11k_hif_write32(ab, addr, *(u32 *)&hw_map_val[i]); + ath11k_hif_write32(ab, addr, + le32_to_cpu(*(__le32 *)&hw_map_val[i])); addr += 4; } @@ -152,9 +156,9 @@ void ath11k_hal_tx_init_data_ring(struct ath11k_base *ab, struct hal_srng *srng) for (i = 0; i < params.num_entries; i++) { tlv = (struct hal_tlv_hdr *)desc; - tlv->tl = FIELD_PREP(HAL_TLV_HDR_TAG, HAL_TCL_DATA_CMD) | - FIELD_PREP(HAL_TLV_HDR_LEN, - sizeof(struct hal_tcl_data_cmd)); + tlv->tl = le32_encode_bits(HAL_TCL_DATA_CMD, HAL_TLV_HDR_TAG) | + le32_encode_bits(sizeof(struct hal_tcl_data_cmd), + HAL_TLV_HDR_LEN); desc += entry_size; } } diff --git a/drivers/net/wireless/ath/ath11k/hw.c b/drivers/net/wireless/ath/ath11k/hw.c index 93f9a03c48dc..c83b058e18f7 100644 --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c @@ -37,22 +37,19 @@ static u8 ath11k_hw_ipq6018_mac_from_pdev_id(int pdev_idx) static void ath11k_hw_ipq8074_tx_mesh_enable(struct ath11k_base *ab, struct hal_tcl_data_cmd *tcl_cmd) { - tcl_cmd->info2 |= FIELD_PREP(HAL_IPQ8074_TCL_DATA_CMD_INFO2_MESH_ENABLE, - true); + tcl_cmd->info2 |= le32_encode_bits(true, HAL_IPQ8074_TCL_DATA_CMD_INFO2_MESH_ENABLE); } static void ath11k_hw_qcn9074_tx_mesh_enable(struct ath11k_base *ab, struct hal_tcl_data_cmd *tcl_cmd) { - tcl_cmd->info3 |= FIELD_PREP(HAL_QCN9074_TCL_DATA_CMD_INFO3_MESH_ENABLE, - true); + tcl_cmd->info3 |= le32_encode_bits(true, HAL_QCN9074_TCL_DATA_CMD_INFO3_MESH_ENABLE); } static void ath11k_hw_wcn6855_tx_mesh_enable(struct ath11k_base *ab, struct hal_tcl_data_cmd *tcl_cmd) { - tcl_cmd->info3 |= FIELD_PREP(HAL_QCN9074_TCL_DATA_CMD_INFO3_MESH_ENABLE, - true); + tcl_cmd->info3 |= le32_encode_bits(true, HAL_QCN9074_TCL_DATA_CMD_INFO3_MESH_ENABLE); } static void ath11k_init_wmi_config_qca6390(struct ath11k_base *ab, -- 2.53.0 The HTT messages exchanged with the firmware (H2T commands like SRNG setup, RX filter and PPDU stats configuration, T2H events like version confirmation, peer map/unmap, TX completion, PPDU and extended stats) as well as the RX attention and TX completion data in the data path are defined as little endian. The corresponding structures, however, use host endian u32 fields accessed with FIELD_PREP()/FIELD_GET(). On big endian hosts this leads to wrong ring configuration, wrong peer mapping and corrupted statistics. Convert the HTT and DP structures, including the HTT stats TLVs used by debugfs, to __le32 and use cpu_to_le32(), le32_to_cpu(), le32_encode_bits() and le32_get_bits() for all accesses. Adjust the format specifiers where the value type changes from unsigned long to u32. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c | 2229 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------- drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h | 1638 ++++++++++++++++++++++++++++++++++++------------------------------------ drivers/net/wireless/ath/ath11k/dp.h | 200 ++++----- drivers/net/wireless/ath/ath11k/dp_rx.c | 270 ++++++------ drivers/net/wireless/ath/ath11k/dp_tx.c | 217 +++++----- 5 files changed, 2370 insertions(+), 2184 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c b/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c index 731f3ca86711..e806f1753dca 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c +++ b/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.c @@ -75,107 +75,118 @@ static inline void htt_print_tx_pdev_stats_cmn_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_CMN_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_PDEV_STATS_CMN_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "hw_queued = %u\n", - htt_stats_buf->hw_queued); + le32_to_cpu(htt_stats_buf->hw_queued)); len += scnprintf(buf + len, buf_len - len, "hw_reaped = %u\n", - htt_stats_buf->hw_reaped); + le32_to_cpu(htt_stats_buf->hw_reaped)); len += scnprintf(buf + len, buf_len - len, "underrun = %u\n", - htt_stats_buf->underrun); + le32_to_cpu(htt_stats_buf->underrun)); len += scnprintf(buf + len, buf_len - len, "hw_paused = %u\n", - htt_stats_buf->hw_paused); + le32_to_cpu(htt_stats_buf->hw_paused)); len += scnprintf(buf + len, buf_len - len, "hw_flush = %u\n", - htt_stats_buf->hw_flush); + le32_to_cpu(htt_stats_buf->hw_flush)); len += scnprintf(buf + len, buf_len - len, "hw_filt = %u\n", - htt_stats_buf->hw_filt); + le32_to_cpu(htt_stats_buf->hw_filt)); len += scnprintf(buf + len, buf_len - len, "tx_abort = %u\n", - htt_stats_buf->tx_abort); + le32_to_cpu(htt_stats_buf->tx_abort)); len += scnprintf(buf + len, buf_len - len, "mpdu_requeued = %u\n", - htt_stats_buf->mpdu_requeued); + le32_to_cpu(htt_stats_buf->mpdu_requeued)); len += scnprintf(buf + len, buf_len - len, "tx_xretry = %u\n", - htt_stats_buf->tx_xretry); + le32_to_cpu(htt_stats_buf->tx_xretry)); len += scnprintf(buf + len, buf_len - len, "data_rc = %u\n", - htt_stats_buf->data_rc); + le32_to_cpu(htt_stats_buf->data_rc)); len += scnprintf(buf + len, buf_len - len, "mpdu_dropped_xretry = %u\n", - htt_stats_buf->mpdu_dropped_xretry); - len += scnprintf(buf + len, buf_len - len, "illegal_rate_phy_err = %u\n", - htt_stats_buf->illgl_rate_phy_err); + le32_to_cpu(htt_stats_buf->mpdu_dropped_xretry)); + len += scnprintf(buf + len, buf_len - len, + "illegal_rate_phy_err = %u\n", + le32_to_cpu(htt_stats_buf->illgl_rate_phy_err)); len += scnprintf(buf + len, buf_len - len, "cont_xretry = %u\n", - htt_stats_buf->cont_xretry); + le32_to_cpu(htt_stats_buf->cont_xretry)); len += scnprintf(buf + len, buf_len - len, "tx_timeout = %u\n", - htt_stats_buf->tx_timeout); + le32_to_cpu(htt_stats_buf->tx_timeout)); len += scnprintf(buf + len, buf_len - len, "pdev_resets = %u\n", - htt_stats_buf->pdev_resets); + le32_to_cpu(htt_stats_buf->pdev_resets)); len += scnprintf(buf + len, buf_len - len, "phy_underrun = %u\n", - htt_stats_buf->phy_underrun); + le32_to_cpu(htt_stats_buf->phy_underrun)); len += scnprintf(buf + len, buf_len - len, "txop_ovf = %u\n", - htt_stats_buf->txop_ovf); + le32_to_cpu(htt_stats_buf->txop_ovf)); len += scnprintf(buf + len, buf_len - len, "seq_posted = %u\n", - htt_stats_buf->seq_posted); + le32_to_cpu(htt_stats_buf->seq_posted)); len += scnprintf(buf + len, buf_len - len, "seq_failed_queueing = %u\n", - htt_stats_buf->seq_failed_queueing); + le32_to_cpu(htt_stats_buf->seq_failed_queueing)); len += scnprintf(buf + len, buf_len - len, "seq_completed = %u\n", - htt_stats_buf->seq_completed); + le32_to_cpu(htt_stats_buf->seq_completed)); len += scnprintf(buf + len, buf_len - len, "seq_restarted = %u\n", - htt_stats_buf->seq_restarted); + le32_to_cpu(htt_stats_buf->seq_restarted)); len += scnprintf(buf + len, buf_len - len, "mu_seq_posted = %u\n", - htt_stats_buf->mu_seq_posted); - len += scnprintf(buf + len, buf_len - len, "seq_switch_hw_paused = %u\n", - htt_stats_buf->seq_switch_hw_paused); + le32_to_cpu(htt_stats_buf->mu_seq_posted)); + len += scnprintf(buf + len, buf_len - len, + "seq_switch_hw_paused = %u\n", + le32_to_cpu(htt_stats_buf->seq_switch_hw_paused)); len += scnprintf(buf + len, buf_len - len, "next_seq_posted_dsr = %u\n", - htt_stats_buf->next_seq_posted_dsr); + le32_to_cpu(htt_stats_buf->next_seq_posted_dsr)); len += scnprintf(buf + len, buf_len - len, "seq_posted_isr = %u\n", - htt_stats_buf->seq_posted_isr); + le32_to_cpu(htt_stats_buf->seq_posted_isr)); len += scnprintf(buf + len, buf_len - len, "seq_ctrl_cached = %u\n", - htt_stats_buf->seq_ctrl_cached); + le32_to_cpu(htt_stats_buf->seq_ctrl_cached)); len += scnprintf(buf + len, buf_len - len, "mpdu_count_tqm = %u\n", - htt_stats_buf->mpdu_count_tqm); + le32_to_cpu(htt_stats_buf->mpdu_count_tqm)); len += scnprintf(buf + len, buf_len - len, "msdu_count_tqm = %u\n", - htt_stats_buf->msdu_count_tqm); + le32_to_cpu(htt_stats_buf->msdu_count_tqm)); len += scnprintf(buf + len, buf_len - len, "mpdu_removed_tqm = %u\n", - htt_stats_buf->mpdu_removed_tqm); + le32_to_cpu(htt_stats_buf->mpdu_removed_tqm)); len += scnprintf(buf + len, buf_len - len, "msdu_removed_tqm = %u\n", - htt_stats_buf->msdu_removed_tqm); + le32_to_cpu(htt_stats_buf->msdu_removed_tqm)); len += scnprintf(buf + len, buf_len - len, "mpdus_sw_flush = %u\n", - htt_stats_buf->mpdus_sw_flush); + le32_to_cpu(htt_stats_buf->mpdus_sw_flush)); len += scnprintf(buf + len, buf_len - len, "mpdus_hw_filter = %u\n", - htt_stats_buf->mpdus_hw_filter); + le32_to_cpu(htt_stats_buf->mpdus_hw_filter)); len += scnprintf(buf + len, buf_len - len, "mpdus_truncated = %u\n", - htt_stats_buf->mpdus_truncated); + le32_to_cpu(htt_stats_buf->mpdus_truncated)); len += scnprintf(buf + len, buf_len - len, "mpdus_ack_failed = %u\n", - htt_stats_buf->mpdus_ack_failed); + le32_to_cpu(htt_stats_buf->mpdus_ack_failed)); len += scnprintf(buf + len, buf_len - len, "mpdus_expired = %u\n", - htt_stats_buf->mpdus_expired); + le32_to_cpu(htt_stats_buf->mpdus_expired)); len += scnprintf(buf + len, buf_len - len, "mpdus_seq_hw_retry = %u\n", - htt_stats_buf->mpdus_seq_hw_retry); + le32_to_cpu(htt_stats_buf->mpdus_seq_hw_retry)); len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n", - htt_stats_buf->ack_tlv_proc); - len += scnprintf(buf + len, buf_len - len, "coex_abort_mpdu_cnt_valid = %u\n", - htt_stats_buf->coex_abort_mpdu_cnt_valid); + le32_to_cpu(htt_stats_buf->ack_tlv_proc)); + len += scnprintf(buf + len, buf_len - len, + "coex_abort_mpdu_cnt_valid = %u\n", + le32_to_cpu(htt_stats_buf->coex_abort_mpdu_cnt_valid)); len += scnprintf(buf + len, buf_len - len, "coex_abort_mpdu_cnt = %u\n", - htt_stats_buf->coex_abort_mpdu_cnt); - len += scnprintf(buf + len, buf_len - len, "num_total_ppdus_tried_ota = %u\n", - htt_stats_buf->num_total_ppdus_tried_ota); - len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_tried_ota = %u\n", - htt_stats_buf->num_data_ppdus_tried_ota); - len += scnprintf(buf + len, buf_len - len, "local_ctrl_mgmt_enqued = %u\n", - htt_stats_buf->local_ctrl_mgmt_enqued); - len += scnprintf(buf + len, buf_len - len, "local_ctrl_mgmt_freed = %u\n", - htt_stats_buf->local_ctrl_mgmt_freed); + le32_to_cpu(htt_stats_buf->coex_abort_mpdu_cnt)); + len += scnprintf(buf + len, buf_len - len, + "num_total_ppdus_tried_ota = %u\n", + le32_to_cpu(htt_stats_buf->num_total_ppdus_tried_ota)); + len += scnprintf(buf + len, buf_len - len, + "num_data_ppdus_tried_ota = %u\n", + le32_to_cpu(htt_stats_buf->num_data_ppdus_tried_ota)); + len += scnprintf(buf + len, buf_len - len, + "local_ctrl_mgmt_enqued = %u\n", + le32_to_cpu(htt_stats_buf->local_ctrl_mgmt_enqued)); + len += scnprintf(buf + len, buf_len - len, + "local_ctrl_mgmt_freed = %u\n", + le32_to_cpu(htt_stats_buf->local_ctrl_mgmt_freed)); len += scnprintf(buf + len, buf_len - len, "local_data_enqued = %u\n", - htt_stats_buf->local_data_enqued); + le32_to_cpu(htt_stats_buf->local_data_enqued)); len += scnprintf(buf + len, buf_len - len, "local_data_freed = %u\n", - htt_stats_buf->local_data_freed); + le32_to_cpu(htt_stats_buf->local_data_freed)); len += scnprintf(buf + len, buf_len - len, "mpdu_tried = %u\n", - htt_stats_buf->mpdu_tried); + le32_to_cpu(htt_stats_buf->mpdu_tried)); len += scnprintf(buf + len, buf_len - len, "isr_wait_seq_posted = %u\n", - htt_stats_buf->isr_wait_seq_posted); - len += scnprintf(buf + len, buf_len - len, "tx_active_dur_us_low = %u\n", - htt_stats_buf->tx_active_dur_us_low); - len += scnprintf(buf + len, buf_len - len, "tx_active_dur_us_high = %u\n\n", - htt_stats_buf->tx_active_dur_us_high); + le32_to_cpu(htt_stats_buf->isr_wait_seq_posted)); + len += scnprintf(buf + len, buf_len - len, + "tx_active_dur_us_low = %u\n", + le32_to_cpu(htt_stats_buf->tx_active_dur_us_low)); + len += scnprintf(buf + len, buf_len - len, + "tx_active_dur_us_high = %u\n\n", + le32_to_cpu(htt_stats_buf->tx_active_dur_us_high)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -318,20 +329,25 @@ htt_print_tx_pdev_stats_tx_ppdu_stats_tlv_v(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_TX_PPDU_STATS_TLV_V:\n"); - len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_legacy_su = %u\n", - htt_stats_buf->num_data_ppdus_legacy_su); + len += scnprintf(buf + len, buf_len - len, + "num_data_ppdus_legacy_su = %u\n", + le32_to_cpu(htt_stats_buf->num_data_ppdus_legacy_su)); - len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ac_su = %u\n", - htt_stats_buf->num_data_ppdus_ac_su); + len += scnprintf(buf + len, buf_len - len, + "num_data_ppdus_ac_su = %u\n", + le32_to_cpu(htt_stats_buf->num_data_ppdus_ac_su)); - len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ax_su = %u\n", - htt_stats_buf->num_data_ppdus_ax_su); + len += scnprintf(buf + len, buf_len - len, + "num_data_ppdus_ax_su = %u\n", + le32_to_cpu(htt_stats_buf->num_data_ppdus_ax_su)); - len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ac_su_txbf = %u\n", - htt_stats_buf->num_data_ppdus_ac_su_txbf); + len += scnprintf(buf + len, buf_len - len, + "num_data_ppdus_ac_su_txbf = %u\n", + le32_to_cpu(htt_stats_buf->num_data_ppdus_ac_su_txbf)); - len += scnprintf(buf + len, buf_len - len, "num_data_ppdus_ax_su_txbf = %u\n\n", - htt_stats_buf->num_data_ppdus_ax_su_txbf); + len += scnprintf(buf + len, buf_len - len, + "num_data_ppdus_ax_su_txbf = %u\n\n", + le32_to_cpu(htt_stats_buf->num_data_ppdus_ax_su_txbf)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -354,8 +370,9 @@ htt_print_tx_pdev_stats_tried_mpdu_cnt_hist_tlv_v(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_TRIED_MPDU_CNT_HIST_TLV_V:\n"); - len += scnprintf(buf + len, buf_len - len, "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u\n", - htt_stats_buf->hist_bin_size); + len += scnprintf(buf + len, buf_len - len, + "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u\n", + le32_to_cpu(htt_stats_buf->hist_bin_size)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->tried_mpdu_cnt_hist, "tried_mpdu_cnt_hist", num_elements, "\n\n"); @@ -382,9 +399,9 @@ static inline void htt_print_hw_stats_intr_misc_tlv(const void *tag_buf, HTT_STATS_MAX_HW_INTR_NAME_LEN); len += scnprintf(buf + len, buf_len - len, "hw_intr_name = %s\n", hw_intr_name); len += scnprintf(buf + len, buf_len - len, "mask = %u\n", - htt_stats_buf->mask); + le32_to_cpu(htt_stats_buf->mask)); len += scnprintf(buf + len, buf_len - len, "count = %u\n\n", - htt_stats_buf->count); + le32_to_cpu(htt_stats_buf->count)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -410,7 +427,7 @@ htt_print_hw_stats_wd_timeout_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "hw_module_name = %s\n", hw_module_name); len += scnprintf(buf + len, buf_len - len, "count = %u\n", - htt_stats_buf->count); + le32_to_cpu(htt_stats_buf->count)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -428,29 +445,31 @@ static inline void htt_print_hw_stats_pdev_errs_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_PDEV_ERRS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_HW_STATS_PDEV_ERRS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "tx_abort = %u\n", - htt_stats_buf->tx_abort); + le32_to_cpu(htt_stats_buf->tx_abort)); len += scnprintf(buf + len, buf_len - len, "tx_abort_fail_count = %u\n", - htt_stats_buf->tx_abort_fail_count); + le32_to_cpu(htt_stats_buf->tx_abort_fail_count)); len += scnprintf(buf + len, buf_len - len, "rx_abort = %u\n", - htt_stats_buf->rx_abort); + le32_to_cpu(htt_stats_buf->rx_abort)); len += scnprintf(buf + len, buf_len - len, "rx_abort_fail_count = %u\n", - htt_stats_buf->rx_abort_fail_count); + le32_to_cpu(htt_stats_buf->rx_abort_fail_count)); len += scnprintf(buf + len, buf_len - len, "warm_reset = %u\n", - htt_stats_buf->warm_reset); + le32_to_cpu(htt_stats_buf->warm_reset)); len += scnprintf(buf + len, buf_len - len, "cold_reset = %u\n", - htt_stats_buf->cold_reset); + le32_to_cpu(htt_stats_buf->cold_reset)); len += scnprintf(buf + len, buf_len - len, "tx_flush = %u\n", - htt_stats_buf->tx_flush); + le32_to_cpu(htt_stats_buf->tx_flush)); len += scnprintf(buf + len, buf_len - len, "tx_glb_reset = %u\n", - htt_stats_buf->tx_glb_reset); + le32_to_cpu(htt_stats_buf->tx_glb_reset)); len += scnprintf(buf + len, buf_len - len, "tx_txq_reset = %u\n", - htt_stats_buf->tx_txq_reset); + le32_to_cpu(htt_stats_buf->tx_txq_reset)); len += scnprintf(buf + len, buf_len - len, "rx_timeout_reset = %u\n\n", - htt_stats_buf->rx_timeout_reset); + le32_to_cpu(htt_stats_buf->rx_timeout_reset)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -468,36 +487,44 @@ static inline void htt_print_msdu_flow_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_MSDU_FLOW_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "last_update_timestamp = %u\n", - htt_stats_buf->last_update_timestamp); + len += scnprintf(buf + len, buf_len - len, + "HTT_MSDU_FLOW_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, + "last_update_timestamp = %u\n", + le32_to_cpu(htt_stats_buf->last_update_timestamp)); len += scnprintf(buf + len, buf_len - len, "last_add_timestamp = %u\n", - htt_stats_buf->last_add_timestamp); - len += scnprintf(buf + len, buf_len - len, "last_remove_timestamp = %u\n", - htt_stats_buf->last_remove_timestamp); - len += scnprintf(buf + len, buf_len - len, "total_processed_msdu_count = %u\n", - htt_stats_buf->total_processed_msdu_count); - len += scnprintf(buf + len, buf_len - len, "cur_msdu_count_in_flowq = %u\n", - htt_stats_buf->cur_msdu_count_in_flowq); + le32_to_cpu(htt_stats_buf->last_add_timestamp)); + len += scnprintf(buf + len, buf_len - len, + "last_remove_timestamp = %u\n", + le32_to_cpu(htt_stats_buf->last_remove_timestamp)); + len += scnprintf(buf + len, buf_len - len, + "total_processed_msdu_count = %u\n", + le32_to_cpu(htt_stats_buf->total_processed_msdu_count)); + len += scnprintf(buf + len, buf_len - len, + "cur_msdu_count_in_flowq = %u\n", + le32_to_cpu(htt_stats_buf->cur_msdu_count_in_flowq)); len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n", - htt_stats_buf->sw_peer_id); - len += scnprintf(buf + len, buf_len - len, "tx_flow_no = %lu\n", - FIELD_GET(HTT_MSDU_FLOW_STATS_TX_FLOW_NO, - htt_stats_buf->tx_flow_no__tid_num__drop_rule)); - len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n", - FIELD_GET(HTT_MSDU_FLOW_STATS_TID_NUM, - htt_stats_buf->tx_flow_no__tid_num__drop_rule)); - len += scnprintf(buf + len, buf_len - len, "drop_rule = %lu\n", - FIELD_GET(HTT_MSDU_FLOW_STATS_DROP_RULE, - htt_stats_buf->tx_flow_no__tid_num__drop_rule)); - len += scnprintf(buf + len, buf_len - len, "last_cycle_enqueue_count = %u\n", - htt_stats_buf->last_cycle_enqueue_count); - len += scnprintf(buf + len, buf_len - len, "last_cycle_dequeue_count = %u\n", - htt_stats_buf->last_cycle_dequeue_count); - len += scnprintf(buf + len, buf_len - len, "last_cycle_drop_count = %u\n", - htt_stats_buf->last_cycle_drop_count); + le32_to_cpu(htt_stats_buf->sw_peer_id)); + len += scnprintf(buf + len, buf_len - len, "tx_flow_no = %u\n", + le32_get_bits(htt_stats_buf->tx_flow_no__tid_num__drop_rule, + HTT_MSDU_FLOW_STATS_TX_FLOW_NO)); + len += scnprintf(buf + len, buf_len - len, "tid_num = %u\n", + le32_get_bits(htt_stats_buf->tx_flow_no__tid_num__drop_rule, + HTT_MSDU_FLOW_STATS_TID_NUM)); + len += scnprintf(buf + len, buf_len - len, "drop_rule = %u\n", + le32_get_bits(htt_stats_buf->tx_flow_no__tid_num__drop_rule, + HTT_MSDU_FLOW_STATS_DROP_RULE)); + len += scnprintf(buf + len, buf_len - len, + "last_cycle_enqueue_count = %u\n", + le32_to_cpu(htt_stats_buf->last_cycle_enqueue_count)); + len += scnprintf(buf + len, buf_len - len, + "last_cycle_dequeue_count = %u\n", + le32_to_cpu(htt_stats_buf->last_cycle_dequeue_count)); + len += scnprintf(buf + len, buf_len - len, + "last_cycle_drop_count = %u\n", + le32_to_cpu(htt_stats_buf->last_cycle_drop_count)); len += scnprintf(buf + len, buf_len - len, "current_drop_th = %u\n\n", - htt_stats_buf->current_drop_th); + le32_to_cpu(htt_stats_buf->current_drop_th)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -519,38 +546,38 @@ static inline void htt_print_tx_tid_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_TID_STATS_TLV:\n"); memcpy(tid_name, &(htt_stats_buf->tid_name[0]), MAX_HTT_TID_NAME); len += scnprintf(buf + len, buf_len - len, "tid_name = %s\n", tid_name); - len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_SW_PEER_ID, - htt_stats_buf->sw_peer_id__tid_num)); - len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_TID_NUM, - htt_stats_buf->sw_peer_id__tid_num)); - len += scnprintf(buf + len, buf_len - len, "num_sched_pending = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_NUM_SCHED_PENDING, - htt_stats_buf->num_sched_pending__num_ppdu_in_hwq)); - len += scnprintf(buf + len, buf_len - len, "num_ppdu_in_hwq = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_NUM_PPDU_IN_HWQ, - htt_stats_buf->num_sched_pending__num_ppdu_in_hwq)); + len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n", + le32_get_bits(htt_stats_buf->sw_peer_id__tid_num, + HTT_TX_TID_STATS_SW_PEER_ID)); + len += scnprintf(buf + len, buf_len - len, "tid_num = %u\n", + le32_get_bits(htt_stats_buf->sw_peer_id__tid_num, + HTT_TX_TID_STATS_TID_NUM)); + len += scnprintf(buf + len, buf_len - len, "num_sched_pending = %u\n", + le32_get_bits(htt_stats_buf->num_sched_pending__num_ppdu_in_hwq, + HTT_TX_TID_STATS_NUM_SCHED_PENDING)); + len += scnprintf(buf + len, buf_len - len, "num_ppdu_in_hwq = %u\n", + le32_get_bits(htt_stats_buf->num_sched_pending__num_ppdu_in_hwq, + HTT_TX_TID_STATS_NUM_PPDU_IN_HWQ)); len += scnprintf(buf + len, buf_len - len, "tid_flags = 0x%x\n", - htt_stats_buf->tid_flags); + le32_to_cpu(htt_stats_buf->tid_flags)); len += scnprintf(buf + len, buf_len - len, "hw_queued = %u\n", - htt_stats_buf->hw_queued); + le32_to_cpu(htt_stats_buf->hw_queued)); len += scnprintf(buf + len, buf_len - len, "hw_reaped = %u\n", - htt_stats_buf->hw_reaped); + le32_to_cpu(htt_stats_buf->hw_reaped)); len += scnprintf(buf + len, buf_len - len, "mpdus_hw_filter = %u\n", - htt_stats_buf->mpdus_hw_filter); + le32_to_cpu(htt_stats_buf->mpdus_hw_filter)); len += scnprintf(buf + len, buf_len - len, "qdepth_bytes = %u\n", - htt_stats_buf->qdepth_bytes); + le32_to_cpu(htt_stats_buf->qdepth_bytes)); len += scnprintf(buf + len, buf_len - len, "qdepth_num_msdu = %u\n", - htt_stats_buf->qdepth_num_msdu); + le32_to_cpu(htt_stats_buf->qdepth_num_msdu)); len += scnprintf(buf + len, buf_len - len, "qdepth_num_mpdu = %u\n", - htt_stats_buf->qdepth_num_mpdu); + le32_to_cpu(htt_stats_buf->qdepth_num_mpdu)); len += scnprintf(buf + len, buf_len - len, "last_scheduled_tsmp = %u\n", - htt_stats_buf->last_scheduled_tsmp); + le32_to_cpu(htt_stats_buf->last_scheduled_tsmp)); len += scnprintf(buf + len, buf_len - len, "pause_module_id = %u\n", - htt_stats_buf->pause_module_id); + le32_to_cpu(htt_stats_buf->pause_module_id)); len += scnprintf(buf + len, buf_len - len, "block_module_id = %u\n\n", - htt_stats_buf->block_module_id); + le32_to_cpu(htt_stats_buf->block_module_id)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -572,42 +599,43 @@ static inline void htt_print_tx_tid_stats_v1_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_TID_STATS_V1_TLV:\n"); memcpy(tid_name, &(htt_stats_buf->tid_name[0]), MAX_HTT_TID_NAME); len += scnprintf(buf + len, buf_len - len, "tid_name = %s\n", tid_name); - len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_V1_SW_PEER_ID, - htt_stats_buf->sw_peer_id__tid_num)); - len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_V1_TID_NUM, - htt_stats_buf->sw_peer_id__tid_num)); - len += scnprintf(buf + len, buf_len - len, "num_sched_pending = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_V1_NUM_SCHED_PENDING, - htt_stats_buf->num_sched_pending__num_ppdu_in_hwq)); - len += scnprintf(buf + len, buf_len - len, "num_ppdu_in_hwq = %lu\n", - FIELD_GET(HTT_TX_TID_STATS_V1_NUM_PPDU_IN_HWQ, - htt_stats_buf->num_sched_pending__num_ppdu_in_hwq)); + len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n", + le32_get_bits(htt_stats_buf->sw_peer_id__tid_num, + HTT_TX_TID_STATS_V1_SW_PEER_ID)); + len += scnprintf(buf + len, buf_len - len, "tid_num = %u\n", + le32_get_bits(htt_stats_buf->sw_peer_id__tid_num, + HTT_TX_TID_STATS_V1_TID_NUM)); + len += scnprintf(buf + len, buf_len - len, "num_sched_pending = %u\n", + le32_get_bits(htt_stats_buf->num_sched_pending__num_ppdu_in_hwq, + HTT_TX_TID_STATS_V1_NUM_SCHED_PENDING)); + len += scnprintf(buf + len, buf_len - len, "num_ppdu_in_hwq = %u\n", + le32_get_bits(htt_stats_buf->num_sched_pending__num_ppdu_in_hwq, + HTT_TX_TID_STATS_V1_NUM_PPDU_IN_HWQ)); len += scnprintf(buf + len, buf_len - len, "tid_flags = 0x%x\n", - htt_stats_buf->tid_flags); + le32_to_cpu(htt_stats_buf->tid_flags)); len += scnprintf(buf + len, buf_len - len, "max_qdepth_bytes = %u\n", - htt_stats_buf->max_qdepth_bytes); + le32_to_cpu(htt_stats_buf->max_qdepth_bytes)); len += scnprintf(buf + len, buf_len - len, "max_qdepth_n_msdus = %u\n", - htt_stats_buf->max_qdepth_n_msdus); + le32_to_cpu(htt_stats_buf->max_qdepth_n_msdus)); len += scnprintf(buf + len, buf_len - len, "rsvd = %u\n", - htt_stats_buf->rsvd); + le32_to_cpu(htt_stats_buf->rsvd)); len += scnprintf(buf + len, buf_len - len, "qdepth_bytes = %u\n", - htt_stats_buf->qdepth_bytes); + le32_to_cpu(htt_stats_buf->qdepth_bytes)); len += scnprintf(buf + len, buf_len - len, "qdepth_num_msdu = %u\n", - htt_stats_buf->qdepth_num_msdu); + le32_to_cpu(htt_stats_buf->qdepth_num_msdu)); len += scnprintf(buf + len, buf_len - len, "qdepth_num_mpdu = %u\n", - htt_stats_buf->qdepth_num_mpdu); + le32_to_cpu(htt_stats_buf->qdepth_num_mpdu)); len += scnprintf(buf + len, buf_len - len, "last_scheduled_tsmp = %u\n", - htt_stats_buf->last_scheduled_tsmp); + le32_to_cpu(htt_stats_buf->last_scheduled_tsmp)); len += scnprintf(buf + len, buf_len - len, "pause_module_id = %u\n", - htt_stats_buf->pause_module_id); + le32_to_cpu(htt_stats_buf->pause_module_id)); len += scnprintf(buf + len, buf_len - len, "block_module_id = %u\n", - htt_stats_buf->block_module_id); + le32_to_cpu(htt_stats_buf->block_module_id)); len += scnprintf(buf + len, buf_len - len, "allow_n_flags = 0x%x\n", - htt_stats_buf->allow_n_flags); - len += scnprintf(buf + len, buf_len - len, "sendn_frms_allowed = %u\n\n", - htt_stats_buf->sendn_frms_allowed); + le32_to_cpu(htt_stats_buf->allow_n_flags)); + len += scnprintf(buf + len, buf_len - len, + "sendn_frms_allowed = %u\n\n", + le32_to_cpu(htt_stats_buf->sendn_frms_allowed)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -627,22 +655,25 @@ static inline void htt_print_rx_tid_stats_tlv(const void *tag_buf, char tid_name[MAX_HTT_TID_NAME + 1] = {}; len += scnprintf(buf + len, buf_len - len, "HTT_RX_TID_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %lu\n", - FIELD_GET(HTT_RX_TID_STATS_SW_PEER_ID, - htt_stats_buf->sw_peer_id__tid_num)); - len += scnprintf(buf + len, buf_len - len, "tid_num = %lu\n", - FIELD_GET(HTT_RX_TID_STATS_TID_NUM, - htt_stats_buf->sw_peer_id__tid_num)); + len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n", + le32_get_bits(htt_stats_buf->sw_peer_id__tid_num, + HTT_RX_TID_STATS_SW_PEER_ID)); + len += scnprintf(buf + len, buf_len - len, "tid_num = %u\n", + le32_get_bits(htt_stats_buf->sw_peer_id__tid_num, + HTT_RX_TID_STATS_TID_NUM)); memcpy(tid_name, &(htt_stats_buf->tid_name[0]), MAX_HTT_TID_NAME); len += scnprintf(buf + len, buf_len - len, "tid_name = %s\n", tid_name); len += scnprintf(buf + len, buf_len - len, "dup_in_reorder = %u\n", - htt_stats_buf->dup_in_reorder); - len += scnprintf(buf + len, buf_len - len, "dup_past_outside_window = %u\n", - htt_stats_buf->dup_past_outside_window); - len += scnprintf(buf + len, buf_len - len, "dup_past_within_window = %u\n", - htt_stats_buf->dup_past_within_window); - len += scnprintf(buf + len, buf_len - len, "rxdesc_err_decrypt = %u\n\n", - htt_stats_buf->rxdesc_err_decrypt); + le32_to_cpu(htt_stats_buf->dup_in_reorder)); + len += scnprintf(buf + len, buf_len - len, + "dup_past_outside_window = %u\n", + le32_to_cpu(htt_stats_buf->dup_past_outside_window)); + len += scnprintf(buf + len, buf_len - len, + "dup_past_within_window = %u\n", + le32_to_cpu(htt_stats_buf->dup_past_within_window)); + len += scnprintf(buf + len, buf_len - len, + "rxdesc_err_decrypt = %u\n\n", + le32_to_cpu(htt_stats_buf->rxdesc_err_decrypt)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -666,7 +697,7 @@ static inline void htt_print_counter_tlv(const void *tag_buf, "counter_name", HTT_MAX_COUNTER_NAME, "\n"); len += scnprintf(buf + len, buf_len - len, "count = %u\n\n", - htt_stats_buf->count); + le32_to_cpu(htt_stats_buf->count)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -686,33 +717,34 @@ static inline void htt_print_peer_stats_cmn_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_PEER_STATS_CMN_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "ppdu_cnt = %u\n", - htt_stats_buf->ppdu_cnt); + le32_to_cpu(htt_stats_buf->ppdu_cnt)); len += scnprintf(buf + len, buf_len - len, "mpdu_cnt = %u\n", - htt_stats_buf->mpdu_cnt); + le32_to_cpu(htt_stats_buf->mpdu_cnt)); len += scnprintf(buf + len, buf_len - len, "msdu_cnt = %u\n", - htt_stats_buf->msdu_cnt); + le32_to_cpu(htt_stats_buf->msdu_cnt)); len += scnprintf(buf + len, buf_len - len, "pause_bitmap = %u\n", - htt_stats_buf->pause_bitmap); + le32_to_cpu(htt_stats_buf->pause_bitmap)); len += scnprintf(buf + len, buf_len - len, "block_bitmap = %u\n", - htt_stats_buf->block_bitmap); + le32_to_cpu(htt_stats_buf->block_bitmap)); len += scnprintf(buf + len, buf_len - len, "last_rssi = %d\n", htt_stats_buf->rssi); len += scnprintf(buf + len, buf_len - len, "enqueued_count = %llu\n", - htt_stats_buf->peer_enqueued_count_low | - ((u64)htt_stats_buf->peer_enqueued_count_high << 32)); + le32_to_cpu(htt_stats_buf->peer_enqueued_count_low) | + ((u64)le32_to_cpu(htt_stats_buf->peer_enqueued_count_high) << 32)); len += scnprintf(buf + len, buf_len - len, "dequeued_count = %llu\n", - htt_stats_buf->peer_dequeued_count_low | - ((u64)htt_stats_buf->peer_dequeued_count_high << 32)); + le32_to_cpu(htt_stats_buf->peer_dequeued_count_low) | + ((u64)le32_to_cpu(htt_stats_buf->peer_dequeued_count_high) << 32)); len += scnprintf(buf + len, buf_len - len, "dropped_count = %llu\n", - htt_stats_buf->peer_dropped_count_low | - ((u64)htt_stats_buf->peer_dropped_count_high << 32)); - len += scnprintf(buf + len, buf_len - len, "transmitted_ppdu_bytes = %llu\n", - htt_stats_buf->ppdu_transmitted_bytes_low | - ((u64)htt_stats_buf->ppdu_transmitted_bytes_high << 32)); + le32_to_cpu(htt_stats_buf->peer_dropped_count_low) | + ((u64)le32_to_cpu(htt_stats_buf->peer_dropped_count_high) << 32)); + len += scnprintf(buf + len, buf_len - len, + "transmitted_ppdu_bytes = %llu\n", + le32_to_cpu(htt_stats_buf->ppdu_transmitted_bytes_low) | + ((u64)le32_to_cpu(htt_stats_buf->ppdu_transmitted_bytes_high) << 32)); len += scnprintf(buf + len, buf_len - len, "ttl_removed_count = %u\n", - htt_stats_buf->peer_ttl_removed_count); + le32_to_cpu(htt_stats_buf->peer_ttl_removed_count)); len += scnprintf(buf + len, buf_len - len, "inactive_time = %u\n\n", - htt_stats_buf->inactive_time); + le32_to_cpu(htt_stats_buf->inactive_time)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -732,36 +764,36 @@ static inline void htt_print_peer_details_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_PEER_DETAILS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "peer_type = %u\n", - htt_stats_buf->peer_type); + le32_to_cpu(htt_stats_buf->peer_type)); len += scnprintf(buf + len, buf_len - len, "sw_peer_id = %u\n", - htt_stats_buf->sw_peer_id); - len += scnprintf(buf + len, buf_len - len, "vdev_id = %lu\n", - FIELD_GET(HTT_PEER_DETAILS_VDEV_ID, - htt_stats_buf->vdev_pdev_ast_idx)); - len += scnprintf(buf + len, buf_len - len, "pdev_id = %lu\n", - FIELD_GET(HTT_PEER_DETAILS_PDEV_ID, - htt_stats_buf->vdev_pdev_ast_idx)); - len += scnprintf(buf + len, buf_len - len, "ast_idx = %lu\n", - FIELD_GET(HTT_PEER_DETAILS_AST_IDX, - htt_stats_buf->vdev_pdev_ast_idx)); - len += scnprintf(buf + len, buf_len - len, - "mac_addr = %02lx:%02lx:%02lx:%02lx:%02lx:%02lx\n", - FIELD_GET(HTT_MAC_ADDR_L32_0, - htt_stats_buf->mac_addr.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_L32_1, - htt_stats_buf->mac_addr.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_L32_2, - htt_stats_buf->mac_addr.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_L32_3, - htt_stats_buf->mac_addr.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_H16_0, - htt_stats_buf->mac_addr.mac_addr_h16), - FIELD_GET(HTT_MAC_ADDR_H16_1, - htt_stats_buf->mac_addr.mac_addr_h16)); + le32_to_cpu(htt_stats_buf->sw_peer_id)); + len += scnprintf(buf + len, buf_len - len, "vdev_id = %u\n", + le32_get_bits(htt_stats_buf->vdev_pdev_ast_idx, + HTT_PEER_DETAILS_VDEV_ID)); + len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n", + le32_get_bits(htt_stats_buf->vdev_pdev_ast_idx, + HTT_PEER_DETAILS_PDEV_ID)); + len += scnprintf(buf + len, buf_len - len, "ast_idx = %u\n", + le32_get_bits(htt_stats_buf->vdev_pdev_ast_idx, + HTT_PEER_DETAILS_AST_IDX)); + len += scnprintf(buf + len, buf_len - len, + "mac_addr = %02x:%02x:%02x:%02x:%02x:%02x\n", + le32_get_bits(htt_stats_buf->mac_addr.mac_addr_l32, + HTT_MAC_ADDR_L32_0), + le32_get_bits(htt_stats_buf->mac_addr.mac_addr_l32, + HTT_MAC_ADDR_L32_1), + le32_get_bits(htt_stats_buf->mac_addr.mac_addr_l32, + HTT_MAC_ADDR_L32_2), + le32_get_bits(htt_stats_buf->mac_addr.mac_addr_l32, + HTT_MAC_ADDR_L32_3), + le32_get_bits(htt_stats_buf->mac_addr.mac_addr_h16, + HTT_MAC_ADDR_H16_0), + le32_get_bits(htt_stats_buf->mac_addr.mac_addr_h16, + HTT_MAC_ADDR_H16_1)); len += scnprintf(buf + len, buf_len - len, "peer_flags = 0x%x\n", - htt_stats_buf->peer_flags); + le32_to_cpu(htt_stats_buf->peer_flags)); len += scnprintf(buf + len, buf_len - len, "qpeer_flags = 0x%x\n\n", - htt_stats_buf->qpeer_flags); + le32_to_cpu(htt_stats_buf->qpeer_flags)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -782,11 +814,11 @@ static inline void htt_print_tx_peer_rate_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_PEER_RATE_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "tx_ldpc = %u\n", - htt_stats_buf->tx_ldpc); + le32_to_cpu(htt_stats_buf->tx_ldpc)); len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n", - htt_stats_buf->rts_cnt); + le32_to_cpu(htt_stats_buf->rts_cnt)); len += scnprintf(buf + len, buf_len - len, "ack_rssi = %u\n", - htt_stats_buf->ack_rssi); + le32_to_cpu(htt_stats_buf->ack_rssi)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->tx_mcs, "tx_mcs", HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS, "\n"); @@ -832,17 +864,17 @@ static inline void htt_print_rx_peer_rate_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_RX_PEER_RATE_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "nsts = %u\n", - htt_stats_buf->nsts); + le32_to_cpu(htt_stats_buf->nsts)); len += scnprintf(buf + len, buf_len - len, "rx_ldpc = %u\n", - htt_stats_buf->rx_ldpc); + le32_to_cpu(htt_stats_buf->rx_ldpc)); len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n", - htt_stats_buf->rts_cnt); + le32_to_cpu(htt_stats_buf->rts_cnt)); len += scnprintf(buf + len, buf_len - len, "rssi_mgmt = %u\n", - htt_stats_buf->rssi_mgmt); + le32_to_cpu(htt_stats_buf->rssi_mgmt)); len += scnprintf(buf + len, buf_len - len, "rssi_data = %u\n", - htt_stats_buf->rssi_data); + le32_to_cpu(htt_stats_buf->rssi_data)); len += scnprintf(buf + len, buf_len - len, "rssi_comb = %u\n", - htt_stats_buf->rssi_comb); + le32_to_cpu(htt_stats_buf->rssi_comb)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->rx_mcs, "rx_mcs", HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n"); @@ -891,11 +923,12 @@ htt_print_tx_hwq_mu_mimo_sch_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_SCH_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_posted = %u\n", - htt_stats_buf->mu_mimo_sch_posted); + le32_to_cpu(htt_stats_buf->mu_mimo_sch_posted)); len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_failed = %u\n", - htt_stats_buf->mu_mimo_sch_failed); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n\n", - htt_stats_buf->mu_mimo_ppdu_posted); + le32_to_cpu(htt_stats_buf->mu_mimo_sch_failed)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_ppdu_posted = %u\n\n", + le32_to_cpu(htt_stats_buf->mu_mimo_ppdu_posted)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -916,20 +949,27 @@ htt_print_tx_hwq_mu_mimo_mpdu_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_MPDU_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_queued_usr = %u\n", - htt_stats_buf->mu_mimo_mpdus_queued_usr); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_tried_usr = %u\n", - htt_stats_buf->mu_mimo_mpdus_tried_usr); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_failed_usr = %u\n", - htt_stats_buf->mu_mimo_mpdus_failed_usr); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdus_requeued_usr = %u\n", - htt_stats_buf->mu_mimo_mpdus_requeued_usr); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_err_no_ba_usr = %u\n", - htt_stats_buf->mu_mimo_err_no_ba_usr); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_mpdu_underrun_usr = %u\n", - htt_stats_buf->mu_mimo_mpdu_underrun_usr); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_ampdu_underrun_usr = %u\n\n", - htt_stats_buf->mu_mimo_ampdu_underrun_usr); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_mpdus_queued_usr = %u\n", + le32_to_cpu(htt_stats_buf->mu_mimo_mpdus_queued_usr)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_mpdus_tried_usr = %u\n", + le32_to_cpu(htt_stats_buf->mu_mimo_mpdus_tried_usr)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_mpdus_failed_usr = %u\n", + le32_to_cpu(htt_stats_buf->mu_mimo_mpdus_failed_usr)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_mpdus_requeued_usr = %u\n", + le32_to_cpu(htt_stats_buf->mu_mimo_mpdus_requeued_usr)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_err_no_ba_usr = %u\n", + le32_to_cpu(htt_stats_buf->mu_mimo_err_no_ba_usr)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_mpdu_underrun_usr = %u\n", + le32_to_cpu(htt_stats_buf->mu_mimo_mpdu_underrun_usr)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_ampdu_underrun_usr = %u\n\n", + le32_to_cpu(htt_stats_buf->mu_mimo_ampdu_underrun_usr)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -948,13 +988,14 @@ htt_print_tx_hwq_mu_mimo_cmn_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_MU_MIMO_CMN_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_TX_HWQ_STATS_MAC_ID, - htt_stats_buf->mac_id__hwq_id__word)); - len += scnprintf(buf + len, buf_len - len, "hwq_id = %lu\n\n", - FIELD_GET(HTT_TX_HWQ_STATS_HWQ_ID, - htt_stats_buf->mac_id__hwq_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_HWQ_MU_MIMO_CMN_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__hwq_id__word, + HTT_TX_HWQ_STATS_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, "hwq_id = %u\n\n", + le32_get_bits(htt_stats_buf->mac_id__hwq_id__word, + HTT_TX_HWQ_STATS_HWQ_ID)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -973,53 +1014,55 @@ htt_print_tx_hwq_stats_cmn_tlv(const void *tag_buf, struct debug_htt_stats_req * u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; /* TODO: HKDBG */ - len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_STATS_CMN_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_TX_HWQ_STATS_MAC_ID, - htt_stats_buf->mac_id__hwq_id__word)); - len += scnprintf(buf + len, buf_len - len, "hwq_id = %lu\n", - FIELD_GET(HTT_TX_HWQ_STATS_HWQ_ID, - htt_stats_buf->mac_id__hwq_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_HWQ_STATS_CMN_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__hwq_id__word, + HTT_TX_HWQ_STATS_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, "hwq_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__hwq_id__word, + HTT_TX_HWQ_STATS_HWQ_ID)); len += scnprintf(buf + len, buf_len - len, "xretry = %u\n", - htt_stats_buf->xretry); + le32_to_cpu(htt_stats_buf->xretry)); len += scnprintf(buf + len, buf_len - len, "underrun_cnt = %u\n", - htt_stats_buf->underrun_cnt); + le32_to_cpu(htt_stats_buf->underrun_cnt)); len += scnprintf(buf + len, buf_len - len, "flush_cnt = %u\n", - htt_stats_buf->flush_cnt); + le32_to_cpu(htt_stats_buf->flush_cnt)); len += scnprintf(buf + len, buf_len - len, "filt_cnt = %u\n", - htt_stats_buf->filt_cnt); + le32_to_cpu(htt_stats_buf->filt_cnt)); len += scnprintf(buf + len, buf_len - len, "null_mpdu_bmap = %u\n", - htt_stats_buf->null_mpdu_bmap); + le32_to_cpu(htt_stats_buf->null_mpdu_bmap)); len += scnprintf(buf + len, buf_len - len, "user_ack_failure = %u\n", - htt_stats_buf->user_ack_failure); + le32_to_cpu(htt_stats_buf->user_ack_failure)); len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n", - htt_stats_buf->ack_tlv_proc); + le32_to_cpu(htt_stats_buf->ack_tlv_proc)); len += scnprintf(buf + len, buf_len - len, "sched_id_proc = %u\n", - htt_stats_buf->sched_id_proc); + le32_to_cpu(htt_stats_buf->sched_id_proc)); len += scnprintf(buf + len, buf_len - len, "null_mpdu_tx_count = %u\n", - htt_stats_buf->null_mpdu_tx_count); + le32_to_cpu(htt_stats_buf->null_mpdu_tx_count)); len += scnprintf(buf + len, buf_len - len, "mpdu_bmap_not_recvd = %u\n", - htt_stats_buf->mpdu_bmap_not_recvd); + le32_to_cpu(htt_stats_buf->mpdu_bmap_not_recvd)); len += scnprintf(buf + len, buf_len - len, "num_bar = %u\n", - htt_stats_buf->num_bar); + le32_to_cpu(htt_stats_buf->num_bar)); len += scnprintf(buf + len, buf_len - len, "rts = %u\n", - htt_stats_buf->rts); + le32_to_cpu(htt_stats_buf->rts)); len += scnprintf(buf + len, buf_len - len, "cts2self = %u\n", - htt_stats_buf->cts2self); + le32_to_cpu(htt_stats_buf->cts2self)); len += scnprintf(buf + len, buf_len - len, "qos_null = %u\n", - htt_stats_buf->qos_null); + le32_to_cpu(htt_stats_buf->qos_null)); len += scnprintf(buf + len, buf_len - len, "mpdu_tried_cnt = %u\n", - htt_stats_buf->mpdu_tried_cnt); + le32_to_cpu(htt_stats_buf->mpdu_tried_cnt)); len += scnprintf(buf + len, buf_len - len, "mpdu_queued_cnt = %u\n", - htt_stats_buf->mpdu_queued_cnt); + le32_to_cpu(htt_stats_buf->mpdu_queued_cnt)); len += scnprintf(buf + len, buf_len - len, "mpdu_ack_fail_cnt = %u\n", - htt_stats_buf->mpdu_ack_fail_cnt); + le32_to_cpu(htt_stats_buf->mpdu_ack_fail_cnt)); len += scnprintf(buf + len, buf_len - len, "mpdu_filt_cnt = %u\n", - htt_stats_buf->mpdu_filt_cnt); - len += scnprintf(buf + len, buf_len - len, "false_mpdu_ack_count = %u\n", - htt_stats_buf->false_mpdu_ack_count); + le32_to_cpu(htt_stats_buf->mpdu_filt_cnt)); + len += scnprintf(buf + len, buf_len - len, + "false_mpdu_ack_count = %u\n", + le32_to_cpu(htt_stats_buf->false_mpdu_ack_count)); len += scnprintf(buf + len, buf_len - len, "txq_timeout = %u\n\n", - htt_stats_buf->txq_timeout); + le32_to_cpu(htt_stats_buf->txq_timeout)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1043,7 +1086,7 @@ htt_print_tx_hwq_difs_latency_stats_tlv_v(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_DIFS_LATENCY_STATS_TLV_V:\n"); len += scnprintf(buf + len, buf_len - len, "hist_intvl = %u\n", - htt_stats_buf->hist_intvl); + le32_to_cpu(htt_stats_buf->hist_intvl)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->difs_latency_hist, "difs_latency_hist", data_len, "\n\n"); @@ -1150,8 +1193,9 @@ htt_print_tx_hwq_tried_mpdu_cnt_hist_tlv_v(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_HWQ_TRIED_MPDU_CNT_HIST_TLV_V:\n"); - len += scnprintf(buf + len, buf_len - len, "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u\n", - htt_stats_buf->hist_bin_size); + len += scnprintf(buf + len, buf_len - len, + "TRIED_MPDU_CNT_HIST_BIN_SIZE : %u\n", + le32_to_cpu(htt_stats_buf->hist_bin_size)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->tried_mpdu_cnt_hist, "tried_mpdu_cnt_hist", num_elements, "\n\n"); @@ -1197,42 +1241,42 @@ static inline void htt_print_tx_sounding_stats_tlv(const void *tag_buf, u8 *buf = stats_req->buf; u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - const u32 *cbf_20 = htt_stats_buf->cbf_20; - const u32 *cbf_40 = htt_stats_buf->cbf_40; - const u32 *cbf_80 = htt_stats_buf->cbf_80; - const u32 *cbf_160 = htt_stats_buf->cbf_160; + const __le32 *cbf_20 = htt_stats_buf->cbf_20; + const __le32 *cbf_40 = htt_stats_buf->cbf_40; + const __le32 *cbf_80 = htt_stats_buf->cbf_80; + const __le32 *cbf_160 = htt_stats_buf->cbf_160; - if (htt_stats_buf->tx_sounding_mode == HTT_TX_AC_SOUNDING_MODE) { + if (le32_to_cpu(htt_stats_buf->tx_sounding_mode) == HTT_TX_AC_SOUNDING_MODE) { len += scnprintf(buf + len, buf_len - len, "\nHTT_TX_AC_SOUNDING_STATS_TLV:\n\n"); len += scnprintf(buf + len, buf_len - len, "ac_cbf_20 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); len += scnprintf(buf + len, buf_len - len, "ac_cbf_40 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); len += scnprintf(buf + len, buf_len - len, "ac_cbf_80 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); len += scnprintf(buf + len, buf_len - len, "ac_cbf_160 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); for (i = 0; i < HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS; i++) { len += scnprintf(buf + len, buf_len - len, @@ -1243,37 +1287,37 @@ static inline void htt_print_tx_sounding_stats_tlv(const void *tag_buf, htt_stats_buf->sounding[2], htt_stats_buf->sounding[3]); } - } else if (htt_stats_buf->tx_sounding_mode == HTT_TX_AX_SOUNDING_MODE) { + } else if (le32_to_cpu(htt_stats_buf->tx_sounding_mode) == HTT_TX_AX_SOUNDING_MODE) { len += scnprintf(buf + len, buf_len - len, "\nHTT_TX_AX_SOUNDING_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "ax_cbf_20 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_20[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_20[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); len += scnprintf(buf + len, buf_len - len, "ax_cbf_40 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_40[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_40[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); len += scnprintf(buf + len, buf_len - len, "ax_cbf_80 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_80[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_80[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); len += scnprintf(buf + len, buf_len - len, "ax_cbf_160 = IBF : %u, SU_SIFS : %u, SU_RBO : %u, MU_SIFS : %u, MU_RBO : %u\n", - cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS], - cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS]); + le32_to_cpu(cbf_160[HTT_IMPLICIT_TXBF_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_SU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_SU_RBO_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_MU_SIFS_STEER_STATS]), + le32_to_cpu(cbf_160[HTT_EXPLICIT_TXBF_MU_RBO_STEER_STATS])); for (i = 0; i < HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS; i++) { len += scnprintf(buf + len, buf_len - len, @@ -1303,31 +1347,33 @@ htt_print_tx_selfgen_cmn_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_CMN_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_SELFGEN_CMN_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "su_bar = %u\n", - htt_stats_buf->su_bar); + le32_to_cpu(htt_stats_buf->su_bar)); len += scnprintf(buf + len, buf_len - len, "rts = %u\n", - htt_stats_buf->rts); + le32_to_cpu(htt_stats_buf->rts)); len += scnprintf(buf + len, buf_len - len, "cts2self = %u\n", - htt_stats_buf->cts2self); + le32_to_cpu(htt_stats_buf->cts2self)); len += scnprintf(buf + len, buf_len - len, "qos_null = %u\n", - htt_stats_buf->qos_null); + le32_to_cpu(htt_stats_buf->qos_null)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_1 = %u\n", - htt_stats_buf->delayed_bar_1); + le32_to_cpu(htt_stats_buf->delayed_bar_1)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_2 = %u\n", - htt_stats_buf->delayed_bar_2); + le32_to_cpu(htt_stats_buf->delayed_bar_2)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_3 = %u\n", - htt_stats_buf->delayed_bar_3); + le32_to_cpu(htt_stats_buf->delayed_bar_3)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_4 = %u\n", - htt_stats_buf->delayed_bar_4); + le32_to_cpu(htt_stats_buf->delayed_bar_4)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_5 = %u\n", - htt_stats_buf->delayed_bar_5); + le32_to_cpu(htt_stats_buf->delayed_bar_5)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_6 = %u\n", - htt_stats_buf->delayed_bar_6); + le32_to_cpu(htt_stats_buf->delayed_bar_6)); len += scnprintf(buf + len, buf_len - len, "delayed_bar_7 = %u\n\n", - htt_stats_buf->delayed_bar_7); + le32_to_cpu(htt_stats_buf->delayed_bar_7)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1348,19 +1394,20 @@ htt_print_tx_selfgen_ac_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "ac_su_ndpa = %u\n", - htt_stats_buf->ac_su_ndpa); + le32_to_cpu(htt_stats_buf->ac_su_ndpa)); len += scnprintf(buf + len, buf_len - len, "ac_su_ndp = %u\n", - htt_stats_buf->ac_su_ndp); + le32_to_cpu(htt_stats_buf->ac_su_ndp)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndpa = %u\n", - htt_stats_buf->ac_mu_mimo_ndpa); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndpa)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndp = %u\n", - htt_stats_buf->ac_mu_mimo_ndp); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndp)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brpoll_1 = %u\n", - htt_stats_buf->ac_mu_mimo_brpoll_1); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_brpoll_1)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brpoll_2 = %u\n", - htt_stats_buf->ac_mu_mimo_brpoll_2); - len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brpoll_3 = %u\n\n", - htt_stats_buf->ac_mu_mimo_brpoll_3); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_brpoll_2)); + len += scnprintf(buf + len, buf_len - len, + "ac_mu_mimo_brpoll_3 = %u\n\n", + le32_to_cpu(htt_stats_buf->ac_mu_mimo_brpoll_3)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1381,37 +1428,37 @@ htt_print_tx_selfgen_ax_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "ax_su_ndpa = %u\n", - htt_stats_buf->ax_su_ndpa); + le32_to_cpu(htt_stats_buf->ax_su_ndpa)); len += scnprintf(buf + len, buf_len - len, "ax_su_ndp = %u\n", - htt_stats_buf->ax_su_ndp); + le32_to_cpu(htt_stats_buf->ax_su_ndp)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndpa = %u\n", - htt_stats_buf->ax_mu_mimo_ndpa); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndpa)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndp = %u\n", - htt_stats_buf->ax_mu_mimo_ndp); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndp)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_1 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_1); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_1)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_2 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_2); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_2)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_3 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_3); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_3)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_4 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_4); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_4)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_5 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_5); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_5)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_6 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_6); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_6)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brpoll_7 = %u\n", - htt_stats_buf->ax_mu_mimo_brpoll_7); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brpoll_7)); len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger = %u\n", - htt_stats_buf->ax_basic_trigger); + le32_to_cpu(htt_stats_buf->ax_basic_trigger)); len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_trigger = %u\n", - htt_stats_buf->ax_ulmumimo_trigger); + le32_to_cpu(htt_stats_buf->ax_ulmumimo_trigger)); len += scnprintf(buf + len, buf_len - len, "ax_bsr_trigger = %u\n", - htt_stats_buf->ax_bsr_trigger); + le32_to_cpu(htt_stats_buf->ax_bsr_trigger)); len += scnprintf(buf + len, buf_len - len, "ax_mu_bar_trigger = %u\n", - htt_stats_buf->ax_mu_bar_trigger); + le32_to_cpu(htt_stats_buf->ax_mu_bar_trigger)); len += scnprintf(buf + len, buf_len - len, "ax_mu_rts_trigger = %u\n\n", - htt_stats_buf->ax_mu_rts_trigger); + le32_to_cpu(htt_stats_buf->ax_mu_rts_trigger)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1432,19 +1479,20 @@ htt_print_tx_selfgen_ac_err_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AC_ERR_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "ac_su_ndp_err = %u\n", - htt_stats_buf->ac_su_ndp_err); + le32_to_cpu(htt_stats_buf->ac_su_ndp_err)); len += scnprintf(buf + len, buf_len - len, "ac_su_ndpa_err = %u\n", - htt_stats_buf->ac_su_ndpa_err); + le32_to_cpu(htt_stats_buf->ac_su_ndpa_err)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndpa_err = %u\n", - htt_stats_buf->ac_mu_mimo_ndpa_err); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndpa_err)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ndp_err = %u\n", - htt_stats_buf->ac_mu_mimo_ndp_err); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_ndp_err)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp1_err = %u\n", - htt_stats_buf->ac_mu_mimo_brp1_err); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_brp1_err)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp2_err = %u\n", - htt_stats_buf->ac_mu_mimo_brp2_err); - len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_brp3_err = %u\n\n", - htt_stats_buf->ac_mu_mimo_brp3_err); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_brp2_err)); + len += scnprintf(buf + len, buf_len - len, + "ac_mu_mimo_brp3_err = %u\n\n", + le32_to_cpu(htt_stats_buf->ac_mu_mimo_brp3_err)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1465,37 +1513,41 @@ htt_print_tx_selfgen_ax_err_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_SELFGEN_AX_ERR_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "ax_su_ndp_err = %u\n", - htt_stats_buf->ax_su_ndp_err); + le32_to_cpu(htt_stats_buf->ax_su_ndp_err)); len += scnprintf(buf + len, buf_len - len, "ax_su_ndpa_err = %u\n", - htt_stats_buf->ax_su_ndpa_err); + le32_to_cpu(htt_stats_buf->ax_su_ndpa_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndpa_err = %u\n", - htt_stats_buf->ax_mu_mimo_ndpa_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndpa_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ndp_err = %u\n", - htt_stats_buf->ax_mu_mimo_ndp_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_ndp_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp1_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp1_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp1_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp2_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp2_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp2_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp3_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp3_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp3_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp4_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp4_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp4_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp5_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp5_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp5_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp6_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp6_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp6_err)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_brp7_err = %u\n", - htt_stats_buf->ax_mu_mimo_brp7_err); - len += scnprintf(buf + len, buf_len - len, "ax_basic_trigger_err = %u\n", - htt_stats_buf->ax_basic_trigger_err); - len += scnprintf(buf + len, buf_len - len, "ax_ulmumimo_trigger_err = %u\n", - htt_stats_buf->ax_ulmumimo_trigger_err); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_brp7_err)); + len += scnprintf(buf + len, buf_len - len, + "ax_basic_trigger_err = %u\n", + le32_to_cpu(htt_stats_buf->ax_basic_trigger_err)); + len += scnprintf(buf + len, buf_len - len, + "ax_ulmumimo_trigger_err = %u\n", + le32_to_cpu(htt_stats_buf->ax_ulmumimo_trigger_err)); len += scnprintf(buf + len, buf_len - len, "ax_bsr_trigger_err = %u\n", - htt_stats_buf->ax_bsr_trigger_err); - len += scnprintf(buf + len, buf_len - len, "ax_mu_bar_trigger_err = %u\n", - htt_stats_buf->ax_mu_bar_trigger_err); - len += scnprintf(buf + len, buf_len - len, "ax_mu_rts_trigger_err = %u\n\n", - htt_stats_buf->ax_mu_rts_trigger_err); + le32_to_cpu(htt_stats_buf->ax_bsr_trigger_err)); + len += scnprintf(buf + len, buf_len - len, + "ax_mu_bar_trigger_err = %u\n", + le32_to_cpu(htt_stats_buf->ax_mu_bar_trigger_err)); + len += scnprintf(buf + len, buf_len - len, + "ax_mu_rts_trigger_err = %u\n\n", + le32_to_cpu(htt_stats_buf->ax_mu_rts_trigger_err)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1518,11 +1570,12 @@ htt_print_tx_pdev_mu_mimo_sch_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_MU_MIMO_SCH_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_posted = %u\n", - htt_stats_buf->mu_mimo_sch_posted); + le32_to_cpu(htt_stats_buf->mu_mimo_sch_posted)); len += scnprintf(buf + len, buf_len - len, "mu_mimo_sch_failed = %u\n", - htt_stats_buf->mu_mimo_sch_failed); - len += scnprintf(buf + len, buf_len - len, "mu_mimo_ppdu_posted = %u\n\n", - htt_stats_buf->mu_mimo_ppdu_posted); + le32_to_cpu(htt_stats_buf->mu_mimo_sch_failed)); + len += scnprintf(buf + len, buf_len - len, + "mu_mimo_ppdu_posted = %u\n\n", + le32_to_cpu(htt_stats_buf->mu_mimo_ppdu_posted)); for (i = 0; i < HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS; i++) len += scnprintf(buf + len, buf_len - len, @@ -1596,116 +1649,117 @@ htt_print_tx_pdev_mu_mimo_mpdu_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - if (htt_stats_buf->tx_sched_mode == HTT_STATS_TX_SCHED_MODE_MU_MIMO_AC) { - if (!htt_stats_buf->user_index) + if (le32_to_cpu(htt_stats_buf->tx_sched_mode) == HTT_STATS_TX_SCHED_MODE_MU_MIMO_AC) { + if (!le32_to_cpu(htt_stats_buf->user_index)) len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_MU_MIMO_AC_MPDU_STATS:\n"); - if (htt_stats_buf->user_index < + if (le32_to_cpu(htt_stats_buf->user_index) < HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS) { len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_mpdus_queued_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_queued_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_queued_usr)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_mpdus_tried_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_tried_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_tried_usr)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_mpdus_failed_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_failed_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_failed_usr)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_mpdus_requeued_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_requeued_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_requeued_usr)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_err_no_ba_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->err_no_ba_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->err_no_ba_usr)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_mpdu_underrun_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdu_underrun_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdu_underrun_usr)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_ampdu_underrun_usr_%u = %u\n\n", - htt_stats_buf->user_index, - htt_stats_buf->ampdu_underrun_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->ampdu_underrun_usr)); } } - if (htt_stats_buf->tx_sched_mode == HTT_STATS_TX_SCHED_MODE_MU_MIMO_AX) { - if (!htt_stats_buf->user_index) + if (le32_to_cpu(htt_stats_buf->tx_sched_mode) == HTT_STATS_TX_SCHED_MODE_MU_MIMO_AX) { + if (!le32_to_cpu(htt_stats_buf->user_index)) len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_MU_MIMO_AX_MPDU_STATS:\n"); - if (htt_stats_buf->user_index < + if (le32_to_cpu(htt_stats_buf->user_index) < HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS) { len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_mpdus_queued_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_queued_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_queued_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_mpdus_tried_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_tried_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_tried_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_mpdus_failed_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_failed_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_failed_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_mpdus_requeued_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_requeued_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_requeued_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_err_no_ba_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->err_no_ba_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->err_no_ba_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_mpdu_underrun_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdu_underrun_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdu_underrun_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_ampdu_underrun_usr_%u = %u\n\n", - htt_stats_buf->user_index, - htt_stats_buf->ampdu_underrun_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->ampdu_underrun_usr)); } } - if (htt_stats_buf->tx_sched_mode == HTT_STATS_TX_SCHED_MODE_MU_OFDMA_AX) { - if (!htt_stats_buf->user_index) + if (le32_to_cpu(htt_stats_buf->tx_sched_mode) == HTT_STATS_TX_SCHED_MODE_MU_OFDMA_AX) { + if (!le32_to_cpu(htt_stats_buf->user_index)) len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_AX_MU_OFDMA_MPDU_STATS:\n"); - if (htt_stats_buf->user_index < HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS) { + if (le32_to_cpu(htt_stats_buf->user_index) < + HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS) { len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_mpdus_queued_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_queued_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_queued_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_mpdus_tried_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_tried_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_tried_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_mpdus_failed_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_failed_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_failed_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_mpdus_requeued_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdus_requeued_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdus_requeued_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_err_no_ba_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->err_no_ba_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->err_no_ba_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_mpdu_underrun_usr_%u = %u\n", - htt_stats_buf->user_index, - htt_stats_buf->mpdu_underrun_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->mpdu_underrun_usr)); len += scnprintf(buf + len, buf_len - len, "ax_mu_ofdma_ampdu_underrun_usr_%u = %u\n\n", - htt_stats_buf->user_index, - htt_stats_buf->ampdu_underrun_usr); + le32_to_cpu(htt_stats_buf->user_index), + le32_to_cpu(htt_stats_buf->ampdu_underrun_usr)); } } @@ -1830,54 +1884,63 @@ htt_print_tx_pdev_stats_sched_per_txq_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_STATS_SCHED_PER_TXQ_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID, - htt_stats_buf->mac_id__txq_id__word)); - len += scnprintf(buf + len, buf_len - len, "txq_id = %lu\n", - FIELD_GET(HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID, - htt_stats_buf->mac_id__txq_id__word)); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__txq_id__word, + HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, "txq_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__txq_id__word, + HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID)); len += scnprintf(buf + len, buf_len - len, "sched_policy = %u\n", - htt_stats_buf->sched_policy); + le32_to_cpu(htt_stats_buf->sched_policy)); len += scnprintf(buf + len, buf_len - len, "last_sched_cmd_posted_timestamp = %u\n", - htt_stats_buf->last_sched_cmd_posted_timestamp); + le32_to_cpu(htt_stats_buf->last_sched_cmd_posted_timestamp)); len += scnprintf(buf + len, buf_len - len, "last_sched_cmd_compl_timestamp = %u\n", - htt_stats_buf->last_sched_cmd_compl_timestamp); - len += scnprintf(buf + len, buf_len - len, "sched_2_tac_lwm_count = %u\n", - htt_stats_buf->sched_2_tac_lwm_count); - len += scnprintf(buf + len, buf_len - len, "sched_2_tac_ring_full = %u\n", - htt_stats_buf->sched_2_tac_ring_full); - len += scnprintf(buf + len, buf_len - len, "sched_cmd_post_failure = %u\n", - htt_stats_buf->sched_cmd_post_failure); + le32_to_cpu(htt_stats_buf->last_sched_cmd_compl_timestamp)); + len += scnprintf(buf + len, buf_len - len, + "sched_2_tac_lwm_count = %u\n", + le32_to_cpu(htt_stats_buf->sched_2_tac_lwm_count)); + len += scnprintf(buf + len, buf_len - len, + "sched_2_tac_ring_full = %u\n", + le32_to_cpu(htt_stats_buf->sched_2_tac_ring_full)); + len += scnprintf(buf + len, buf_len - len, + "sched_cmd_post_failure = %u\n", + le32_to_cpu(htt_stats_buf->sched_cmd_post_failure)); len += scnprintf(buf + len, buf_len - len, "num_active_tids = %u\n", - htt_stats_buf->num_active_tids); + le32_to_cpu(htt_stats_buf->num_active_tids)); len += scnprintf(buf + len, buf_len - len, "num_ps_schedules = %u\n", - htt_stats_buf->num_ps_schedules); + le32_to_cpu(htt_stats_buf->num_ps_schedules)); len += scnprintf(buf + len, buf_len - len, "sched_cmds_pending = %u\n", - htt_stats_buf->sched_cmds_pending); + le32_to_cpu(htt_stats_buf->sched_cmds_pending)); len += scnprintf(buf + len, buf_len - len, "num_tid_register = %u\n", - htt_stats_buf->num_tid_register); + le32_to_cpu(htt_stats_buf->num_tid_register)); len += scnprintf(buf + len, buf_len - len, "num_tid_unregister = %u\n", - htt_stats_buf->num_tid_unregister); + le32_to_cpu(htt_stats_buf->num_tid_unregister)); len += scnprintf(buf + len, buf_len - len, "num_qstats_queried = %u\n", - htt_stats_buf->num_qstats_queried); - len += scnprintf(buf + len, buf_len - len, "qstats_update_pending = %u\n", - htt_stats_buf->qstats_update_pending); - len += scnprintf(buf + len, buf_len - len, "last_qstats_query_timestamp = %u\n", - htt_stats_buf->last_qstats_query_timestamp); + le32_to_cpu(htt_stats_buf->num_qstats_queried)); + len += scnprintf(buf + len, buf_len - len, + "qstats_update_pending = %u\n", + le32_to_cpu(htt_stats_buf->qstats_update_pending)); + len += scnprintf(buf + len, buf_len - len, + "last_qstats_query_timestamp = %u\n", + le32_to_cpu(htt_stats_buf->last_qstats_query_timestamp)); len += scnprintf(buf + len, buf_len - len, "num_tqm_cmdq_full = %u\n", - htt_stats_buf->num_tqm_cmdq_full); - len += scnprintf(buf + len, buf_len - len, "num_de_sched_algo_trigger = %u\n", - htt_stats_buf->num_de_sched_algo_trigger); - len += scnprintf(buf + len, buf_len - len, "num_rt_sched_algo_trigger = %u\n", - htt_stats_buf->num_rt_sched_algo_trigger); - len += scnprintf(buf + len, buf_len - len, "num_tqm_sched_algo_trigger = %u\n", - htt_stats_buf->num_tqm_sched_algo_trigger); + le32_to_cpu(htt_stats_buf->num_tqm_cmdq_full)); + len += scnprintf(buf + len, buf_len - len, + "num_de_sched_algo_trigger = %u\n", + le32_to_cpu(htt_stats_buf->num_de_sched_algo_trigger)); + len += scnprintf(buf + len, buf_len - len, + "num_rt_sched_algo_trigger = %u\n", + le32_to_cpu(htt_stats_buf->num_rt_sched_algo_trigger)); + len += scnprintf(buf + len, buf_len - len, + "num_tqm_sched_algo_trigger = %u\n", + le32_to_cpu(htt_stats_buf->num_tqm_sched_algo_trigger)); len += scnprintf(buf + len, buf_len - len, "notify_sched = %u\n\n", - htt_stats_buf->notify_sched); - len += scnprintf(buf + len, buf_len - len, "dur_based_sendn_term = %u\n\n", - htt_stats_buf->dur_based_sendn_term); + le32_to_cpu(htt_stats_buf->notify_sched)); + len += scnprintf(buf + len, buf_len - len, + "dur_based_sendn_term = %u\n\n", + le32_to_cpu(htt_stats_buf->dur_based_sendn_term)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1895,11 +1958,13 @@ static inline void htt_print_stats_tx_sched_cmn_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_STATS_TX_SCHED_CMN_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_STATS_TX_SCHED_CMN_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "current_timestamp = %u\n\n", - htt_stats_buf->current_timestamp); + le32_to_cpu(htt_stats_buf->current_timestamp)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -1995,67 +2060,72 @@ htt_print_tx_tqm_pdev_stats_tlv_v(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_PDEV_STATS_TLV_V:\n"); len += scnprintf(buf + len, buf_len - len, "msdu_count = %u\n", - htt_stats_buf->msdu_count); + le32_to_cpu(htt_stats_buf->msdu_count)); len += scnprintf(buf + len, buf_len - len, "mpdu_count = %u\n", - htt_stats_buf->mpdu_count); + le32_to_cpu(htt_stats_buf->mpdu_count)); len += scnprintf(buf + len, buf_len - len, "remove_msdu = %u\n", - htt_stats_buf->remove_msdu); + le32_to_cpu(htt_stats_buf->remove_msdu)); len += scnprintf(buf + len, buf_len - len, "remove_mpdu = %u\n", - htt_stats_buf->remove_mpdu); + le32_to_cpu(htt_stats_buf->remove_mpdu)); len += scnprintf(buf + len, buf_len - len, "remove_msdu_ttl = %u\n", - htt_stats_buf->remove_msdu_ttl); + le32_to_cpu(htt_stats_buf->remove_msdu_ttl)); len += scnprintf(buf + len, buf_len - len, "send_bar = %u\n", - htt_stats_buf->send_bar); + le32_to_cpu(htt_stats_buf->send_bar)); len += scnprintf(buf + len, buf_len - len, "bar_sync = %u\n", - htt_stats_buf->bar_sync); + le32_to_cpu(htt_stats_buf->bar_sync)); len += scnprintf(buf + len, buf_len - len, "notify_mpdu = %u\n", - htt_stats_buf->notify_mpdu); + le32_to_cpu(htt_stats_buf->notify_mpdu)); len += scnprintf(buf + len, buf_len - len, "sync_cmd = %u\n", - htt_stats_buf->sync_cmd); + le32_to_cpu(htt_stats_buf->sync_cmd)); len += scnprintf(buf + len, buf_len - len, "write_cmd = %u\n", - htt_stats_buf->write_cmd); + le32_to_cpu(htt_stats_buf->write_cmd)); len += scnprintf(buf + len, buf_len - len, "hwsch_trigger = %u\n", - htt_stats_buf->hwsch_trigger); + le32_to_cpu(htt_stats_buf->hwsch_trigger)); len += scnprintf(buf + len, buf_len - len, "ack_tlv_proc = %u\n", - htt_stats_buf->ack_tlv_proc); + le32_to_cpu(htt_stats_buf->ack_tlv_proc)); len += scnprintf(buf + len, buf_len - len, "gen_mpdu_cmd = %u\n", - htt_stats_buf->gen_mpdu_cmd); + le32_to_cpu(htt_stats_buf->gen_mpdu_cmd)); len += scnprintf(buf + len, buf_len - len, "gen_list_cmd = %u\n", - htt_stats_buf->gen_list_cmd); + le32_to_cpu(htt_stats_buf->gen_list_cmd)); len += scnprintf(buf + len, buf_len - len, "remove_mpdu_cmd = %u\n", - htt_stats_buf->remove_mpdu_cmd); - len += scnprintf(buf + len, buf_len - len, "remove_mpdu_tried_cmd = %u\n", - htt_stats_buf->remove_mpdu_tried_cmd); - len += scnprintf(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u\n", - htt_stats_buf->mpdu_queue_stats_cmd); + le32_to_cpu(htt_stats_buf->remove_mpdu_cmd)); + len += scnprintf(buf + len, buf_len - len, + "remove_mpdu_tried_cmd = %u\n", + le32_to_cpu(htt_stats_buf->remove_mpdu_tried_cmd)); + len += scnprintf(buf + len, buf_len - len, + "mpdu_queue_stats_cmd = %u\n", + le32_to_cpu(htt_stats_buf->mpdu_queue_stats_cmd)); len += scnprintf(buf + len, buf_len - len, "mpdu_head_info_cmd = %u\n", - htt_stats_buf->mpdu_head_info_cmd); + le32_to_cpu(htt_stats_buf->mpdu_head_info_cmd)); len += scnprintf(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u\n", - htt_stats_buf->msdu_flow_stats_cmd); + le32_to_cpu(htt_stats_buf->msdu_flow_stats_cmd)); len += scnprintf(buf + len, buf_len - len, "remove_msdu_cmd = %u\n", - htt_stats_buf->remove_msdu_cmd); + le32_to_cpu(htt_stats_buf->remove_msdu_cmd)); len += scnprintf(buf + len, buf_len - len, "remove_msdu_ttl_cmd = %u\n", - htt_stats_buf->remove_msdu_ttl_cmd); + le32_to_cpu(htt_stats_buf->remove_msdu_ttl_cmd)); len += scnprintf(buf + len, buf_len - len, "flush_cache_cmd = %u\n", - htt_stats_buf->flush_cache_cmd); + le32_to_cpu(htt_stats_buf->flush_cache_cmd)); len += scnprintf(buf + len, buf_len - len, "update_mpduq_cmd = %u\n", - htt_stats_buf->update_mpduq_cmd); + le32_to_cpu(htt_stats_buf->update_mpduq_cmd)); len += scnprintf(buf + len, buf_len - len, "enqueue = %u\n", - htt_stats_buf->enqueue); + le32_to_cpu(htt_stats_buf->enqueue)); len += scnprintf(buf + len, buf_len - len, "enqueue_notify = %u\n", - htt_stats_buf->enqueue_notify); + le32_to_cpu(htt_stats_buf->enqueue_notify)); len += scnprintf(buf + len, buf_len - len, "notify_mpdu_at_head = %u\n", - htt_stats_buf->notify_mpdu_at_head); - len += scnprintf(buf + len, buf_len - len, "notify_mpdu_state_valid = %u\n", - htt_stats_buf->notify_mpdu_state_valid); + le32_to_cpu(htt_stats_buf->notify_mpdu_at_head)); + len += scnprintf(buf + len, buf_len - len, + "notify_mpdu_state_valid = %u\n", + le32_to_cpu(htt_stats_buf->notify_mpdu_state_valid)); len += scnprintf(buf + len, buf_len - len, "sched_udp_notify1 = %u\n", - htt_stats_buf->sched_udp_notify1); + le32_to_cpu(htt_stats_buf->sched_udp_notify1)); len += scnprintf(buf + len, buf_len - len, "sched_udp_notify2 = %u\n", - htt_stats_buf->sched_udp_notify2); - len += scnprintf(buf + len, buf_len - len, "sched_nonudp_notify1 = %u\n", - htt_stats_buf->sched_nonudp_notify1); - len += scnprintf(buf + len, buf_len - len, "sched_nonudp_notify2 = %u\n\n", - htt_stats_buf->sched_nonudp_notify2); + le32_to_cpu(htt_stats_buf->sched_udp_notify2)); + len += scnprintf(buf + len, buf_len - len, + "sched_nonudp_notify1 = %u\n", + le32_to_cpu(htt_stats_buf->sched_nonudp_notify1)); + len += scnprintf(buf + len, buf_len - len, + "sched_nonudp_notify2 = %u\n\n", + le32_to_cpu(htt_stats_buf->sched_nonudp_notify2)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2073,23 +2143,26 @@ static inline void htt_print_tx_tqm_cmn_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_CMN_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_TQM_CMN_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "max_cmdq_id = %u\n", - htt_stats_buf->max_cmdq_id); - len += scnprintf(buf + len, buf_len - len, "list_mpdu_cnt_hist_intvl = %u\n", - htt_stats_buf->list_mpdu_cnt_hist_intvl); + le32_to_cpu(htt_stats_buf->max_cmdq_id)); + len += scnprintf(buf + len, buf_len - len, + "list_mpdu_cnt_hist_intvl = %u\n", + le32_to_cpu(htt_stats_buf->list_mpdu_cnt_hist_intvl)); len += scnprintf(buf + len, buf_len - len, "add_msdu = %u\n", - htt_stats_buf->add_msdu); + le32_to_cpu(htt_stats_buf->add_msdu)); len += scnprintf(buf + len, buf_len - len, "q_empty = %u\n", - htt_stats_buf->q_empty); + le32_to_cpu(htt_stats_buf->q_empty)); len += scnprintf(buf + len, buf_len - len, "q_not_empty = %u\n", - htt_stats_buf->q_not_empty); + le32_to_cpu(htt_stats_buf->q_not_empty)); len += scnprintf(buf + len, buf_len - len, "drop_notification = %u\n", - htt_stats_buf->drop_notification); + le32_to_cpu(htt_stats_buf->drop_notification)); len += scnprintf(buf + len, buf_len - len, "desc_threshold = %u\n\n", - htt_stats_buf->desc_threshold); + le32_to_cpu(htt_stats_buf->desc_threshold)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2109,11 +2182,11 @@ static inline void htt_print_tx_tqm_error_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_ERROR_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "q_empty_failure = %u\n", - htt_stats_buf->q_empty_failure); + le32_to_cpu(htt_stats_buf->q_empty_failure)); len += scnprintf(buf + len, buf_len - len, "q_not_empty_failure = %u\n", - htt_stats_buf->q_not_empty_failure); + le32_to_cpu(htt_stats_buf->q_not_empty_failure)); len += scnprintf(buf + len, buf_len - len, "add_msdu_failure = %u\n\n", - htt_stats_buf->add_msdu_failure); + le32_to_cpu(htt_stats_buf->add_msdu_failure)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2131,35 +2204,37 @@ static inline void htt_print_tx_tqm_cmdq_status_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_TQM_CMDQ_STATUS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_TX_TQM_CMDQ_STATUS_MAC_ID, - htt_stats_buf->mac_id__cmdq_id__word)); - len += scnprintf(buf + len, buf_len - len, "cmdq_id = %lu\n\n", - FIELD_GET(HTT_TX_TQM_CMDQ_STATUS_CMDQ_ID, - htt_stats_buf->mac_id__cmdq_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_TQM_CMDQ_STATUS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__cmdq_id__word, + HTT_TX_TQM_CMDQ_STATUS_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, "cmdq_id = %u\n\n", + le32_get_bits(htt_stats_buf->mac_id__cmdq_id__word, + HTT_TX_TQM_CMDQ_STATUS_CMDQ_ID)); len += scnprintf(buf + len, buf_len - len, "sync_cmd = %u\n", - htt_stats_buf->sync_cmd); + le32_to_cpu(htt_stats_buf->sync_cmd)); len += scnprintf(buf + len, buf_len - len, "write_cmd = %u\n", - htt_stats_buf->write_cmd); + le32_to_cpu(htt_stats_buf->write_cmd)); len += scnprintf(buf + len, buf_len - len, "gen_mpdu_cmd = %u\n", - htt_stats_buf->gen_mpdu_cmd); - len += scnprintf(buf + len, buf_len - len, "mpdu_queue_stats_cmd = %u\n", - htt_stats_buf->mpdu_queue_stats_cmd); + le32_to_cpu(htt_stats_buf->gen_mpdu_cmd)); + len += scnprintf(buf + len, buf_len - len, + "mpdu_queue_stats_cmd = %u\n", + le32_to_cpu(htt_stats_buf->mpdu_queue_stats_cmd)); len += scnprintf(buf + len, buf_len - len, "mpdu_head_info_cmd = %u\n", - htt_stats_buf->mpdu_head_info_cmd); + le32_to_cpu(htt_stats_buf->mpdu_head_info_cmd)); len += scnprintf(buf + len, buf_len - len, "msdu_flow_stats_cmd = %u\n", - htt_stats_buf->msdu_flow_stats_cmd); + le32_to_cpu(htt_stats_buf->msdu_flow_stats_cmd)); len += scnprintf(buf + len, buf_len - len, "remove_mpdu_cmd = %u\n", - htt_stats_buf->remove_mpdu_cmd); + le32_to_cpu(htt_stats_buf->remove_mpdu_cmd)); len += scnprintf(buf + len, buf_len - len, "remove_msdu_cmd = %u\n", - htt_stats_buf->remove_msdu_cmd); + le32_to_cpu(htt_stats_buf->remove_msdu_cmd)); len += scnprintf(buf + len, buf_len - len, "flush_cache_cmd = %u\n", - htt_stats_buf->flush_cache_cmd); + le32_to_cpu(htt_stats_buf->flush_cache_cmd)); len += scnprintf(buf + len, buf_len - len, "update_mpduq_cmd = %u\n", - htt_stats_buf->update_mpduq_cmd); + le32_to_cpu(htt_stats_buf->update_mpduq_cmd)); len += scnprintf(buf + len, buf_len - len, "update_msduq_cmd = %u\n\n", - htt_stats_buf->update_msduq_cmd); + le32_to_cpu(htt_stats_buf->update_msduq_cmd)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2181,17 +2256,17 @@ htt_print_tx_de_eapol_packets_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_EAPOL_PACKETS_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "m1_packets = %u\n", - htt_stats_buf->m1_packets); + le32_to_cpu(htt_stats_buf->m1_packets)); len += scnprintf(buf + len, buf_len - len, "m2_packets = %u\n", - htt_stats_buf->m2_packets); + le32_to_cpu(htt_stats_buf->m2_packets)); len += scnprintf(buf + len, buf_len - len, "m3_packets = %u\n", - htt_stats_buf->m3_packets); + le32_to_cpu(htt_stats_buf->m3_packets)); len += scnprintf(buf + len, buf_len - len, "m4_packets = %u\n", - htt_stats_buf->m4_packets); + le32_to_cpu(htt_stats_buf->m4_packets)); len += scnprintf(buf + len, buf_len - len, "g1_packets = %u\n", - htt_stats_buf->g1_packets); + le32_to_cpu(htt_stats_buf->g1_packets)); len += scnprintf(buf + len, buf_len - len, "g2_packets = %u\n\n", - htt_stats_buf->g2_packets); + le32_to_cpu(htt_stats_buf->g2_packets)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2212,32 +2287,39 @@ htt_print_tx_de_classify_failed_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CLASSIFY_FAILED_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "ap_bss_peer_not_found = %u\n", - htt_stats_buf->ap_bss_peer_not_found); - len += scnprintf(buf + len, buf_len - len, "ap_bcast_mcast_no_peer = %u\n", - htt_stats_buf->ap_bcast_mcast_no_peer); - len += scnprintf(buf + len, buf_len - len, "sta_delete_in_progress = %u\n", - htt_stats_buf->sta_delete_in_progress); + len += scnprintf(buf + len, buf_len - len, + "ap_bss_peer_not_found = %u\n", + le32_to_cpu(htt_stats_buf->ap_bss_peer_not_found)); + len += scnprintf(buf + len, buf_len - len, + "ap_bcast_mcast_no_peer = %u\n", + le32_to_cpu(htt_stats_buf->ap_bcast_mcast_no_peer)); + len += scnprintf(buf + len, buf_len - len, + "sta_delete_in_progress = %u\n", + le32_to_cpu(htt_stats_buf->sta_delete_in_progress)); len += scnprintf(buf + len, buf_len - len, "ibss_no_bss_peer = %u\n", - htt_stats_buf->ibss_no_bss_peer); + le32_to_cpu(htt_stats_buf->ibss_no_bss_peer)); len += scnprintf(buf + len, buf_len - len, "invalid_vdev_type = %u\n", - htt_stats_buf->invalid_vdev_type); - len += scnprintf(buf + len, buf_len - len, "invalid_ast_peer_entry = %u\n", - htt_stats_buf->invalid_ast_peer_entry); + le32_to_cpu(htt_stats_buf->invalid_vdev_type)); + len += scnprintf(buf + len, buf_len - len, + "invalid_ast_peer_entry = %u\n", + le32_to_cpu(htt_stats_buf->invalid_ast_peer_entry)); len += scnprintf(buf + len, buf_len - len, "peer_entry_invalid = %u\n", - htt_stats_buf->peer_entry_invalid); + le32_to_cpu(htt_stats_buf->peer_entry_invalid)); len += scnprintf(buf + len, buf_len - len, "ethertype_not_ip = %u\n", - htt_stats_buf->ethertype_not_ip); + le32_to_cpu(htt_stats_buf->ethertype_not_ip)); len += scnprintf(buf + len, buf_len - len, "eapol_lookup_failed = %u\n", - htt_stats_buf->eapol_lookup_failed); - len += scnprintf(buf + len, buf_len - len, "qpeer_not_allow_data = %u\n", - htt_stats_buf->qpeer_not_allow_data); + le32_to_cpu(htt_stats_buf->eapol_lookup_failed)); + len += scnprintf(buf + len, buf_len - len, + "qpeer_not_allow_data = %u\n", + le32_to_cpu(htt_stats_buf->qpeer_not_allow_data)); len += scnprintf(buf + len, buf_len - len, "fse_tid_override = %u\n", - htt_stats_buf->fse_tid_override); - len += scnprintf(buf + len, buf_len - len, "ipv6_jumbogram_zero_length = %u\n", - htt_stats_buf->ipv6_jumbogram_zero_length); - len += scnprintf(buf + len, buf_len - len, "qos_to_non_qos_in_prog = %u\n\n", - htt_stats_buf->qos_to_non_qos_in_prog); + le32_to_cpu(htt_stats_buf->fse_tid_override)); + len += scnprintf(buf + len, buf_len - len, + "ipv6_jumbogram_zero_length = %u\n", + le32_to_cpu(htt_stats_buf->ipv6_jumbogram_zero_length)); + len += scnprintf(buf + len, buf_len - len, + "qos_to_non_qos_in_prog = %u\n\n", + le32_to_cpu(htt_stats_buf->qos_to_non_qos_in_prog)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2258,71 +2340,81 @@ htt_print_tx_de_classify_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CLASSIFY_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "arp_packets = %u\n", - htt_stats_buf->arp_packets); + le32_to_cpu(htt_stats_buf->arp_packets)); len += scnprintf(buf + len, buf_len - len, "igmp_packets = %u\n", - htt_stats_buf->igmp_packets); + le32_to_cpu(htt_stats_buf->igmp_packets)); len += scnprintf(buf + len, buf_len - len, "dhcp_packets = %u\n", - htt_stats_buf->dhcp_packets); + le32_to_cpu(htt_stats_buf->dhcp_packets)); len += scnprintf(buf + len, buf_len - len, "host_inspected = %u\n", - htt_stats_buf->host_inspected); + le32_to_cpu(htt_stats_buf->host_inspected)); len += scnprintf(buf + len, buf_len - len, "htt_included = %u\n", - htt_stats_buf->htt_included); + le32_to_cpu(htt_stats_buf->htt_included)); len += scnprintf(buf + len, buf_len - len, "htt_valid_mcs = %u\n", - htt_stats_buf->htt_valid_mcs); + le32_to_cpu(htt_stats_buf->htt_valid_mcs)); len += scnprintf(buf + len, buf_len - len, "htt_valid_nss = %u\n", - htt_stats_buf->htt_valid_nss); - len += scnprintf(buf + len, buf_len - len, "htt_valid_preamble_type = %u\n", - htt_stats_buf->htt_valid_preamble_type); + le32_to_cpu(htt_stats_buf->htt_valid_nss)); + len += scnprintf(buf + len, buf_len - len, + "htt_valid_preamble_type = %u\n", + le32_to_cpu(htt_stats_buf->htt_valid_preamble_type)); len += scnprintf(buf + len, buf_len - len, "htt_valid_chainmask = %u\n", - htt_stats_buf->htt_valid_chainmask); - len += scnprintf(buf + len, buf_len - len, "htt_valid_guard_interval = %u\n", - htt_stats_buf->htt_valid_guard_interval); + le32_to_cpu(htt_stats_buf->htt_valid_chainmask)); + len += scnprintf(buf + len, buf_len - len, + "htt_valid_guard_interval = %u\n", + le32_to_cpu(htt_stats_buf->htt_valid_guard_interval)); len += scnprintf(buf + len, buf_len - len, "htt_valid_retries = %u\n", - htt_stats_buf->htt_valid_retries); + le32_to_cpu(htt_stats_buf->htt_valid_retries)); len += scnprintf(buf + len, buf_len - len, "htt_valid_bw_info = %u\n", - htt_stats_buf->htt_valid_bw_info); + le32_to_cpu(htt_stats_buf->htt_valid_bw_info)); len += scnprintf(buf + len, buf_len - len, "htt_valid_power = %u\n", - htt_stats_buf->htt_valid_power); - len += scnprintf(buf + len, buf_len - len, "htt_valid_key_flags = 0x%x\n", - htt_stats_buf->htt_valid_key_flags); - len += scnprintf(buf + len, buf_len - len, "htt_valid_no_encryption = %u\n", - htt_stats_buf->htt_valid_no_encryption); + le32_to_cpu(htt_stats_buf->htt_valid_power)); + len += scnprintf(buf + len, buf_len - len, + "htt_valid_key_flags = 0x%x\n", + le32_to_cpu(htt_stats_buf->htt_valid_key_flags)); + len += scnprintf(buf + len, buf_len - len, + "htt_valid_no_encryption = %u\n", + le32_to_cpu(htt_stats_buf->htt_valid_no_encryption)); len += scnprintf(buf + len, buf_len - len, "fse_entry_count = %u\n", - htt_stats_buf->fse_entry_count); + le32_to_cpu(htt_stats_buf->fse_entry_count)); len += scnprintf(buf + len, buf_len - len, "fse_priority_be = %u\n", - htt_stats_buf->fse_priority_be); + le32_to_cpu(htt_stats_buf->fse_priority_be)); len += scnprintf(buf + len, buf_len - len, "fse_priority_high = %u\n", - htt_stats_buf->fse_priority_high); + le32_to_cpu(htt_stats_buf->fse_priority_high)); len += scnprintf(buf + len, buf_len - len, "fse_priority_low = %u\n", - htt_stats_buf->fse_priority_low); + le32_to_cpu(htt_stats_buf->fse_priority_low)); len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_be = %u\n", - htt_stats_buf->fse_traffic_ptrn_be); - len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_over_sub = %u\n", - htt_stats_buf->fse_traffic_ptrn_over_sub); - len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_bursty = %u\n", - htt_stats_buf->fse_traffic_ptrn_bursty); - len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_interactive = %u\n", - htt_stats_buf->fse_traffic_ptrn_interactive); - len += scnprintf(buf + len, buf_len - len, "fse_traffic_ptrn_periodic = %u\n", - htt_stats_buf->fse_traffic_ptrn_periodic); + le32_to_cpu(htt_stats_buf->fse_traffic_ptrn_be)); + len += scnprintf(buf + len, buf_len - len, + "fse_traffic_ptrn_over_sub = %u\n", + le32_to_cpu(htt_stats_buf->fse_traffic_ptrn_over_sub)); + len += scnprintf(buf + len, buf_len - len, + "fse_traffic_ptrn_bursty = %u\n", + le32_to_cpu(htt_stats_buf->fse_traffic_ptrn_bursty)); + len += scnprintf(buf + len, buf_len - len, + "fse_traffic_ptrn_interactive = %u\n", + le32_to_cpu(htt_stats_buf->fse_traffic_ptrn_interactive)); + len += scnprintf(buf + len, buf_len - len, + "fse_traffic_ptrn_periodic = %u\n", + le32_to_cpu(htt_stats_buf->fse_traffic_ptrn_periodic)); len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_alloc = %u\n", - htt_stats_buf->fse_hwqueue_alloc); + le32_to_cpu(htt_stats_buf->fse_hwqueue_alloc)); len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_created = %u\n", - htt_stats_buf->fse_hwqueue_created); - len += scnprintf(buf + len, buf_len - len, "fse_hwqueue_send_to_host = %u\n", - htt_stats_buf->fse_hwqueue_send_to_host); + le32_to_cpu(htt_stats_buf->fse_hwqueue_created)); + len += scnprintf(buf + len, buf_len - len, + "fse_hwqueue_send_to_host = %u\n", + le32_to_cpu(htt_stats_buf->fse_hwqueue_send_to_host)); len += scnprintf(buf + len, buf_len - len, "mcast_entry = %u\n", - htt_stats_buf->mcast_entry); + le32_to_cpu(htt_stats_buf->mcast_entry)); len += scnprintf(buf + len, buf_len - len, "bcast_entry = %u\n", - htt_stats_buf->bcast_entry); - len += scnprintf(buf + len, buf_len - len, "htt_update_peer_cache = %u\n", - htt_stats_buf->htt_update_peer_cache); + le32_to_cpu(htt_stats_buf->bcast_entry)); + len += scnprintf(buf + len, buf_len - len, + "htt_update_peer_cache = %u\n", + le32_to_cpu(htt_stats_buf->htt_update_peer_cache)); len += scnprintf(buf + len, buf_len - len, "htt_learning_frame = %u\n", - htt_stats_buf->htt_learning_frame); + le32_to_cpu(htt_stats_buf->htt_learning_frame)); len += scnprintf(buf + len, buf_len - len, "fse_invalid_peer = %u\n", - htt_stats_buf->fse_invalid_peer); + le32_to_cpu(htt_stats_buf->fse_invalid_peer)); len += scnprintf(buf + len, buf_len - len, "mec_notify = %u\n\n", - htt_stats_buf->mec_notify); + le32_to_cpu(htt_stats_buf->mec_notify)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2344,21 +2436,22 @@ htt_print_tx_de_classify_status_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CLASSIFY_STATUS_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "eok = %u\n", - htt_stats_buf->eok); + le32_to_cpu(htt_stats_buf->eok)); len += scnprintf(buf + len, buf_len - len, "classify_done = %u\n", - htt_stats_buf->classify_done); + le32_to_cpu(htt_stats_buf->classify_done)); len += scnprintf(buf + len, buf_len - len, "lookup_failed = %u\n", - htt_stats_buf->lookup_failed); + le32_to_cpu(htt_stats_buf->lookup_failed)); len += scnprintf(buf + len, buf_len - len, "send_host_dhcp = %u\n", - htt_stats_buf->send_host_dhcp); + le32_to_cpu(htt_stats_buf->send_host_dhcp)); len += scnprintf(buf + len, buf_len - len, "send_host_mcast = %u\n", - htt_stats_buf->send_host_mcast); - len += scnprintf(buf + len, buf_len - len, "send_host_unknown_dest = %u\n", - htt_stats_buf->send_host_unknown_dest); + le32_to_cpu(htt_stats_buf->send_host_mcast)); + len += scnprintf(buf + len, buf_len - len, + "send_host_unknown_dest = %u\n", + le32_to_cpu(htt_stats_buf->send_host_unknown_dest)); len += scnprintf(buf + len, buf_len - len, "send_host = %u\n", - htt_stats_buf->send_host); + le32_to_cpu(htt_stats_buf->send_host)); len += scnprintf(buf + len, buf_len - len, "status_invalid = %u\n\n", - htt_stats_buf->status_invalid); + le32_to_cpu(htt_stats_buf->status_invalid)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2380,11 +2473,11 @@ htt_print_tx_de_enqueue_packets_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_ENQUEUE_PACKETS_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "enqueued_pkts = %u\n", - htt_stats_buf->enqueued_pkts); + le32_to_cpu(htt_stats_buf->enqueued_pkts)); len += scnprintf(buf + len, buf_len - len, "to_tqm = %u\n", - htt_stats_buf->to_tqm); + le32_to_cpu(htt_stats_buf->to_tqm)); len += scnprintf(buf + len, buf_len - len, "to_tqm_bypass = %u\n\n", - htt_stats_buf->to_tqm_bypass); + le32_to_cpu(htt_stats_buf->to_tqm_bypass)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2406,11 +2499,11 @@ htt_print_tx_de_enqueue_discard_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_ENQUEUE_DISCARD_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "discarded_pkts = %u\n", - htt_stats_buf->discarded_pkts); + le32_to_cpu(htt_stats_buf->discarded_pkts)); len += scnprintf(buf + len, buf_len - len, "local_frames = %u\n", - htt_stats_buf->local_frames); + le32_to_cpu(htt_stats_buf->local_frames)); len += scnprintf(buf + len, buf_len - len, "is_ext_msdu = %u\n\n", - htt_stats_buf->is_ext_msdu); + le32_to_cpu(htt_stats_buf->is_ext_msdu)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2430,15 +2523,15 @@ static inline void htt_print_tx_de_compl_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_COMPL_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "tcl_dummy_frame = %u\n", - htt_stats_buf->tcl_dummy_frame); + le32_to_cpu(htt_stats_buf->tcl_dummy_frame)); len += scnprintf(buf + len, buf_len - len, "tqm_dummy_frame = %u\n", - htt_stats_buf->tqm_dummy_frame); + le32_to_cpu(htt_stats_buf->tqm_dummy_frame)); len += scnprintf(buf + len, buf_len - len, "tqm_notify_frame = %u\n", - htt_stats_buf->tqm_notify_frame); + le32_to_cpu(htt_stats_buf->tqm_notify_frame)); len += scnprintf(buf + len, buf_len - len, "fw2wbm_enq = %u\n", - htt_stats_buf->fw2wbm_enq); + le32_to_cpu(htt_stats_buf->fw2wbm_enq)); len += scnprintf(buf + len, buf_len - len, "tqm_bypass_frame = %u\n\n", - htt_stats_buf->tqm_bypass_frame); + le32_to_cpu(htt_stats_buf->tqm_bypass_frame)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2481,21 +2574,25 @@ htt_print_tx_de_cmn_stats_tlv(const void *tag_buf, struct debug_htt_stats_req *s u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_DE_CMN_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_DE_CMN_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "tcl2fw_entry_count = %u\n", - htt_stats_buf->tcl2fw_entry_count); + le32_to_cpu(htt_stats_buf->tcl2fw_entry_count)); len += scnprintf(buf + len, buf_len - len, "not_to_fw = %u\n", - htt_stats_buf->not_to_fw); - len += scnprintf(buf + len, buf_len - len, "invalid_pdev_vdev_peer = %u\n", - htt_stats_buf->invalid_pdev_vdev_peer); - len += scnprintf(buf + len, buf_len - len, "tcl_res_invalid_addrx = %u\n", - htt_stats_buf->tcl_res_invalid_addrx); + le32_to_cpu(htt_stats_buf->not_to_fw)); + len += scnprintf(buf + len, buf_len - len, + "invalid_pdev_vdev_peer = %u\n", + le32_to_cpu(htt_stats_buf->invalid_pdev_vdev_peer)); + len += scnprintf(buf + len, buf_len - len, + "tcl_res_invalid_addrx = %u\n", + le32_to_cpu(htt_stats_buf->tcl_res_invalid_addrx)); len += scnprintf(buf + len, buf_len - len, "wbm2fw_entry_count = %u\n", - htt_stats_buf->wbm2fw_entry_count); + le32_to_cpu(htt_stats_buf->wbm2fw_entry_count)); len += scnprintf(buf + len, buf_len - len, "invalid_pdev = %u\n\n", - htt_stats_buf->invalid_pdev); + le32_to_cpu(htt_stats_buf->invalid_pdev)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2515,43 +2612,45 @@ static inline void htt_print_ring_if_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_RING_IF_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "base_addr = %u\n", - htt_stats_buf->base_addr); + le32_to_cpu(htt_stats_buf->base_addr)); len += scnprintf(buf + len, buf_len - len, "elem_size = %u\n", - htt_stats_buf->elem_size); - len += scnprintf(buf + len, buf_len - len, "num_elems = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_NUM_ELEMS, - htt_stats_buf->num_elems__prefetch_tail_idx)); - len += scnprintf(buf + len, buf_len - len, "prefetch_tail_idx = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_PREFETCH_TAIL_INDEX, - htt_stats_buf->num_elems__prefetch_tail_idx)); - len += scnprintf(buf + len, buf_len - len, "head_idx = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_HEAD_IDX, - htt_stats_buf->head_idx__tail_idx)); - len += scnprintf(buf + len, buf_len - len, "tail_idx = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_TAIL_IDX, - htt_stats_buf->head_idx__tail_idx)); - len += scnprintf(buf + len, buf_len - len, "shadow_head_idx = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_SHADOW_HEAD_IDX, - htt_stats_buf->shadow_head_idx__shadow_tail_idx)); - len += scnprintf(buf + len, buf_len - len, "shadow_tail_idx = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_SHADOW_TAIL_IDX, - htt_stats_buf->shadow_head_idx__shadow_tail_idx)); + le32_to_cpu(htt_stats_buf->elem_size)); + len += scnprintf(buf + len, buf_len - len, "num_elems = %u\n", + le32_get_bits(htt_stats_buf->num_elems__prefetch_tail_idx, + HTT_RING_IF_STATS_NUM_ELEMS)); + len += scnprintf(buf + len, buf_len - len, "prefetch_tail_idx = %u\n", + le32_get_bits(htt_stats_buf->num_elems__prefetch_tail_idx, + HTT_RING_IF_STATS_PREFETCH_TAIL_INDEX)); + len += scnprintf(buf + len, buf_len - len, "head_idx = %u\n", + le32_get_bits(htt_stats_buf->head_idx__tail_idx, + HTT_RING_IF_STATS_HEAD_IDX)); + len += scnprintf(buf + len, buf_len - len, "tail_idx = %u\n", + le32_get_bits(htt_stats_buf->head_idx__tail_idx, + HTT_RING_IF_STATS_TAIL_IDX)); + len += scnprintf(buf + len, buf_len - len, "shadow_head_idx = %u\n", + le32_get_bits(htt_stats_buf->shadow_head_idx__shadow_tail_idx, + HTT_RING_IF_STATS_SHADOW_HEAD_IDX)); + len += scnprintf(buf + len, buf_len - len, "shadow_tail_idx = %u\n", + le32_get_bits(htt_stats_buf->shadow_head_idx__shadow_tail_idx, + HTT_RING_IF_STATS_SHADOW_TAIL_IDX)); len += scnprintf(buf + len, buf_len - len, "num_tail_incr = %u\n", - htt_stats_buf->num_tail_incr); - len += scnprintf(buf + len, buf_len - len, "lwm_thresh = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_LWM_THRESH, - htt_stats_buf->lwm_thresh__hwm_thresh)); - len += scnprintf(buf + len, buf_len - len, "hwm_thresh = %lu\n", - FIELD_GET(HTT_RING_IF_STATS_HWM_THRESH, - htt_stats_buf->lwm_thresh__hwm_thresh)); + le32_to_cpu(htt_stats_buf->num_tail_incr)); + len += scnprintf(buf + len, buf_len - len, "lwm_thresh = %u\n", + le32_get_bits(htt_stats_buf->lwm_thresh__hwm_thresh, + HTT_RING_IF_STATS_LWM_THRESH)); + len += scnprintf(buf + len, buf_len - len, "hwm_thresh = %u\n", + le32_get_bits(htt_stats_buf->lwm_thresh__hwm_thresh, + HTT_RING_IF_STATS_HWM_THRESH)); len += scnprintf(buf + len, buf_len - len, "overrun_hit_count = %u\n", - htt_stats_buf->overrun_hit_count); + le32_to_cpu(htt_stats_buf->overrun_hit_count)); len += scnprintf(buf + len, buf_len - len, "underrun_hit_count = %u\n", - htt_stats_buf->underrun_hit_count); - len += scnprintf(buf + len, buf_len - len, "prod_blockwait_count = %u\n", - htt_stats_buf->prod_blockwait_count); - len += scnprintf(buf + len, buf_len - len, "cons_blockwait_count = %u\n", - htt_stats_buf->cons_blockwait_count); + le32_to_cpu(htt_stats_buf->underrun_hit_count)); + len += scnprintf(buf + len, buf_len - len, + "prod_blockwait_count = %u\n", + le32_to_cpu(htt_stats_buf->prod_blockwait_count)); + len += scnprintf(buf + len, buf_len - len, + "cons_blockwait_count = %u\n", + le32_to_cpu(htt_stats_buf->cons_blockwait_count)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->low_wm_hit_count, "low_wm_hit_count", HTT_STATS_LOW_WM_BINS, "\n"); @@ -2575,10 +2674,11 @@ static inline void htt_print_ring_if_cmn_tlv(const void *tag_buf, u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; len += scnprintf(buf + len, buf_len - len, "HTT_RING_IF_CMN_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n", - htt_stats_buf->num_records); + le32_to_cpu(htt_stats_buf->num_records)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2621,19 +2721,19 @@ static inline void htt_print_sfm_client_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CLIENT_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "client_id = %u\n", - htt_stats_buf->client_id); + le32_to_cpu(htt_stats_buf->client_id)); len += scnprintf(buf + len, buf_len - len, "buf_min = %u\n", - htt_stats_buf->buf_min); + le32_to_cpu(htt_stats_buf->buf_min)); len += scnprintf(buf + len, buf_len - len, "buf_max = %u\n", - htt_stats_buf->buf_max); + le32_to_cpu(htt_stats_buf->buf_max)); len += scnprintf(buf + len, buf_len - len, "buf_busy = %u\n", - htt_stats_buf->buf_busy); + le32_to_cpu(htt_stats_buf->buf_busy)); len += scnprintf(buf + len, buf_len - len, "buf_alloc = %u\n", - htt_stats_buf->buf_alloc); + le32_to_cpu(htt_stats_buf->buf_alloc)); len += scnprintf(buf + len, buf_len - len, "buf_avail = %u\n", - htt_stats_buf->buf_avail); + le32_to_cpu(htt_stats_buf->buf_avail)); len += scnprintf(buf + len, buf_len - len, "num_users = %u\n\n", - htt_stats_buf->num_users); + le32_to_cpu(htt_stats_buf->num_users)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2652,16 +2752,17 @@ static inline void htt_print_sfm_cmn_tlv(const void *tag_buf, u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; len += scnprintf(buf + len, buf_len - len, "HTT_SFM_CMN_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "buf_total = %u\n", - htt_stats_buf->buf_total); + le32_to_cpu(htt_stats_buf->buf_total)); len += scnprintf(buf + len, buf_len - len, "mem_empty = %u\n", - htt_stats_buf->mem_empty); + le32_to_cpu(htt_stats_buf->mem_empty)); len += scnprintf(buf + len, buf_len - len, "deallocate_bufs = %u\n", - htt_stats_buf->deallocate_bufs); + le32_to_cpu(htt_stats_buf->deallocate_bufs)); len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n", - htt_stats_buf->num_records); + le32_to_cpu(htt_stats_buf->num_records)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2680,50 +2781,50 @@ static inline void htt_print_sring_stats_tlv(const void *tag_buf, u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; len += scnprintf(buf + len, buf_len - len, "HTT_SRING_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_SRING_STATS_MAC_ID, - htt_stats_buf->mac_id__ring_id__arena__ep)); - len += scnprintf(buf + len, buf_len - len, "ring_id = %lu\n", - FIELD_GET(HTT_SRING_STATS_RING_ID, - htt_stats_buf->mac_id__ring_id__arena__ep)); - len += scnprintf(buf + len, buf_len - len, "arena = %lu\n", - FIELD_GET(HTT_SRING_STATS_ARENA, - htt_stats_buf->mac_id__ring_id__arena__ep)); - len += scnprintf(buf + len, buf_len - len, "ep = %lu\n", - FIELD_GET(HTT_SRING_STATS_EP, - htt_stats_buf->mac_id__ring_id__arena__ep)); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__ring_id__arena__ep, + HTT_SRING_STATS_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, "ring_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__ring_id__arena__ep, + HTT_SRING_STATS_RING_ID)); + len += scnprintf(buf + len, buf_len - len, "arena = %u\n", + le32_get_bits(htt_stats_buf->mac_id__ring_id__arena__ep, + HTT_SRING_STATS_ARENA)); + len += scnprintf(buf + len, buf_len - len, "ep = %u\n", + le32_get_bits(htt_stats_buf->mac_id__ring_id__arena__ep, + HTT_SRING_STATS_EP)); len += scnprintf(buf + len, buf_len - len, "base_addr_lsb = 0x%x\n", - htt_stats_buf->base_addr_lsb); + le32_to_cpu(htt_stats_buf->base_addr_lsb)); len += scnprintf(buf + len, buf_len - len, "base_addr_msb = 0x%x\n", - htt_stats_buf->base_addr_msb); + le32_to_cpu(htt_stats_buf->base_addr_msb)); len += scnprintf(buf + len, buf_len - len, "ring_size = %u\n", - htt_stats_buf->ring_size); + le32_to_cpu(htt_stats_buf->ring_size)); len += scnprintf(buf + len, buf_len - len, "elem_size = %u\n", - htt_stats_buf->elem_size); - len += scnprintf(buf + len, buf_len - len, "num_avail_words = %lu\n", - FIELD_GET(HTT_SRING_STATS_NUM_AVAIL_WORDS, - htt_stats_buf->num_avail_words__num_valid_words)); - len += scnprintf(buf + len, buf_len - len, "num_valid_words = %lu\n", - FIELD_GET(HTT_SRING_STATS_NUM_VALID_WORDS, - htt_stats_buf->num_avail_words__num_valid_words)); - len += scnprintf(buf + len, buf_len - len, "head_ptr = %lu\n", - FIELD_GET(HTT_SRING_STATS_HEAD_PTR, - htt_stats_buf->head_ptr__tail_ptr)); - len += scnprintf(buf + len, buf_len - len, "tail_ptr = %lu\n", - FIELD_GET(HTT_SRING_STATS_TAIL_PTR, - htt_stats_buf->head_ptr__tail_ptr)); - len += scnprintf(buf + len, buf_len - len, "consumer_empty = %lu\n", - FIELD_GET(HTT_SRING_STATS_CONSUMER_EMPTY, - htt_stats_buf->consumer_empty__producer_full)); - len += scnprintf(buf + len, buf_len - len, "producer_full = %lu\n", - FIELD_GET(HTT_SRING_STATS_PRODUCER_FULL, - htt_stats_buf->consumer_empty__producer_full)); - len += scnprintf(buf + len, buf_len - len, "prefetch_count = %lu\n", - FIELD_GET(HTT_SRING_STATS_PREFETCH_COUNT, - htt_stats_buf->prefetch_count__internal_tail_ptr)); - len += scnprintf(buf + len, buf_len - len, "internal_tail_ptr = %lu\n\n", - FIELD_GET(HTT_SRING_STATS_INTERNAL_TAIL_PTR, - htt_stats_buf->prefetch_count__internal_tail_ptr)); + le32_to_cpu(htt_stats_buf->elem_size)); + len += scnprintf(buf + len, buf_len - len, "num_avail_words = %u\n", + le32_get_bits(htt_stats_buf->num_avail_words__num_valid_words, + HTT_SRING_STATS_NUM_AVAIL_WORDS)); + len += scnprintf(buf + len, buf_len - len, "num_valid_words = %u\n", + le32_get_bits(htt_stats_buf->num_avail_words__num_valid_words, + HTT_SRING_STATS_NUM_VALID_WORDS)); + len += scnprintf(buf + len, buf_len - len, "head_ptr = %u\n", + le32_get_bits(htt_stats_buf->head_ptr__tail_ptr, + HTT_SRING_STATS_HEAD_PTR)); + len += scnprintf(buf + len, buf_len - len, "tail_ptr = %u\n", + le32_get_bits(htt_stats_buf->head_ptr__tail_ptr, + HTT_SRING_STATS_TAIL_PTR)); + len += scnprintf(buf + len, buf_len - len, "consumer_empty = %u\n", + le32_get_bits(htt_stats_buf->consumer_empty__producer_full, + HTT_SRING_STATS_CONSUMER_EMPTY)); + len += scnprintf(buf + len, buf_len - len, "producer_full = %u\n", + le32_get_bits(htt_stats_buf->consumer_empty__producer_full, + HTT_SRING_STATS_PRODUCER_FULL)); + len += scnprintf(buf + len, buf_len - len, "prefetch_count = %u\n", + le32_get_bits(htt_stats_buf->prefetch_count__internal_tail_ptr, + HTT_SRING_STATS_PREFETCH_COUNT)); + len += scnprintf(buf + len, buf_len - len, "internal_tail_ptr = %u\n\n", + le32_get_bits(htt_stats_buf->prefetch_count__internal_tail_ptr, + HTT_SRING_STATS_INTERNAL_TAIL_PTR)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2743,7 +2844,7 @@ static inline void htt_print_sring_cmn_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_SRING_CMN_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "num_records = %u\n\n", - htt_stats_buf->num_records); + le32_to_cpu(htt_stats_buf->num_records)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -2762,23 +2863,25 @@ static inline void htt_print_tx_pdev_rate_stats_tlv(const void *tag_buf, u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; u8 j; - len += scnprintf(buf + len, buf_len - len, "HTT_TX_PDEV_RATE_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_TX_PDEV_RATE_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "tx_ldpc = %u\n", - htt_stats_buf->tx_ldpc); + le32_to_cpu(htt_stats_buf->tx_ldpc)); len += scnprintf(buf + len, buf_len - len, "ac_mu_mimo_tx_ldpc = %u\n", - htt_stats_buf->ac_mu_mimo_tx_ldpc); + le32_to_cpu(htt_stats_buf->ac_mu_mimo_tx_ldpc)); len += scnprintf(buf + len, buf_len - len, "ax_mu_mimo_tx_ldpc = %u\n", - htt_stats_buf->ax_mu_mimo_tx_ldpc); + le32_to_cpu(htt_stats_buf->ax_mu_mimo_tx_ldpc)); len += scnprintf(buf + len, buf_len - len, "ofdma_tx_ldpc = %u\n", - htt_stats_buf->ofdma_tx_ldpc); + le32_to_cpu(htt_stats_buf->ofdma_tx_ldpc)); len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n", - htt_stats_buf->rts_cnt); + le32_to_cpu(htt_stats_buf->rts_cnt)); len += scnprintf(buf + len, buf_len - len, "rts_success = %u\n", - htt_stats_buf->rts_success); + le32_to_cpu(htt_stats_buf->rts_success)); len += scnprintf(buf + len, buf_len - len, "ack_rssi = %u\n", - htt_stats_buf->ack_rssi); + le32_to_cpu(htt_stats_buf->ack_rssi)); len += scnprintf(buf + len, buf_len - len, "Legacy CCK Rates: 1 Mbps: %u, 2 Mbps: %u, 5.5 Mbps: %u, 11 Mbps: %u\n", @@ -2888,21 +2991,23 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; u8 i, j; - len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_RATE_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_RX_PDEV_RATE_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "nsts = %u\n", - htt_stats_buf->nsts); + le32_to_cpu(htt_stats_buf->nsts)); len += scnprintf(buf + len, buf_len - len, "rx_ldpc = %u\n", - htt_stats_buf->rx_ldpc); + le32_to_cpu(htt_stats_buf->rx_ldpc)); len += scnprintf(buf + len, buf_len - len, "rts_cnt = %u\n", - htt_stats_buf->rts_cnt); + le32_to_cpu(htt_stats_buf->rts_cnt)); len += scnprintf(buf + len, buf_len - len, "rssi_mgmt = %u\n", - htt_stats_buf->rssi_mgmt); + le32_to_cpu(htt_stats_buf->rssi_mgmt)); len += scnprintf(buf + len, buf_len - len, "rssi_data = %u\n", - htt_stats_buf->rssi_data); + le32_to_cpu(htt_stats_buf->rssi_data)); len += scnprintf(buf + len, buf_len - len, "rssi_comb = %u\n", - htt_stats_buf->rssi_comb); + le32_to_cpu(htt_stats_buf->rssi_comb)); len += scnprintf(buf + len, buf_len - len, "rssi_in_dbm = %d\n", htt_stats_buf->rssi_in_dbm); @@ -2918,10 +3023,10 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n"); len += scnprintf(buf + len, buf_len - len, "rx_evm_nss_count = %u\n", - htt_stats_buf->nss_count); + le32_to_cpu(htt_stats_buf->nss_count)); len += scnprintf(buf + len, buf_len - len, "rx_evm_pilot_count = %u\n", - htt_stats_buf->pilot_count); + le32_to_cpu(htt_stats_buf->pilot_count)); for (j = 0; j < HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) { len += scnprintf(buf + len, buf_len - len, @@ -2962,30 +3067,30 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES, "\n"); len += scnprintf(buf + len, buf_len - len, "rx_11ax_su_ext = %u\n", - htt_stats_buf->rx_11ax_su_ext); + le32_to_cpu(htt_stats_buf->rx_11ax_su_ext)); len += scnprintf(buf + len, buf_len - len, "rx_11ac_mumimo = %u\n", - htt_stats_buf->rx_11ac_mumimo); + le32_to_cpu(htt_stats_buf->rx_11ac_mumimo)); len += scnprintf(buf + len, buf_len - len, "rx_11ax_mumimo = %u\n", - htt_stats_buf->rx_11ax_mumimo); + le32_to_cpu(htt_stats_buf->rx_11ax_mumimo)); len += scnprintf(buf + len, buf_len - len, "rx_11ax_ofdma = %u\n", - htt_stats_buf->rx_11ax_ofdma); + le32_to_cpu(htt_stats_buf->rx_11ax_ofdma)); len += scnprintf(buf + len, buf_len - len, "txbf = %u\n", - htt_stats_buf->txbf); + le32_to_cpu(htt_stats_buf->txbf)); len += scnprintf(buf + len, buf_len - len, "\nrx_su_ndpa = %u", - htt_stats_buf->rx_su_ndpa); + le32_to_cpu(htt_stats_buf->rx_su_ndpa)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->rx_11ax_su_txbf_mcs, "rx_11ax_su_txbf_mcs", HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n"); len += scnprintf(buf + len, buf_len - len, "\nrx_mu_ndpa = %u", - htt_stats_buf->rx_mu_ndpa); + le32_to_cpu(htt_stats_buf->rx_mu_ndpa)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->rx_11ax_mu_txbf_mcs, "rx_11ax_mu_txbf_mcs", HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS, "\n"); len += scnprintf(buf + len, buf_len - len, "\nrx_br_poll = %u", - htt_stats_buf->rx_br_poll); + le32_to_cpu(htt_stats_buf->rx_br_poll)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->rx_legacy_cck_rate, "rx_legacy_cck_rate", @@ -2995,12 +3100,14 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, "rx_legacy_ofdm_rate", HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS, "\n"); - len += scnprintf(buf + len, buf_len - len, "rx_active_dur_us_low = %u\n", - htt_stats_buf->rx_active_dur_us_low); - len += scnprintf(buf + len, buf_len - len, "rx_active_dur_us_high = %u\n", - htt_stats_buf->rx_active_dur_us_high); + len += scnprintf(buf + len, buf_len - len, + "rx_active_dur_us_low = %u\n", + le32_to_cpu(htt_stats_buf->rx_active_dur_us_low)); + len += scnprintf(buf + len, buf_len - len, + "rx_active_dur_us_high = %u\n", + le32_to_cpu(htt_stats_buf->rx_active_dur_us_high)); len += scnprintf(buf + len, buf_len - len, "rx_11ax_ul_ofdma = %u\n", - htt_stats_buf->rx_11ax_ul_ofdma); + le32_to_cpu(htt_stats_buf->rx_11ax_ul_ofdma)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->ul_ofdma_rx_mcs, "ul_ofdma_rx_mcs", @@ -3021,9 +3128,9 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, HTT_RX_PDEV_STATS_NUM_BW_COUNTERS, "\n"); len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_stbc = %u\n", - htt_stats_buf->ul_ofdma_rx_stbc); + le32_to_cpu(htt_stats_buf->ul_ofdma_rx_stbc)); len += scnprintf(buf + len, buf_len - len, "ul_ofdma_rx_ldpc = %u\n", - htt_stats_buf->ul_ofdma_rx_ldpc); + le32_to_cpu(htt_stats_buf->ul_ofdma_rx_ldpc)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->rx_ulofdma_non_data_ppdu, "rx_ulofdma_non_data_ppdu", @@ -3081,8 +3188,9 @@ static inline void htt_print_rx_pdev_rate_stats_tlv(const void *tag_buf, "rx_ulmumimo_mpdu_fail", HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER, "\n"); - len += scnprintf(buf + len, buf_len - len, "per_chain_rssi_pkt_type = %#x\n", - htt_stats_buf->per_chain_rssi_pkt_type); + len += scnprintf(buf + len, buf_len - len, + "per_chain_rssi_pkt_type = %#x\n", + le32_to_cpu(htt_stats_buf->per_chain_rssi_pkt_type)); for (j = 0; j < HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS; j++) { len += scnprintf(buf + len, buf_len - len, @@ -3113,34 +3221,40 @@ static inline void htt_print_rx_soc_fw_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_RX_SOC_FW_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "fw_reo_ring_data_msdu = %u\n", - htt_stats_buf->fw_reo_ring_data_msdu); - len += scnprintf(buf + len, buf_len - len, "fw_to_host_data_msdu_bcmc = %u\n", - htt_stats_buf->fw_to_host_data_msdu_bcmc); - len += scnprintf(buf + len, buf_len - len, "fw_to_host_data_msdu_uc = %u\n", - htt_stats_buf->fw_to_host_data_msdu_uc); + len += scnprintf(buf + len, buf_len - len, + "HTT_RX_SOC_FW_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, + "fw_reo_ring_data_msdu = %u\n", + le32_to_cpu(htt_stats_buf->fw_reo_ring_data_msdu)); + len += scnprintf(buf + len, buf_len - len, + "fw_to_host_data_msdu_bcmc = %u\n", + le32_to_cpu(htt_stats_buf->fw_to_host_data_msdu_bcmc)); + len += scnprintf(buf + len, buf_len - len, + "fw_to_host_data_msdu_uc = %u\n", + le32_to_cpu(htt_stats_buf->fw_to_host_data_msdu_uc)); len += scnprintf(buf + len, buf_len - len, "ofld_remote_data_buf_recycle_cnt = %u\n", - htt_stats_buf->ofld_remote_data_buf_recycle_cnt); + le32_to_cpu(htt_stats_buf->ofld_remote_data_buf_recycle_cnt)); len += scnprintf(buf + len, buf_len - len, "ofld_remote_free_buf_indication_cnt = %u\n", - htt_stats_buf->ofld_remote_free_buf_indication_cnt); + le32_to_cpu(htt_stats_buf->ofld_remote_free_buf_indication_cnt)); len += scnprintf(buf + len, buf_len - len, "ofld_buf_to_host_data_msdu_uc = %u\n", - htt_stats_buf->ofld_buf_to_host_data_msdu_uc); + le32_to_cpu(htt_stats_buf->ofld_buf_to_host_data_msdu_uc)); len += scnprintf(buf + len, buf_len - len, "reo_fw_ring_to_host_data_msdu_uc = %u\n", - htt_stats_buf->reo_fw_ring_to_host_data_msdu_uc); + le32_to_cpu(htt_stats_buf->reo_fw_ring_to_host_data_msdu_uc)); len += scnprintf(buf + len, buf_len - len, "wbm_sw_ring_reap = %u\n", - htt_stats_buf->wbm_sw_ring_reap); - len += scnprintf(buf + len, buf_len - len, "wbm_forward_to_host_cnt = %u\n", - htt_stats_buf->wbm_forward_to_host_cnt); - len += scnprintf(buf + len, buf_len - len, "wbm_target_recycle_cnt = %u\n", - htt_stats_buf->wbm_target_recycle_cnt); + le32_to_cpu(htt_stats_buf->wbm_sw_ring_reap)); + len += scnprintf(buf + len, buf_len - len, + "wbm_forward_to_host_cnt = %u\n", + le32_to_cpu(htt_stats_buf->wbm_forward_to_host_cnt)); + len += scnprintf(buf + len, buf_len - len, + "wbm_target_recycle_cnt = %u\n", + le32_to_cpu(htt_stats_buf->wbm_target_recycle_cnt)); len += scnprintf(buf + len, buf_len - len, "target_refill_ring_recycle_cnt = %u\n", - htt_stats_buf->target_refill_ring_recycle_cnt); + le32_to_cpu(htt_stats_buf->target_refill_ring_recycle_cnt)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3237,25 +3351,26 @@ htt_print_rx_reo_debug_stats_tlv_v(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_RX_REO_RESOURCE_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "sample_id = %u\n", - htt_stats_buf->sample_id); + le32_to_cpu(htt_stats_buf->sample_id)); len += scnprintf(buf + len, buf_len - len, "total_max = %u\n", - htt_stats_buf->total_max); + le32_to_cpu(htt_stats_buf->total_max)); len += scnprintf(buf + len, buf_len - len, "total_avg = %u\n", - htt_stats_buf->total_avg); + le32_to_cpu(htt_stats_buf->total_avg)); len += scnprintf(buf + len, buf_len - len, "total_sample = %u\n", - htt_stats_buf->total_sample); + le32_to_cpu(htt_stats_buf->total_sample)); len += scnprintf(buf + len, buf_len - len, "non_zeros_avg = %u\n", - htt_stats_buf->non_zeros_avg); + le32_to_cpu(htt_stats_buf->non_zeros_avg)); len += scnprintf(buf + len, buf_len - len, "non_zeros_sample = %u\n", - htt_stats_buf->non_zeros_sample); + le32_to_cpu(htt_stats_buf->non_zeros_sample)); len += scnprintf(buf + len, buf_len - len, "last_non_zeros_max = %u\n", - htt_stats_buf->last_non_zeros_max); + le32_to_cpu(htt_stats_buf->last_non_zeros_max)); len += scnprintf(buf + len, buf_len - len, "last_non_zeros_min %u\n", - htt_stats_buf->last_non_zeros_min); + le32_to_cpu(htt_stats_buf->last_non_zeros_min)); len += scnprintf(buf + len, buf_len - len, "last_non_zeros_avg %u\n", - htt_stats_buf->last_non_zeros_avg); - len += scnprintf(buf + len, buf_len - len, "last_non_zeros_sample %u\n\n", - htt_stats_buf->last_non_zeros_sample); + le32_to_cpu(htt_stats_buf->last_non_zeros_avg)); + len += scnprintf(buf + len, buf_len - len, + "last_non_zeros_sample %u\n\n", + le32_to_cpu(htt_stats_buf->last_non_zeros_sample)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3298,25 +3413,27 @@ static inline void htt_print_rx_pdev_fw_stats_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_FW_STATS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); + len += scnprintf(buf + len, buf_len - len, + "HTT_RX_PDEV_FW_STATS_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); len += scnprintf(buf + len, buf_len - len, "ppdu_recvd = %u\n", - htt_stats_buf->ppdu_recvd); + le32_to_cpu(htt_stats_buf->ppdu_recvd)); len += scnprintf(buf + len, buf_len - len, "mpdu_cnt_fcs_ok = %u\n", - htt_stats_buf->mpdu_cnt_fcs_ok); + le32_to_cpu(htt_stats_buf->mpdu_cnt_fcs_ok)); len += scnprintf(buf + len, buf_len - len, "mpdu_cnt_fcs_err = %u\n", - htt_stats_buf->mpdu_cnt_fcs_err); + le32_to_cpu(htt_stats_buf->mpdu_cnt_fcs_err)); len += scnprintf(buf + len, buf_len - len, "tcp_msdu_cnt = %u\n", - htt_stats_buf->tcp_msdu_cnt); + le32_to_cpu(htt_stats_buf->tcp_msdu_cnt)); len += scnprintf(buf + len, buf_len - len, "tcp_ack_msdu_cnt = %u\n", - htt_stats_buf->tcp_ack_msdu_cnt); + le32_to_cpu(htt_stats_buf->tcp_ack_msdu_cnt)); len += scnprintf(buf + len, buf_len - len, "udp_msdu_cnt = %u\n", - htt_stats_buf->udp_msdu_cnt); + le32_to_cpu(htt_stats_buf->udp_msdu_cnt)); len += scnprintf(buf + len, buf_len - len, "other_msdu_cnt = %u\n", - htt_stats_buf->other_msdu_cnt); + le32_to_cpu(htt_stats_buf->other_msdu_cnt)); len += scnprintf(buf + len, buf_len - len, "fw_ring_mpdu_ind = %u\n", - htt_stats_buf->fw_ring_mpdu_ind); + le32_to_cpu(htt_stats_buf->fw_ring_mpdu_ind)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->fw_ring_mgmt_subtype, "fw_ring_mgmt_subtype", HTT_STATS_SUBTYPE_MAX, "\n"); @@ -3324,79 +3441,103 @@ static inline void htt_print_rx_pdev_fw_stats_tlv(const void *tag_buf, PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->fw_ring_ctrl_subtype, "fw_ring_ctrl_subtype", HTT_STATS_SUBTYPE_MAX, "\n"); - len += scnprintf(buf + len, buf_len - len, "fw_ring_mcast_data_msdu = %u\n", - htt_stats_buf->fw_ring_mcast_data_msdu); - len += scnprintf(buf + len, buf_len - len, "fw_ring_bcast_data_msdu = %u\n", - htt_stats_buf->fw_ring_bcast_data_msdu); - len += scnprintf(buf + len, buf_len - len, "fw_ring_ucast_data_msdu = %u\n", - htt_stats_buf->fw_ring_ucast_data_msdu); - len += scnprintf(buf + len, buf_len - len, "fw_ring_null_data_msdu = %u\n", - htt_stats_buf->fw_ring_null_data_msdu); + len += scnprintf(buf + len, buf_len - len, + "fw_ring_mcast_data_msdu = %u\n", + le32_to_cpu(htt_stats_buf->fw_ring_mcast_data_msdu)); + len += scnprintf(buf + len, buf_len - len, + "fw_ring_bcast_data_msdu = %u\n", + le32_to_cpu(htt_stats_buf->fw_ring_bcast_data_msdu)); + len += scnprintf(buf + len, buf_len - len, + "fw_ring_ucast_data_msdu = %u\n", + le32_to_cpu(htt_stats_buf->fw_ring_ucast_data_msdu)); + len += scnprintf(buf + len, buf_len - len, + "fw_ring_null_data_msdu = %u\n", + le32_to_cpu(htt_stats_buf->fw_ring_null_data_msdu)); len += scnprintf(buf + len, buf_len - len, "fw_ring_mpdu_drop = %u\n", - htt_stats_buf->fw_ring_mpdu_drop); - len += scnprintf(buf + len, buf_len - len, "ofld_local_data_ind_cnt = %u\n", - htt_stats_buf->ofld_local_data_ind_cnt); + le32_to_cpu(htt_stats_buf->fw_ring_mpdu_drop)); + len += scnprintf(buf + len, buf_len - len, + "ofld_local_data_ind_cnt = %u\n", + le32_to_cpu(htt_stats_buf->ofld_local_data_ind_cnt)); len += scnprintf(buf + len, buf_len - len, "ofld_local_data_buf_recycle_cnt = %u\n", - htt_stats_buf->ofld_local_data_buf_recycle_cnt); - len += scnprintf(buf + len, buf_len - len, "drx_local_data_ind_cnt = %u\n", - htt_stats_buf->drx_local_data_ind_cnt); + le32_to_cpu(htt_stats_buf->ofld_local_data_buf_recycle_cnt)); + len += scnprintf(buf + len, buf_len - len, + "drx_local_data_ind_cnt = %u\n", + le32_to_cpu(htt_stats_buf->drx_local_data_ind_cnt)); len += scnprintf(buf + len, buf_len - len, "drx_local_data_buf_recycle_cnt = %u\n", - htt_stats_buf->drx_local_data_buf_recycle_cnt); - len += scnprintf(buf + len, buf_len - len, "local_nondata_ind_cnt = %u\n", - htt_stats_buf->local_nondata_ind_cnt); - len += scnprintf(buf + len, buf_len - len, "local_nondata_buf_recycle_cnt = %u\n", - htt_stats_buf->local_nondata_buf_recycle_cnt); - len += scnprintf(buf + len, buf_len - len, "fw_status_buf_ring_refill_cnt = %u\n", - htt_stats_buf->fw_status_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "fw_status_buf_ring_empty_cnt = %u\n", - htt_stats_buf->fw_status_buf_ring_empty_cnt); - len += scnprintf(buf + len, buf_len - len, "fw_pkt_buf_ring_refill_cnt = %u\n", - htt_stats_buf->fw_pkt_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "fw_pkt_buf_ring_empty_cnt = %u\n", - htt_stats_buf->fw_pkt_buf_ring_empty_cnt); - len += scnprintf(buf + len, buf_len - len, "fw_link_buf_ring_refill_cnt = %u\n", - htt_stats_buf->fw_link_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "fw_link_buf_ring_empty_cnt = %u\n", - htt_stats_buf->fw_link_buf_ring_empty_cnt); - len += scnprintf(buf + len, buf_len - len, "host_pkt_buf_ring_refill_cnt = %u\n", - htt_stats_buf->host_pkt_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "host_pkt_buf_ring_empty_cnt = %u\n", - htt_stats_buf->host_pkt_buf_ring_empty_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_pkt_buf_ring_refill_cnt = %u\n", - htt_stats_buf->mon_pkt_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_pkt_buf_ring_empty_cnt = %u\n", - htt_stats_buf->mon_pkt_buf_ring_empty_cnt); + le32_to_cpu(htt_stats_buf->drx_local_data_buf_recycle_cnt)); + len += scnprintf(buf + len, buf_len - len, + "local_nondata_ind_cnt = %u\n", + le32_to_cpu(htt_stats_buf->local_nondata_ind_cnt)); + len += scnprintf(buf + len, buf_len - len, + "local_nondata_buf_recycle_cnt = %u\n", + le32_to_cpu(htt_stats_buf->local_nondata_buf_recycle_cnt)); + len += scnprintf(buf + len, buf_len - len, + "fw_status_buf_ring_refill_cnt = %u\n", + le32_to_cpu(htt_stats_buf->fw_status_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "fw_status_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->fw_status_buf_ring_empty_cnt)); + len += scnprintf(buf + len, buf_len - len, + "fw_pkt_buf_ring_refill_cnt = %u\n", + le32_to_cpu(htt_stats_buf->fw_pkt_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "fw_pkt_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->fw_pkt_buf_ring_empty_cnt)); + len += scnprintf(buf + len, buf_len - len, + "fw_link_buf_ring_refill_cnt = %u\n", + le32_to_cpu(htt_stats_buf->fw_link_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "fw_link_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->fw_link_buf_ring_empty_cnt)); + len += scnprintf(buf + len, buf_len - len, + "host_pkt_buf_ring_refill_cnt = %u\n", + le32_to_cpu(htt_stats_buf->host_pkt_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "host_pkt_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->host_pkt_buf_ring_empty_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_pkt_buf_ring_refill_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_pkt_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_pkt_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_pkt_buf_ring_empty_cnt)); len += scnprintf(buf + len, buf_len - len, "mon_status_buf_ring_refill_cnt = %u\n", - htt_stats_buf->mon_status_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_status_buf_ring_empty_cnt = %u\n", - htt_stats_buf->mon_status_buf_ring_empty_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_desc_buf_ring_refill_cnt = %u\n", - htt_stats_buf->mon_desc_buf_ring_refill_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_desc_buf_ring_empty_cnt = %u\n", - htt_stats_buf->mon_desc_buf_ring_empty_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_dest_ring_update_cnt = %u\n", - htt_stats_buf->mon_dest_ring_update_cnt); - len += scnprintf(buf + len, buf_len - len, "mon_dest_ring_full_cnt = %u\n", - htt_stats_buf->mon_dest_ring_full_cnt); + le32_to_cpu(htt_stats_buf->mon_status_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_status_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_status_buf_ring_empty_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_desc_buf_ring_refill_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_desc_buf_ring_refill_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_desc_buf_ring_empty_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_desc_buf_ring_empty_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_dest_ring_update_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_dest_ring_update_cnt)); + len += scnprintf(buf + len, buf_len - len, + "mon_dest_ring_full_cnt = %u\n", + le32_to_cpu(htt_stats_buf->mon_dest_ring_full_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_suspend_cnt = %u\n", - htt_stats_buf->rx_suspend_cnt); + le32_to_cpu(htt_stats_buf->rx_suspend_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_suspend_fail_cnt = %u\n", - htt_stats_buf->rx_suspend_fail_cnt); + le32_to_cpu(htt_stats_buf->rx_suspend_fail_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_resume_cnt = %u\n", - htt_stats_buf->rx_resume_cnt); + le32_to_cpu(htt_stats_buf->rx_resume_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_resume_fail_cnt = %u\n", - htt_stats_buf->rx_resume_fail_cnt); + le32_to_cpu(htt_stats_buf->rx_resume_fail_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_ring_switch_cnt = %u\n", - htt_stats_buf->rx_ring_switch_cnt); + le32_to_cpu(htt_stats_buf->rx_ring_switch_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_ring_restore_cnt = %u\n", - htt_stats_buf->rx_ring_restore_cnt); + le32_to_cpu(htt_stats_buf->rx_ring_restore_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_flush_cnt = %u\n", - htt_stats_buf->rx_flush_cnt); - len += scnprintf(buf + len, buf_len - len, "rx_recovery_reset_cnt = %u\n\n", - htt_stats_buf->rx_recovery_reset_cnt); + le32_to_cpu(htt_stats_buf->rx_flush_cnt)); + len += scnprintf(buf + len, buf_len - len, + "rx_recovery_reset_cnt = %u\n\n", + le32_to_cpu(htt_stats_buf->rx_recovery_reset_cnt)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3464,9 +3605,9 @@ htt_print_rx_pdev_fw_stats_phy_err_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_RX_PDEV_FW_STATS_PHY_ERR_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "mac_id__word = %u\n", - htt_stats_buf->mac_id__word); + le32_to_cpu(htt_stats_buf->mac_id__word)); len += scnprintf(buf + len, buf_len - len, "total_phy_err_nct = %u\n", - htt_stats_buf->total_phy_err_cnt); + le32_to_cpu(htt_stats_buf->total_phy_err_cnt)); PRINT_ARRAY_TO_BUF(buf, len, htt_stats_buf->phy_err, "phy_errs", HTT_STATS_PHY_ERR_MAX, "\n\n"); @@ -3490,13 +3631,15 @@ htt_print_pdev_cca_stats_hist_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "\nHTT_PDEV_CCA_STATS_HIST_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "chan_num = %u\n", - htt_stats_buf->chan_num); + le32_to_cpu(htt_stats_buf->chan_num)); len += scnprintf(buf + len, buf_len - len, "num_records = %u\n", - htt_stats_buf->num_records); - len += scnprintf(buf + len, buf_len - len, "valid_cca_counters_bitmap = 0x%x\n", - htt_stats_buf->valid_cca_counters_bitmap); - len += scnprintf(buf + len, buf_len - len, "collection_interval = %u\n\n", - htt_stats_buf->collection_interval); + le32_to_cpu(htt_stats_buf->num_records)); + len += scnprintf(buf + len, buf_len - len, + "valid_cca_counters_bitmap = 0x%x\n", + le32_to_cpu(htt_stats_buf->valid_cca_counters_bitmap)); + len += scnprintf(buf + len, buf_len - len, + "collection_interval = %u\n\n", + le32_to_cpu(htt_stats_buf->collection_interval)); len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_STATS_CCA_COUNTERS_TLV:(in usec)\n"); @@ -3522,14 +3665,14 @@ htt_print_pdev_stats_cca_counters_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "|%10u| %10u| %10u| %11u| %10u| %11u| %18u| %10u|\n", - htt_stats_buf->tx_frame_usec, - htt_stats_buf->rx_frame_usec, - htt_stats_buf->rx_clear_usec, - htt_stats_buf->my_rx_frame_usec, - htt_stats_buf->usec_cnt, - htt_stats_buf->med_rx_idle_usec, - htt_stats_buf->med_tx_idle_global_usec, - htt_stats_buf->cca_obss_usec); + le32_to_cpu(htt_stats_buf->tx_frame_usec), + le32_to_cpu(htt_stats_buf->rx_frame_usec), + le32_to_cpu(htt_stats_buf->rx_clear_usec), + le32_to_cpu(htt_stats_buf->my_rx_frame_usec), + le32_to_cpu(htt_stats_buf->usec_cnt), + le32_to_cpu(htt_stats_buf->med_rx_idle_usec), + le32_to_cpu(htt_stats_buf->med_tx_idle_global_usec), + le32_to_cpu(htt_stats_buf->cca_obss_usec)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3547,32 +3690,41 @@ static inline void htt_print_hw_stats_whal_tx_tlv(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "HTT_HW_STATS_WHAL_TX_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "mac_id = %lu\n", - FIELD_GET(HTT_STATS_MAC_ID, htt_stats_buf->mac_id__word)); - len += scnprintf(buf + len, buf_len - len, "last_unpause_ppdu_id = %u\n", - htt_stats_buf->last_unpause_ppdu_id); - len += scnprintf(buf + len, buf_len - len, "hwsch_unpause_wait_tqm_write = %u\n", - htt_stats_buf->hwsch_unpause_wait_tqm_write); - len += scnprintf(buf + len, buf_len - len, "hwsch_dummy_tlv_skipped = %u\n", - htt_stats_buf->hwsch_dummy_tlv_skipped); + len += scnprintf(buf + len, buf_len - len, + "HTT_HW_STATS_WHAL_TX_TLV:\n"); + len += scnprintf(buf + len, buf_len - len, "mac_id = %u\n", + le32_get_bits(htt_stats_buf->mac_id__word, + HTT_STATS_MAC_ID)); + len += scnprintf(buf + len, buf_len - len, + "last_unpause_ppdu_id = %u\n", + le32_to_cpu(htt_stats_buf->last_unpause_ppdu_id)); + len += scnprintf(buf + len, buf_len - len, + "hwsch_unpause_wait_tqm_write = %u\n", + le32_to_cpu(htt_stats_buf->hwsch_unpause_wait_tqm_write)); + len += scnprintf(buf + len, buf_len - len, + "hwsch_dummy_tlv_skipped = %u\n", + le32_to_cpu(htt_stats_buf->hwsch_dummy_tlv_skipped)); len += scnprintf(buf + len, buf_len - len, "hwsch_misaligned_offset_received = %u\n", - htt_stats_buf->hwsch_misaligned_offset_received); + le32_to_cpu(htt_stats_buf->hwsch_misaligned_offset_received)); len += scnprintf(buf + len, buf_len - len, "hwsch_reset_count = %u\n", - htt_stats_buf->hwsch_reset_count); + le32_to_cpu(htt_stats_buf->hwsch_reset_count)); len += scnprintf(buf + len, buf_len - len, "hwsch_dev_reset_war = %u\n", - htt_stats_buf->hwsch_dev_reset_war); + le32_to_cpu(htt_stats_buf->hwsch_dev_reset_war)); len += scnprintf(buf + len, buf_len - len, "hwsch_delayed_pause = %u\n", - htt_stats_buf->hwsch_delayed_pause); - len += scnprintf(buf + len, buf_len - len, "hwsch_long_delayed_pause = %u\n", - htt_stats_buf->hwsch_long_delayed_pause); - len += scnprintf(buf + len, buf_len - len, "sch_rx_ppdu_no_response = %u\n", - htt_stats_buf->sch_rx_ppdu_no_response); - len += scnprintf(buf + len, buf_len - len, "sch_selfgen_response = %u\n", - htt_stats_buf->sch_selfgen_response); - len += scnprintf(buf + len, buf_len - len, "sch_rx_sifs_resp_trigger= %u\n\n", - htt_stats_buf->sch_rx_sifs_resp_trigger); + le32_to_cpu(htt_stats_buf->hwsch_delayed_pause)); + len += scnprintf(buf + len, buf_len - len, + "hwsch_long_delayed_pause = %u\n", + le32_to_cpu(htt_stats_buf->hwsch_long_delayed_pause)); + len += scnprintf(buf + len, buf_len - len, + "sch_rx_ppdu_no_response = %u\n", + le32_to_cpu(htt_stats_buf->sch_rx_ppdu_no_response)); + len += scnprintf(buf + len, buf_len - len, + "sch_selfgen_response = %u\n", + le32_to_cpu(htt_stats_buf->sch_selfgen_response)); + len += scnprintf(buf + len, buf_len - len, + "sch_rx_sifs_resp_trigger= %u\n\n", + le32_to_cpu(htt_stats_buf->sch_rx_sifs_resp_trigger)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3593,9 +3745,9 @@ htt_print_pdev_stats_twt_sessions_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_STATS_TWT_SESSIONS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n", - htt_stats_buf->pdev_id); + le32_to_cpu(htt_stats_buf->pdev_id)); len += scnprintf(buf + len, buf_len - len, "num_sessions = %u\n\n", - htt_stats_buf->num_sessions); + le32_to_cpu(htt_stats_buf->num_sessions)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3616,31 +3768,31 @@ htt_print_pdev_stats_twt_session_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_PDEV_STATS_TWT_SESSION_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "vdev_id = %u\n", - htt_stats_buf->vdev_id); - len += scnprintf(buf + len, buf_len - len, - "peer_mac = %02lx:%02lx:%02lx:%02lx:%02lx:%02lx\n", - FIELD_GET(HTT_MAC_ADDR_L32_0, - htt_stats_buf->peer_mac.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_L32_1, - htt_stats_buf->peer_mac.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_L32_2, - htt_stats_buf->peer_mac.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_L32_3, - htt_stats_buf->peer_mac.mac_addr_l32), - FIELD_GET(HTT_MAC_ADDR_H16_0, - htt_stats_buf->peer_mac.mac_addr_h16), - FIELD_GET(HTT_MAC_ADDR_H16_1, - htt_stats_buf->peer_mac.mac_addr_h16)); + le32_to_cpu(htt_stats_buf->vdev_id)); + len += scnprintf(buf + len, buf_len - len, + "peer_mac = %02x:%02x:%02x:%02x:%02x:%02x\n", + le32_get_bits(htt_stats_buf->peer_mac.mac_addr_l32, + HTT_MAC_ADDR_L32_0), + le32_get_bits(htt_stats_buf->peer_mac.mac_addr_l32, + HTT_MAC_ADDR_L32_1), + le32_get_bits(htt_stats_buf->peer_mac.mac_addr_l32, + HTT_MAC_ADDR_L32_2), + le32_get_bits(htt_stats_buf->peer_mac.mac_addr_l32, + HTT_MAC_ADDR_L32_3), + le32_get_bits(htt_stats_buf->peer_mac.mac_addr_h16, + HTT_MAC_ADDR_H16_0), + le32_get_bits(htt_stats_buf->peer_mac.mac_addr_h16, + HTT_MAC_ADDR_H16_1)); len += scnprintf(buf + len, buf_len - len, "flow_id_flags = %u\n", - htt_stats_buf->flow_id_flags); + le32_to_cpu(htt_stats_buf->flow_id_flags)); len += scnprintf(buf + len, buf_len - len, "dialog_id = %u\n", - htt_stats_buf->dialog_id); + le32_to_cpu(htt_stats_buf->dialog_id)); len += scnprintf(buf + len, buf_len - len, "wake_dura_us = %u\n", - htt_stats_buf->wake_dura_us); + le32_to_cpu(htt_stats_buf->wake_dura_us)); len += scnprintf(buf + len, buf_len - len, "wake_intvl_us = %u\n", - htt_stats_buf->wake_intvl_us); + le32_to_cpu(htt_stats_buf->wake_intvl_us)); len += scnprintf(buf + len, buf_len - len, "sp_offset_us = %u\n\n", - htt_stats_buf->sp_offset_us); + le32_to_cpu(htt_stats_buf->sp_offset_us)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3659,22 +3811,26 @@ htt_print_pdev_obss_pd_stats_tlv_v(const void *tag_buf, u32 len = stats_req->buf_len; u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; - len += scnprintf(buf + len, buf_len - len, "OBSS Tx success PPDU = %u\n", - htt_stats_buf->num_obss_tx_ppdu_success); - len += scnprintf(buf + len, buf_len - len, "OBSS Tx failures PPDU = %u\n", - htt_stats_buf->num_obss_tx_ppdu_failure); - len += scnprintf(buf + len, buf_len - len, "Non-SRG Opportunities = %u\n", - htt_stats_buf->num_non_srg_opportunities); + len += scnprintf(buf + len, buf_len - len, + "OBSS Tx success PPDU = %u\n", + le32_to_cpu(htt_stats_buf->num_obss_tx_ppdu_success)); + len += scnprintf(buf + len, buf_len - len, + "OBSS Tx failures PPDU = %u\n", + le32_to_cpu(htt_stats_buf->num_obss_tx_ppdu_failure)); + len += scnprintf(buf + len, buf_len - len, + "Non-SRG Opportunities = %u\n", + le32_to_cpu(htt_stats_buf->num_non_srg_opportunities)); len += scnprintf(buf + len, buf_len - len, "Non-SRG tried PPDU = %u\n", - htt_stats_buf->num_non_srg_ppdu_tried); - len += scnprintf(buf + len, buf_len - len, "Non-SRG success PPDU = %u\n", - htt_stats_buf->num_non_srg_ppdu_success); + le32_to_cpu(htt_stats_buf->num_non_srg_ppdu_tried)); + len += scnprintf(buf + len, buf_len - len, + "Non-SRG success PPDU = %u\n", + le32_to_cpu(htt_stats_buf->num_non_srg_ppdu_success)); len += scnprintf(buf + len, buf_len - len, "SRG Opportunities = %u\n", - htt_stats_buf->num_srg_opportunities); + le32_to_cpu(htt_stats_buf->num_srg_opportunities)); len += scnprintf(buf + len, buf_len - len, "SRG tried PPDU = %u\n", - htt_stats_buf->num_srg_ppdu_tried); + le32_to_cpu(htt_stats_buf->num_srg_ppdu_tried)); len += scnprintf(buf + len, buf_len - len, "SRG success PPDU = %u\n\n", - htt_stats_buf->num_srg_ppdu_success); + le32_to_cpu(htt_stats_buf->num_srg_ppdu_success)); if (len >= buf_len) buf[buf_len - 1] = 0; @@ -3697,16 +3853,16 @@ static inline void htt_print_backpressure_stats_tlv_v(const u32 *tag_buf, u32 buf_len = ATH11K_HTT_STATS_BUF_SIZE; len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n", - htt_stats_buf->pdev_id); + le32_to_cpu(htt_stats_buf->pdev_id)); len += scnprintf(buf + len, buf_len - len, "current_head_idx = %u\n", - htt_stats_buf->current_head_idx); + le32_to_cpu(htt_stats_buf->current_head_idx)); len += scnprintf(buf + len, buf_len - len, "current_tail_idx = %u\n", - htt_stats_buf->current_tail_idx); + le32_to_cpu(htt_stats_buf->current_tail_idx)); len += scnprintf(buf + len, buf_len - len, "num_htt_msgs_sent = %u\n", - htt_stats_buf->num_htt_msgs_sent); + le32_to_cpu(htt_stats_buf->num_htt_msgs_sent)); len += scnprintf(buf + len, buf_len - len, "backpressure_time_ms = %u\n", - htt_stats_buf->backpressure_time_ms); + le32_to_cpu(htt_stats_buf->backpressure_time_ms)); for (i = 0; i < 5; i++) len += scnprintf(buf + len, buf_len - len, @@ -3942,24 +4098,28 @@ void htt_print_phy_counters_tlv(const void *tag_buf, int i; len += scnprintf(buf + len, buf_len - len, "HTT_PHY_COUNTERS_TLV:\n"); - len += scnprintf(buf + len, buf_len - len, "rx_ofdma_timing_err_cnt = %u\n", - htt_stats_buf->rx_ofdma_timing_err_cnt); + len += scnprintf(buf + len, buf_len - len, + "rx_ofdma_timing_err_cnt = %u\n", + le32_to_cpu(htt_stats_buf->rx_ofdma_timing_err_cnt)); len += scnprintf(buf + len, buf_len - len, "rx_cck_fail_cnt = %u\n", - htt_stats_buf->rx_cck_fail_cnt); + le32_to_cpu(htt_stats_buf->rx_cck_fail_cnt)); len += scnprintf(buf + len, buf_len - len, "mactx_abort_cnt = %u\n", - htt_stats_buf->mactx_abort_cnt); + le32_to_cpu(htt_stats_buf->mactx_abort_cnt)); len += scnprintf(buf + len, buf_len - len, "macrx_abort_cnt = %u\n", - htt_stats_buf->macrx_abort_cnt); + le32_to_cpu(htt_stats_buf->macrx_abort_cnt)); len += scnprintf(buf + len, buf_len - len, "phytx_abort_cnt = %u\n", - htt_stats_buf->phytx_abort_cnt); + le32_to_cpu(htt_stats_buf->phytx_abort_cnt)); len += scnprintf(buf + len, buf_len - len, "phyrx_abort_cnt = %u\n", - htt_stats_buf->phyrx_abort_cnt); - len += scnprintf(buf + len, buf_len - len, "phyrx_defer_abort_cnt = %u\n", - htt_stats_buf->phyrx_defer_abort_cnt); - len += scnprintf(buf + len, buf_len - len, "rx_gain_adj_lstf_event_cnt = %u\n", - htt_stats_buf->rx_gain_adj_lstf_event_cnt); - len += scnprintf(buf + len, buf_len - len, "rx_gain_adj_non_legacy_cnt = %u\n", - htt_stats_buf->rx_gain_adj_non_legacy_cnt); + le32_to_cpu(htt_stats_buf->phyrx_abort_cnt)); + len += scnprintf(buf + len, buf_len - len, + "phyrx_defer_abort_cnt = %u\n", + le32_to_cpu(htt_stats_buf->phyrx_defer_abort_cnt)); + len += scnprintf(buf + len, buf_len - len, + "rx_gain_adj_lstf_event_cnt = %u\n", + le32_to_cpu(htt_stats_buf->rx_gain_adj_lstf_event_cnt)); + len += scnprintf(buf + len, buf_len - len, + "rx_gain_adj_non_legacy_cnt = %u\n", + le32_to_cpu(htt_stats_buf->rx_gain_adj_non_legacy_cnt)); for (i = 0; i < HTT_MAX_RX_PKT_CNT; i++) len += scnprintf(buf + len, buf_len - len, "rx_pkt_cnt[%d] = %u\n", @@ -4000,13 +4160,13 @@ void htt_print_phy_stats_tlv(const void *tag_buf, i, htt_stats_buf->nf_chain[i]); len += scnprintf(buf + len, buf_len - len, "false_radar_cnt = %u\n", - htt_stats_buf->false_radar_cnt); + le32_to_cpu(htt_stats_buf->false_radar_cnt)); len += scnprintf(buf + len, buf_len - len, "radar_cs_cnt = %u\n", - htt_stats_buf->radar_cs_cnt); + le32_to_cpu(htt_stats_buf->radar_cs_cnt)); len += scnprintf(buf + len, buf_len - len, "ani_level = %d\n", htt_stats_buf->ani_level); len += scnprintf(buf + len, buf_len - len, "fw_run_time = %u\n", - htt_stats_buf->fw_run_time); + le32_to_cpu(htt_stats_buf->fw_run_time)); stats_req->buf_len = len; } @@ -4027,17 +4187,22 @@ htt_print_phy_reset_counters_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_PHY_RESET_COUNTERS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n", - htt_stats_buf->pdev_id); - len += scnprintf(buf + len, buf_len - len, "cf_active_low_fail_cnt = %u\n", - htt_stats_buf->cf_active_low_fail_cnt); - len += scnprintf(buf + len, buf_len - len, "cf_active_low_pass_cnt = %u\n", - htt_stats_buf->cf_active_low_pass_cnt); - len += scnprintf(buf + len, buf_len - len, "phy_off_through_vreg_cnt = %u\n", - htt_stats_buf->phy_off_through_vreg_cnt); - len += scnprintf(buf + len, buf_len - len, "force_calibration_cnt = %u\n", - htt_stats_buf->force_calibration_cnt); - len += scnprintf(buf + len, buf_len - len, "rf_mode_switch_phy_off_cnt = %u\n", - htt_stats_buf->rf_mode_switch_phy_off_cnt); + le32_to_cpu(htt_stats_buf->pdev_id)); + len += scnprintf(buf + len, buf_len - len, + "cf_active_low_fail_cnt = %u\n", + le32_to_cpu(htt_stats_buf->cf_active_low_fail_cnt)); + len += scnprintf(buf + len, buf_len - len, + "cf_active_low_pass_cnt = %u\n", + le32_to_cpu(htt_stats_buf->cf_active_low_pass_cnt)); + len += scnprintf(buf + len, buf_len - len, + "phy_off_through_vreg_cnt = %u\n", + le32_to_cpu(htt_stats_buf->phy_off_through_vreg_cnt)); + len += scnprintf(buf + len, buf_len - len, + "force_calibration_cnt = %u\n", + le32_to_cpu(htt_stats_buf->force_calibration_cnt)); + len += scnprintf(buf + len, buf_len - len, + "rf_mode_switch_phy_off_cnt = %u\n", + le32_to_cpu(htt_stats_buf->rf_mode_switch_phy_off_cnt)); stats_req->buf_len = len; } @@ -4058,63 +4223,70 @@ htt_print_phy_reset_stats_tlv(const void *tag_buf, len += scnprintf(buf + len, buf_len - len, "HTT_PHY_RESET_STATS_TLV:\n"); len += scnprintf(buf + len, buf_len - len, "pdev_id = %u\n", - htt_stats_buf->pdev_id); + le32_to_cpu(htt_stats_buf->pdev_id)); len += scnprintf(buf + len, buf_len - len, "chan_mhz = %u\n", - htt_stats_buf->chan_mhz); - len += scnprintf(buf + len, buf_len - len, "chan_band_center_freq1 = %u\n", - htt_stats_buf->chan_band_center_freq1); - len += scnprintf(buf + len, buf_len - len, "chan_band_center_freq2 = %u\n", - htt_stats_buf->chan_band_center_freq2); + le32_to_cpu(htt_stats_buf->chan_mhz)); + len += scnprintf(buf + len, buf_len - len, + "chan_band_center_freq1 = %u\n", + le32_to_cpu(htt_stats_buf->chan_band_center_freq1)); + len += scnprintf(buf + len, buf_len - len, + "chan_band_center_freq2 = %u\n", + le32_to_cpu(htt_stats_buf->chan_band_center_freq2)); len += scnprintf(buf + len, buf_len - len, "chan_phy_mode = %u\n", - htt_stats_buf->chan_phy_mode); + le32_to_cpu(htt_stats_buf->chan_phy_mode)); len += scnprintf(buf + len, buf_len - len, "chan_flags = 0x%0x\n", - htt_stats_buf->chan_flags); + le32_to_cpu(htt_stats_buf->chan_flags)); len += scnprintf(buf + len, buf_len - len, "chan_num = %u\n", - htt_stats_buf->chan_num); + le32_to_cpu(htt_stats_buf->chan_num)); len += scnprintf(buf + len, buf_len - len, "reset_cause = 0x%0x\n", - htt_stats_buf->reset_cause); + le32_to_cpu(htt_stats_buf->reset_cause)); len += scnprintf(buf + len, buf_len - len, "prev_reset_cause = 0x%0x\n", - htt_stats_buf->prev_reset_cause); - len += scnprintf(buf + len, buf_len - len, "phy_warm_reset_src = 0x%0x\n", - htt_stats_buf->phy_warm_reset_src); + le32_to_cpu(htt_stats_buf->prev_reset_cause)); + len += scnprintf(buf + len, buf_len - len, + "phy_warm_reset_src = 0x%0x\n", + le32_to_cpu(htt_stats_buf->phy_warm_reset_src)); len += scnprintf(buf + len, buf_len - len, "rx_gain_tbl_mode = %d\n", - htt_stats_buf->rx_gain_tbl_mode); + le32_to_cpu(htt_stats_buf->rx_gain_tbl_mode)); len += scnprintf(buf + len, buf_len - len, "xbar_val = 0x%0x\n", - htt_stats_buf->xbar_val); + le32_to_cpu(htt_stats_buf->xbar_val)); len += scnprintf(buf + len, buf_len - len, "force_calibration = %u\n", - htt_stats_buf->force_calibration); + le32_to_cpu(htt_stats_buf->force_calibration)); len += scnprintf(buf + len, buf_len - len, "phyrf_mode = %u\n", - htt_stats_buf->phyrf_mode); + le32_to_cpu(htt_stats_buf->phyrf_mode)); len += scnprintf(buf + len, buf_len - len, "phy_homechan = %u\n", - htt_stats_buf->phy_homechan); + le32_to_cpu(htt_stats_buf->phy_homechan)); len += scnprintf(buf + len, buf_len - len, "phy_tx_ch_mask = 0x%0x\n", - htt_stats_buf->phy_tx_ch_mask); + le32_to_cpu(htt_stats_buf->phy_tx_ch_mask)); len += scnprintf(buf + len, buf_len - len, "phy_rx_ch_mask = 0x%0x\n", - htt_stats_buf->phy_rx_ch_mask); + le32_to_cpu(htt_stats_buf->phy_rx_ch_mask)); len += scnprintf(buf + len, buf_len - len, "phybb_ini_mask = 0x%0x\n", - htt_stats_buf->phybb_ini_mask); + le32_to_cpu(htt_stats_buf->phybb_ini_mask)); len += scnprintf(buf + len, buf_len - len, "phyrf_ini_mask = 0x%0x\n", - htt_stats_buf->phyrf_ini_mask); + le32_to_cpu(htt_stats_buf->phyrf_ini_mask)); len += scnprintf(buf + len, buf_len - len, "phy_dfs_en_mask = 0x%0x\n", - htt_stats_buf->phy_dfs_en_mask); - len += scnprintf(buf + len, buf_len - len, "phy_sscan_en_mask = 0x%0x\n", - htt_stats_buf->phy_sscan_en_mask); - len += scnprintf(buf + len, buf_len - len, "phy_synth_sel_mask = 0x%0x\n", - htt_stats_buf->phy_synth_sel_mask); + le32_to_cpu(htt_stats_buf->phy_dfs_en_mask)); + len += scnprintf(buf + len, buf_len - len, + "phy_sscan_en_mask = 0x%0x\n", + le32_to_cpu(htt_stats_buf->phy_sscan_en_mask)); + len += scnprintf(buf + len, buf_len - len, + "phy_synth_sel_mask = 0x%0x\n", + le32_to_cpu(htt_stats_buf->phy_synth_sel_mask)); len += scnprintf(buf + len, buf_len - len, "phy_adfs_freq = %u\n", - htt_stats_buf->phy_adfs_freq); + le32_to_cpu(htt_stats_buf->phy_adfs_freq)); len += scnprintf(buf + len, buf_len - len, "cck_fir_settings = 0x%0x\n", - htt_stats_buf->cck_fir_settings); + le32_to_cpu(htt_stats_buf->cck_fir_settings)); len += scnprintf(buf + len, buf_len - len, "phy_dyn_pri_chan = %u\n", - htt_stats_buf->phy_dyn_pri_chan); + le32_to_cpu(htt_stats_buf->phy_dyn_pri_chan)); len += scnprintf(buf + len, buf_len - len, "cca_thresh = 0x%0x\n", - htt_stats_buf->cca_thresh); + le32_to_cpu(htt_stats_buf->cca_thresh)); len += scnprintf(buf + len, buf_len - len, "dyn_cca_status = %u\n", - htt_stats_buf->dyn_cca_status); - len += scnprintf(buf + len, buf_len - len, "rxdesense_thresh_hw = 0x%x\n", - htt_stats_buf->rxdesense_thresh_hw); - len += scnprintf(buf + len, buf_len - len, "rxdesense_thresh_sw = 0x%x\n", - htt_stats_buf->rxdesense_thresh_sw); + le32_to_cpu(htt_stats_buf->dyn_cca_status)); + len += scnprintf(buf + len, buf_len - len, + "rxdesense_thresh_hw = 0x%x\n", + le32_to_cpu(htt_stats_buf->rxdesense_thresh_hw)); + len += scnprintf(buf + len, buf_len - len, + "rxdesense_thresh_sw = 0x%x\n", + le32_to_cpu(htt_stats_buf->rxdesense_thresh_sw)); stats_req->buf_len = len; } @@ -4562,7 +4734,7 @@ void ath11k_debugfs_htt_ext_stats_handler(struct ath11k_base *ab, u8 pdev_id; msg = (struct ath11k_htt_extd_stats_msg *)skb->data; - cookie = msg->cookie; + cookie = le64_to_cpu(msg->cookie); if (FIELD_GET(HTT_STATS_COOKIE_MSB, cookie) != HTT_STATS_MAGIC_VALUE) { ath11k_warn(ab, "received invalid htt ext stats event\n"); @@ -4584,13 +4756,14 @@ void ath11k_debugfs_htt_ext_stats_handler(struct ath11k_base *ab, spin_lock_bh(&ar->debug.htt_stats.lock); - stats_req->done = FIELD_GET(HTT_T2H_EXT_STATS_INFO1_DONE, msg->info1); + stats_req->done = le32_get_bits(msg->info1, + HTT_T2H_EXT_STATS_INFO1_DONE); if (stats_req->done) send_completion = true; spin_unlock_bh(&ar->debug.htt_stats.lock); - len = FIELD_GET(HTT_T2H_EXT_STATS_INFO1_LENGTH, msg->info1); + len = le32_get_bits(msg->info1, HTT_T2H_EXT_STATS_INFO1_LENGTH); ret = ath11k_dp_htt_tlv_iter(ab, msg->data, len, ath11k_dbg_htt_ext_stats_parse, stats_req); diff --git a/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h b/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h index 856aa74ba365..8e5228c6154e 100644 --- a/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h +++ b/drivers/net/wireless/ath/ath11k/debugfs_htt_stats.h @@ -146,102 +146,102 @@ enum htt_tx_pdev_underrun_enum { /* Length should be multiple of DWORD */ struct htt_stats_string_tlv { /* Can be variable length */ - DECLARE_FLEX_ARRAY(u32, data); + DECLARE_FLEX_ARRAY(__le32, data); } __packed; #define HTT_STATS_MAC_ID GENMASK(7, 0) /* == TX PDEV STATS == */ struct htt_tx_pdev_stats_cmn_tlv { - u32 mac_id__word; - u32 hw_queued; - u32 hw_reaped; - u32 underrun; - u32 hw_paused; - u32 hw_flush; - u32 hw_filt; - u32 tx_abort; - u32 mpdu_requeued; - u32 tx_xretry; - u32 data_rc; - u32 mpdu_dropped_xretry; - u32 illgl_rate_phy_err; - u32 cont_xretry; - u32 tx_timeout; - u32 pdev_resets; - u32 phy_underrun; - u32 txop_ovf; - u32 seq_posted; - u32 seq_failed_queueing; - u32 seq_completed; - u32 seq_restarted; - u32 mu_seq_posted; - u32 seq_switch_hw_paused; - u32 next_seq_posted_dsr; - u32 seq_posted_isr; - u32 seq_ctrl_cached; - u32 mpdu_count_tqm; - u32 msdu_count_tqm; - u32 mpdu_removed_tqm; - u32 msdu_removed_tqm; - u32 mpdus_sw_flush; - u32 mpdus_hw_filter; - u32 mpdus_truncated; - u32 mpdus_ack_failed; - u32 mpdus_expired; - u32 mpdus_seq_hw_retry; - u32 ack_tlv_proc; - u32 coex_abort_mpdu_cnt_valid; - u32 coex_abort_mpdu_cnt; - u32 num_total_ppdus_tried_ota; - u32 num_data_ppdus_tried_ota; - u32 local_ctrl_mgmt_enqued; - u32 local_ctrl_mgmt_freed; - u32 local_data_enqued; - u32 local_data_freed; - u32 mpdu_tried; - u32 isr_wait_seq_posted; - - u32 tx_active_dur_us_low; - u32 tx_active_dur_us_high; + __le32 mac_id__word; + __le32 hw_queued; + __le32 hw_reaped; + __le32 underrun; + __le32 hw_paused; + __le32 hw_flush; + __le32 hw_filt; + __le32 tx_abort; + __le32 mpdu_requeued; + __le32 tx_xretry; + __le32 data_rc; + __le32 mpdu_dropped_xretry; + __le32 illgl_rate_phy_err; + __le32 cont_xretry; + __le32 tx_timeout; + __le32 pdev_resets; + __le32 phy_underrun; + __le32 txop_ovf; + __le32 seq_posted; + __le32 seq_failed_queueing; + __le32 seq_completed; + __le32 seq_restarted; + __le32 mu_seq_posted; + __le32 seq_switch_hw_paused; + __le32 next_seq_posted_dsr; + __le32 seq_posted_isr; + __le32 seq_ctrl_cached; + __le32 mpdu_count_tqm; + __le32 msdu_count_tqm; + __le32 mpdu_removed_tqm; + __le32 msdu_removed_tqm; + __le32 mpdus_sw_flush; + __le32 mpdus_hw_filter; + __le32 mpdus_truncated; + __le32 mpdus_ack_failed; + __le32 mpdus_expired; + __le32 mpdus_seq_hw_retry; + __le32 ack_tlv_proc; + __le32 coex_abort_mpdu_cnt_valid; + __le32 coex_abort_mpdu_cnt; + __le32 num_total_ppdus_tried_ota; + __le32 num_data_ppdus_tried_ota; + __le32 local_ctrl_mgmt_enqued; + __le32 local_ctrl_mgmt_freed; + __le32 local_data_enqued; + __le32 local_data_freed; + __le32 mpdu_tried; + __le32 isr_wait_seq_posted; + + __le32 tx_active_dur_us_low; + __le32 tx_active_dur_us_high; }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_pdev_stats_urrn_tlv_v { /* HTT_TX_PDEV_MAX_URRN_STATS */ - DECLARE_FLEX_ARRAY(u32, urrn_stats); + DECLARE_FLEX_ARRAY(__le32, urrn_stats); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_pdev_stats_flush_tlv_v { /* HTT_TX_PDEV_MAX_FLUSH_REASON_STATS */ - DECLARE_FLEX_ARRAY(u32, flush_errs); + DECLARE_FLEX_ARRAY(__le32, flush_errs); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_pdev_stats_sifs_tlv_v { /* HTT_TX_PDEV_MAX_SIFS_BURST_STATS */ - DECLARE_FLEX_ARRAY(u32, sifs_status); + DECLARE_FLEX_ARRAY(__le32, sifs_status); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_pdev_stats_phy_err_tlv_v { /* HTT_TX_PDEV_MAX_PHY_ERR_STATS */ - DECLARE_FLEX_ARRAY(u32, phy_errs); + DECLARE_FLEX_ARRAY(__le32, phy_errs); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_pdev_stats_sifs_hist_tlv_v { /* HTT_TX_PDEV_SIFS_BURST_HIST_STATS */ - DECLARE_FLEX_ARRAY(u32, sifs_hist_status); + DECLARE_FLEX_ARRAY(__le32, sifs_hist_status); }; struct htt_tx_pdev_stats_tx_ppdu_stats_tlv_v { - u32 num_data_ppdus_legacy_su; - u32 num_data_ppdus_ac_su; - u32 num_data_ppdus_ax_su; - u32 num_data_ppdus_ac_su_txbf; - u32 num_data_ppdus_ax_su_txbf; + __le32 num_data_ppdus_legacy_su; + __le32 num_data_ppdus_ac_su; + __le32 num_data_ppdus_ax_su; + __le32 num_data_ppdus_ac_su_txbf; + __le32 num_data_ppdus_ax_su_txbf; }; /* NOTE: Variable length TLV, use length spec to infer array size . @@ -257,8 +257,8 @@ struct htt_tx_pdev_stats_tx_ppdu_stats_tlv_v { * #define WAL_TRIED_MPDU_CNT_HISTOGRAM_INTERVAL 30 */ struct htt_tx_pdev_stats_tried_mpdu_cnt_hist_tlv_v { - u32 hist_bin_size; - u32 tried_mpdu_cnt_hist[]; /* HTT_TX_PDEV_TRIED_MPDU_CNT_HIST */ + __le32 hist_bin_size; + __le32 tried_mpdu_cnt_hist[]; /* HTT_TX_PDEV_TRIED_MPDU_CNT_HIST */ }; /* == SOC ERROR STATS == */ @@ -268,44 +268,44 @@ struct htt_tx_pdev_stats_tried_mpdu_cnt_hist_tlv_v { struct htt_hw_stats_intr_misc_tlv { /* Stored as little endian */ u8 hw_intr_name[HTT_STATS_MAX_HW_INTR_NAME_LEN]; - u32 mask; - u32 count; + __le32 mask; + __le32 count; }; #define HTT_STATS_MAX_HW_MODULE_NAME_LEN 8 struct htt_hw_stats_wd_timeout_tlv { /* Stored as little endian */ u8 hw_module_name[HTT_STATS_MAX_HW_MODULE_NAME_LEN]; - u32 count; + __le32 count; }; struct htt_hw_stats_pdev_errs_tlv { - u32 mac_id__word; /* BIT [ 7 : 0] : mac_id */ - u32 tx_abort; - u32 tx_abort_fail_count; - u32 rx_abort; - u32 rx_abort_fail_count; - u32 warm_reset; - u32 cold_reset; - u32 tx_flush; - u32 tx_glb_reset; - u32 tx_txq_reset; - u32 rx_timeout_reset; + __le32 mac_id__word; /* BIT [ 7 : 0] : mac_id */ + __le32 tx_abort; + __le32 tx_abort_fail_count; + __le32 rx_abort; + __le32 rx_abort_fail_count; + __le32 warm_reset; + __le32 cold_reset; + __le32 tx_flush; + __le32 tx_glb_reset; + __le32 tx_txq_reset; + __le32 rx_timeout_reset; }; struct htt_hw_stats_whal_tx_tlv { - u32 mac_id__word; - u32 last_unpause_ppdu_id; - u32 hwsch_unpause_wait_tqm_write; - u32 hwsch_dummy_tlv_skipped; - u32 hwsch_misaligned_offset_received; - u32 hwsch_reset_count; - u32 hwsch_dev_reset_war; - u32 hwsch_delayed_pause; - u32 hwsch_long_delayed_pause; - u32 sch_rx_ppdu_no_response; - u32 sch_selfgen_response; - u32 sch_rx_sifs_resp_trigger; + __le32 mac_id__word; + __le32 last_unpause_ppdu_id; + __le32 hwsch_unpause_wait_tqm_write; + __le32 hwsch_dummy_tlv_skipped; + __le32 hwsch_misaligned_offset_received; + __le32 hwsch_reset_count; + __le32 hwsch_dev_reset_war; + __le32 hwsch_delayed_pause; + __le32 hwsch_long_delayed_pause; + __le32 sch_rx_ppdu_no_response; + __le32 sch_selfgen_response; + __le32 sch_rx_sifs_resp_trigger; }; /* ============ PEER STATS ============ */ @@ -314,17 +314,17 @@ struct htt_hw_stats_whal_tx_tlv { #define HTT_MSDU_FLOW_STATS_DROP_RULE BIT(20) struct htt_msdu_flow_stats_tlv { - u32 last_update_timestamp; - u32 last_add_timestamp; - u32 last_remove_timestamp; - u32 total_processed_msdu_count; - u32 cur_msdu_count_in_flowq; - u32 sw_peer_id; - u32 tx_flow_no__tid_num__drop_rule; - u32 last_cycle_enqueue_count; - u32 last_cycle_dequeue_count; - u32 last_cycle_drop_count; - u32 current_drop_th; + __le32 last_update_timestamp; + __le32 last_add_timestamp; + __le32 last_remove_timestamp; + __le32 total_processed_msdu_count; + __le32 cur_msdu_count_in_flowq; + __le32 sw_peer_id; + __le32 tx_flow_no__tid_num__drop_rule; + __le32 last_cycle_enqueue_count; + __le32 last_cycle_dequeue_count; + __le32 last_cycle_drop_count; + __le32 current_drop_th; }; #define MAX_HTT_TID_NAME 8 @@ -338,20 +338,20 @@ struct htt_msdu_flow_stats_tlv { struct htt_tx_tid_stats_tlv { /* Stored as little endian */ u8 tid_name[MAX_HTT_TID_NAME]; - u32 sw_peer_id__tid_num; - u32 num_sched_pending__num_ppdu_in_hwq; - u32 tid_flags; - u32 hw_queued; - u32 hw_reaped; - u32 mpdus_hw_filter; - - u32 qdepth_bytes; - u32 qdepth_num_msdu; - u32 qdepth_num_mpdu; - u32 last_scheduled_tsmp; - u32 pause_module_id; - u32 block_module_id; - u32 tid_tx_airtime; + __le32 sw_peer_id__tid_num; + __le32 num_sched_pending__num_ppdu_in_hwq; + __le32 tid_flags; + __le32 hw_queued; + __le32 hw_reaped; + __le32 mpdus_hw_filter; + + __le32 qdepth_bytes; + __le32 qdepth_num_msdu; + __le32 qdepth_num_mpdu; + __le32 last_scheduled_tsmp; + __le32 pause_module_id; + __le32 block_module_id; + __le32 tid_tx_airtime; }; #define HTT_TX_TID_STATS_V1_SW_PEER_ID GENMASK(15, 0) @@ -363,63 +363,63 @@ struct htt_tx_tid_stats_tlv { struct htt_tx_tid_stats_v1_tlv { /* Stored as little endian */ u8 tid_name[MAX_HTT_TID_NAME]; - u32 sw_peer_id__tid_num; - u32 num_sched_pending__num_ppdu_in_hwq; - u32 tid_flags; - u32 max_qdepth_bytes; - u32 max_qdepth_n_msdus; - u32 rsvd; - - u32 qdepth_bytes; - u32 qdepth_num_msdu; - u32 qdepth_num_mpdu; - u32 last_scheduled_tsmp; - u32 pause_module_id; - u32 block_module_id; - u32 tid_tx_airtime; - u32 allow_n_flags; - u32 sendn_frms_allowed; + __le32 sw_peer_id__tid_num; + __le32 num_sched_pending__num_ppdu_in_hwq; + __le32 tid_flags; + __le32 max_qdepth_bytes; + __le32 max_qdepth_n_msdus; + __le32 rsvd; + + __le32 qdepth_bytes; + __le32 qdepth_num_msdu; + __le32 qdepth_num_mpdu; + __le32 last_scheduled_tsmp; + __le32 pause_module_id; + __le32 block_module_id; + __le32 tid_tx_airtime; + __le32 allow_n_flags; + __le32 sendn_frms_allowed; }; #define HTT_RX_TID_STATS_SW_PEER_ID GENMASK(15, 0) #define HTT_RX_TID_STATS_TID_NUM GENMASK(31, 16) struct htt_rx_tid_stats_tlv { - u32 sw_peer_id__tid_num; + __le32 sw_peer_id__tid_num; u8 tid_name[MAX_HTT_TID_NAME]; - u32 dup_in_reorder; - u32 dup_past_outside_window; - u32 dup_past_within_window; - u32 rxdesc_err_decrypt; - u32 tid_rx_airtime; + __le32 dup_in_reorder; + __le32 dup_past_outside_window; + __le32 dup_past_within_window; + __le32 rxdesc_err_decrypt; + __le32 tid_rx_airtime; }; #define HTT_MAX_COUNTER_NAME 8 struct htt_counter_tlv { u8 counter_name[HTT_MAX_COUNTER_NAME]; - u32 count; + __le32 count; }; struct htt_peer_stats_cmn_tlv { - u32 ppdu_cnt; - u32 mpdu_cnt; - u32 msdu_cnt; - u32 pause_bitmap; - u32 block_bitmap; - u32 current_timestamp; - u32 peer_tx_airtime; - u32 peer_rx_airtime; + __le32 ppdu_cnt; + __le32 mpdu_cnt; + __le32 msdu_cnt; + __le32 pause_bitmap; + __le32 block_bitmap; + __le32 current_timestamp; + __le32 peer_tx_airtime; + __le32 peer_rx_airtime; s32 rssi; - u32 peer_enqueued_count_low; - u32 peer_enqueued_count_high; - u32 peer_dequeued_count_low; - u32 peer_dequeued_count_high; - u32 peer_dropped_count_low; - u32 peer_dropped_count_high; - u32 ppdu_transmitted_bytes_low; - u32 ppdu_transmitted_bytes_high; - u32 peer_ttl_removed_count; - u32 inactive_time; + __le32 peer_enqueued_count_low; + __le32 peer_enqueued_count_high; + __le32 peer_dequeued_count_low; + __le32 peer_dequeued_count_high; + __le32 peer_dropped_count_low; + __le32 peer_dropped_count_high; + __le32 ppdu_transmitted_bytes_low; + __le32 ppdu_transmitted_bytes_high; + __le32 peer_ttl_removed_count; + __le32 inactive_time; }; #define HTT_PEER_DETAILS_VDEV_ID GENMASK(7, 0) @@ -427,12 +427,12 @@ struct htt_peer_stats_cmn_tlv { #define HTT_PEER_DETAILS_AST_IDX GENMASK(31, 16) struct htt_peer_details_tlv { - u32 peer_type; - u32 sw_peer_id; - u32 vdev_pdev_ast_idx; + __le32 peer_type; + __le32 sw_peer_id; + __le32 vdev_pdev_ast_idx; struct htt_mac_addr mac_addr; - u32 peer_flags; - u32 qpeer_flags; + __le32 peer_flags; + __le32 qpeer_flags; }; enum htt_stats_param_type { @@ -455,27 +455,27 @@ enum htt_stats_param_type { #define HTT_TX_PEER_STATS_NUM_PREAMBLE_TYPES HTT_STATS_PREAM_COUNT struct htt_tx_peer_rate_stats_tlv { - u32 tx_ldpc; - u32 rts_cnt; - u32 ack_rssi; + __le32 tx_ldpc; + __le32 rts_cnt; + __le32 ack_rssi; - u32 tx_mcs[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; - u32 tx_su_mcs[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; - u32 tx_mu_mcs[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 tx_mcs[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 tx_su_mcs[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 tx_mu_mcs[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; /* element 0,1, ...7 -> NSS 1,2, ...8 */ - u32 tx_nss[HTT_TX_PEER_STATS_NUM_SPATIAL_STREAMS]; + __le32 tx_nss[HTT_TX_PEER_STATS_NUM_SPATIAL_STREAMS]; /* element 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160 and 80+80 MHz */ - u32 tx_bw[HTT_TX_PEER_STATS_NUM_BW_COUNTERS]; - u32 tx_stbc[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; - u32 tx_pream[HTT_TX_PEER_STATS_NUM_PREAMBLE_TYPES]; + __le32 tx_bw[HTT_TX_PEER_STATS_NUM_BW_COUNTERS]; + __le32 tx_stbc[HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 tx_pream[HTT_TX_PEER_STATS_NUM_PREAMBLE_TYPES]; /* Counters to track number of tx packets in each GI * (400us, 800us, 1600us & 3200us) in each mcs (0-11) */ - u32 tx_gi[HTT_TX_PEER_STATS_NUM_GI_COUNTERS][HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 tx_gi[HTT_TX_PEER_STATS_NUM_GI_COUNTERS][HTT_TX_PEER_STATS_NUM_MCS_COUNTERS]; /* Counters to track packets in dcm mcs (MCS 0, 1, 3, 4) */ - u32 tx_dcm[HTT_TX_PEER_STATS_NUM_DCM_COUNTERS]; + __le32 tx_dcm[HTT_TX_PEER_STATS_NUM_DCM_COUNTERS]; }; @@ -487,30 +487,30 @@ struct htt_tx_peer_rate_stats_tlv { #define HTT_RX_PEER_STATS_NUM_PREAMBLE_TYPES HTT_STATS_PREAM_COUNT struct htt_rx_peer_rate_stats_tlv { - u32 nsts; + __le32 nsts; /* Number of rx ldpc packets */ - u32 rx_ldpc; + __le32 rx_ldpc; /* Number of rx rts packets */ - u32 rts_cnt; + __le32 rts_cnt; - u32 rssi_mgmt; /* units = dB above noise floor */ - u32 rssi_data; /* units = dB above noise floor */ - u32 rssi_comb; /* units = dB above noise floor */ - u32 rx_mcs[HTT_RX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 rssi_mgmt; /* units = dB above noise floor */ + __le32 rssi_data; /* units = dB above noise floor */ + __le32 rssi_comb; /* units = dB above noise floor */ + __le32 rx_mcs[HTT_RX_PEER_STATS_NUM_MCS_COUNTERS]; /* element 0,1, ...7 -> NSS 1,2, ...8 */ - u32 rx_nss[HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS]; - u32 rx_dcm[HTT_RX_PEER_STATS_NUM_DCM_COUNTERS]; - u32 rx_stbc[HTT_RX_PEER_STATS_NUM_MCS_COUNTERS]; + __le32 rx_nss[HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS]; + __le32 rx_dcm[HTT_RX_PEER_STATS_NUM_DCM_COUNTERS]; + __le32 rx_stbc[HTT_RX_PEER_STATS_NUM_MCS_COUNTERS]; /* element 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160 and 80+80 MHz */ - u32 rx_bw[HTT_RX_PEER_STATS_NUM_BW_COUNTERS]; - u32 rx_pream[HTT_RX_PEER_STATS_NUM_PREAMBLE_TYPES]; + __le32 rx_bw[HTT_RX_PEER_STATS_NUM_BW_COUNTERS]; + __le32 rx_pream[HTT_RX_PEER_STATS_NUM_PREAMBLE_TYPES]; /* units = dB above noise floor */ u8 rssi_chain[HTT_RX_PEER_STATS_NUM_SPATIAL_STREAMS] [HTT_RX_PEER_STATS_NUM_BW_COUNTERS]; /* Counters to track number of rx packets in each GI in each mcs (0-11) */ - u32 rx_gi[HTT_RX_PEER_STATS_NUM_GI_COUNTERS] + __le32 rx_gi[HTT_RX_PEER_STATS_NUM_GI_COUNTERS] [HTT_RX_PEER_STATS_NUM_MCS_COUNTERS]; }; @@ -535,83 +535,83 @@ enum htt_peer_stats_tlv_enum { /* =========== MUMIMO HWQ stats =========== */ /* MU MIMO stats per hwQ */ struct htt_tx_hwq_mu_mimo_sch_stats_tlv { - u32 mu_mimo_sch_posted; - u32 mu_mimo_sch_failed; - u32 mu_mimo_ppdu_posted; + __le32 mu_mimo_sch_posted; + __le32 mu_mimo_sch_failed; + __le32 mu_mimo_ppdu_posted; }; struct htt_tx_hwq_mu_mimo_mpdu_stats_tlv { - u32 mu_mimo_mpdus_queued_usr; - u32 mu_mimo_mpdus_tried_usr; - u32 mu_mimo_mpdus_failed_usr; - u32 mu_mimo_mpdus_requeued_usr; - u32 mu_mimo_err_no_ba_usr; - u32 mu_mimo_mpdu_underrun_usr; - u32 mu_mimo_ampdu_underrun_usr; + __le32 mu_mimo_mpdus_queued_usr; + __le32 mu_mimo_mpdus_tried_usr; + __le32 mu_mimo_mpdus_failed_usr; + __le32 mu_mimo_mpdus_requeued_usr; + __le32 mu_mimo_err_no_ba_usr; + __le32 mu_mimo_mpdu_underrun_usr; + __le32 mu_mimo_ampdu_underrun_usr; }; #define HTT_TX_HWQ_STATS_MAC_ID GENMASK(7, 0) #define HTT_TX_HWQ_STATS_HWQ_ID GENMASK(15, 8) struct htt_tx_hwq_mu_mimo_cmn_stats_tlv { - u32 mac_id__hwq_id__word; + __le32 mac_id__hwq_id__word; }; /* == TX HWQ STATS == */ struct htt_tx_hwq_stats_cmn_tlv { - u32 mac_id__hwq_id__word; + __le32 mac_id__hwq_id__word; /* PPDU level stats */ - u32 xretry; - u32 underrun_cnt; - u32 flush_cnt; - u32 filt_cnt; - u32 null_mpdu_bmap; - u32 user_ack_failure; - u32 ack_tlv_proc; - u32 sched_id_proc; - u32 null_mpdu_tx_count; - u32 mpdu_bmap_not_recvd; + __le32 xretry; + __le32 underrun_cnt; + __le32 flush_cnt; + __le32 filt_cnt; + __le32 null_mpdu_bmap; + __le32 user_ack_failure; + __le32 ack_tlv_proc; + __le32 sched_id_proc; + __le32 null_mpdu_tx_count; + __le32 mpdu_bmap_not_recvd; /* Selfgen stats per hwQ */ - u32 num_bar; - u32 rts; - u32 cts2self; - u32 qos_null; + __le32 num_bar; + __le32 rts; + __le32 cts2self; + __le32 qos_null; /* MPDU level stats */ - u32 mpdu_tried_cnt; - u32 mpdu_queued_cnt; - u32 mpdu_ack_fail_cnt; - u32 mpdu_filt_cnt; - u32 false_mpdu_ack_count; + __le32 mpdu_tried_cnt; + __le32 mpdu_queued_cnt; + __le32 mpdu_ack_fail_cnt; + __le32 mpdu_filt_cnt; + __le32 false_mpdu_ack_count; - u32 txq_timeout; + __le32 txq_timeout; }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_hwq_difs_latency_stats_tlv_v { - u32 hist_intvl; + __le32 hist_intvl; /* histogram of ppdu post to hwsch - > cmd status received */ - u32 difs_latency_hist[]; /* HTT_TX_HWQ_MAX_DIFS_LATENCY_BINS */ + __le32 difs_latency_hist[]; /* HTT_TX_HWQ_MAX_DIFS_LATENCY_BINS */ }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_hwq_cmd_result_stats_tlv_v { /* Histogram of sched cmd result, HTT_TX_HWQ_MAX_CMD_RESULT_STATS */ - DECLARE_FLEX_ARRAY(u32, cmd_result); + DECLARE_FLEX_ARRAY(__le32, cmd_result); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_hwq_cmd_stall_stats_tlv_v { /* Histogram of various pause conitions, HTT_TX_HWQ_MAX_CMD_STALL_STATS */ - DECLARE_FLEX_ARRAY(u32, cmd_stall_status); + DECLARE_FLEX_ARRAY(__le32, cmd_stall_status); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_hwq_fes_result_stats_tlv_v { /* Histogram of number of user fes result, HTT_TX_HWQ_MAX_FES_RESULT_STATS */ - DECLARE_FLEX_ARRAY(u32, fes_result); + DECLARE_FLEX_ARRAY(__le32, fes_result); }; /* NOTE: Variable length TLV, use length spec to infer array size @@ -627,9 +627,9 @@ struct htt_tx_hwq_fes_result_stats_tlv_v { * #define WAL_TRIED_MPDU_CNT_HISTOGRAM_INTERVAL 30 */ struct htt_tx_hwq_tried_mpdu_cnt_hist_tlv_v { - u32 hist_bin_size; + __le32 hist_bin_size; /* Histogram of number of mpdus on tried mpdu */ - u32 tried_mpdu_cnt_hist[]; /* HTT_TX_HWQ_TRIED_MPDU_CNT_HIST */ + __le32 tried_mpdu_cnt_hist[]; /* HTT_TX_HWQ_TRIED_MPDU_CNT_HIST */ }; /* NOTE: Variable length TLV, use length spec to infer array size @@ -644,85 +644,85 @@ struct htt_tx_hwq_tried_mpdu_cnt_hist_tlv_v { */ struct htt_tx_hwq_txop_used_cnt_hist_tlv_v { /* Histogram of txop used cnt, HTT_TX_HWQ_TXOP_USED_CNT_HIST */ - DECLARE_FLEX_ARRAY(u32, txop_used_cnt_hist); + DECLARE_FLEX_ARRAY(__le32, txop_used_cnt_hist); }; /* == TX SELFGEN STATS == */ struct htt_tx_selfgen_cmn_stats_tlv { - u32 mac_id__word; - u32 su_bar; - u32 rts; - u32 cts2self; - u32 qos_null; - u32 delayed_bar_1; /* MU user 1 */ - u32 delayed_bar_2; /* MU user 2 */ - u32 delayed_bar_3; /* MU user 3 */ - u32 delayed_bar_4; /* MU user 4 */ - u32 delayed_bar_5; /* MU user 5 */ - u32 delayed_bar_6; /* MU user 6 */ - u32 delayed_bar_7; /* MU user 7 */ + __le32 mac_id__word; + __le32 su_bar; + __le32 rts; + __le32 cts2self; + __le32 qos_null; + __le32 delayed_bar_1; /* MU user 1 */ + __le32 delayed_bar_2; /* MU user 2 */ + __le32 delayed_bar_3; /* MU user 3 */ + __le32 delayed_bar_4; /* MU user 4 */ + __le32 delayed_bar_5; /* MU user 5 */ + __le32 delayed_bar_6; /* MU user 6 */ + __le32 delayed_bar_7; /* MU user 7 */ }; struct htt_tx_selfgen_ac_stats_tlv { /* 11AC */ - u32 ac_su_ndpa; - u32 ac_su_ndp; - u32 ac_mu_mimo_ndpa; - u32 ac_mu_mimo_ndp; - u32 ac_mu_mimo_brpoll_1; /* MU user 1 */ - u32 ac_mu_mimo_brpoll_2; /* MU user 2 */ - u32 ac_mu_mimo_brpoll_3; /* MU user 3 */ + __le32 ac_su_ndpa; + __le32 ac_su_ndp; + __le32 ac_mu_mimo_ndpa; + __le32 ac_mu_mimo_ndp; + __le32 ac_mu_mimo_brpoll_1; /* MU user 1 */ + __le32 ac_mu_mimo_brpoll_2; /* MU user 2 */ + __le32 ac_mu_mimo_brpoll_3; /* MU user 3 */ }; struct htt_tx_selfgen_ax_stats_tlv { /* 11AX */ - u32 ax_su_ndpa; - u32 ax_su_ndp; - u32 ax_mu_mimo_ndpa; - u32 ax_mu_mimo_ndp; - u32 ax_mu_mimo_brpoll_1; /* MU user 1 */ - u32 ax_mu_mimo_brpoll_2; /* MU user 2 */ - u32 ax_mu_mimo_brpoll_3; /* MU user 3 */ - u32 ax_mu_mimo_brpoll_4; /* MU user 4 */ - u32 ax_mu_mimo_brpoll_5; /* MU user 5 */ - u32 ax_mu_mimo_brpoll_6; /* MU user 6 */ - u32 ax_mu_mimo_brpoll_7; /* MU user 7 */ - u32 ax_basic_trigger; - u32 ax_bsr_trigger; - u32 ax_mu_bar_trigger; - u32 ax_mu_rts_trigger; - u32 ax_ulmumimo_trigger; + __le32 ax_su_ndpa; + __le32 ax_su_ndp; + __le32 ax_mu_mimo_ndpa; + __le32 ax_mu_mimo_ndp; + __le32 ax_mu_mimo_brpoll_1; /* MU user 1 */ + __le32 ax_mu_mimo_brpoll_2; /* MU user 2 */ + __le32 ax_mu_mimo_brpoll_3; /* MU user 3 */ + __le32 ax_mu_mimo_brpoll_4; /* MU user 4 */ + __le32 ax_mu_mimo_brpoll_5; /* MU user 5 */ + __le32 ax_mu_mimo_brpoll_6; /* MU user 6 */ + __le32 ax_mu_mimo_brpoll_7; /* MU user 7 */ + __le32 ax_basic_trigger; + __le32 ax_bsr_trigger; + __le32 ax_mu_bar_trigger; + __le32 ax_mu_rts_trigger; + __le32 ax_ulmumimo_trigger; }; struct htt_tx_selfgen_ac_err_stats_tlv { /* 11AC error stats */ - u32 ac_su_ndp_err; - u32 ac_su_ndpa_err; - u32 ac_mu_mimo_ndpa_err; - u32 ac_mu_mimo_ndp_err; - u32 ac_mu_mimo_brp1_err; - u32 ac_mu_mimo_brp2_err; - u32 ac_mu_mimo_brp3_err; + __le32 ac_su_ndp_err; + __le32 ac_su_ndpa_err; + __le32 ac_mu_mimo_ndpa_err; + __le32 ac_mu_mimo_ndp_err; + __le32 ac_mu_mimo_brp1_err; + __le32 ac_mu_mimo_brp2_err; + __le32 ac_mu_mimo_brp3_err; }; struct htt_tx_selfgen_ax_err_stats_tlv { /* 11AX error stats */ - u32 ax_su_ndp_err; - u32 ax_su_ndpa_err; - u32 ax_mu_mimo_ndpa_err; - u32 ax_mu_mimo_ndp_err; - u32 ax_mu_mimo_brp1_err; - u32 ax_mu_mimo_brp2_err; - u32 ax_mu_mimo_brp3_err; - u32 ax_mu_mimo_brp4_err; - u32 ax_mu_mimo_brp5_err; - u32 ax_mu_mimo_brp6_err; - u32 ax_mu_mimo_brp7_err; - u32 ax_basic_trigger_err; - u32 ax_bsr_trigger_err; - u32 ax_mu_bar_trigger_err; - u32 ax_mu_rts_trigger_err; - u32 ax_ulmumimo_trigger_err; + __le32 ax_su_ndp_err; + __le32 ax_su_ndpa_err; + __le32 ax_mu_mimo_ndpa_err; + __le32 ax_mu_mimo_ndp_err; + __le32 ax_mu_mimo_brp1_err; + __le32 ax_mu_mimo_brp2_err; + __le32 ax_mu_mimo_brp3_err; + __le32 ax_mu_mimo_brp4_err; + __le32 ax_mu_mimo_brp5_err; + __le32 ax_mu_mimo_brp6_err; + __le32 ax_mu_mimo_brp7_err; + __le32 ax_basic_trigger_err; + __le32 ax_bsr_trigger_err; + __le32 ax_mu_bar_trigger_err; + __le32 ax_mu_rts_trigger_err; + __le32 ax_ulmumimo_trigger_err; }; /* == TX MU STATS == */ @@ -733,63 +733,63 @@ struct htt_tx_selfgen_ax_err_stats_tlv { struct htt_tx_pdev_mu_mimo_sch_stats_tlv { /* mu-mimo sw sched cmd stats */ - u32 mu_mimo_sch_posted; - u32 mu_mimo_sch_failed; + __le32 mu_mimo_sch_posted; + __le32 mu_mimo_sch_failed; /* MU PPDU stats per hwQ */ - u32 mu_mimo_ppdu_posted; + __le32 mu_mimo_ppdu_posted; /* * Counts the number of users in each transmission of * the given TX mode. * * Index is the number of users - 1. */ - u32 ac_mu_mimo_sch_nusers[HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS]; - u32 ax_mu_mimo_sch_nusers[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS]; - u32 ax_ofdma_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; - u32 ax_ul_ofdma_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; - u32 ax_ul_ofdma_bsr_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; - u32 ax_ul_ofdma_bar_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; - u32 ax_ul_ofdma_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ac_mu_mimo_sch_nusers[HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS]; + __le32 ax_mu_mimo_sch_nusers[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS]; + __le32 ax_ofdma_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ul_ofdma_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ul_ofdma_bsr_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ul_ofdma_bar_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ul_ofdma_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* UL MU-MIMO */ /* ax_ul_mumimo_basic_sch_nusers[i] is the number of basic triggers sent * for (i+1) users */ - u32 ax_ul_mumimo_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS]; + __le32 ax_ul_mumimo_basic_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS]; /* ax_ul_mumimo_brp_sch_nusers[i] is the number of brp triggers sent * for (i+1) users */ - u32 ax_ul_mumimo_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS]; + __le32 ax_ul_mumimo_brp_sch_nusers[HTT_TX_PDEV_STATS_NUM_UL_MUMIMO_USER_STATS]; - u32 ac_mu_mimo_sch_posted_per_grp_sz[HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS]; - u32 ax_mu_mimo_sch_posted_per_grp_sz[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS]; + __le32 ac_mu_mimo_sch_posted_per_grp_sz[HTT_TX_PDEV_STATS_NUM_AC_MUMIMO_USER_STATS]; + __le32 ax_mu_mimo_sch_posted_per_grp_sz[HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS]; }; struct htt_tx_pdev_mu_mimo_mpdu_stats_tlv { - u32 mu_mimo_mpdus_queued_usr; - u32 mu_mimo_mpdus_tried_usr; - u32 mu_mimo_mpdus_failed_usr; - u32 mu_mimo_mpdus_requeued_usr; - u32 mu_mimo_err_no_ba_usr; - u32 mu_mimo_mpdu_underrun_usr; - u32 mu_mimo_ampdu_underrun_usr; - - u32 ax_mu_mimo_mpdus_queued_usr; - u32 ax_mu_mimo_mpdus_tried_usr; - u32 ax_mu_mimo_mpdus_failed_usr; - u32 ax_mu_mimo_mpdus_requeued_usr; - u32 ax_mu_mimo_err_no_ba_usr; - u32 ax_mu_mimo_mpdu_underrun_usr; - u32 ax_mu_mimo_ampdu_underrun_usr; - - u32 ax_ofdma_mpdus_queued_usr; - u32 ax_ofdma_mpdus_tried_usr; - u32 ax_ofdma_mpdus_failed_usr; - u32 ax_ofdma_mpdus_requeued_usr; - u32 ax_ofdma_err_no_ba_usr; - u32 ax_ofdma_mpdu_underrun_usr; - u32 ax_ofdma_ampdu_underrun_usr; + __le32 mu_mimo_mpdus_queued_usr; + __le32 mu_mimo_mpdus_tried_usr; + __le32 mu_mimo_mpdus_failed_usr; + __le32 mu_mimo_mpdus_requeued_usr; + __le32 mu_mimo_err_no_ba_usr; + __le32 mu_mimo_mpdu_underrun_usr; + __le32 mu_mimo_ampdu_underrun_usr; + + __le32 ax_mu_mimo_mpdus_queued_usr; + __le32 ax_mu_mimo_mpdus_tried_usr; + __le32 ax_mu_mimo_mpdus_failed_usr; + __le32 ax_mu_mimo_mpdus_requeued_usr; + __le32 ax_mu_mimo_err_no_ba_usr; + __le32 ax_mu_mimo_mpdu_underrun_usr; + __le32 ax_mu_mimo_ampdu_underrun_usr; + + __le32 ax_ofdma_mpdus_queued_usr; + __le32 ax_ofdma_mpdus_tried_usr; + __le32 ax_ofdma_mpdus_failed_usr; + __le32 ax_ofdma_mpdus_requeued_usr; + __le32 ax_ofdma_err_no_ba_usr; + __le32 ax_ofdma_mpdu_underrun_usr; + __le32 ax_ofdma_ampdu_underrun_usr; }; #define HTT_STATS_TX_SCHED_MODE_MU_MIMO_AC 1 @@ -798,34 +798,34 @@ struct htt_tx_pdev_mu_mimo_mpdu_stats_tlv { struct htt_tx_pdev_mpdu_stats_tlv { /* mpdu level stats */ - u32 mpdus_queued_usr; - u32 mpdus_tried_usr; - u32 mpdus_failed_usr; - u32 mpdus_requeued_usr; - u32 err_no_ba_usr; - u32 mpdu_underrun_usr; - u32 ampdu_underrun_usr; - u32 user_index; - u32 tx_sched_mode; /* HTT_STATS_TX_SCHED_MODE_xxx */ + __le32 mpdus_queued_usr; + __le32 mpdus_tried_usr; + __le32 mpdus_failed_usr; + __le32 mpdus_requeued_usr; + __le32 err_no_ba_usr; + __le32 mpdu_underrun_usr; + __le32 ampdu_underrun_usr; + __le32 user_index; + __le32 tx_sched_mode; /* HTT_STATS_TX_SCHED_MODE_xxx */ }; /* == TX SCHED STATS == */ /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_sched_txq_cmd_posted_tlv_v { /* HTT_TX_PDEV_SCHED_TX_MODE_MAX */ - DECLARE_FLEX_ARRAY(u32, sched_cmd_posted); + DECLARE_FLEX_ARRAY(__le32, sched_cmd_posted); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_sched_txq_cmd_reaped_tlv_v { /* HTT_TX_PDEV_SCHED_TX_MODE_MAX */ - DECLARE_FLEX_ARRAY(u32, sched_cmd_reaped); + DECLARE_FLEX_ARRAY(__le32, sched_cmd_reaped); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_sched_txq_sched_order_su_tlv_v { /* HTT_TX_PDEV_NUM_SCHED_ORDER_LOG */ - DECLARE_FLEX_ARRAY(u32, sched_order_su); + DECLARE_FLEX_ARRAY(__le32, sched_order_su); }; enum htt_sched_txq_sched_ineligibility_tlv_enum { @@ -853,43 +853,43 @@ enum htt_sched_txq_sched_ineligibility_tlv_enum { /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_sched_txq_sched_ineligibility_tlv_v { /* indexed by htt_sched_txq_sched_ineligibility_tlv_enum */ - DECLARE_FLEX_ARRAY(u32, sched_ineligibility); + DECLARE_FLEX_ARRAY(__le32, sched_ineligibility); }; #define HTT_TX_PDEV_STATS_SCHED_PER_TXQ_MAC_ID GENMASK(7, 0) #define HTT_TX_PDEV_STATS_SCHED_PER_TXQ_ID GENMASK(15, 8) struct htt_tx_pdev_stats_sched_per_txq_tlv { - u32 mac_id__txq_id__word; - u32 sched_policy; - u32 last_sched_cmd_posted_timestamp; - u32 last_sched_cmd_compl_timestamp; - u32 sched_2_tac_lwm_count; - u32 sched_2_tac_ring_full; - u32 sched_cmd_post_failure; - u32 num_active_tids; - u32 num_ps_schedules; - u32 sched_cmds_pending; - u32 num_tid_register; - u32 num_tid_unregister; - u32 num_qstats_queried; - u32 qstats_update_pending; - u32 last_qstats_query_timestamp; - u32 num_tqm_cmdq_full; - u32 num_de_sched_algo_trigger; - u32 num_rt_sched_algo_trigger; - u32 num_tqm_sched_algo_trigger; - u32 notify_sched; - u32 dur_based_sendn_term; + __le32 mac_id__txq_id__word; + __le32 sched_policy; + __le32 last_sched_cmd_posted_timestamp; + __le32 last_sched_cmd_compl_timestamp; + __le32 sched_2_tac_lwm_count; + __le32 sched_2_tac_ring_full; + __le32 sched_cmd_post_failure; + __le32 num_active_tids; + __le32 num_ps_schedules; + __le32 sched_cmds_pending; + __le32 num_tid_register; + __le32 num_tid_unregister; + __le32 num_qstats_queried; + __le32 qstats_update_pending; + __le32 last_qstats_query_timestamp; + __le32 num_tqm_cmdq_full; + __le32 num_de_sched_algo_trigger; + __le32 num_rt_sched_algo_trigger; + __le32 num_tqm_sched_algo_trigger; + __le32 notify_sched; + __le32 dur_based_sendn_term; }; struct htt_stats_tx_sched_cmn_tlv { /* BIT [ 7 : 0] :- mac_id * BIT [31 : 8] :- reserved */ - u32 mac_id__word; + __le32 mac_id__word; /* Current timestamp */ - u32 current_timestamp; + __le32 current_timestamp; }; /* == TQM STATS == */ @@ -900,49 +900,49 @@ struct htt_stats_tx_sched_cmn_tlv { /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_tqm_gen_mpdu_stats_tlv_v { /* HTT_TX_TQM_MAX_GEN_MPDU_END_REASON */ - DECLARE_FLEX_ARRAY(u32, gen_mpdu_end_reason); + DECLARE_FLEX_ARRAY(__le32, gen_mpdu_end_reason); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_tqm_list_mpdu_stats_tlv_v { /* HTT_TX_TQM_MAX_LIST_MPDU_END_REASON */ - DECLARE_FLEX_ARRAY(u32, list_mpdu_end_reason); + DECLARE_FLEX_ARRAY(__le32, list_mpdu_end_reason); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_tx_tqm_list_mpdu_cnt_tlv_v { /* HTT_TX_TQM_MAX_LIST_MPDU_CNT_HISTOGRAM_BINS */ - DECLARE_FLEX_ARRAY(u32, list_mpdu_cnt_hist); + DECLARE_FLEX_ARRAY(__le32, list_mpdu_cnt_hist); }; struct htt_tx_tqm_pdev_stats_tlv_v { - u32 msdu_count; - u32 mpdu_count; - u32 remove_msdu; - u32 remove_mpdu; - u32 remove_msdu_ttl; - u32 send_bar; - u32 bar_sync; - u32 notify_mpdu; - u32 sync_cmd; - u32 write_cmd; - u32 hwsch_trigger; - u32 ack_tlv_proc; - u32 gen_mpdu_cmd; - u32 gen_list_cmd; - u32 remove_mpdu_cmd; - u32 remove_mpdu_tried_cmd; - u32 mpdu_queue_stats_cmd; - u32 mpdu_head_info_cmd; - u32 msdu_flow_stats_cmd; - u32 remove_msdu_cmd; - u32 remove_msdu_ttl_cmd; - u32 flush_cache_cmd; - u32 update_mpduq_cmd; - u32 enqueue; - u32 enqueue_notify; - u32 notify_mpdu_at_head; - u32 notify_mpdu_state_valid; + __le32 msdu_count; + __le32 mpdu_count; + __le32 remove_msdu; + __le32 remove_mpdu; + __le32 remove_msdu_ttl; + __le32 send_bar; + __le32 bar_sync; + __le32 notify_mpdu; + __le32 sync_cmd; + __le32 write_cmd; + __le32 hwsch_trigger; + __le32 ack_tlv_proc; + __le32 gen_mpdu_cmd; + __le32 gen_list_cmd; + __le32 remove_mpdu_cmd; + __le32 remove_mpdu_tried_cmd; + __le32 mpdu_queue_stats_cmd; + __le32 mpdu_head_info_cmd; + __le32 msdu_flow_stats_cmd; + __le32 remove_msdu_cmd; + __le32 remove_msdu_ttl_cmd; + __le32 flush_cache_cmd; + __le32 update_mpduq_cmd; + __le32 enqueue; + __le32 enqueue_notify; + __le32 notify_mpdu_at_head; + __le32 notify_mpdu_state_valid; /* * On receiving TQM_FLOW_NOT_EMPTY_STATUS from TQM, (on MSDUs being enqueued * the flow is non empty), if the number of MSDUs is greater than the threshold, @@ -955,30 +955,30 @@ struct htt_tx_tqm_pdev_stats_tlv_v { * * Notify signifies that we trigger the scheduler. */ - u32 sched_udp_notify1; - u32 sched_udp_notify2; - u32 sched_nonudp_notify1; - u32 sched_nonudp_notify2; + __le32 sched_udp_notify1; + __le32 sched_udp_notify2; + __le32 sched_nonudp_notify1; + __le32 sched_nonudp_notify2; }; struct htt_tx_tqm_cmn_stats_tlv { - u32 mac_id__word; - u32 max_cmdq_id; - u32 list_mpdu_cnt_hist_intvl; + __le32 mac_id__word; + __le32 max_cmdq_id; + __le32 list_mpdu_cnt_hist_intvl; /* Global stats */ - u32 add_msdu; - u32 q_empty; - u32 q_not_empty; - u32 drop_notification; - u32 desc_threshold; + __le32 add_msdu; + __le32 q_empty; + __le32 q_not_empty; + __le32 drop_notification; + __le32 desc_threshold; }; struct htt_tx_tqm_error_stats_tlv { /* Error stats */ - u32 q_empty_failure; - u32 q_not_empty_failure; - u32 add_msdu_failure; + __le32 q_empty_failure; + __le32 q_not_empty_failure; + __le32 add_msdu_failure; }; /* == TQM CMDQ stats == */ @@ -986,117 +986,117 @@ struct htt_tx_tqm_error_stats_tlv { #define HTT_TX_TQM_CMDQ_STATUS_CMDQ_ID GENMASK(15, 8) struct htt_tx_tqm_cmdq_status_tlv { - u32 mac_id__cmdq_id__word; - u32 sync_cmd; - u32 write_cmd; - u32 gen_mpdu_cmd; - u32 mpdu_queue_stats_cmd; - u32 mpdu_head_info_cmd; - u32 msdu_flow_stats_cmd; - u32 remove_mpdu_cmd; - u32 remove_msdu_cmd; - u32 flush_cache_cmd; - u32 update_mpduq_cmd; - u32 update_msduq_cmd; + __le32 mac_id__cmdq_id__word; + __le32 sync_cmd; + __le32 write_cmd; + __le32 gen_mpdu_cmd; + __le32 mpdu_queue_stats_cmd; + __le32 mpdu_head_info_cmd; + __le32 msdu_flow_stats_cmd; + __le32 remove_mpdu_cmd; + __le32 remove_msdu_cmd; + __le32 flush_cache_cmd; + __le32 update_mpduq_cmd; + __le32 update_msduq_cmd; }; /* == TX-DE STATS == */ /* Structures for tx de stats */ struct htt_tx_de_eapol_packets_stats_tlv { - u32 m1_packets; - u32 m2_packets; - u32 m3_packets; - u32 m4_packets; - u32 g1_packets; - u32 g2_packets; + __le32 m1_packets; + __le32 m2_packets; + __le32 m3_packets; + __le32 m4_packets; + __le32 g1_packets; + __le32 g2_packets; }; struct htt_tx_de_classify_failed_stats_tlv { - u32 ap_bss_peer_not_found; - u32 ap_bcast_mcast_no_peer; - u32 sta_delete_in_progress; - u32 ibss_no_bss_peer; - u32 invalid_vdev_type; - u32 invalid_ast_peer_entry; - u32 peer_entry_invalid; - u32 ethertype_not_ip; - u32 eapol_lookup_failed; - u32 qpeer_not_allow_data; - u32 fse_tid_override; - u32 ipv6_jumbogram_zero_length; - u32 qos_to_non_qos_in_prog; + __le32 ap_bss_peer_not_found; + __le32 ap_bcast_mcast_no_peer; + __le32 sta_delete_in_progress; + __le32 ibss_no_bss_peer; + __le32 invalid_vdev_type; + __le32 invalid_ast_peer_entry; + __le32 peer_entry_invalid; + __le32 ethertype_not_ip; + __le32 eapol_lookup_failed; + __le32 qpeer_not_allow_data; + __le32 fse_tid_override; + __le32 ipv6_jumbogram_zero_length; + __le32 qos_to_non_qos_in_prog; }; struct htt_tx_de_classify_stats_tlv { - u32 arp_packets; - u32 igmp_packets; - u32 dhcp_packets; - u32 host_inspected; - u32 htt_included; - u32 htt_valid_mcs; - u32 htt_valid_nss; - u32 htt_valid_preamble_type; - u32 htt_valid_chainmask; - u32 htt_valid_guard_interval; - u32 htt_valid_retries; - u32 htt_valid_bw_info; - u32 htt_valid_power; - u32 htt_valid_key_flags; - u32 htt_valid_no_encryption; - u32 fse_entry_count; - u32 fse_priority_be; - u32 fse_priority_high; - u32 fse_priority_low; - u32 fse_traffic_ptrn_be; - u32 fse_traffic_ptrn_over_sub; - u32 fse_traffic_ptrn_bursty; - u32 fse_traffic_ptrn_interactive; - u32 fse_traffic_ptrn_periodic; - u32 fse_hwqueue_alloc; - u32 fse_hwqueue_created; - u32 fse_hwqueue_send_to_host; - u32 mcast_entry; - u32 bcast_entry; - u32 htt_update_peer_cache; - u32 htt_learning_frame; - u32 fse_invalid_peer; + __le32 arp_packets; + __le32 igmp_packets; + __le32 dhcp_packets; + __le32 host_inspected; + __le32 htt_included; + __le32 htt_valid_mcs; + __le32 htt_valid_nss; + __le32 htt_valid_preamble_type; + __le32 htt_valid_chainmask; + __le32 htt_valid_guard_interval; + __le32 htt_valid_retries; + __le32 htt_valid_bw_info; + __le32 htt_valid_power; + __le32 htt_valid_key_flags; + __le32 htt_valid_no_encryption; + __le32 fse_entry_count; + __le32 fse_priority_be; + __le32 fse_priority_high; + __le32 fse_priority_low; + __le32 fse_traffic_ptrn_be; + __le32 fse_traffic_ptrn_over_sub; + __le32 fse_traffic_ptrn_bursty; + __le32 fse_traffic_ptrn_interactive; + __le32 fse_traffic_ptrn_periodic; + __le32 fse_hwqueue_alloc; + __le32 fse_hwqueue_created; + __le32 fse_hwqueue_send_to_host; + __le32 mcast_entry; + __le32 bcast_entry; + __le32 htt_update_peer_cache; + __le32 htt_learning_frame; + __le32 fse_invalid_peer; /* * mec_notify is HTT TX WBM multicast echo check notification * from firmware to host. FW sends SA addresses to host for all * multicast/broadcast packets received on STA side. */ - u32 mec_notify; + __le32 mec_notify; }; struct htt_tx_de_classify_status_stats_tlv { - u32 eok; - u32 classify_done; - u32 lookup_failed; - u32 send_host_dhcp; - u32 send_host_mcast; - u32 send_host_unknown_dest; - u32 send_host; - u32 status_invalid; + __le32 eok; + __le32 classify_done; + __le32 lookup_failed; + __le32 send_host_dhcp; + __le32 send_host_mcast; + __le32 send_host_unknown_dest; + __le32 send_host; + __le32 status_invalid; }; struct htt_tx_de_enqueue_packets_stats_tlv { - u32 enqueued_pkts; - u32 to_tqm; - u32 to_tqm_bypass; + __le32 enqueued_pkts; + __le32 to_tqm; + __le32 to_tqm_bypass; }; struct htt_tx_de_enqueue_discard_stats_tlv { - u32 discarded_pkts; - u32 local_frames; - u32 is_ext_msdu; + __le32 discarded_pkts; + __le32 local_frames; + __le32 is_ext_msdu; }; struct htt_tx_de_compl_stats_tlv { - u32 tcl_dummy_frame; - u32 tqm_dummy_frame; - u32 tqm_notify_frame; - u32 fw2wbm_enq; - u32 tqm_bypass_frame; + __le32 tcl_dummy_frame; + __le32 tqm_dummy_frame; + __le32 tqm_notify_frame; + __le32 fw2wbm_enq; + __le32 tqm_bypass_frame; }; /* @@ -1111,19 +1111,19 @@ struct htt_tx_de_compl_stats_tlv { * ENTRIES_PER_BIN_COUNT) */ struct htt_tx_de_fw2wbm_ring_full_hist_tlv { - DECLARE_FLEX_ARRAY(u32, fw2wbm_ring_full_hist); + DECLARE_FLEX_ARRAY(__le32, fw2wbm_ring_full_hist); }; struct htt_tx_de_cmn_stats_tlv { - u32 mac_id__word; + __le32 mac_id__word; /* Global Stats */ - u32 tcl2fw_entry_count; - u32 not_to_fw; - u32 invalid_pdev_vdev_peer; - u32 tcl_res_invalid_addrx; - u32 wbm2fw_entry_count; - u32 invalid_pdev; + __le32 tcl2fw_entry_count; + __le32 not_to_fw; + __le32 invalid_pdev_vdev_peer; + __le32 tcl_res_invalid_addrx; + __le32 wbm2fw_entry_count; + __le32 invalid_pdev; }; /* == RING-IF STATS == */ @@ -1140,64 +1140,64 @@ struct htt_tx_de_cmn_stats_tlv { #define HTT_RING_IF_STATS_HWM_THRESH GENMASK(31, 16) struct htt_ring_if_stats_tlv { - u32 base_addr; /* DWORD aligned base memory address of the ring */ - u32 elem_size; - u32 num_elems__prefetch_tail_idx; - u32 head_idx__tail_idx; - u32 shadow_head_idx__shadow_tail_idx; - u32 num_tail_incr; - u32 lwm_thresh__hwm_thresh; - u32 overrun_hit_count; - u32 underrun_hit_count; - u32 prod_blockwait_count; - u32 cons_blockwait_count; - u32 low_wm_hit_count[HTT_STATS_LOW_WM_BINS]; - u32 high_wm_hit_count[HTT_STATS_HIGH_WM_BINS]; + __le32 base_addr; /* DWORD aligned base memory address of the ring */ + __le32 elem_size; + __le32 num_elems__prefetch_tail_idx; + __le32 head_idx__tail_idx; + __le32 shadow_head_idx__shadow_tail_idx; + __le32 num_tail_incr; + __le32 lwm_thresh__hwm_thresh; + __le32 overrun_hit_count; + __le32 underrun_hit_count; + __le32 prod_blockwait_count; + __le32 cons_blockwait_count; + __le32 low_wm_hit_count[HTT_STATS_LOW_WM_BINS]; + __le32 high_wm_hit_count[HTT_STATS_HIGH_WM_BINS]; }; struct htt_ring_if_cmn_tlv { - u32 mac_id__word; - u32 num_records; + __le32 mac_id__word; + __le32 num_records; }; /* == SFM STATS == */ /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_sfm_client_user_tlv_v { /* Number of DWORDS used per user and per client */ - DECLARE_FLEX_ARRAY(u32, dwords_used_by_user_n); + DECLARE_FLEX_ARRAY(__le32, dwords_used_by_user_n); }; struct htt_sfm_client_tlv { /* Client ID */ - u32 client_id; + __le32 client_id; /* Minimum number of buffers */ - u32 buf_min; + __le32 buf_min; /* Maximum number of buffers */ - u32 buf_max; + __le32 buf_max; /* Number of Busy buffers */ - u32 buf_busy; + __le32 buf_busy; /* Number of Allocated buffers */ - u32 buf_alloc; + __le32 buf_alloc; /* Number of Available/Usable buffers */ - u32 buf_avail; + __le32 buf_avail; /* Number of users */ - u32 num_users; + __le32 num_users; }; struct htt_sfm_cmn_tlv { - u32 mac_id__word; + __le32 mac_id__word; /* Indicates the total number of 128 byte buffers * in the CMEM that are available for buffer sharing */ - u32 buf_total; + __le32 buf_total; /* Indicates for certain client or all the clients * there is no dowrd saved in SFM, refer to SFM_R1_MEM_EMPTY */ - u32 mem_empty; + __le32 mem_empty; /* DEALLOCATE_BUFFERS, refer to register SFM_R0_DEALLOCATE_BUFFERS */ - u32 deallocate_bufs; + __le32 deallocate_bufs; /* Number of Records */ - u32 num_records; + __le32 num_records; }; /* == SRNG STATS == */ @@ -1215,20 +1215,20 @@ struct htt_sfm_cmn_tlv { #define HTT_SRING_STATS_INTERNAL_TAIL_PTR GENMASK(31, 16) struct htt_sring_stats_tlv { - u32 mac_id__ring_id__arena__ep; - u32 base_addr_lsb; /* DWORD aligned base memory address of the ring */ - u32 base_addr_msb; - u32 ring_size; - u32 elem_size; + __le32 mac_id__ring_id__arena__ep; + __le32 base_addr_lsb; /* DWORD aligned base memory address of the ring */ + __le32 base_addr_msb; + __le32 ring_size; + __le32 elem_size; - u32 num_avail_words__num_valid_words; - u32 head_ptr__tail_ptr; - u32 consumer_empty__producer_full; - u32 prefetch_count__internal_tail_ptr; + __le32 num_avail_words__num_valid_words; + __le32 head_ptr__tail_ptr; + __le32 consumer_empty__producer_full; + __le32 prefetch_count__internal_tail_ptr; }; struct htt_sring_cmn_tlv { - u32 num_records; + __le32 num_records; }; /* == PDEV TX RATE CTRL STATS == */ @@ -1247,33 +1247,33 @@ struct htt_sring_cmn_tlv { HTT_TX_PDEV_STATS_NUM_AX_MUMIMO_USER_STATS) struct htt_tx_pdev_rate_stats_tlv { - u32 mac_id__word; - u32 tx_ldpc; - u32 rts_cnt; + __le32 mac_id__word; + __le32 tx_ldpc; + __le32 rts_cnt; /* RSSI value of last ack packet (units = dB above noise floor) */ - u32 ack_rssi; + __le32 ack_rssi; - u32 tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 tx_su_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 tx_mu_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 tx_su_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 tx_mu_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; /* element 0,1, ...7 -> NSS 1,2, ...8 */ - u32 tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; /* element 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160 and 80+80 MHz */ - u32 tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 tx_stbc[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 tx_pream[HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES]; + __le32 tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; + __le32 tx_stbc[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 tx_pream[HTT_TX_PDEV_STATS_NUM_PREAMBLE_TYPES]; /* Counters to track number of tx packets * in each GI (400us, 800us, 1600us & 3200us) in each mcs (0-11) */ - u32 tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS][HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS][HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; /* Counters to track packets in dcm mcs (MCS 0, 1, 3, 4) */ - u32 tx_dcm[HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS]; + __le32 tx_dcm[HTT_TX_PDEV_STATS_NUM_DCM_COUNTERS]; /* Number of CTS-acknowledged RTS packets */ - u32 rts_success; + __le32 rts_success; /* * Counters for legacy 11a and 11b transmissions. @@ -1285,12 +1285,12 @@ struct htt_tx_pdev_rate_stats_tlv { * OFDM: 0: 6 Mbps, 1: 9 Mbps, 2: 12 Mbps, 3: 18 Mbps, * 4: 24 Mbps, 5: 36 Mbps, 6: 48 Mbps, 7: 54 Mbps */ - u32 tx_legacy_cck_rate[HTT_TX_PDEV_STATS_NUM_LEGACY_CCK_STATS]; - u32 tx_legacy_ofdm_rate[HTT_TX_PDEV_STATS_NUM_LEGACY_OFDM_STATS]; + __le32 tx_legacy_cck_rate[HTT_TX_PDEV_STATS_NUM_LEGACY_CCK_STATS]; + __le32 tx_legacy_ofdm_rate[HTT_TX_PDEV_STATS_NUM_LEGACY_OFDM_STATS]; - u32 ac_mu_mimo_tx_ldpc; - u32 ax_mu_mimo_tx_ldpc; - u32 ofdma_tx_ldpc; + __le32 ac_mu_mimo_tx_ldpc; + __le32 ax_mu_mimo_tx_ldpc; + __le32 ofdma_tx_ldpc; /* * Counters for 11ax HE LTF selection during TX. @@ -1299,25 +1299,25 @@ struct htt_tx_pdev_rate_stats_tlv { * * 0: unused, 1: 1x LTF, 2: 2x LTF, 3: 4x LTF */ - u32 tx_he_ltf[HTT_TX_PDEV_STATS_NUM_LTF]; + __le32 tx_he_ltf[HTT_TX_PDEV_STATS_NUM_LTF]; - u32 ac_mu_mimo_tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ax_mu_mimo_tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ofdma_tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 ac_mu_mimo_tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 ax_mu_mimo_tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 ofdma_tx_mcs[HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ac_mu_mimo_tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; - u32 ax_mu_mimo_tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; - u32 ofdma_tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 ac_mu_mimo_tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 ax_mu_mimo_tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 ofdma_tx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; - u32 ac_mu_mimo_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 ax_mu_mimo_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 ofdma_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; + __le32 ac_mu_mimo_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; + __le32 ax_mu_mimo_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; + __le32 ofdma_tx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 ac_mu_mimo_tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] + __le32 ac_mu_mimo_tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] [HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ax_mu_mimo_tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] + __le32 ax_mu_mimo_tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] [HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ofdma_tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] + __le32 ofdma_tx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] [HTT_TX_PDEV_STATS_NUM_MCS_COUNTERS]; }; @@ -1336,23 +1336,23 @@ struct htt_tx_pdev_rate_stats_tlv { #define HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER 8 struct htt_rx_pdev_rate_stats_tlv { - u32 mac_id__word; - u32 nsts; + __le32 mac_id__word; + __le32 nsts; - u32 rx_ldpc; - u32 rts_cnt; + __le32 rx_ldpc; + __le32 rts_cnt; - u32 rssi_mgmt; /* units = dB above noise floor */ - u32 rssi_data; /* units = dB above noise floor */ - u32 rssi_comb; /* units = dB above noise floor */ - u32 rx_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 rssi_mgmt; /* units = dB above noise floor */ + __le32 rssi_data; /* units = dB above noise floor */ + __le32 rssi_comb; /* units = dB above noise floor */ + __le32 rx_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; /* element 0,1, ...7 -> NSS 1,2, ...8 */ - u32 rx_nss[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]; - u32 rx_dcm[HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS]; - u32 rx_stbc[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 rx_nss[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 rx_dcm[HTT_RX_PDEV_STATS_NUM_DCM_COUNTERS]; + __le32 rx_stbc[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; /* element 0: 20 MHz, 1: 40 MHz, 2: 80 MHz, 3: 160 and 80+80 MHz */ - u32 rx_bw[HTT_RX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 rx_pream[HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES]; + __le32 rx_bw[HTT_RX_PDEV_STATS_NUM_BW_COUNTERS]; + __le32 rx_pream[HTT_RX_PDEV_STATS_NUM_PREAMBLE_TYPES]; u8 rssi_chain[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS] [HTT_RX_PDEV_STATS_NUM_BW_COUNTERS]; /* units = dB above noise floor */ @@ -1360,37 +1360,37 @@ struct htt_rx_pdev_rate_stats_tlv { /* Counters to track number of rx packets * in each GI in each mcs (0-11) */ - u32 rx_gi[HTT_RX_PDEV_STATS_NUM_GI_COUNTERS][HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 rx_gi[HTT_RX_PDEV_STATS_NUM_GI_COUNTERS][HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; s32 rssi_in_dbm; /* rx Signal Strength value in dBm unit */ - u32 rx_11ax_su_ext; - u32 rx_11ac_mumimo; - u32 rx_11ax_mumimo; - u32 rx_11ax_ofdma; - u32 txbf; - u32 rx_legacy_cck_rate[HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS]; - u32 rx_legacy_ofdm_rate[HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS]; - u32 rx_active_dur_us_low; - u32 rx_active_dur_us_high; + __le32 rx_11ax_su_ext; + __le32 rx_11ac_mumimo; + __le32 rx_11ax_mumimo; + __le32 rx_11ax_ofdma; + __le32 txbf; + __le32 rx_legacy_cck_rate[HTT_RX_PDEV_STATS_NUM_LEGACY_CCK_STATS]; + __le32 rx_legacy_ofdm_rate[HTT_RX_PDEV_STATS_NUM_LEGACY_OFDM_STATS]; + __le32 rx_active_dur_us_low; + __le32 rx_active_dur_us_high; - u32 rx_11ax_ul_ofdma; + __le32 rx_11ax_ul_ofdma; - u32 ul_ofdma_rx_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ul_ofdma_rx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] + __le32 ul_ofdma_rx_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 ul_ofdma_rx_gi[HTT_TX_PDEV_STATS_NUM_GI_COUNTERS] [HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 ul_ofdma_rx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; - u32 ul_ofdma_rx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 ul_ofdma_rx_stbc; - u32 ul_ofdma_rx_ldpc; + __le32 ul_ofdma_rx_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 ul_ofdma_rx_bw[HTT_TX_PDEV_STATS_NUM_BW_COUNTERS]; + __le32 ul_ofdma_rx_stbc; + __le32 ul_ofdma_rx_ldpc; /* record the stats for each user index */ - u32 rx_ulofdma_non_data_ppdu[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* ppdu level */ - u32 rx_ulofdma_data_ppdu[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* ppdu level */ - u32 rx_ulofdma_mpdu_ok[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* mpdu level */ - u32 rx_ulofdma_mpdu_fail[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* mpdu level */ + __le32 rx_ulofdma_non_data_ppdu[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* ppdu level */ + __le32 rx_ulofdma_data_ppdu[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* ppdu level */ + __le32 rx_ulofdma_mpdu_ok[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* mpdu level */ + __le32 rx_ulofdma_mpdu_fail[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; /* mpdu level */ - u32 nss_count; - u32 pilot_count; + __le32 nss_count; + __le32 pilot_count; /* RxEVM stats in dB */ s32 rx_pilot_evm_db[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS] [HTT_RX_PDEV_STATS_RXEVM_MAX_PILOTS_PER_NSS]; @@ -1409,54 +1409,54 @@ struct htt_rx_pdev_rate_stats_tlv { * BIT [7 : 4] :- IEEE80211_FC0_SUBTYPE * BIT [31 : 8] :- Reserved */ - u32 per_chain_rssi_pkt_type; + __le32 per_chain_rssi_pkt_type; s8 rx_per_chain_rssi_in_dbm[HTT_RX_PDEV_STATS_NUM_SPATIAL_STREAMS] [HTT_RX_PDEV_STATS_NUM_BW_COUNTERS]; - u32 rx_su_ndpa; - u32 rx_11ax_su_txbf_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 rx_mu_ndpa; - u32 rx_11ax_mu_txbf_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 rx_br_poll; - u32 rx_11ax_dl_ofdma_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; - u32 rx_11ax_dl_ofdma_ru[HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS]; + __le32 rx_su_ndpa; + __le32 rx_11ax_su_txbf_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 rx_mu_ndpa; + __le32 rx_11ax_mu_txbf_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 rx_br_poll; + __le32 rx_11ax_dl_ofdma_mcs[HTT_RX_PDEV_STATS_NUM_MCS_COUNTERS]; + __le32 rx_11ax_dl_ofdma_ru[HTT_RX_PDEV_STATS_NUM_RU_SIZE_COUNTERS]; - u32 rx_ulmumimo_non_data_ppdu[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; - u32 rx_ulmumimo_data_ppdu[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; - u32 rx_ulmumimo_mpdu_ok[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; - u32 rx_ulmumimo_mpdu_fail[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; - u32 rx_ulofdma_non_data_nusers[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; - u32 rx_ulofdma_data_nusers[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; + __le32 rx_ulmumimo_non_data_ppdu[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; + __le32 rx_ulmumimo_data_ppdu[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; + __le32 rx_ulmumimo_mpdu_ok[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; + __le32 rx_ulmumimo_mpdu_fail[HTT_RX_PDEV_MAX_ULMUMIMO_NUM_USER]; + __le32 rx_ulofdma_non_data_nusers[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; + __le32 rx_ulofdma_data_nusers[HTT_RX_PDEV_MAX_OFDMA_NUM_USER]; }; /* == RX PDEV/SOC STATS == */ struct htt_rx_soc_fw_stats_tlv { - u32 fw_reo_ring_data_msdu; - u32 fw_to_host_data_msdu_bcmc; - u32 fw_to_host_data_msdu_uc; - u32 ofld_remote_data_buf_recycle_cnt; - u32 ofld_remote_free_buf_indication_cnt; + __le32 fw_reo_ring_data_msdu; + __le32 fw_to_host_data_msdu_bcmc; + __le32 fw_to_host_data_msdu_uc; + __le32 ofld_remote_data_buf_recycle_cnt; + __le32 ofld_remote_free_buf_indication_cnt; - u32 ofld_buf_to_host_data_msdu_uc; - u32 reo_fw_ring_to_host_data_msdu_uc; + __le32 ofld_buf_to_host_data_msdu_uc; + __le32 reo_fw_ring_to_host_data_msdu_uc; - u32 wbm_sw_ring_reap; - u32 wbm_forward_to_host_cnt; - u32 wbm_target_recycle_cnt; + __le32 wbm_sw_ring_reap; + __le32 wbm_forward_to_host_cnt; + __le32 wbm_target_recycle_cnt; - u32 target_refill_ring_recycle_cnt; + __le32 target_refill_ring_recycle_cnt; }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_rx_soc_fw_refill_ring_empty_tlv_v { /* HTT_RX_STATS_REFILL_MAX_RING */ - DECLARE_FLEX_ARRAY(u32, refill_ring_empty_cnt); + DECLARE_FLEX_ARRAY(__le32, refill_ring_empty_cnt); }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_rx_soc_fw_refill_ring_num_refill_tlv_v { /* HTT_RX_STATS_REFILL_MAX_RING */ - DECLARE_FLEX_ARRAY(u32, refill_ring_num_refill); + DECLARE_FLEX_ARRAY(__le32, refill_ring_num_refill); }; /* RXDMA error code from WBM released packets */ @@ -1488,7 +1488,7 @@ enum htt_rx_rxdma_error_code_enum { /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_rx_soc_fw_refill_ring_num_rxdma_err_tlv_v { - DECLARE_FLEX_ARRAY(u32, rxdma_err); /* HTT_RX_RXDMA_MAX_ERR_CODE */ + DECLARE_FLEX_ARRAY(__le32, rxdma_err); /* HTT_RX_RXDMA_MAX_ERR_CODE */ }; /* REO error code from WBM released packets */ @@ -1520,69 +1520,69 @@ enum htt_rx_reo_error_code_enum { /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_rx_soc_fw_refill_ring_num_reo_err_tlv_v { - DECLARE_FLEX_ARRAY(u32, reo_err); /* HTT_RX_REO_MAX_ERR_CODE */ + DECLARE_FLEX_ARRAY(__le32, reo_err); /* HTT_RX_REO_MAX_ERR_CODE */ }; /* == RX PDEV STATS == */ #define HTT_STATS_SUBTYPE_MAX 16 struct htt_rx_pdev_fw_stats_tlv { - u32 mac_id__word; - u32 ppdu_recvd; - u32 mpdu_cnt_fcs_ok; - u32 mpdu_cnt_fcs_err; - u32 tcp_msdu_cnt; - u32 tcp_ack_msdu_cnt; - u32 udp_msdu_cnt; - u32 other_msdu_cnt; - u32 fw_ring_mpdu_ind; - u32 fw_ring_mgmt_subtype[HTT_STATS_SUBTYPE_MAX]; - u32 fw_ring_ctrl_subtype[HTT_STATS_SUBTYPE_MAX]; - u32 fw_ring_mcast_data_msdu; - u32 fw_ring_bcast_data_msdu; - u32 fw_ring_ucast_data_msdu; - u32 fw_ring_null_data_msdu; - u32 fw_ring_mpdu_drop; - u32 ofld_local_data_ind_cnt; - u32 ofld_local_data_buf_recycle_cnt; - u32 drx_local_data_ind_cnt; - u32 drx_local_data_buf_recycle_cnt; - u32 local_nondata_ind_cnt; - u32 local_nondata_buf_recycle_cnt; - - u32 fw_status_buf_ring_refill_cnt; - u32 fw_status_buf_ring_empty_cnt; - u32 fw_pkt_buf_ring_refill_cnt; - u32 fw_pkt_buf_ring_empty_cnt; - u32 fw_link_buf_ring_refill_cnt; - u32 fw_link_buf_ring_empty_cnt; - - u32 host_pkt_buf_ring_refill_cnt; - u32 host_pkt_buf_ring_empty_cnt; - u32 mon_pkt_buf_ring_refill_cnt; - u32 mon_pkt_buf_ring_empty_cnt; - u32 mon_status_buf_ring_refill_cnt; - u32 mon_status_buf_ring_empty_cnt; - u32 mon_desc_buf_ring_refill_cnt; - u32 mon_desc_buf_ring_empty_cnt; - u32 mon_dest_ring_update_cnt; - u32 mon_dest_ring_full_cnt; - - u32 rx_suspend_cnt; - u32 rx_suspend_fail_cnt; - u32 rx_resume_cnt; - u32 rx_resume_fail_cnt; - u32 rx_ring_switch_cnt; - u32 rx_ring_restore_cnt; - u32 rx_flush_cnt; - u32 rx_recovery_reset_cnt; + __le32 mac_id__word; + __le32 ppdu_recvd; + __le32 mpdu_cnt_fcs_ok; + __le32 mpdu_cnt_fcs_err; + __le32 tcp_msdu_cnt; + __le32 tcp_ack_msdu_cnt; + __le32 udp_msdu_cnt; + __le32 other_msdu_cnt; + __le32 fw_ring_mpdu_ind; + __le32 fw_ring_mgmt_subtype[HTT_STATS_SUBTYPE_MAX]; + __le32 fw_ring_ctrl_subtype[HTT_STATS_SUBTYPE_MAX]; + __le32 fw_ring_mcast_data_msdu; + __le32 fw_ring_bcast_data_msdu; + __le32 fw_ring_ucast_data_msdu; + __le32 fw_ring_null_data_msdu; + __le32 fw_ring_mpdu_drop; + __le32 ofld_local_data_ind_cnt; + __le32 ofld_local_data_buf_recycle_cnt; + __le32 drx_local_data_ind_cnt; + __le32 drx_local_data_buf_recycle_cnt; + __le32 local_nondata_ind_cnt; + __le32 local_nondata_buf_recycle_cnt; + + __le32 fw_status_buf_ring_refill_cnt; + __le32 fw_status_buf_ring_empty_cnt; + __le32 fw_pkt_buf_ring_refill_cnt; + __le32 fw_pkt_buf_ring_empty_cnt; + __le32 fw_link_buf_ring_refill_cnt; + __le32 fw_link_buf_ring_empty_cnt; + + __le32 host_pkt_buf_ring_refill_cnt; + __le32 host_pkt_buf_ring_empty_cnt; + __le32 mon_pkt_buf_ring_refill_cnt; + __le32 mon_pkt_buf_ring_empty_cnt; + __le32 mon_status_buf_ring_refill_cnt; + __le32 mon_status_buf_ring_empty_cnt; + __le32 mon_desc_buf_ring_refill_cnt; + __le32 mon_desc_buf_ring_empty_cnt; + __le32 mon_dest_ring_update_cnt; + __le32 mon_dest_ring_full_cnt; + + __le32 rx_suspend_cnt; + __le32 rx_suspend_fail_cnt; + __le32 rx_resume_cnt; + __le32 rx_resume_fail_cnt; + __le32 rx_ring_switch_cnt; + __le32 rx_ring_restore_cnt; + __le32 rx_flush_cnt; + __le32 rx_recovery_reset_cnt; }; #define HTT_STATS_PHY_ERR_MAX 43 struct htt_rx_pdev_fw_stats_phy_err_tlv { - u32 mac_id__word; - u32 total_phy_err_cnt; + __le32 mac_id__word; + __le32 total_phy_err_cnt; /* Counts of different types of phy errs * The mapping of PHY error types to phy_err array elements is HW dependent. * The only currently-supported mapping is shown below: @@ -1631,19 +1631,21 @@ struct htt_rx_pdev_fw_stats_phy_err_tlv { * 41 phyrx_err_unsupported_cbf * 42 phyrx_err_other */ - u32 phy_err[HTT_STATS_PHY_ERR_MAX]; + __le32 phy_err[HTT_STATS_PHY_ERR_MAX]; }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_rx_pdev_fw_ring_mpdu_err_tlv_v { /* Num error MPDU for each RxDMA error type */ - DECLARE_FLEX_ARRAY(u32, fw_ring_mpdu_err); /* HTT_RX_STATS_RXDMA_MAX_ERR */ + DECLARE_FLEX_ARRAY(__le32, + fw_ring_mpdu_err); /* HTT_RX_STATS_RXDMA_MAX_ERR */ }; /* NOTE: Variable length TLV, use length spec to infer array size */ struct htt_rx_pdev_fw_mpdu_drop_tlv_v { /* Num MPDU dropped */ - DECLARE_FLEX_ARRAY(u32, fw_mpdu_drop); /* HTT_RX_STATS_FW_DROP_REASON_MAX */ + DECLARE_FLEX_ARRAY(__le32, + fw_mpdu_drop); /* HTT_RX_STATS_FW_DROP_REASON_MAX */ }; #define HTT_PDEV_CCA_STATS_TX_FRAME_INFO_PRESENT (0x1) @@ -1657,22 +1659,22 @@ struct htt_rx_pdev_fw_mpdu_drop_tlv_v { struct htt_pdev_stats_cca_counters_tlv { /* Below values are obtained from the HW Cycles counter registers */ - u32 tx_frame_usec; - u32 rx_frame_usec; - u32 rx_clear_usec; - u32 my_rx_frame_usec; - u32 usec_cnt; - u32 med_rx_idle_usec; - u32 med_tx_idle_global_usec; - u32 cca_obss_usec; + __le32 tx_frame_usec; + __le32 rx_frame_usec; + __le32 rx_clear_usec; + __le32 my_rx_frame_usec; + __le32 usec_cnt; + __le32 med_rx_idle_usec; + __le32 med_tx_idle_global_usec; + __le32 cca_obss_usec; }; struct htt_pdev_cca_stats_hist_v1_tlv { - u32 chan_num; + __le32 chan_num; /* num of CCA records (Num of htt_pdev_stats_cca_counters_tlv)*/ - u32 num_records; - u32 valid_cca_counters_bitmap; - u32 collection_interval; + __le32 num_records; + __le32 valid_cca_counters_bitmap; + __le32 collection_interval; /* This will be followed by an array which contains the CCA stats * collected in the last N intervals, @@ -1684,22 +1686,22 @@ struct htt_pdev_cca_stats_hist_v1_tlv { }; struct htt_pdev_stats_twt_session_tlv { - u32 vdev_id; + __le32 vdev_id; struct htt_mac_addr peer_mac; - u32 flow_id_flags; + __le32 flow_id_flags; /* TWT_DIALOG_ID_UNAVAILABLE is used * when TWT session is not initiated by host */ - u32 dialog_id; - u32 wake_dura_us; - u32 wake_intvl_us; - u32 sp_offset_us; + __le32 dialog_id; + __le32 wake_dura_us; + __le32 wake_intvl_us; + __le32 sp_offset_us; }; struct htt_pdev_stats_twt_sessions_tlv { - u32 pdev_id; - u32 num_sessions; + __le32 pdev_id; + __le32 num_sessions; struct htt_pdev_stats_twt_session_tlv twt_session[]; }; @@ -1724,16 +1726,16 @@ enum htt_rx_reo_resource_sample_id_enum { struct htt_rx_reo_resource_stats_tlv_v { /* Variable based on the Number of records. HTT_RX_REO_RESOURCE_STATS_MAX */ - u32 sample_id; - u32 total_max; - u32 total_avg; - u32 total_sample; - u32 non_zeros_avg; - u32 non_zeros_sample; - u32 last_non_zeros_max; - u32 last_non_zeros_min; - u32 last_non_zeros_avg; - u32 last_non_zeros_sample; + __le32 sample_id; + __le32 total_max; + __le32 total_avg; + __le32 total_sample; + __le32 non_zeros_avg; + __le32 non_zeros_sample; + __le32 last_non_zeros_max; + __le32 last_non_zeros_min; + __le32 last_non_zeros_avg; + __le32 last_non_zeros_sample; }; /* == TX SOUNDING STATS == */ @@ -1753,49 +1755,49 @@ enum htt_stats_sounding_tx_mode { }; struct htt_tx_sounding_stats_tlv { - u32 tx_sounding_mode; /* HTT_TX_XX_SOUNDING_MODE */ + __le32 tx_sounding_mode; /* HTT_TX_XX_SOUNDING_MODE */ /* Counts number of soundings for all steering modes in each bw */ - u32 cbf_20[HTT_TXBF_MAX_NUM_OF_MODES]; - u32 cbf_40[HTT_TXBF_MAX_NUM_OF_MODES]; - u32 cbf_80[HTT_TXBF_MAX_NUM_OF_MODES]; - u32 cbf_160[HTT_TXBF_MAX_NUM_OF_MODES]; + __le32 cbf_20[HTT_TXBF_MAX_NUM_OF_MODES]; + __le32 cbf_40[HTT_TXBF_MAX_NUM_OF_MODES]; + __le32 cbf_80[HTT_TXBF_MAX_NUM_OF_MODES]; + __le32 cbf_160[HTT_TXBF_MAX_NUM_OF_MODES]; /* * The sounding array is a 2-D array stored as an 1-D array of - * u32. The stats for a particular user/bw combination is + * __le32. The stats for a particular user/bw combination is * referenced with the following: * * sounding[(user* max_bw) + bw] * * ... where max_bw == 4 for 160mhz */ - u32 sounding[HTT_TX_NUM_OF_SOUNDING_STATS_WORDS]; + __le32 sounding[HTT_TX_NUM_OF_SOUNDING_STATS_WORDS]; }; struct htt_pdev_obss_pd_stats_tlv { - u32 num_obss_tx_ppdu_success; - u32 num_obss_tx_ppdu_failure; - u32 num_sr_tx_transmissions; - u32 num_spatial_reuse_opportunities; - u32 num_non_srg_opportunities; - u32 num_non_srg_ppdu_tried; - u32 num_non_srg_ppdu_success; - u32 num_srg_opportunities; - u32 num_srg_ppdu_tried; - u32 num_srg_ppdu_success; - u32 num_psr_opportunities; - u32 num_psr_ppdu_tried; - u32 num_psr_ppdu_success; + __le32 num_obss_tx_ppdu_success; + __le32 num_obss_tx_ppdu_failure; + __le32 num_sr_tx_transmissions; + __le32 num_spatial_reuse_opportunities; + __le32 num_non_srg_opportunities; + __le32 num_non_srg_ppdu_tried; + __le32 num_non_srg_ppdu_success; + __le32 num_srg_opportunities; + __le32 num_srg_ppdu_tried; + __le32 num_srg_ppdu_success; + __le32 num_psr_opportunities; + __le32 num_psr_ppdu_tried; + __le32 num_psr_ppdu_success; }; struct htt_ring_backpressure_stats_tlv { - u32 pdev_id; - u32 current_head_idx; - u32 current_tail_idx; - u32 num_htt_msgs_sent; + __le32 pdev_id; + __le32 current_head_idx; + __le32 current_tail_idx; + __le32 num_htt_msgs_sent; /* Time in milliseconds for which the ring has been in * its current backpressure condition */ - u32 backpressure_time_ms; + __le32 backpressure_time_ms; /* backpressure_hist - histogram showing how many times * different degrees of backpressure duration occurred: * Index 0 indicates the number of times ring was @@ -1809,7 +1811,7 @@ struct htt_ring_backpressure_stats_tlv { * Index 4 indicates the number of times ring was * continuously in backpressure state beyond 500ms. */ - u32 backpressure_hist[5]; + __le32 backpressure_hist[5]; }; #define HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS 14 @@ -1818,75 +1820,75 @@ struct htt_ring_backpressure_stats_tlv { struct htt_pdev_txrate_txbf_stats_tlv { /* SU TxBF TX MCS stats */ - u32 tx_su_txbf_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS]; + __le32 tx_su_txbf_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS]; /* Implicit BF TX MCS stats */ - u32 tx_su_ibf_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS]; + __le32 tx_su_ibf_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS]; /* Open loop TX MCS stats */ - u32 tx_su_ol_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS]; + __le32 tx_su_ol_mcs[HTT_TX_TXBF_RATE_STATS_NUM_MCS_COUNTERS]; /* SU TxBF TX NSS stats */ - u32 tx_su_txbf_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 tx_su_txbf_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; /* Implicit BF TX NSS stats */ - u32 tx_su_ibf_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 tx_su_ibf_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; /* Open loop TX NSS stats */ - u32 tx_su_ol_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; + __le32 tx_su_ol_nss[HTT_TX_PDEV_STATS_NUM_SPATIAL_STREAMS]; /* SU TxBF TX BW stats */ - u32 tx_su_txbf_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS]; + __le32 tx_su_txbf_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS]; /* Implicit BF TX BW stats */ - u32 tx_su_ibf_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS]; + __le32 tx_su_ibf_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS]; /* Open loop TX BW stats */ - u32 tx_su_ol_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS]; + __le32 tx_su_ol_bw[HTT_TX_TXBF_RATE_STATS_NUM_BW_COUNTERS]; }; struct htt_txbf_ofdma_ndpa_stats_tlv { /* 11AX HE OFDMA NDPA frame queued to the HW */ - u32 ax_ofdma_ndpa_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndpa_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA NDPA frame sent over the air */ - u32 ax_ofdma_ndpa_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndpa_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA NDPA frame flushed by HW */ - u32 ax_ofdma_ndpa_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndpa_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA NDPA frame completed with error(s) */ - u32 ax_ofdma_ndpa_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndpa_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; }; struct htt_txbf_ofdma_ndp_stats_tlv { /* 11AX HE OFDMA NDP frame queued to the HW */ - u32 ax_ofdma_ndp_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndp_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA NDPA frame sent over the air */ - u32 ax_ofdma_ndp_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndp_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA NDPA frame flushed by HW */ - u32 ax_ofdma_ndp_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndp_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA NDPA frame completed with error(s) */ - u32 ax_ofdma_ndp_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_ndp_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; }; struct htt_txbf_ofdma_brp_stats_tlv { /* 11AX HE OFDMA MU BRPOLL frame queued to the HW */ - u32 ax_ofdma_brpoll_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_brpoll_queued[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA MU BRPOLL frame sent over the air */ - u32 ax_ofdma_brpoll_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_brpoll_tried[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA MU BRPOLL frame flushed by HW */ - u32 ax_ofdma_brpoll_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_brpoll_flushed[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA MU BRPOLL frame completed with error(s) */ - u32 ax_ofdma_brp_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_brp_err[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* Number of CBF(s) received when 11AX HE OFDMA MU BRPOLL frame * completed with error(s). */ - u32 ax_ofdma_brp_err_num_cbf_rcvd[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS + 1]; + __le32 ax_ofdma_brp_err_num_cbf_rcvd[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS + 1]; }; struct htt_txbf_ofdma_steer_stats_tlv { /* 11AX HE OFDMA PPDUs that were sent over the air with steering (TXBF + OFDMA) */ - u32 ax_ofdma_num_ppdu_steer[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_num_ppdu_steer[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA PPDUs that were sent over the air in open loop */ - u32 ax_ofdma_num_ppdu_ol[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_num_ppdu_ol[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA number of users for which CBF prefetch was * initiated to PHY HW during TX. */ - u32 ax_ofdma_num_usrs_prefetch[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_num_usrs_prefetch[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA number of users for which sounding was initiated during TX */ - u32 ax_ofdma_num_usrs_sound[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_num_usrs_sound[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; /* 11AX HE OFDMA number of users for which sounding was forced during TX */ - u32 ax_ofdma_num_usrs_force_sound[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; + __le32 ax_ofdma_num_usrs_force_sound[HTT_TX_PDEV_STATS_NUM_OFDMA_USER_STATS]; }; #define HTT_MAX_RX_PKT_CNT 8 @@ -1898,38 +1900,38 @@ struct htt_txbf_ofdma_steer_stats_tlv { struct htt_phy_counters_tlv { /* number of RXTD OFDMA OTA error counts except power surge and drop */ - u32 rx_ofdma_timing_err_cnt; + __le32 rx_ofdma_timing_err_cnt; /* rx_cck_fail_cnt: * number of cck error counts due to rx reception failure because of * timing error in cck */ - u32 rx_cck_fail_cnt; + __le32 rx_cck_fail_cnt; /* number of times tx abort initiated by mac */ - u32 mactx_abort_cnt; + __le32 mactx_abort_cnt; /* number of times rx abort initiated by mac */ - u32 macrx_abort_cnt; + __le32 macrx_abort_cnt; /* number of times tx abort initiated by phy */ - u32 phytx_abort_cnt; + __le32 phytx_abort_cnt; /* number of times rx abort initiated by phy */ - u32 phyrx_abort_cnt; + __le32 phyrx_abort_cnt; /* number of rx deferred count initiated by phy */ - u32 phyrx_defer_abort_cnt; + __le32 phyrx_defer_abort_cnt; /* number of sizing events generated at LSTF */ - u32 rx_gain_adj_lstf_event_cnt; + __le32 rx_gain_adj_lstf_event_cnt; /* number of sizing events generated at non-legacy LTF */ - u32 rx_gain_adj_non_legacy_cnt; + __le32 rx_gain_adj_non_legacy_cnt; /* rx_pkt_cnt - * Received EOP (end-of-packet) count per packet type; * [0] = 11a; [1] = 11b; [2] = 11n; [3] = 11ac; [4] = 11ax; [5] = GF * [6-7]=RSVD */ - u32 rx_pkt_cnt[HTT_MAX_RX_PKT_CNT]; + __le32 rx_pkt_cnt[HTT_MAX_RX_PKT_CNT]; /* rx_pkt_crc_pass_cnt - * Received EOP (end-of-packet) count per packet type; * [0] = 11a; [1] = 11b; [2] = 11n; [3] = 11ac; [4] = 11ax; [5] = GF * [6-7]=RSVD */ - u32 rx_pkt_crc_pass_cnt[HTT_MAX_RX_PKT_CRC_PASS_CNT]; + __le32 rx_pkt_crc_pass_cnt[HTT_MAX_RX_PKT_CRC_PASS_CNT]; /* per_blk_err_cnt - * Error count per error source; * [0] = unknown; [1] = LSIG; [2] = HTSIG; [3] = VHTSIG; [4] = HESIG; @@ -1937,7 +1939,7 @@ struct htt_phy_counters_tlv { * [9] = PMI; [10] = TXFD; [11] = TXTD; [12] = PHYRF * [13-19]=RSVD */ - u32 per_blk_err_cnt[HTT_MAX_PER_BLK_ERR_CNT]; + __le32 per_blk_err_cnt[HTT_MAX_PER_BLK_ERR_CNT]; /* rx_ota_err_cnt - * RXTD OTA (over-the-air) error count per error reason; * [0] = voting fail; [1] = weak det fail; [2] = strong sig fail; @@ -1946,16 +1948,16 @@ struct htt_phy_counters_tlv { * [8] = coarse timing timeout error * [9-13]=RSVD */ - u32 rx_ota_err_cnt[HTT_MAX_RX_OTA_ERR_CNT]; + __le32 rx_ota_err_cnt[HTT_MAX_RX_OTA_ERR_CNT]; }; struct htt_phy_stats_tlv { /* per chain hw noise floor values in dBm */ s32 nf_chain[HTT_STATS_MAX_CHAINS]; /* number of false radars detected */ - u32 false_radar_cnt; + __le32 false_radar_cnt; /* number of channel switches happened due to radar detection */ - u32 radar_cs_cnt; + __le32 radar_cs_cnt; /* ani_level - * ANI level (noise interference) corresponds to the channel * the desense levels range from -5 to 15 in dB units, @@ -1963,48 +1965,48 @@ struct htt_phy_stats_tlv { */ s32 ani_level; /* running time in minutes since FW boot */ - u32 fw_run_time; + __le32 fw_run_time; }; struct htt_phy_reset_counters_tlv { - u32 pdev_id; - u32 cf_active_low_fail_cnt; - u32 cf_active_low_pass_cnt; - u32 phy_off_through_vreg_cnt; - u32 force_calibration_cnt; - u32 rf_mode_switch_phy_off_cnt; + __le32 pdev_id; + __le32 cf_active_low_fail_cnt; + __le32 cf_active_low_pass_cnt; + __le32 phy_off_through_vreg_cnt; + __le32 force_calibration_cnt; + __le32 rf_mode_switch_phy_off_cnt; }; struct htt_phy_reset_stats_tlv { - u32 pdev_id; - u32 chan_mhz; - u32 chan_band_center_freq1; - u32 chan_band_center_freq2; - u32 chan_phy_mode; - u32 chan_flags; - u32 chan_num; - u32 reset_cause; - u32 prev_reset_cause; - u32 phy_warm_reset_src; - u32 rx_gain_tbl_mode; - u32 xbar_val; - u32 force_calibration; - u32 phyrf_mode; - u32 phy_homechan; - u32 phy_tx_ch_mask; - u32 phy_rx_ch_mask; - u32 phybb_ini_mask; - u32 phyrf_ini_mask; - u32 phy_dfs_en_mask; - u32 phy_sscan_en_mask; - u32 phy_synth_sel_mask; - u32 phy_adfs_freq; - u32 cck_fir_settings; - u32 phy_dyn_pri_chan; - u32 cca_thresh; - u32 dyn_cca_status; - u32 rxdesense_thresh_hw; - u32 rxdesense_thresh_sw; + __le32 pdev_id; + __le32 chan_mhz; + __le32 chan_band_center_freq1; + __le32 chan_band_center_freq2; + __le32 chan_phy_mode; + __le32 chan_flags; + __le32 chan_num; + __le32 reset_cause; + __le32 prev_reset_cause; + __le32 phy_warm_reset_src; + __le32 rx_gain_tbl_mode; + __le32 xbar_val; + __le32 force_calibration; + __le32 phyrf_mode; + __le32 phy_homechan; + __le32 phy_tx_ch_mask; + __le32 phy_rx_ch_mask; + __le32 phybb_ini_mask; + __le32 phyrf_ini_mask; + __le32 phy_dfs_en_mask; + __le32 phy_sscan_en_mask; + __le32 phy_synth_sel_mask; + __le32 phy_adfs_freq; + __le32 cck_fir_settings; + __le32 phy_dyn_pri_chan; + __le32 cca_thresh; + __le32 dyn_cca_status; + __le32 rxdesense_thresh_hw; + __le32 rxdesense_thresh_sw; }; struct htt_peer_ctrl_path_txrx_stats_tlv { @@ -2012,9 +2014,9 @@ struct htt_peer_ctrl_path_txrx_stats_tlv { u8 peer_mac_addr[ETH_ALEN]; u8 rsvd[2]; /* Num of tx mgmt frames with subtype on peer level */ - u32 peer_tx_mgmt_subtype[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; + __le32 peer_tx_mgmt_subtype[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; /* Num of rx mgmt frames with subtype on peer level */ - u32 peer_rx_mgmt_subtype[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; + __le32 peer_rx_mgmt_subtype[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; }; #ifdef CONFIG_ATH11K_DEBUGFS diff --git a/drivers/net/wireless/ath/ath11k/dp.h b/drivers/net/wireless/ath/ath11k/dp.h index 84f66839f0c6..1fedcd41d2be 100644 --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h @@ -315,10 +315,10 @@ struct ath11k_dp { #define HTT_TX_WBM_COMP_INFO2_VALID BIT(21) struct htt_tx_wbm_completion { - u32 info0; - u32 info1; - u32 info2; - u32 info3; + __le32 info0; + __le32 info1; + __le32 info2; + __le32 info3; } __packed; enum htt_h2t_msg_type { @@ -333,7 +333,7 @@ enum htt_h2t_msg_type { #define HTT_VER_REQ_INFO_MSG_ID GENMASK(7, 0) struct htt_ver_req_cmd { - u32 ver_reg_info; + __le32 ver_reg_info; } __packed; enum htt_srng_ring_type { @@ -501,19 +501,19 @@ enum htt_srng_ring_id { #define HTT_SRNG_SETUP_CMD_INFO2_RESPONSE_REQUIRED BIT(19) struct htt_srng_setup_cmd { - u32 info0; - u32 ring_base_addr_lo; - u32 ring_base_addr_hi; - u32 info1; - u32 ring_head_off32_remote_addr_lo; - u32 ring_head_off32_remote_addr_hi; - u32 ring_tail_off32_remote_addr_lo; - u32 ring_tail_off32_remote_addr_hi; - u32 ring_msi_addr_lo; - u32 ring_msi_addr_hi; - u32 msi_data; - u32 intr_info; - u32 info2; + __le32 info0; + __le32 ring_base_addr_lo; + __le32 ring_base_addr_hi; + __le32 info1; + __le32 ring_head_off32_remote_addr_lo; + __le32 ring_head_off32_remote_addr_hi; + __le32 ring_tail_off32_remote_addr_lo; + __le32 ring_tail_off32_remote_addr_hi; + __le32 ring_msi_addr_lo; + __le32 ring_msi_addr_hi; + __le32 msi_data; + __le32 intr_info; + __le32 info2; } __packed; /* host -> target FW PPDU_STATS config message @@ -550,7 +550,7 @@ struct htt_srng_setup_cmd { */ struct htt_ppdu_stats_cfg_cmd { - u32 msg; + __le32 msg; } __packed; #define HTT_PPDU_STATS_CFG_MSG_TYPE GENMASK(7, 0) @@ -976,13 +976,13 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { HTT_RX_FILTER_TLV_FLAGS_ATTENTION) struct htt_rx_ring_selection_cfg_cmd { - u32 info0; - u32 info1; - u32 pkt_type_en_flags0; - u32 pkt_type_en_flags1; - u32 pkt_type_en_flags2; - u32 pkt_type_en_flags3; - u32 rx_filter_tlv; + __le32 info0; + __le32 info1; + __le32 pkt_type_en_flags0; + __le32 pkt_type_en_flags1; + __le32 pkt_type_en_flags2; + __le32 pkt_type_en_flags3; + __le32 rx_filter_tlv; } __packed; struct htt_rx_ring_tlv_filter { @@ -1015,8 +1015,8 @@ enum htt_rx_full_mon_release_ring { }; struct htt_rx_full_monitor_mode_cfg_cmd { - u32 info0; - u32 cfg; + __le32 info0; + __le32 cfg; } __packed; /* HTT message target->host */ @@ -1042,7 +1042,7 @@ enum htt_t2h_msg_type { #define HTT_T2H_VERSION_CONF_MAJOR GENMASK(23, 16) struct htt_t2h_version_conf_msg { - u32 version; + __le32 version; } __packed; #define HTT_T2H_PEER_MAP_INFO_VDEV_ID GENMASK(15, 8) @@ -1054,10 +1054,10 @@ struct htt_t2h_version_conf_msg { #define HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S 16 struct htt_t2h_peer_map_event { - u32 info; - u32 mac_addr_l32; - u32 info1; - u32 info2; + __le32 info; + __le32 mac_addr_l32; + __le32 info1; + __le32 info2; } __packed; #define HTT_T2H_PEER_UNMAP_INFO_VDEV_ID HTT_T2H_PEER_MAP_INFO_VDEV_ID @@ -1068,9 +1068,9 @@ struct htt_t2h_peer_map_event { #define HTT_T2H_PEER_MAP_INFO1_NEXT_HOP_S HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S struct htt_t2h_peer_unmap_event { - u32 info; - u32 mac_addr_l32; - u32 info1; + __le32 info; + __le32 mac_addr_l32; + __le32 info1; } __packed; struct htt_resp_msg { @@ -1176,15 +1176,15 @@ enum htt_backpressure_lmac_ringid { #define HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE GENMASK(31, 16) struct ath11k_htt_ppdu_stats_msg { - u32 info; - u32 ppdu_id; - u32 timestamp; - u32 rsvd; + __le32 info; + __le32 ppdu_id; + __le32 timestamp; + __le32 rsvd; u8 data[]; } __packed; struct htt_tlv { - u32 header; + __le32 header; u8 value[]; } __packed; @@ -1207,21 +1207,21 @@ enum HTT_PPDU_STATS_BW { #define HTT_PPDU_STATS_CMN_FLAGS_BW_M GENMASK(19, 16) struct htt_ppdu_stats_common { - u32 ppdu_id; - u16 sched_cmdid; + __le32 ppdu_id; + __le16 sched_cmdid; u8 ring_id; u8 num_users; - u32 flags; /* %HTT_PPDU_STATS_COMMON_FLAGS_*/ - u32 chain_mask; - u32 fes_duration_us; /* frame exchange sequence */ - u32 ppdu_sch_eval_start_tstmp_us; - u32 ppdu_sch_end_tstmp_us; - u32 ppdu_start_tstmp_us; + __le32 flags; /* %HTT_PPDU_STATS_COMMON_FLAGS_*/ + __le32 chain_mask; + __le32 fes_duration_us; /* frame exchange sequence */ + __le32 ppdu_sch_eval_start_tstmp_us; + __le32 ppdu_sch_end_tstmp_us; + __le32 ppdu_start_tstmp_us; /* BIT [15 : 0] - phy mode (WLAN_PHY_MODE) with which ppdu was transmitted * BIT [31 : 16] - bandwidth (in MHz) with which ppdu was transmitted */ - u16 phy_mode; - u16 bw_mhz; + __le16 phy_mode; + __le16 bw_mhz; } __packed; enum htt_ppdu_stats_gi { @@ -1250,17 +1250,17 @@ enum htt_ppdu_stats_gi { #define HTT_PPDU_STATS_USER_RATE_FLAGS_LDPC_M BIT(29) #define HTT_USR_RATE_PREAMBLE(_val) \ - FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_PREAMBLE_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_PREAMBLE_M) #define HTT_USR_RATE_BW(_val) \ - FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_BW_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_BW_M) #define HTT_USR_RATE_NSS(_val) \ - FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_NSS_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_NSS_M) #define HTT_USR_RATE_MCS(_val) \ - FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_MCS_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_MCS_M) #define HTT_USR_RATE_GI(_val) \ - FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M) #define HTT_USR_RATE_DCM(_val) \ - FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M GENMASK(1, 0) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M BIT(2) @@ -1277,16 +1277,16 @@ enum htt_ppdu_stats_gi { struct htt_ppdu_stats_user_rate { u8 tid_num; u8 reserved0; - u16 sw_peer_id; - u32 info0; /* %HTT_PPDU_STATS_USER_RATE_INFO0_*/ - u16 ru_end; - u16 ru_start; - u16 resp_ru_end; - u16 resp_ru_start; - u32 info1; /* %HTT_PPDU_STATS_USER_RATE_INFO1_ */ - u32 rate_flags; /* %HTT_PPDU_STATS_USER_RATE_FLAGS_ */ + __le16 sw_peer_id; + __le32 info0; /* %HTT_PPDU_STATS_USER_RATE_INFO0_*/ + __le16 ru_end; + __le16 ru_start; + __le16 resp_ru_end; + __le16 resp_ru_start; + __le32 info1; /* %HTT_PPDU_STATS_USER_RATE_INFO1_ */ + __le32 rate_flags; /* %HTT_PPDU_STATS_USER_RATE_FLAGS_ */ /* Note: resp_rate_info is only valid for if resp_type is UL */ - u32 resp_rate_flags; /* %HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_ */ + __le32 resp_rate_flags; /* %HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_ */ } __packed; #define HTT_PPDU_STATS_TX_INFO_FLAGS_RATECODE_M GENMASK(7, 0) @@ -1297,13 +1297,17 @@ struct htt_ppdu_stats_user_rate { #define HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M GENMASK(31, 16) #define HTT_TX_INFO_IS_AMSDU(_flags) \ - FIELD_GET(HTT_PPDU_STATS_TX_INFO_FLAGS_IS_AMPDU_M, _flags) + le32_get_bits(_flags, \ + HTT_PPDU_STATS_TX_INFO_FLAGS_IS_AMPDU_M) #define HTT_TX_INFO_BA_ACK_FAILED(_flags) \ - FIELD_GET(HTT_PPDU_STATS_TX_INFO_FLAGS_BA_ACK_FAILED_M, _flags) + le32_get_bits(_flags, \ + HTT_PPDU_STATS_TX_INFO_FLAGS_BA_ACK_FAILED_M) #define HTT_TX_INFO_RATECODE(_flags) \ - FIELD_GET(HTT_PPDU_STATS_TX_INFO_FLAGS_RATECODE_M, _flags) + le32_get_bits(_flags, \ + HTT_PPDU_STATS_TX_INFO_FLAGS_RATECODE_M) #define HTT_TX_INFO_PEERID(_flags) \ - FIELD_GET(HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M, _flags) + le32_get_bits(_flags, \ + HTT_PPDU_STATS_TX_INFO_FLAGS_PEERID_M) enum htt_ppdu_stats_usr_compln_status { HTT_PPDU_STATS_USER_STATUS_OK, @@ -1319,21 +1323,21 @@ enum htt_ppdu_stats_usr_compln_status { #define HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_RESP_TYPE_M GENMASK(12, 9) #define HTT_USR_CMPLTN_IS_AMPDU(_val) \ - FIELD_GET(HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_IS_AMPDU_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_IS_AMPDU_M) #define HTT_USR_CMPLTN_LONG_RETRY(_val) \ - FIELD_GET(HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRY_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRY_M) #define HTT_USR_CMPLTN_SHORT_RETRY(_val) \ - FIELD_GET(HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_SHORT_RETRY_M, _val) + le32_get_bits(_val, HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_SHORT_RETRY_M) struct htt_ppdu_stats_usr_cmpltn_cmn { u8 status; u8 tid_num; - u16 sw_peer_id; + __le16 sw_peer_id; /* RSSI value of last ack packet (units = dB above noise floor) */ - u32 ack_rssi; - u16 mpdu_tried; - u16 mpdu_success; - u32 flags; /* %HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRIES*/ + __le32 ack_rssi; + __le16 mpdu_tried; + __le16 mpdu_success; + __le32 flags; /* %HTT_PPDU_STATS_USR_CMPLTN_CMN_FLAGS_LONG_RETRIES*/ } __packed; #define HTT_PPDU_STATS_ACK_BA_INFO_NUM_MPDU_M GENMASK(8, 0) @@ -1343,13 +1347,13 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { #define HTT_PPDU_STATS_NON_QOS_TID 16 struct htt_ppdu_stats_usr_cmpltn_ack_ba_status { - u32 ppdu_id; - u16 sw_peer_id; - u16 reserved0; - u32 info; /* %HTT_PPDU_STATS_USR_CMPLTN_CMN_INFO_ */ - u16 current_seq; - u16 start_seq; - u32 success_bytes; + __le32 ppdu_id; + __le16 sw_peer_id; + __le16 reserved0; + __le32 info; /* %HTT_PPDU_STATS_USR_CMPLTN_CMN_INFO_ */ + __le16 current_seq; + __le16 start_seq; + __le32 success_bytes; } __packed; struct htt_ppdu_user_stats { @@ -1409,7 +1413,7 @@ struct htt_ppdu_stats_info { * Value: payload size in bytes (payload size is a multiple of 4 bytes) */ struct htt_pktlog_msg { - u32 hdr; + __le32 hdr; u8 payload[]; }; @@ -1499,13 +1503,13 @@ struct htt_ext_stats_cfg_hdr { struct htt_ext_stats_cfg_cmd { struct htt_ext_stats_cfg_hdr hdr; - u32 cfg_param0; - u32 cfg_param1; - u32 cfg_param2; - u32 cfg_param3; - u32 reserved; - u32 cookie_lsb; - u32 cookie_msb; + __le32 cfg_param0; + __le32 cfg_param1; + __le32 cfg_param2; + __le32 cfg_param3; + __le32 reserved; + __le32 cookie_lsb; + __le32 cookie_msb; } __packed; /* htt stats config default params */ @@ -1626,9 +1630,9 @@ struct htt_ext_stats_cfg_params { #define HTT_T2H_EXT_STATS_INFO1_LENGTH GENMASK(31, 16) struct ath11k_htt_extd_stats_msg { - u32 info0; - u64 cookie; - u32 info1; + __le32 info0; + __le64 cookie; + __le32 info1; u8 data[]; } __packed; @@ -1640,8 +1644,8 @@ struct ath11k_htt_extd_stats_msg { #define HTT_MAC_ADDR_H16_1 GENMASK(15, 8) struct htt_mac_addr { - u32 mac_addr_l32; - u32 mac_addr_h16; + __le32 mac_addr_l32; + __le32 mac_addr_h16; }; static inline void ath11k_dp_get_mac_addr(u32 addr_l32, u16 addr_h16, u8 *addr) diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c index 6d95f7b343a5..3c5b2c323c1e 100644 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c @@ -102,26 +102,24 @@ static inline void *ath11k_dp_rx_get_attention(struct ath11k_base *ab, static inline bool ath11k_dp_rx_h_attn_msdu_done(struct rx_attention *attn) { - return !!FIELD_GET(RX_ATTENTION_INFO2_MSDU_DONE, - __le32_to_cpu(attn->info2)); + return !!le32_get_bits(attn->info2, RX_ATTENTION_INFO2_MSDU_DONE); } static inline bool ath11k_dp_rx_h_attn_l4_cksum_fail(struct rx_attention *attn) { - return !!FIELD_GET(RX_ATTENTION_INFO1_TCP_UDP_CKSUM_FAIL, - __le32_to_cpu(attn->info1)); + return !!le32_get_bits(attn->info1, + RX_ATTENTION_INFO1_TCP_UDP_CKSUM_FAIL); } static inline bool ath11k_dp_rx_h_attn_ip_cksum_fail(struct rx_attention *attn) { - return !!FIELD_GET(RX_ATTENTION_INFO1_IP_CKSUM_FAIL, - __le32_to_cpu(attn->info1)); + return !!le32_get_bits(attn->info1, RX_ATTENTION_INFO1_IP_CKSUM_FAIL); } static inline bool ath11k_dp_rx_h_attn_is_decrypted(struct rx_attention *attn) { - return (FIELD_GET(RX_ATTENTION_INFO2_DCRYPT_STATUS_CODE, - __le32_to_cpu(attn->info2)) == + return (le32_get_bits(attn->info2, + RX_ATTENTION_INFO2_DCRYPT_STATUS_CODE) == RX_DESC_DECRYPT_STATUS_CODE_OK); } @@ -247,8 +245,7 @@ static void ath11k_dp_rx_desc_end_tlv_copy(struct ath11k_base *ab, static inline u32 ath11k_dp_rxdesc_get_mpdulen_err(struct rx_attention *attn) { - return FIELD_GET(RX_ATTENTION_INFO1_MPDU_LEN_ERR, - __le32_to_cpu(attn->info1)); + return le32_get_bits(attn->info1, RX_ATTENTION_INFO1_MPDU_LEN_ERR); } static inline u8 *ath11k_dp_rxdesc_get_80211hdr(struct ath11k_base *ab, @@ -290,8 +287,7 @@ static bool ath11k_dp_rx_h_attn_is_mcbc(struct ath11k_base *ab, struct rx_attention *attn = ath11k_dp_rx_get_attention(ab, desc); return ath11k_dp_rx_h_msdu_end_first_msdu(ab, desc) && - (!!FIELD_GET(RX_ATTENTION_INFO1_MCAST_BCAST, - __le32_to_cpu(attn->info1))); + (!!le32_get_bits(attn->info1, RX_ATTENTION_INFO1_MCAST_BCAST)); } static bool ath11k_dp_rxdesc_mac_addr2_valid(struct ath11k_base *ab, @@ -1271,7 +1267,7 @@ static int ath11k_htt_tlv_ppdu_stats_parse(struct ath11k_base *ab, return -EINVAL; } - peer_id = ((struct htt_ppdu_stats_user_rate *)ptr)->sw_peer_id; + peer_id = le16_to_cpu(((struct htt_ppdu_stats_user_rate *)ptr)->sw_peer_id); cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, peer_id); if (cur_user < 0) @@ -1290,7 +1286,7 @@ static int ath11k_htt_tlv_ppdu_stats_parse(struct ath11k_base *ab, return -EINVAL; } - peer_id = ((struct htt_ppdu_stats_usr_cmpltn_cmn *)ptr)->sw_peer_id; + peer_id = le16_to_cpu(((struct htt_ppdu_stats_usr_cmpltn_cmn *)ptr)->sw_peer_id); cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, peer_id); if (cur_user < 0) @@ -1311,7 +1307,7 @@ static int ath11k_htt_tlv_ppdu_stats_parse(struct ath11k_base *ab, } peer_id = - ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->sw_peer_id; + le16_to_cpu(((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->sw_peer_id); cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, peer_id); if (cur_user < 0) @@ -1344,8 +1340,8 @@ int ath11k_dp_htt_tlv_iter(struct ath11k_base *ab, const void *ptr, size_t len, return -EINVAL; } tlv = (struct htt_tlv *)ptr; - tlv_tag = FIELD_GET(HTT_TLV_TAG, tlv->header); - tlv_len = FIELD_GET(HTT_TLV_LEN, tlv->header); + tlv_tag = le32_get_bits(tlv->header, HTT_TLV_TAG); + tlv_len = le32_get_bits(tlv->header, HTT_TLV_LEN); ptr += sizeof(*tlv); len -= sizeof(*tlv); @@ -1393,15 +1389,15 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar, if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) { - succ_bytes = usr_stats->ack_ba.success_bytes; - succ_pkts = FIELD_GET(HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M, - usr_stats->ack_ba.info); - tid = FIELD_GET(HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM, - usr_stats->ack_ba.info); + succ_bytes = le32_to_cpu(usr_stats->ack_ba.success_bytes); + succ_pkts = le32_get_bits(usr_stats->ack_ba.info, + HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M); + tid = le32_get_bits(usr_stats->ack_ba.info, + HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM); } if (common->fes_duration_us) - tx_duration = common->fes_duration_us; + tx_duration = le32_to_cpu(common->fes_duration_us); user_rate = &usr_stats->rate; flags = HTT_USR_RATE_PREAMBLE(user_rate->rate_flags); @@ -1481,8 +1477,8 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar, arsta->txrate.he_dcm = dcm; arsta->txrate.he_gi = ath11k_mac_he_gi_to_nl80211_he_gi(sgi); arsta->txrate.he_ru_alloc = ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc - ((user_rate->ru_end - - user_rate->ru_start) + 1); + ((le16_to_cpu(user_rate->ru_end) - + le16_to_cpu(user_rate->ru_start)) + 1); break; } @@ -1567,9 +1563,9 @@ static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, u32 ppdu_id, len; msg = (struct ath11k_htt_ppdu_stats_msg *)skb->data; - len = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE, msg->info); - pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, msg->info); - ppdu_id = msg->ppdu_id; + len = le32_get_bits(msg->info, HTT_T2H_PPDU_STATS_INFO_PAYLOAD_SIZE); + pdev_id = le32_get_bits(msg->info, HTT_T2H_PPDU_STATS_INFO_PDEV_ID); + ppdu_id = le32_to_cpu(msg->ppdu_id); rcu_read_lock(); ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id); @@ -1613,7 +1609,7 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb) struct ath11k *ar; u8 pdev_id; - pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, data->hdr); + pdev_id = le32_get_bits(data->hdr, HTT_T2H_PPDU_STATS_INFO_PDEV_ID); rcu_read_lock(); @@ -1633,22 +1629,22 @@ static void ath11k_htt_pktlog(struct ath11k_base *ab, struct sk_buff *skb) static void ath11k_htt_backpressure_event_handler(struct ath11k_base *ab, struct sk_buff *skb) { - u32 *data = (u32 *)skb->data; + __le32 *data = (__le32 *)skb->data; u8 pdev_id, ring_type, ring_id, pdev_idx; u16 hp, tp; u32 backpressure_time; struct ath11k_bp_stats *bp_stats; - pdev_id = FIELD_GET(HTT_BACKPRESSURE_EVENT_PDEV_ID_M, *data); - ring_type = FIELD_GET(HTT_BACKPRESSURE_EVENT_RING_TYPE_M, *data); - ring_id = FIELD_GET(HTT_BACKPRESSURE_EVENT_RING_ID_M, *data); + pdev_id = le32_get_bits(*data, HTT_BACKPRESSURE_EVENT_PDEV_ID_M); + ring_type = le32_get_bits(*data, HTT_BACKPRESSURE_EVENT_RING_TYPE_M); + ring_id = le32_get_bits(*data, HTT_BACKPRESSURE_EVENT_RING_ID_M); ++data; - hp = FIELD_GET(HTT_BACKPRESSURE_EVENT_HP_M, *data); - tp = FIELD_GET(HTT_BACKPRESSURE_EVENT_TP_M, *data); + hp = le32_get_bits(*data, HTT_BACKPRESSURE_EVENT_HP_M); + tp = le32_get_bits(*data, HTT_BACKPRESSURE_EVENT_TP_M); ++data; - backpressure_time = *data; + backpressure_time = le32_to_cpu(*data); ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "backpressure event, pdev %d, ring type %d,ring id %d, hp %d tp %d, backpressure time %d\n", pdev_id, ring_type, ring_id, hp, tp, backpressure_time); @@ -1684,7 +1680,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(struct ath11k_base *ab, { struct ath11k_dp *dp = &ab->dp; struct htt_resp_msg *resp = (struct htt_resp_msg *)skb->data; - enum htt_t2h_msg_type type = FIELD_GET(HTT_T2H_MSG_TYPE, *(u32 *)resp); + enum htt_t2h_msg_type type = FIELD_GET(HTT_T2H_MSG_TYPE, + le32_to_cpu(*(__le32 *)resp)); u16 peer_id; u8 vdev_id; u8 mac_addr[ETH_ALEN]; @@ -1696,43 +1693,43 @@ void ath11k_dp_htt_htc_t2h_msg_handler(struct ath11k_base *ab, switch (type) { case HTT_T2H_MSG_TYPE_VERSION_CONF: - dp->htt_tgt_ver_major = FIELD_GET(HTT_T2H_VERSION_CONF_MAJOR, - resp->version_msg.version); - dp->htt_tgt_ver_minor = FIELD_GET(HTT_T2H_VERSION_CONF_MINOR, - resp->version_msg.version); + dp->htt_tgt_ver_major = le32_get_bits(resp->version_msg.version, + HTT_T2H_VERSION_CONF_MAJOR); + dp->htt_tgt_ver_minor = le32_get_bits(resp->version_msg.version, + HTT_T2H_VERSION_CONF_MINOR); complete(&dp->htt_tgt_version_received); break; case HTT_T2H_MSG_TYPE_PEER_MAP: - vdev_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO_VDEV_ID, - resp->peer_map_ev.info); - peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO_PEER_ID, - resp->peer_map_ev.info); - peer_mac_h16 = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16, - resp->peer_map_ev.info1); - ath11k_dp_get_mac_addr(resp->peer_map_ev.mac_addr_l32, + vdev_id = le32_get_bits(resp->peer_map_ev.info, + HTT_T2H_PEER_MAP_INFO_VDEV_ID); + peer_id = le32_get_bits(resp->peer_map_ev.info, + HTT_T2H_PEER_MAP_INFO_PEER_ID); + peer_mac_h16 = le32_get_bits(resp->peer_map_ev.info1, + HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16); + ath11k_dp_get_mac_addr(le32_to_cpu(resp->peer_map_ev.mac_addr_l32), peer_mac_h16, mac_addr); ath11k_peer_map_event(ab, vdev_id, peer_id, mac_addr, 0, 0); break; case HTT_T2H_MSG_TYPE_PEER_MAP2: - vdev_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO_VDEV_ID, - resp->peer_map_ev.info); - peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO_PEER_ID, - resp->peer_map_ev.info); - peer_mac_h16 = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16, - resp->peer_map_ev.info1); - ath11k_dp_get_mac_addr(resp->peer_map_ev.mac_addr_l32, + vdev_id = le32_get_bits(resp->peer_map_ev.info, + HTT_T2H_PEER_MAP_INFO_VDEV_ID); + peer_id = le32_get_bits(resp->peer_map_ev.info, + HTT_T2H_PEER_MAP_INFO_PEER_ID); + peer_mac_h16 = le32_get_bits(resp->peer_map_ev.info1, + HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16); + ath11k_dp_get_mac_addr(le32_to_cpu(resp->peer_map_ev.mac_addr_l32), peer_mac_h16, mac_addr); - ast_hash = FIELD_GET(HTT_T2H_PEER_MAP_INFO2_AST_HASH_VAL, - resp->peer_map_ev.info2); - hw_peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID, - resp->peer_map_ev.info1); + ast_hash = le32_get_bits(resp->peer_map_ev.info2, + HTT_T2H_PEER_MAP_INFO2_AST_HASH_VAL); + hw_peer_id = le32_get_bits(resp->peer_map_ev.info1, + HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID); ath11k_peer_map_event(ab, vdev_id, peer_id, mac_addr, ast_hash, hw_peer_id); break; case HTT_T2H_MSG_TYPE_PEER_UNMAP: case HTT_T2H_MSG_TYPE_PEER_UNMAP2: - peer_id = FIELD_GET(HTT_T2H_PEER_UNMAP_INFO_PEER_ID, - resp->peer_unmap_ev.info); + peer_id = le32_get_bits(resp->peer_unmap_ev.info, + HTT_T2H_PEER_UNMAP_INFO_PEER_ID); ath11k_peer_unmap_event(ab, peer_id); break; case HTT_T2H_MSG_TYPE_PPDU_STATS_IND: @@ -1965,7 +1962,7 @@ static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, size_t hdr_len; u8 da[ETH_ALEN]; u8 sa[ETH_ALEN]; - u16 qos_ctl = 0; + __le16 qos_ctl = 0; u8 *qos; /* copy SA & DA and pull decapped header */ @@ -1996,10 +1993,10 @@ static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, /* Reset the order bit as the HT_Control header is stripped */ hdr->frame_control &= ~(__cpu_to_le16(IEEE80211_FCTL_ORDER)); - qos_ctl = rxcb->tid; + qos_ctl = cpu_to_le16(rxcb->tid & IEEE80211_QOS_CTL_TID_MASK); if (ath11k_dp_rx_h_msdu_start_mesh_ctl_present(ar->ab, rxcb->rx_desc)) - qos_ctl |= IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT; + qos_ctl |= cpu_to_le16(IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT); /* TODO Add other QoS ctl fields when required */ @@ -2686,8 +2683,8 @@ int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, while (likely(desc = (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab, srng))) { - cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - desc->buf_addr_info.info1); + cookie = le32_get_bits(desc->buf_addr_info.info1, + BUFFER_ADDR_INFO1_SW_COOKIE); buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, cookie); mac_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_PDEV_ID, cookie); @@ -2716,8 +2713,8 @@ int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, num_buffs_reaped[mac_id]++; - push_reason = FIELD_GET(HAL_REO_DEST_RING_INFO0_PUSH_REASON, - desc->info0); + push_reason = le32_get_bits(desc->info0, + HAL_REO_DEST_RING_INFO0_PUSH_REASON); if (unlikely(push_reason != HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION)) { dev_kfree_skb_any(msdu); @@ -2725,18 +2722,18 @@ int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, continue; } - rxcb->is_first_msdu = !!(desc->rx_msdu_info.info0 & + rxcb->is_first_msdu = !!(le32_to_cpu(desc->rx_msdu_info.info0) & RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU); - rxcb->is_last_msdu = !!(desc->rx_msdu_info.info0 & + rxcb->is_last_msdu = !!(le32_to_cpu(desc->rx_msdu_info.info0) & RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU); - rxcb->is_continuation = !!(desc->rx_msdu_info.info0 & + rxcb->is_continuation = !!(le32_to_cpu(desc->rx_msdu_info.info0) & RX_MSDU_DESC_INFO0_MSDU_CONTINUATION); - rxcb->peer_id = FIELD_GET(RX_MPDU_DESC_META_DATA_PEER_ID, - desc->rx_mpdu_info.meta_data); - rxcb->seq_no = FIELD_GET(RX_MPDU_DESC_INFO0_SEQ_NUM, - desc->rx_mpdu_info.info0); - rxcb->tid = FIELD_GET(HAL_REO_DEST_RING_INFO0_RX_QUEUE_NUM, - desc->info0); + rxcb->peer_id = le32_get_bits(desc->rx_mpdu_info.meta_data, + RX_MPDU_DESC_META_DATA_PEER_ID); + rxcb->seq_no = le32_get_bits(desc->rx_mpdu_info.info0, + RX_MPDU_DESC_INFO0_SEQ_NUM); + rxcb->tid = le32_get_bits(desc->info0, + HAL_REO_DEST_RING_INFO0_RX_QUEUE_NUM); rxcb->mac_id = mac_id; __skb_queue_tail(&msdu_list[mac_id], msdu); @@ -2985,18 +2982,18 @@ ath11k_dp_rx_mon_update_status_buf_state(struct ath11k_mon_data *pmon, u8 *ptr; /* PPDU id is part of second tlv, move ptr to second tlv */ - tlv_len = FIELD_GET(HAL_TLV_HDR_LEN, tlv->tl); + tlv_len = le32_get_bits(tlv->tl, HAL_TLV_HDR_LEN); ptr = (u8 *)tlv; ptr += sizeof(*tlv) + tlv_len; tlv = (struct hal_tlv_hdr *)ptr; - if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_PPDU_START) + if (le32_get_bits(tlv->tl, HAL_TLV_HDR_TAG) != HAL_RX_PPDU_START) return; ptr += sizeof(*tlv); ppdu_start = (struct hal_rx_ppdu_start *)ptr; - ppdu_id = FIELD_GET(HAL_RX_PPDU_START_INFO0_PPDU_ID, - __le32_to_cpu(ppdu_start->info0)); + ppdu_id = le32_get_bits(ppdu_start->info0, + HAL_RX_PPDU_START_INFO0_PPDU_ID); if (pmon->sw_mon_entries.ppdu_id < ppdu_id) { pmon->buf_state = DP_MON_STATUS_LEAD; @@ -3045,7 +3042,8 @@ ath11k_dp_rx_mon_buf_done(struct ath11k_base *ab, struct hal_srng *srng, DMA_FROM_DEVICE); tlv = (struct hal_tlv_hdr *)skb->data; - if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_STATUS_BUFFER_DONE) + if (le32_get_bits(tlv->tl, + HAL_TLV_HDR_TAG) != HAL_RX_STATUS_BUFFER_DONE) return DP_MON_STATUS_NO_DMA; return DP_MON_STATUS_REPLINISH; @@ -3114,11 +3112,12 @@ static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id, DMA_FROM_DEVICE); tlv = (struct hal_tlv_hdr *)skb->data; - if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != + if (le32_get_bits(tlv->tl, HAL_TLV_HDR_TAG) != HAL_RX_STATUS_BUFFER_DONE) { - ath11k_warn(ab, "mon status DONE not set %lx, buf_id %d\n", - FIELD_GET(HAL_TLV_HDR_TAG, - tlv->tl), buf_id); + ath11k_warn(ab, + "mon status DONE not set %x, buf_id %d\n", + le32_get_bits(tlv->tl, + HAL_TLV_HDR_TAG), buf_id); /* RxDMA status done bit might not be set even * though tp is moved by HW. */ @@ -3423,7 +3422,8 @@ static int ath11k_dp_rx_h_defrag_reo_reinject(struct ath11k *ar, struct dp_rx_ti struct hal_rx_msdu_details *msdu0; struct hal_srng *srng; dma_addr_t paddr; - u32 desc_bank, msdu_info, mpdu_info; + u32 desc_bank; + __le32 msdu_info, mpdu_info; u32 dst_idx, cookie, hal_rx_desc_sz; int ret, buf_id; @@ -3435,17 +3435,18 @@ static int ath11k_dp_rx_h_defrag_reo_reinject(struct ath11k *ar, struct dp_rx_ti msdu_link = (struct hal_rx_msdu_link *)(link_desc_banks[desc_bank].vaddr + (paddr - link_desc_banks[desc_bank].paddr)); msdu0 = &msdu_link->msdu_link[0]; - dst_idx = FIELD_GET(RX_MSDU_DESC_INFO0_REO_DEST_IND, msdu0->rx_msdu_info.info0); + dst_idx = le32_get_bits(msdu0->rx_msdu_info.info0, + RX_MSDU_DESC_INFO0_REO_DEST_IND); memset(msdu0, 0, sizeof(*msdu0)); - msdu_info = FIELD_PREP(RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU, 1) | - FIELD_PREP(RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU, 1) | - FIELD_PREP(RX_MSDU_DESC_INFO0_MSDU_CONTINUATION, 0) | - FIELD_PREP(RX_MSDU_DESC_INFO0_MSDU_LENGTH, - defrag_skb->len - hal_rx_desc_sz) | - FIELD_PREP(RX_MSDU_DESC_INFO0_REO_DEST_IND, dst_idx) | - FIELD_PREP(RX_MSDU_DESC_INFO0_VALID_SA, 1) | - FIELD_PREP(RX_MSDU_DESC_INFO0_VALID_DA, 1); + msdu_info = le32_encode_bits(1, RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU) | + le32_encode_bits(1, RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU) | + le32_encode_bits(0, RX_MSDU_DESC_INFO0_MSDU_CONTINUATION) | + le32_encode_bits(defrag_skb->len - hal_rx_desc_sz, + RX_MSDU_DESC_INFO0_MSDU_LENGTH) | + le32_encode_bits(dst_idx, RX_MSDU_DESC_INFO0_REO_DEST_IND) | + le32_encode_bits(1, RX_MSDU_DESC_INFO0_VALID_SA) | + le32_encode_bits(1, RX_MSDU_DESC_INFO0_VALID_DA); msdu0->rx_msdu_info.info0 = msdu_info; /* change msdu len in hal rx desc */ @@ -3493,21 +3494,23 @@ static int ath11k_dp_rx_h_defrag_reo_reinject(struct ath11k *ar, struct dp_rx_ti ath11k_hal_rx_buf_addr_info_set(reo_ent_ring, paddr, desc_bank, HAL_RX_BUF_RBM_WBM_IDLE_DESC_LIST); - mpdu_info = FIELD_PREP(RX_MPDU_DESC_INFO0_MSDU_COUNT, 1) | - FIELD_PREP(RX_MPDU_DESC_INFO0_SEQ_NUM, rx_tid->cur_sn) | - FIELD_PREP(RX_MPDU_DESC_INFO0_FRAG_FLAG, 0) | - FIELD_PREP(RX_MPDU_DESC_INFO0_VALID_SA, 1) | - FIELD_PREP(RX_MPDU_DESC_INFO0_VALID_DA, 1) | - FIELD_PREP(RX_MPDU_DESC_INFO0_RAW_MPDU, 1) | - FIELD_PREP(RX_MPDU_DESC_INFO0_VALID_PN, 1); + mpdu_info = le32_encode_bits(1, RX_MPDU_DESC_INFO0_MSDU_COUNT) | + le32_encode_bits(rx_tid->cur_sn, + RX_MPDU_DESC_INFO0_SEQ_NUM) | + le32_encode_bits(0, RX_MPDU_DESC_INFO0_FRAG_FLAG) | + le32_encode_bits(1, RX_MPDU_DESC_INFO0_VALID_SA) | + le32_encode_bits(1, RX_MPDU_DESC_INFO0_VALID_DA) | + le32_encode_bits(1, RX_MPDU_DESC_INFO0_RAW_MPDU) | + le32_encode_bits(1, RX_MPDU_DESC_INFO0_VALID_PN); reo_ent_ring->rx_mpdu_info.info0 = mpdu_info; reo_ent_ring->rx_mpdu_info.meta_data = reo_dest_ring->rx_mpdu_info.meta_data; reo_ent_ring->queue_addr_lo = reo_dest_ring->queue_addr_lo; - reo_ent_ring->info0 = FIELD_PREP(HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI, - FIELD_GET(HAL_REO_DEST_RING_INFO0_QUEUE_ADDR_HI, - reo_dest_ring->info0)) | - FIELD_PREP(HAL_REO_ENTR_RING_INFO0_DEST_IND, dst_idx); + reo_ent_ring->info0 = le32_encode_bits(le32_get_bits(reo_dest_ring->info0, + HAL_REO_DEST_RING_INFO0_QUEUE_ADDR_HI), + HAL_REO_ENTR_RING_INFO0_QUEUE_ADDR_HI) | + le32_encode_bits(dst_idx, + HAL_REO_ENTR_RING_INFO0_DEST_IND); ath11k_hal_srng_access_end(ab, srng); spin_unlock_bh(&srng->lock); @@ -3864,7 +3867,8 @@ int ath11k_dp_process_rx_err(struct ath11k_base *ab, struct napi_struct *napi, continue; } - is_frag = !!(reo_desc->rx_mpdu_info.info0 & RX_MPDU_DESC_INFO0_FRAG_FLAG); + is_frag = !!(le32_to_cpu(reo_desc->rx_mpdu_info.info0) & + RX_MPDU_DESC_INFO0_FRAG_FLAG); /* Process only rx fragments with one msdu per link desc below, and drop * msdu's indicated due to error reasons. @@ -4292,8 +4296,8 @@ int ath11k_dp_process_rxdma_err(struct ath11k_base *ab, int mac_id, int budget) entr_ring = (struct hal_reo_entrance_ring *)desc; rxdma_err_code = - FIELD_GET(HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE, - entr_ring->info1); + le32_get_bits(entr_ring->info1, + HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE); ab->soc_stats.rxdma_error[rxdma_err_code]++; link_desc_va = link_desc_banks[desc_bank].vaddr + @@ -4360,7 +4364,7 @@ void ath11k_dp_process_reo_status(struct ath11k_base *ab) ath11k_hal_srng_access_begin(ab, srng); while ((reo_desc = ath11k_hal_srng_dst_get_next_entry(ab, srng))) { - tag = FIELD_GET(HAL_SRNG_TLV_HDR_TAG, *reo_desc); + tag = le32_get_bits(*(__le32 *)reo_desc, HAL_SRNG_TLV_HDR_TAG); switch (tag) { case HAL_REO_GET_QUEUE_STATS_STATUS: @@ -4615,19 +4619,20 @@ static void ath11k_hal_rx_msdu_list_get(struct ath11k *ar, struct rx_msdu_desc *msdu_desc_info = NULL; struct hal_rx_msdu_link *msdu_link = NULL; int i; - u32 last = FIELD_PREP(RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU, 1); - u32 first = FIELD_PREP(RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU, 1); + __le32 last = le32_encode_bits(1, RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU); + __le32 first = le32_encode_bits(1, + RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU); u8 tmp = 0; msdu_link = msdu_link_desc; msdu_details = &msdu_link->msdu_link[0]; for (i = 0; i < HAL_RX_NUM_MSDU_DESC; i++) { - if (!i && FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - msdu_details[i].buf_addr_info.info0) == 0) + if (!i && le32_get_bits(msdu_details[i].buf_addr_info.info0, + BUFFER_ADDR_INFO0_ADDR) == 0) break; - if (FIELD_GET(BUFFER_ADDR_INFO0_ADDR, - msdu_details[i].buf_addr_info.info0) == 0) { + if (le32_get_bits(msdu_details[i].buf_addr_info.info0, + BUFFER_ADDR_INFO0_ADDR) == 0) { msdu_desc_info = &msdu_details[i - 1].rx_msdu_info; msdu_desc_info->info0 |= last; break; @@ -4638,14 +4643,14 @@ static void ath11k_hal_rx_msdu_list_get(struct ath11k *ar, msdu_desc_info->info0 |= first; else if (i == (HAL_RX_NUM_MSDU_DESC - 1)) msdu_desc_info->info0 |= last; - msdu_list->msdu_info[i].msdu_flags = msdu_desc_info->info0; + msdu_list->msdu_info[i].msdu_flags = le32_to_cpu(msdu_desc_info->info0); msdu_list->msdu_info[i].msdu_len = - HAL_RX_MSDU_PKT_LENGTH_GET(msdu_desc_info->info0); + HAL_RX_MSDU_PKT_LENGTH_GET(le32_to_cpu(msdu_desc_info->info0)); msdu_list->sw_cookie[i] = - FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - msdu_details[i].buf_addr_info.info1); - tmp = FIELD_GET(BUFFER_ADDR_INFO1_RET_BUF_MGR, - msdu_details[i].buf_addr_info.info1); + le32_get_bits(msdu_details[i].buf_addr_info.info1, + BUFFER_ADDR_INFO1_SW_COOKIE); + tmp = le32_get_bits(msdu_details[i].buf_addr_info.info1, + BUFFER_ADDR_INFO1_RET_BUF_MGR); msdu_list->rbm[i] = tmp; } *num_msdus = i; @@ -4732,12 +4737,12 @@ u32 ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id, &p_last_buf_addr_info, &rbm, &msdu_cnt); - if (FIELD_GET(HAL_REO_ENTR_RING_INFO1_RXDMA_PUSH_REASON, - ent_desc->info1) == + if (le32_get_bits(ent_desc->info1, + HAL_REO_ENTR_RING_INFO1_RXDMA_PUSH_REASON) == HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED) { u8 rxdma_err = - FIELD_GET(HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE, - ent_desc->info1); + le32_get_bits(ent_desc->info1, + HAL_REO_ENTR_RING_INFO1_RXDMA_ERROR_CODE); if (rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR || rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_MPDU_LEN_ERR || rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_OVERFLOW_ERR) { @@ -5375,16 +5380,17 @@ ath11k_dp_rx_full_mon_mpdu_pop(struct ath11k *ar, msdu_cnt = sw_mon_entries->msdu_cnt; sw_mon_entries->end_of_ppdu = - FIELD_GET(HAL_SW_MON_RING_INFO0_END_OF_PPDU, sw_desc->info0); + le32_get_bits(sw_desc->info0, + HAL_SW_MON_RING_INFO0_END_OF_PPDU); if (sw_mon_entries->end_of_ppdu) return rx_bufs_used; - if (FIELD_GET(HAL_SW_MON_RING_INFO0_RXDMA_PUSH_REASON, - sw_desc->info0) == + if (le32_get_bits(sw_desc->info0, + HAL_SW_MON_RING_INFO0_RXDMA_PUSH_REASON) == HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED) { rxdma_err = - FIELD_GET(HAL_SW_MON_RING_INFO0_RXDMA_ERROR_CODE, - sw_desc->info0); + le32_get_bits(sw_desc->info0, + HAL_SW_MON_RING_INFO0_RXDMA_ERROR_CODE); if (rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR || rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_MPDU_LEN_ERR || rxdma_err == HAL_REO_ENTR_RING_RXDMA_ECODE_OVERFLOW_ERR) { diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c index cac970c92806..20bee1d7d842 100644 --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c @@ -397,20 +397,21 @@ ath11k_dp_tx_process_htt_tx_complete(struct ath11k_base *ab, status_desc = desc + HTT_TX_WBM_COMP_STATUS_OFFSET; - wbm_status = FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, - status_desc->info0); + wbm_status = le32_get_bits(status_desc->info0, + HTT_TX_WBM_COMP_INFO0_STATUS); switch (wbm_status) { case HAL_WBM_REL_HTT_TX_COMP_STATUS_OK: case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP: case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL: ts.acked = (wbm_status == HAL_WBM_REL_HTT_TX_COMP_STATUS_OK); ts.msdu_id = msdu_id; - ts.ack_rssi = FIELD_GET(HTT_TX_WBM_COMP_INFO1_ACK_RSSI, - status_desc->info1); + ts.ack_rssi = le32_get_bits(status_desc->info1, + HTT_TX_WBM_COMP_INFO1_ACK_RSSI); - if (FIELD_GET(HTT_TX_WBM_COMP_INFO2_VALID, status_desc->info2)) - ts.peer_id = FIELD_GET(HTT_TX_WBM_COMP_INFO2_SW_PEER_ID, - status_desc->info2); + if (le32_get_bits(status_desc->info2, + HTT_TX_WBM_COMP_INFO2_VALID)) + ts.peer_id = le32_get_bits(status_desc->info2, + HTT_TX_WBM_COMP_INFO2_SW_PEER_ID); else ts.peer_id = HTT_INVALID_PEER_ID; @@ -658,7 +659,8 @@ static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab, struct hal_tx_status *ts) { ts->buf_rel_source = - FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0); + le32_get_bits(desc->info0, + HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE); if (unlikely(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW && ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) return; @@ -666,20 +668,20 @@ static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab, if (unlikely(ts->buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) return; - ts->status = FIELD_GET(HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON, - desc->info0); - ts->ppdu_id = FIELD_GET(HAL_WBM_RELEASE_INFO1_TQM_STATUS_NUMBER, - desc->info1); - ts->try_cnt = FIELD_GET(HAL_WBM_RELEASE_INFO1_TRANSMIT_COUNT, - desc->info1); - ts->ack_rssi = FIELD_GET(HAL_WBM_RELEASE_INFO2_ACK_FRAME_RSSI, - desc->info2); - if (desc->info2 & HAL_WBM_RELEASE_INFO2_FIRST_MSDU) + ts->status = le32_get_bits(desc->info0, + HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON); + ts->ppdu_id = le32_get_bits(desc->info1, + HAL_WBM_RELEASE_INFO1_TQM_STATUS_NUMBER); + ts->try_cnt = le32_get_bits(desc->info1, + HAL_WBM_RELEASE_INFO1_TRANSMIT_COUNT); + ts->ack_rssi = le32_get_bits(desc->info2, + HAL_WBM_RELEASE_INFO2_ACK_FRAME_RSSI); + if (le32_to_cpu(desc->info2) & HAL_WBM_RELEASE_INFO2_FIRST_MSDU) ts->flags |= HAL_TX_STATUS_FLAGS_FIRST_MSDU; - ts->peer_id = FIELD_GET(HAL_WBM_RELEASE_INFO3_PEER_ID, desc->info3); - ts->tid = FIELD_GET(HAL_WBM_RELEASE_INFO3_TID, desc->info3); - if (desc->rate_stats.info0 & HAL_TX_RATE_STATS_INFO0_VALID) - ts->rate_stats = desc->rate_stats.info0; + ts->peer_id = le32_get_bits(desc->info3, HAL_WBM_RELEASE_INFO3_PEER_ID); + ts->tid = le32_get_bits(desc->info3, HAL_WBM_RELEASE_INFO3_TID); + if (le32_to_cpu(desc->rate_stats.info0) & HAL_TX_RATE_STATS_INFO0_VALID) + ts->rate_stats = le32_to_cpu(desc->rate_stats.info0); else ts->rate_stats = 0; } @@ -730,8 +732,8 @@ void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id) tx_status = &tx_ring->tx_status[tx_ring->tx_status_tail]; ath11k_dp_tx_status_parse(ab, tx_status, &ts); - desc_id = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, - tx_status->buf_addr_info.info1); + desc_id = le32_get_bits(tx_status->buf_addr_info.info1, + BUFFER_ADDR_INFO1_SW_COOKIE); mac_id = FIELD_GET(DP_TX_DESC_ID_MAC_ID, desc_id); msdu_id = FIELD_GET(DP_TX_DESC_ID_MSDU_ID, desc_id); @@ -906,24 +908,25 @@ int ath11k_dp_tx_htt_srng_setup(struct ath11k_base *ab, u32 ring_id, skb_put(skb, len); cmd = (struct htt_srng_setup_cmd *)skb->data; - cmd->info0 = FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO0_MSG_TYPE, - HTT_H2T_MSG_TYPE_SRING_SETUP); + cmd->info0 = le32_encode_bits(HTT_H2T_MSG_TYPE_SRING_SETUP, + HTT_SRNG_SETUP_CMD_INFO0_MSG_TYPE); if (htt_ring_type == HTT_SW_TO_HW_RING || htt_ring_type == HTT_HW_TO_SW_RING) - cmd->info0 |= FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID, - DP_SW2HW_MACID(mac_id)); + cmd->info0 |= le32_encode_bits(DP_SW2HW_MACID(mac_id), + HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID); else - cmd->info0 |= FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID, - mac_id); - cmd->info0 |= FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO0_RING_TYPE, - htt_ring_type); - cmd->info0 |= FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO0_RING_ID, htt_ring_id); + cmd->info0 |= le32_encode_bits(mac_id, + HTT_SRNG_SETUP_CMD_INFO0_PDEV_ID); + cmd->info0 |= le32_encode_bits(htt_ring_type, + HTT_SRNG_SETUP_CMD_INFO0_RING_TYPE); + cmd->info0 |= le32_encode_bits(htt_ring_id, + HTT_SRNG_SETUP_CMD_INFO0_RING_ID); - cmd->ring_base_addr_lo = params.ring_base_paddr & - HAL_ADDR_LSB_REG_MASK; + cmd->ring_base_addr_lo = cpu_to_le32(params.ring_base_paddr & + HAL_ADDR_LSB_REG_MASK); - cmd->ring_base_addr_hi = (u64)params.ring_base_paddr >> - HAL_ADDR_MSB_REG_SHIFT; + cmd->ring_base_addr_hi = cpu_to_le32((u64)params.ring_base_paddr >> + HAL_ADDR_MSB_REG_SHIFT); ret = ath11k_hal_srng_get_entrysize(ab, ring_type); if (ret < 0) @@ -932,45 +935,40 @@ int ath11k_dp_tx_htt_srng_setup(struct ath11k_base *ab, u32 ring_id, ring_entry_sz = ret; ring_entry_sz >>= 2; - cmd->info1 = FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO1_RING_ENTRY_SIZE, - ring_entry_sz); - cmd->info1 |= FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO1_RING_SIZE, - params.num_entries * ring_entry_sz); - cmd->info1 |= FIELD_PREP(HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_MSI_SWAP, - !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); - cmd->info1 |= FIELD_PREP( - HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_TLV_SWAP, - !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); - cmd->info1 |= FIELD_PREP( - HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_HOST_FW_SWAP, - !!(params.flags & HAL_SRNG_FLAGS_RING_PTR_SWAP)); + cmd->info1 = le32_encode_bits(ring_entry_sz, + HTT_SRNG_SETUP_CMD_INFO1_RING_ENTRY_SIZE); + cmd->info1 |= le32_encode_bits(params.num_entries * ring_entry_sz, + HTT_SRNG_SETUP_CMD_INFO1_RING_SIZE); + cmd->info1 |= le32_encode_bits(!!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP), + HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_MSI_SWAP); + cmd->info1 |= le32_encode_bits(!!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP), + HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_TLV_SWAP); + cmd->info1 |= le32_encode_bits(!!(params.flags & HAL_SRNG_FLAGS_RING_PTR_SWAP), + HTT_SRNG_SETUP_CMD_INFO1_RING_FLAGS_HOST_FW_SWAP); if (htt_ring_type == HTT_SW_TO_HW_RING) - cmd->info1 |= HTT_SRNG_SETUP_CMD_INFO1_RING_LOOP_CNT_DIS; + cmd->info1 |= cpu_to_le32(HTT_SRNG_SETUP_CMD_INFO1_RING_LOOP_CNT_DIS); - cmd->ring_head_off32_remote_addr_lo = hp_addr & HAL_ADDR_LSB_REG_MASK; - cmd->ring_head_off32_remote_addr_hi = (u64)hp_addr >> - HAL_ADDR_MSB_REG_SHIFT; + cmd->ring_head_off32_remote_addr_lo = cpu_to_le32(hp_addr & HAL_ADDR_LSB_REG_MASK); + cmd->ring_head_off32_remote_addr_hi = cpu_to_le32((u64)hp_addr >> + HAL_ADDR_MSB_REG_SHIFT); - cmd->ring_tail_off32_remote_addr_lo = tp_addr & HAL_ADDR_LSB_REG_MASK; - cmd->ring_tail_off32_remote_addr_hi = (u64)tp_addr >> - HAL_ADDR_MSB_REG_SHIFT; + cmd->ring_tail_off32_remote_addr_lo = cpu_to_le32(tp_addr & HAL_ADDR_LSB_REG_MASK); + cmd->ring_tail_off32_remote_addr_hi = cpu_to_le32((u64)tp_addr >> + HAL_ADDR_MSB_REG_SHIFT); - cmd->ring_msi_addr_lo = lower_32_bits(params.msi_addr); - cmd->ring_msi_addr_hi = upper_32_bits(params.msi_addr); - cmd->msi_data = params.msi_data; + cmd->ring_msi_addr_lo = cpu_to_le32(lower_32_bits(params.msi_addr)); + cmd->ring_msi_addr_hi = cpu_to_le32(upper_32_bits(params.msi_addr)); + cmd->msi_data = cpu_to_le32(params.msi_data); - cmd->intr_info = FIELD_PREP( - HTT_SRNG_SETUP_CMD_INTR_INFO_BATCH_COUNTER_THRESH, - params.intr_batch_cntr_thres_entries * ring_entry_sz); - cmd->intr_info |= FIELD_PREP( - HTT_SRNG_SETUP_CMD_INTR_INFO_INTR_TIMER_THRESH, - params.intr_timer_thres_us >> 3); + cmd->intr_info = le32_encode_bits(params.intr_batch_cntr_thres_entries * ring_entry_sz, + HTT_SRNG_SETUP_CMD_INTR_INFO_BATCH_COUNTER_THRESH); + cmd->intr_info |= le32_encode_bits(params.intr_timer_thres_us >> 3, + HTT_SRNG_SETUP_CMD_INTR_INFO_INTR_TIMER_THRESH); - cmd->info2 = 0; + cmd->info2 = cpu_to_le32(0); if (params.flags & HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN) { - cmd->info2 = FIELD_PREP( - HTT_SRNG_SETUP_CMD_INFO2_INTR_LOW_THRESH, - params.low_threshold); + cmd->info2 = le32_encode_bits(params.low_threshold, + HTT_SRNG_SETUP_CMD_INFO2_INTR_LOW_THRESH); } ath11k_dbg(ab, ATH11K_DBG_DP_TX, @@ -1008,8 +1006,8 @@ int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab) skb_put(skb, len); cmd = (struct htt_ver_req_cmd *)skb->data; - cmd->ver_reg_info = FIELD_PREP(HTT_VER_REQ_INFO_MSG_ID, - HTT_H2T_MSG_TYPE_VERSION_REQ); + cmd->ver_reg_info = le32_encode_bits(HTT_H2T_MSG_TYPE_VERSION_REQ, + HTT_VER_REQ_INFO_MSG_ID); ret = ath11k_htc_send(&ab->htc, dp->eid, skb); if (ret) { @@ -1051,12 +1049,14 @@ int ath11k_dp_tx_htt_h2t_ppdu_stats_req(struct ath11k *ar, u32 mask) skb_put(skb, len); cmd = (struct htt_ppdu_stats_cfg_cmd *)skb->data; - cmd->msg = FIELD_PREP(HTT_PPDU_STATS_CFG_MSG_TYPE, - HTT_H2T_MSG_TYPE_PPDU_STATS_CFG); + cmd->msg = le32_encode_bits(HTT_H2T_MSG_TYPE_PPDU_STATS_CFG, + HTT_PPDU_STATS_CFG_MSG_TYPE); pdev_mask = 1 << (ar->pdev_idx + i); - cmd->msg |= FIELD_PREP(HTT_PPDU_STATS_CFG_PDEV_ID, pdev_mask); - cmd->msg |= FIELD_PREP(HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK, mask); + cmd->msg |= le32_encode_bits(pdev_mask, + HTT_PPDU_STATS_CFG_PDEV_ID); + cmd->msg |= le32_encode_bits(mask, + HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK); ret = ath11k_htc_send(&ab->htc, dp->eid, skb); if (ret) { @@ -1097,31 +1097,31 @@ int ath11k_dp_tx_htt_rx_filter_setup(struct ath11k_base *ab, u32 ring_id, skb_put(skb, len); cmd = (struct htt_rx_ring_selection_cfg_cmd *)skb->data; - cmd->info0 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE, - HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG); + cmd->info0 = le32_encode_bits(HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG, + HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE); if (htt_ring_type == HTT_SW_TO_HW_RING || htt_ring_type == HTT_HW_TO_SW_RING) cmd->info0 |= - FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID, - DP_SW2HW_MACID(mac_id)); + le32_encode_bits(DP_SW2HW_MACID(mac_id), + HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID); else cmd->info0 |= - FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID, - mac_id); - cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID, - htt_ring_id); - cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS, - !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); - cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS, - !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); - - cmd->info1 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE, - rx_buf_size); - cmd->pkt_type_en_flags0 = tlv_filter->pkt_filter_flags0; - cmd->pkt_type_en_flags1 = tlv_filter->pkt_filter_flags1; - cmd->pkt_type_en_flags2 = tlv_filter->pkt_filter_flags2; - cmd->pkt_type_en_flags3 = tlv_filter->pkt_filter_flags3; - cmd->rx_filter_tlv = tlv_filter->rx_filter; + le32_encode_bits(mac_id, + HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PDEV_ID); + cmd->info0 |= le32_encode_bits(htt_ring_id, + HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID); + cmd->info0 |= le32_encode_bits(!!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP), + HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS); + cmd->info0 |= le32_encode_bits(!!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP), + HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS); + + cmd->info1 = le32_encode_bits(rx_buf_size, + HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE); + cmd->pkt_type_en_flags0 = cpu_to_le32(tlv_filter->pkt_filter_flags0); + cmd->pkt_type_en_flags1 = cpu_to_le32(tlv_filter->pkt_filter_flags1); + cmd->pkt_type_en_flags2 = cpu_to_le32(tlv_filter->pkt_filter_flags2); + cmd->pkt_type_en_flags3 = cpu_to_le32(tlv_filter->pkt_filter_flags3); + cmd->rx_filter_tlv = cpu_to_le32(tlv_filter->rx_filter); ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); if (ret) @@ -1166,12 +1166,12 @@ ath11k_dp_tx_htt_h2t_ext_stats_req(struct ath11k *ar, u8 type, cmd->hdr.pdev_mask = 1 << pdev_id; cmd->hdr.stats_type = type; - cmd->cfg_param0 = cfg_params->cfg0; - cmd->cfg_param1 = cfg_params->cfg1; - cmd->cfg_param2 = cfg_params->cfg2; - cmd->cfg_param3 = cfg_params->cfg3; - cmd->cookie_lsb = lower_32_bits(cookie); - cmd->cookie_msb = upper_32_bits(cookie); + cmd->cfg_param0 = cpu_to_le32(cfg_params->cfg0); + cmd->cfg_param1 = cpu_to_le32(cfg_params->cfg1); + cmd->cfg_param2 = cpu_to_le32(cfg_params->cfg2); + cmd->cfg_param3 = cpu_to_le32(cfg_params->cfg3); + cmd->cookie_lsb = cpu_to_le32(lower_32_bits(cookie)); + cmd->cookie_msb = cpu_to_le32(upper_32_bits(cookie)); ret = ath11k_htc_send(&ab->htc, dp->eid, skb); if (ret) { @@ -1280,17 +1280,18 @@ int ath11k_dp_tx_htt_rx_full_mon_setup(struct ath11k_base *ab, int mac_id, skb_put(skb, len); cmd = (struct htt_rx_full_monitor_mode_cfg_cmd *)skb->data; memset(cmd, 0, sizeof(*cmd)); - cmd->info0 = FIELD_PREP(HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE, - HTT_H2T_MSG_TYPE_RX_FULL_MONITOR_MODE); + cmd->info0 = le32_encode_bits(HTT_H2T_MSG_TYPE_RX_FULL_MONITOR_MODE, + HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE); - cmd->info0 |= FIELD_PREP(HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_PDEV_ID, mac_id); + cmd->info0 |= le32_encode_bits(mac_id, + HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_PDEV_ID); - cmd->cfg = HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ENABLE | - FIELD_PREP(HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_RELEASE_RING, - HTT_RX_MON_RING_SW); + cmd->cfg = cpu_to_le32(HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ENABLE) | + le32_encode_bits(HTT_RX_MON_RING_SW, + HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_RELEASE_RING); if (config) { - cmd->cfg |= HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ZERO_MPDUS_END | - HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_NON_ZERO_MPDUS_END; + cmd->cfg |= cpu_to_le32(HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_ZERO_MPDUS_END | + HTT_RX_FULL_MON_MODE_CFG_CMD_CFG_NON_ZERO_MPDUS_END); } ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); -- 2.53.0 All WMI commands and events exchanged with the firmware, including the TLV headers and the FTM testmode segments, are defined as little endian. The corresponding structures, however, use host endian u32 fields accessed directly or with FIELD_PREP()/FIELD_GET(), and some arrays (e.g. HE PPE thresholds, rate bitmaps, key RSC counters) are copied with memcpy() as a whole. On big endian hosts this results in wrong command parameters and misinterpreted events, so the firmware cannot be brought up correctly. Convert the WMI and testmode structures to __le32 and use cpu_to_le32(), le32_to_cpu(), le32_encode_bits() and le32_get_bits() for all accesses. This includes the users of WMI structures outside of wmi.c, i.e. the DMA buffer ring configuration and release event handling in dbring, the P2P NoA handling and the spectral scan report processing. Replace the memcpy() of multi-word values by per-element conversions. Since the HE capability info fields in struct ath11k_band_cap are passed on unchanged to mac80211 as byte arrays, keep them as __le32. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/core.h | 4 +- drivers/net/wireless/ath/ath11k/dbring.c | 44 +- drivers/net/wireless/ath/ath11k/p2p.c | 30 +- drivers/net/wireless/ath/ath11k/spectral.c | 8 +- drivers/net/wireless/ath/ath11k/testmode.c | 42 +- drivers/net/wireless/ath/ath11k/wmi.c | 2817 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------- drivers/net/wireless/ath/ath11k/wmi.h | 2013 ++++++++++++++++++++++++++++++++++++++-------------------------------------- 7 files changed, 2571 insertions(+), 2387 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h index a0d725923ef2..6e1dd223a48f 100644 --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -818,9 +818,9 @@ struct ath11k_band_cap { u32 phy_id; u32 max_bw_supported; u32 ht_cap_info; - u32 he_cap_info[2]; + __le32 he_cap_info[2]; u32 he_mcs; - u32 he_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE]; + __le32 he_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE]; struct ath11k_ppe_threshold he_ppet; u16 he_6ghz_capa; }; diff --git a/drivers/net/wireless/ath/ath11k/dbring.c b/drivers/net/wireless/ath/ath11k/dbring.c index 6ac18f8a1e5f..96a9ad1266d2 100644 --- a/drivers/net/wireless/ath/ath11k/dbring.c +++ b/drivers/net/wireless/ath/ath11k/dbring.c @@ -162,22 +162,22 @@ int ath11k_dbring_wmi_cfg_setup(struct ath11k *ar, if (id >= WMI_DIRECT_BUF_MAX) return -EINVAL; - param.module_id = id; - param.base_paddr_lo = lower_32_bits(ring->refill_srng.paddr); - param.base_paddr_hi = upper_32_bits(ring->refill_srng.paddr); - param.head_idx_paddr_lo = lower_32_bits(ring->hp_addr); - param.head_idx_paddr_hi = upper_32_bits(ring->hp_addr); - param.tail_idx_paddr_lo = lower_32_bits(ring->tp_addr); - param.tail_idx_paddr_hi = upper_32_bits(ring->tp_addr); - param.num_elems = ring->bufs_max; - param.buf_size = ring->buf_sz; - param.num_resp_per_event = ring->num_resp_per_event; - param.event_timeout_ms = ring->event_timeout_ms; + param.module_id = cpu_to_le32(id); + param.base_paddr_lo = cpu_to_le32(lower_32_bits(ring->refill_srng.paddr)); + param.base_paddr_hi = cpu_to_le32(upper_32_bits(ring->refill_srng.paddr)); + param.head_idx_paddr_lo = cpu_to_le32(lower_32_bits(ring->hp_addr)); + param.head_idx_paddr_hi = cpu_to_le32(upper_32_bits(ring->hp_addr)); + param.tail_idx_paddr_lo = cpu_to_le32(lower_32_bits(ring->tp_addr)); + param.tail_idx_paddr_hi = cpu_to_le32(upper_32_bits(ring->tp_addr)); + param.num_elems = cpu_to_le32(ring->bufs_max); + param.buf_size = cpu_to_le32(ring->buf_sz); + param.num_resp_per_event = cpu_to_le32(ring->num_resp_per_event); + param.event_timeout_ms = cpu_to_le32(ring->event_timeout_ms); /* For single pdev, 2GHz and 5GHz use one DBR. */ if (ar->ab->hw_params.single_pdev_only) { for (i = 0; i < ar->ab->target_pdev_count; i++) { - param.pdev_id = ar->ab->target_pdev_ids[i].pdev_id; + param.pdev_id = cpu_to_le32(ar->ab->target_pdev_ids[i].pdev_id); ret = ath11k_wmi_pdev_dma_ring_cfg(ar, ¶m); if (ret) { ath11k_warn(ar->ab, "failed to setup db ring cfg\n"); @@ -185,7 +185,7 @@ int ath11k_dbring_wmi_cfg_setup(struct ath11k *ar, } } } else { - param.pdev_id = DP_SW2HW_MACID(ring->pdev_id); + param.pdev_id = cpu_to_le32(DP_SW2HW_MACID(ring->pdev_id)); ret = ath11k_wmi_pdev_dma_ring_cfg(ar, ¶m); if (ret) { ath11k_warn(ar->ab, "failed to setup db ring cfg\n"); @@ -297,8 +297,8 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab, int ret = 0; int status; - pdev_idx = ev->fixed.pdev_id; - module_id = ev->fixed.module_id; + pdev_idx = le32_to_cpu(ev->fixed.pdev_id); + module_id = le32_to_cpu(ev->fixed.module_id); if (ab->hw_params.single_pdev_only && pdev_idx < ab->target_pdev_count) @@ -309,11 +309,11 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab, return -EINVAL; } - if (ev->fixed.num_buf_release_entry != - ev->fixed.num_meta_data_entry) { + if (le32_to_cpu(ev->fixed.num_buf_release_entry) != + le32_to_cpu(ev->fixed.num_meta_data_entry)) { ath11k_warn(ab, "Buffer entry %d mismatch meta entry %d\n", - ev->fixed.num_buf_release_entry, - ev->fixed.num_meta_data_entry); + le32_to_cpu(ev->fixed.num_buf_release_entry), + le32_to_cpu(ev->fixed.num_meta_data_entry)); return -EINVAL; } @@ -325,7 +325,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab, goto rcu_unlock; } - switch (ev->fixed.module_id) { + switch (le32_to_cpu(ev->fixed.module_id)) { case WMI_DIRECT_BUF_SPECTRAL: ring = ath11k_spectral_get_dbring(ar); break; @@ -335,7 +335,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab, default: ring = NULL; ath11k_warn(ab, "Recv dma buffer release ev on unsupp module %d\n", - ev->fixed.module_id); + le32_to_cpu(ev->fixed.module_id)); break; } @@ -345,7 +345,7 @@ int ath11k_dbring_buffer_release_event(struct ath11k_base *ab, } srng = &ab->hal.srng_list[ring->refill_srng.ring_id]; - num_entry = ev->fixed.num_buf_release_entry; + num_entry = le32_to_cpu(ev->fixed.num_buf_release_entry); size = ring->buf_sz + ring->buf_align - 1; num_buff_reaped = 0; diff --git a/drivers/net/wireless/ath/ath11k/p2p.c b/drivers/net/wireless/ath/ath11k/p2p.c index 77672099c602..2ac1ce800ca2 100644 --- a/drivers/net/wireless/ath/ath11k/p2p.c +++ b/drivers/net/wireless/ath/ath11k/p2p.c @@ -18,10 +18,10 @@ static void ath11k_p2p_noa_ie_fill(u8 *data, size_t len, u16 attr_len; int i; - ctwindow = u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_CTWIN_TU); - oppps = u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_OPP_PS); - noa_descriptors = u32_get_bits(noa->noa_attr, - WMI_P2P_NOA_INFO_DESC_NUM); + ctwindow = le32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_CTWIN_TU); + oppps = le32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_OPP_PS); + noa_descriptors = le32_get_bits(noa->noa_attr, + WMI_P2P_NOA_INFO_DESC_NUM); /* P2P IE */ data[0] = WLAN_EID_VENDOR_SPECIFIC; @@ -36,20 +36,18 @@ static void ath11k_p2p_noa_ie_fill(u8 *data, size_t len, noa_attr_len = (__le16 *)&data[7]; /* 2 bytes */ noa_attr = (struct ieee80211_p2p_noa_attr *)&data[9]; - noa_attr->index = u32_get_bits(noa->noa_attr, - WMI_P2P_NOA_INFO_INDEX); + noa_attr->index = le32_get_bits(noa->noa_attr, + WMI_P2P_NOA_INFO_INDEX); noa_attr->oppps_ctwindow = ctwindow; if (oppps) noa_attr->oppps_ctwindow |= IEEE80211_P2P_OPPPS_ENABLE_BIT; for (i = 0; i < noa_descriptors; i++) { - noa_attr->desc[i].count = noa->descriptors[i].type_count; - noa_attr->desc[i].duration = - cpu_to_le32(noa->descriptors[i].duration); - noa_attr->desc[i].interval = - cpu_to_le32(noa->descriptors[i].interval); - noa_attr->desc[i].start_time = - cpu_to_le32(noa->descriptors[i].start_time); + noa_attr->desc[i].count = + le32_to_cpu(noa->descriptors[i].type_count); + noa_attr->desc[i].duration = noa->descriptors[i].duration; + noa_attr->desc[i].interval = noa->descriptors[i].interval; + noa_attr->desc[i].start_time = noa->descriptors[i].start_time; } attr_len = 2; /* index + oppps_ctwindow */ @@ -61,11 +59,11 @@ static size_t ath11k_p2p_noa_ie_len_compute(const struct ath11k_wmi_p2p_noa_info *noa) { size_t len = 0; - u8 noa_descriptors = u32_get_bits(noa->noa_attr, - WMI_P2P_NOA_INFO_DESC_NUM); + u8 noa_descriptors = le32_get_bits(noa->noa_attr, + WMI_P2P_NOA_INFO_DESC_NUM); if (!(noa_descriptors) && - !(u32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_OPP_PS))) + !(le32_get_bits(noa->noa_attr, WMI_P2P_NOA_INFO_OPP_PS))) return 0; len += 1 + 1 + 4; /* EID + len + OUI */ diff --git a/drivers/net/wireless/ath/ath11k/spectral.c b/drivers/net/wireless/ath/ath11k/spectral.c index 03af39071839..2e00e5cbc352 100644 --- a/drivers/net/wireless/ath/ath11k/spectral.c +++ b/drivers/net/wireless/ath/ath11k/spectral.c @@ -626,7 +626,7 @@ int ath11k_spectral_process_fft(struct ath11k *ar, return ret; } - chan_width_mhz = summary->meta.ch_width; + chan_width_mhz = le32_to_cpu(summary->meta.ch_width); switch (chan_width_mhz) { case ATH11K_SPECTRAL_20MHZ: @@ -657,12 +657,12 @@ int ath11k_spectral_process_fft(struct ath11k *ar, summary->inb_pwr_db >>= 1; fft_sample->rssi = __cpu_to_be16(summary->inb_pwr_db); - fft_sample->noise = __cpu_to_be32(summary->meta.noise_floor[search.chain_idx]); + fft_sample->noise = __cpu_to_be32(le32_to_cpu(summary->meta.noise_floor[search.chain_idx])); - freq = summary->meta.freq1; + freq = le32_to_cpu(summary->meta.freq1); fft_sample->freq1 = __cpu_to_be16(freq); - freq = summary->meta.freq2; + freq = le32_to_cpu(summary->meta.freq2); fft_sample->freq2 = __cpu_to_be16(freq); /* If freq2 is available then the spectral scan results are fragmented diff --git a/drivers/net/wireless/ath/ath11k/testmode.c b/drivers/net/wireless/ath/ath11k/testmode.c index 21a85301bf9f..0819af403ac2 100644 --- a/drivers/net/wireless/ath/ath11k/testmode.c +++ b/drivers/net/wireless/ath/ath11k/testmode.c @@ -110,7 +110,7 @@ static int ath11k_tm_process_event(struct ath11k_base *ab, u32 cmd_id, "event wmi cmd_id %d ftm event msg %p datalen %d\n", cmd_id, ftm_msg, length); ath11k_dbg_dump(ab, ATH11K_DBG_TESTMODE, NULL, "", ftm_msg, length); - pdev_id = DP_HW2SW_MACID(ftm_msg->seg_hdr.pdev_id); + pdev_id = DP_HW2SW_MACID(le32_to_cpu(ftm_msg->seg_hdr.pdev_id)); if (pdev_id >= ab->num_radios) { ath11k_warn(ab, "testmode event not handled due to invalid pdev id: %d\n", @@ -124,10 +124,10 @@ static int ath11k_tm_process_event(struct ath11k_base *ab, u32 cmd_id, return -ENODEV; } - current_seq = FIELD_GET(ATH11K_FTM_SEGHDR_CURRENT_SEQ, - ftm_msg->seg_hdr.segmentinfo); - total_segments = FIELD_GET(ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS, - ftm_msg->seg_hdr.segmentinfo); + current_seq = le32_get_bits(ftm_msg->seg_hdr.segmentinfo, + ATH11K_FTM_SEGHDR_CURRENT_SEQ); + total_segments = le32_get_bits(ftm_msg->seg_hdr.segmentinfo, + ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS); datalen = length - (sizeof(struct wmi_ftm_seg_hdr)); buf_pos = ftm_msg->data; @@ -160,7 +160,7 @@ static int ath11k_tm_process_event(struct ath11k_base *ab, u32 cmd_id, ath11k_dbg(ab, ATH11K_DBG_TESTMODE, "total data length pos %d len %d\n", - data_pos, ftm_msg->seg_hdr.len); + data_pos, le32_to_cpu(ftm_msg->seg_hdr.len)); nl_skb = cfg80211_testmode_alloc_event_skb(ar->hw->wiphy, 2 * nla_total_size(sizeof(u32)) + nla_total_size(data_pos), @@ -306,7 +306,7 @@ static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[], u32 cmd_id, buf_len; int ret, tag; void *buf; - u32 *ptr; + __le32 *ptr; mutex_lock(&ar->conf_mutex); @@ -339,19 +339,19 @@ static int ath11k_tm_cmd_wmi(struct ath11k *ar, struct nlattr *tb[], } ptr = buf; - tag = FIELD_GET(WMI_TLV_TAG, *ptr); + tag = le32_get_bits(*ptr, WMI_TLV_TAG); /* pdev/vdev id start after TLV header */ ptr++; if (tag == WMI_TAG_PDEV_SET_PARAM_CMD) - *ptr = ar->pdev->pdev_id; + *ptr = cpu_to_le32(ar->pdev->pdev_id); if (ar->ab->fw_mode != ATH11K_FIRMWARE_MODE_FTM && (tag == WMI_TAG_VDEV_SET_PARAM_CMD || tag == WMI_TAG_UNIT_TEST_CMD)) { if (vif) { arvif = ath11k_vif_to_arvif(vif); - *ptr = arvif->vdev_id; + *ptr = cpu_to_le32(arvif->vdev_id); } else { ret = -EINVAL; goto out; @@ -392,10 +392,12 @@ static int ath11k_tm_cmd_wmi_ftm(struct ath11k *ar, struct nlattr *tb[]) struct ath11k_pdev_wmi *wmi = ar->wmi; struct ath11k_base *ab = ar->ab; struct sk_buff *skb; - u32 cmd_id, buf_len, hdr_info; + u32 cmd_id, buf_len; + __le32 hdr_info; int ret; void *buf; - u8 segnumber = 0, seginfo; + u8 segnumber = 0; + __le32 seginfo; u16 chunk_len, total_bytes, num_segments; u8 *bufpos; struct wmi_ftm_cmd *ftm_cmd; @@ -441,14 +443,16 @@ static int ath11k_tm_cmd_wmi_ftm(struct ath11k *ar, struct nlattr *tb[]) } ftm_cmd = (struct wmi_ftm_cmd *)skb->data; - hdr_info = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, (chunk_len + - sizeof(struct wmi_ftm_seg_hdr))); + hdr_info = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits((chunk_len + + sizeof(struct wmi_ftm_seg_hdr)), WMI_TLV_LEN); ftm_cmd->tlv_header = hdr_info; - ftm_cmd->seg_hdr.len = total_bytes; - ftm_cmd->seg_hdr.msgref = ar->ftm_msgref; - seginfo = FIELD_PREP(ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS, num_segments) | - FIELD_PREP(ATH11K_FTM_SEGHDR_CURRENT_SEQ, segnumber); + ftm_cmd->seg_hdr.len = cpu_to_le32(total_bytes); + ftm_cmd->seg_hdr.msgref = cpu_to_le32(ar->ftm_msgref); + seginfo = le32_encode_bits(num_segments, + ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS) | + le32_encode_bits(segnumber, + ATH11K_FTM_SEGHDR_CURRENT_SEQ); ftm_cmd->seg_hdr.segmentinfo = seginfo; segnumber++; diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 08babb0cb534..537848c28582 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -196,8 +196,8 @@ ath11k_wmi_tlv_iter(struct ath11k_base *ab, const void *ptr, size_t len, } tlv = ptr; - tlv_tag = FIELD_GET(WMI_TLV_TAG, tlv->header); - tlv_len = FIELD_GET(WMI_TLV_LEN, tlv->header); + tlv_tag = le32_get_bits(tlv->header, WMI_TLV_TAG); + tlv_len = le32_get_bits(tlv->header, WMI_TLV_LEN); ptr += sizeof(*tlv); len -= sizeof(*tlv); @@ -268,7 +268,7 @@ static u32 ath11k_wmi_tlv_data_len(const void *data) { const struct wmi_tlv *tlv = (const struct wmi_tlv *)data - 1; - return FIELD_GET(WMI_TLV_LEN, tlv->header); + return le32_get_bits(tlv->header, WMI_TLV_LEN); } static int ath11k_wmi_cmd_send_nowait(struct ath11k_pdev_wmi *wmi, struct sk_buff *skb, @@ -286,7 +286,7 @@ static int ath11k_wmi_cmd_send_nowait(struct ath11k_pdev_wmi *wmi, struct sk_buf cmd |= FIELD_PREP(WMI_CMD_HDR_CMD_ID, cmd_id); cmd_hdr = (struct wmi_cmd_hdr *)skb->data; - cmd_hdr->cmd_id = cmd; + cmd_hdr->cmd_id = cpu_to_le32(cmd); trace_ath11k_wmi_cmd(ab, cmd_id, skb->data, skb->len); @@ -349,17 +349,22 @@ static int ath11k_pull_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle, struct ath11k_service_ext_param *param) { const struct wmi_service_ready_ext_event *ev = ptr; + int i; if (!ev) return -EINVAL; /* Move this to host based bitmap */ - param->default_conc_scan_config_bits = ev->default_conc_scan_config_bits; - param->default_fw_config_bits = ev->default_fw_config_bits; - param->he_cap_info = ev->he_cap_info; - param->mpdu_density = ev->mpdu_density; - param->max_bssid_rx_filters = ev->max_bssid_rx_filters; - memcpy(¶m->ppet, &ev->ppet, sizeof(param->ppet)); + param->default_conc_scan_config_bits = le32_to_cpu(ev->default_conc_scan_config_bits); + param->default_fw_config_bits = le32_to_cpu(ev->default_fw_config_bits); + param->he_cap_info = le32_to_cpu(ev->he_cap_info); + param->mpdu_density = le32_to_cpu(ev->mpdu_density); + param->max_bssid_rx_filters = le32_to_cpu(ev->max_bssid_rx_filters); + param->ppet.numss_m1 = le32_to_cpu(ev->ppet.numss_m1); + param->ppet.ru_bit_mask = le32_to_cpu(ev->ppet.ru_mask); + for (i = 0; i < ARRAY_SIZE(param->ppet.ppet16_ppet8_ru3_ru0); i++) + param->ppet.ppet16_ppet8_ru3_ru0[i] = + le32_to_cpu(ev->ppet.ppet16_ppet8_ru3_ru0[i]); return 0; } @@ -379,61 +384,63 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle, struct ath11k_pdev_cap *pdev_cap = &pdev->cap; u32 phy_map; u32 hw_idx, phy_idx = 0; + unsigned long tx_chain_mask, rx_chain_mask; + int i; if (!hw_caps || !wmi_hw_mode_caps || !hal_reg_caps) return -EINVAL; - for (hw_idx = 0; hw_idx < hw_caps->num_hw_modes; hw_idx++) { - if (hw_mode_id == wmi_hw_mode_caps[hw_idx].hw_mode_id) + for (hw_idx = 0; hw_idx < le32_to_cpu(hw_caps->num_hw_modes); hw_idx++) { + if (hw_mode_id == le32_to_cpu(wmi_hw_mode_caps[hw_idx].hw_mode_id)) break; - phy_map = wmi_hw_mode_caps[hw_idx].phy_id_map; + phy_map = le32_to_cpu(wmi_hw_mode_caps[hw_idx].phy_id_map); while (phy_map) { phy_map >>= 1; phy_idx++; } } - if (hw_idx == hw_caps->num_hw_modes) + if (hw_idx == le32_to_cpu(hw_caps->num_hw_modes)) return -EINVAL; phy_idx += phy_id; - if (phy_id >= hal_reg_caps->num_phy) + if (phy_id >= le32_to_cpu(hal_reg_caps->num_phy)) return -EINVAL; mac_phy_caps = wmi_mac_phy_caps + phy_idx; - pdev->pdev_id = mac_phy_caps->pdev_id; - pdev_cap->supported_bands |= mac_phy_caps->supported_bands; - pdev_cap->ampdu_density = mac_phy_caps->ampdu_density; + pdev->pdev_id = le32_to_cpu(mac_phy_caps->pdev_id); + pdev_cap->supported_bands |= le32_to_cpu(mac_phy_caps->supported_bands); + pdev_cap->ampdu_density = le32_to_cpu(mac_phy_caps->ampdu_density); ab->target_pdev_ids[ab->target_pdev_count].supported_bands = - mac_phy_caps->supported_bands; - ab->target_pdev_ids[ab->target_pdev_count].pdev_id = mac_phy_caps->pdev_id; + le32_to_cpu(mac_phy_caps->supported_bands); + ab->target_pdev_ids[ab->target_pdev_count].pdev_id = le32_to_cpu(mac_phy_caps->pdev_id); ab->target_pdev_count++; - if (!(mac_phy_caps->supported_bands & WMI_HOST_WLAN_2G_CAP) && - !(mac_phy_caps->supported_bands & WMI_HOST_WLAN_5G_CAP)) + if (!(le32_to_cpu(mac_phy_caps->supported_bands) & WMI_HOST_WLAN_2G_CAP) && + !(le32_to_cpu(mac_phy_caps->supported_bands) & WMI_HOST_WLAN_5G_CAP)) return -EINVAL; /* Take non-zero tx/rx chainmask. If tx/rx chainmask differs from * band to band for a single radio, need to see how this should be * handled. */ - if (mac_phy_caps->supported_bands & WMI_HOST_WLAN_2G_CAP) { - pdev_cap->tx_chain_mask = mac_phy_caps->tx_chain_mask_2g; - pdev_cap->rx_chain_mask = mac_phy_caps->rx_chain_mask_2g; + if (le32_to_cpu(mac_phy_caps->supported_bands) & WMI_HOST_WLAN_2G_CAP) { + pdev_cap->tx_chain_mask = le32_to_cpu(mac_phy_caps->tx_chain_mask_2g); + pdev_cap->rx_chain_mask = le32_to_cpu(mac_phy_caps->rx_chain_mask_2g); } - if (mac_phy_caps->supported_bands & WMI_HOST_WLAN_5G_CAP) { - pdev_cap->vht_cap = mac_phy_caps->vht_cap_info_5g; - pdev_cap->vht_mcs = mac_phy_caps->vht_supp_mcs_5g; - pdev_cap->he_mcs = mac_phy_caps->he_supp_mcs_5g; - pdev_cap->tx_chain_mask = mac_phy_caps->tx_chain_mask_5g; - pdev_cap->rx_chain_mask = mac_phy_caps->rx_chain_mask_5g; + if (le32_to_cpu(mac_phy_caps->supported_bands) & WMI_HOST_WLAN_5G_CAP) { + pdev_cap->vht_cap = le32_to_cpu(mac_phy_caps->vht_cap_info_5g); + pdev_cap->vht_mcs = le32_to_cpu(mac_phy_caps->vht_supp_mcs_5g); + pdev_cap->he_mcs = le32_to_cpu(mac_phy_caps->he_supp_mcs_5g); + pdev_cap->tx_chain_mask = le32_to_cpu(mac_phy_caps->tx_chain_mask_5g); + pdev_cap->rx_chain_mask = le32_to_cpu(mac_phy_caps->rx_chain_mask_5g); pdev_cap->nss_ratio_enabled = - WMI_NSS_RATIO_ENABLE_DISABLE_GET(mac_phy_caps->nss_ratio); + WMI_NSS_RATIO_ENABLE_DISABLE_GET(le32_to_cpu(mac_phy_caps->nss_ratio)); pdev_cap->nss_ratio_info = - WMI_NSS_RATIO_INFO_GET(mac_phy_caps->nss_ratio); + WMI_NSS_RATIO_INFO_GET(le32_to_cpu(mac_phy_caps->nss_ratio)); } /* tx/rx chainmask reported from fw depends on the actual hw chains used, @@ -444,48 +451,57 @@ ath11k_pull_mac_phy_cap_svc_ready_ext(struct ath11k_pdev_wmi *wmi_handle, * for tx/rx chainmask which will be used to advertise supported ht/vht rates to * mac80211. */ - pdev_cap->tx_chain_mask_shift = - find_first_bit((unsigned long *)&pdev_cap->tx_chain_mask, 32); - pdev_cap->rx_chain_mask_shift = - find_first_bit((unsigned long *)&pdev_cap->rx_chain_mask, 32); + tx_chain_mask = pdev_cap->tx_chain_mask; + rx_chain_mask = pdev_cap->rx_chain_mask; + pdev_cap->tx_chain_mask_shift = find_first_bit(&tx_chain_mask, 32); + pdev_cap->rx_chain_mask_shift = find_first_bit(&rx_chain_mask, 32); - if (mac_phy_caps->supported_bands & WMI_HOST_WLAN_2G_CAP) { + if (le32_to_cpu(mac_phy_caps->supported_bands) & WMI_HOST_WLAN_2G_CAP) { cap_band = &pdev_cap->band[NL80211_BAND_2GHZ]; - cap_band->phy_id = mac_phy_caps->phy_id; - cap_band->max_bw_supported = mac_phy_caps->max_bw_supported_2g; - cap_band->ht_cap_info = mac_phy_caps->ht_cap_info_2g; + cap_band->phy_id = le32_to_cpu(mac_phy_caps->phy_id); + cap_band->max_bw_supported = le32_to_cpu(mac_phy_caps->max_bw_supported_2g); + cap_band->ht_cap_info = le32_to_cpu(mac_phy_caps->ht_cap_info_2g); cap_band->he_cap_info[0] = mac_phy_caps->he_cap_info_2g; cap_band->he_cap_info[1] = mac_phy_caps->he_cap_info_2g_ext; - cap_band->he_mcs = mac_phy_caps->he_supp_mcs_2g; + cap_band->he_mcs = le32_to_cpu(mac_phy_caps->he_supp_mcs_2g); memcpy(cap_band->he_cap_phy_info, &mac_phy_caps->he_cap_phy_info_2g, sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE); - memcpy(&cap_band->he_ppet, &mac_phy_caps->he_ppet2g, - sizeof(struct ath11k_ppe_threshold)); + cap_band->he_ppet.numss_m1 = le32_to_cpu(mac_phy_caps->he_ppet2g.numss_m1); + cap_band->he_ppet.ru_bit_mask = le32_to_cpu(mac_phy_caps->he_ppet2g.ru_mask); + for (i = 0; i < ARRAY_SIZE(cap_band->he_ppet.ppet16_ppet8_ru3_ru0); i++) + cap_band->he_ppet.ppet16_ppet8_ru3_ru0[i] = + le32_to_cpu(mac_phy_caps->he_ppet2g.ppet16_ppet8_ru3_ru0[i]); } - if (mac_phy_caps->supported_bands & WMI_HOST_WLAN_5G_CAP) { + if (le32_to_cpu(mac_phy_caps->supported_bands) & WMI_HOST_WLAN_5G_CAP) { cap_band = &pdev_cap->band[NL80211_BAND_5GHZ]; - cap_band->phy_id = mac_phy_caps->phy_id; - cap_band->max_bw_supported = mac_phy_caps->max_bw_supported_5g; - cap_band->ht_cap_info = mac_phy_caps->ht_cap_info_5g; + cap_band->phy_id = le32_to_cpu(mac_phy_caps->phy_id); + cap_band->max_bw_supported = le32_to_cpu(mac_phy_caps->max_bw_supported_5g); + cap_band->ht_cap_info = le32_to_cpu(mac_phy_caps->ht_cap_info_5g); cap_band->he_cap_info[0] = mac_phy_caps->he_cap_info_5g; cap_band->he_cap_info[1] = mac_phy_caps->he_cap_info_5g_ext; - cap_band->he_mcs = mac_phy_caps->he_supp_mcs_5g; + cap_band->he_mcs = le32_to_cpu(mac_phy_caps->he_supp_mcs_5g); memcpy(cap_band->he_cap_phy_info, &mac_phy_caps->he_cap_phy_info_5g, sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE); - memcpy(&cap_band->he_ppet, &mac_phy_caps->he_ppet5g, - sizeof(struct ath11k_ppe_threshold)); + cap_band->he_ppet.numss_m1 = le32_to_cpu(mac_phy_caps->he_ppet5g.numss_m1); + cap_band->he_ppet.ru_bit_mask = le32_to_cpu(mac_phy_caps->he_ppet5g.ru_mask); + for (i = 0; i < ARRAY_SIZE(cap_band->he_ppet.ppet16_ppet8_ru3_ru0); i++) + cap_band->he_ppet.ppet16_ppet8_ru3_ru0[i] = + le32_to_cpu(mac_phy_caps->he_ppet5g.ppet16_ppet8_ru3_ru0[i]); cap_band = &pdev_cap->band[NL80211_BAND_6GHZ]; - cap_band->max_bw_supported = mac_phy_caps->max_bw_supported_5g; - cap_band->ht_cap_info = mac_phy_caps->ht_cap_info_5g; + cap_band->max_bw_supported = le32_to_cpu(mac_phy_caps->max_bw_supported_5g); + cap_band->ht_cap_info = le32_to_cpu(mac_phy_caps->ht_cap_info_5g); cap_band->he_cap_info[0] = mac_phy_caps->he_cap_info_5g; cap_band->he_cap_info[1] = mac_phy_caps->he_cap_info_5g_ext; - cap_band->he_mcs = mac_phy_caps->he_supp_mcs_5g; + cap_band->he_mcs = le32_to_cpu(mac_phy_caps->he_supp_mcs_5g); memcpy(cap_band->he_cap_phy_info, &mac_phy_caps->he_cap_phy_info_5g, sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE); - memcpy(&cap_band->he_ppet, &mac_phy_caps->he_ppet5g, - sizeof(struct ath11k_ppe_threshold)); + cap_band->he_ppet.numss_m1 = le32_to_cpu(mac_phy_caps->he_ppet5g.numss_m1); + cap_band->he_ppet.ru_bit_mask = le32_to_cpu(mac_phy_caps->he_ppet5g.ru_mask); + for (i = 0; i < ARRAY_SIZE(cap_band->he_ppet.ppet16_ppet8_ru3_ru0); i++) + cap_band->he_ppet.ppet16_ppet8_ru3_ru0[i] = + le32_to_cpu(mac_phy_caps->he_ppet5g.ppet16_ppet8_ru3_ru0[i]); } return 0; @@ -503,22 +519,22 @@ ath11k_pull_reg_cap_svc_rdy_ext(struct ath11k_pdev_wmi *wmi_handle, if (!reg_caps || !wmi_ext_reg_cap) return -EINVAL; - if (phy_idx >= reg_caps->num_phy) + if (phy_idx >= le32_to_cpu(reg_caps->num_phy)) return -EINVAL; ext_reg_cap = &wmi_ext_reg_cap[phy_idx]; - param->phy_id = ext_reg_cap->phy_id; - param->eeprom_reg_domain = ext_reg_cap->eeprom_reg_domain; + param->phy_id = le32_to_cpu(ext_reg_cap->phy_id); + param->eeprom_reg_domain = le32_to_cpu(ext_reg_cap->eeprom_reg_domain); param->eeprom_reg_domain_ext = - ext_reg_cap->eeprom_reg_domain_ext; - param->regcap1 = ext_reg_cap->regcap1; - param->regcap2 = ext_reg_cap->regcap2; + le32_to_cpu(ext_reg_cap->eeprom_reg_domain_ext); + param->regcap1 = le32_to_cpu(ext_reg_cap->regcap1); + param->regcap2 = le32_to_cpu(ext_reg_cap->regcap2); /* check if param->wireless_mode is needed */ - param->low_2ghz_chan = ext_reg_cap->low_2ghz_chan; - param->high_2ghz_chan = ext_reg_cap->high_2ghz_chan; - param->low_5ghz_chan = ext_reg_cap->low_5ghz_chan; - param->high_5ghz_chan = ext_reg_cap->high_5ghz_chan; + param->low_2ghz_chan = le32_to_cpu(ext_reg_cap->low_2ghz_chan); + param->high_2ghz_chan = le32_to_cpu(ext_reg_cap->high_2ghz_chan); + param->low_5ghz_chan = le32_to_cpu(ext_reg_cap->low_5ghz_chan); + param->high_5ghz_chan = le32_to_cpu(ext_reg_cap->high_5ghz_chan); return 0; } @@ -535,23 +551,23 @@ static int ath11k_pull_service_ready_tlv(struct ath11k_base *ab, return -EINVAL; } - cap->phy_capability = ev->phy_capability; - cap->max_frag_entry = ev->max_frag_entry; - cap->num_rf_chains = ev->num_rf_chains; - cap->ht_cap_info = ev->ht_cap_info; - cap->vht_cap_info = ev->vht_cap_info; - cap->vht_supp_mcs = ev->vht_supp_mcs; - cap->hw_min_tx_power = ev->hw_min_tx_power; - cap->hw_max_tx_power = ev->hw_max_tx_power; - cap->sys_cap_info = ev->sys_cap_info; - cap->min_pkt_size_enable = ev->min_pkt_size_enable; - cap->max_bcn_ie_size = ev->max_bcn_ie_size; - cap->max_num_scan_channels = ev->max_num_scan_channels; - cap->max_supported_macs = ev->max_supported_macs; - cap->wmi_fw_sub_feat_caps = ev->wmi_fw_sub_feat_caps; - cap->txrx_chainmask = ev->txrx_chainmask; - cap->default_dbs_hw_mode_index = ev->default_dbs_hw_mode_index; - cap->num_msdu_desc = ev->num_msdu_desc; + cap->phy_capability = le32_to_cpu(ev->phy_capability); + cap->max_frag_entry = le32_to_cpu(ev->max_frag_entry); + cap->num_rf_chains = le32_to_cpu(ev->num_rf_chains); + cap->ht_cap_info = le32_to_cpu(ev->ht_cap_info); + cap->vht_cap_info = le32_to_cpu(ev->vht_cap_info); + cap->vht_supp_mcs = le32_to_cpu(ev->vht_supp_mcs); + cap->hw_min_tx_power = le32_to_cpu(ev->hw_min_tx_power); + cap->hw_max_tx_power = le32_to_cpu(ev->hw_max_tx_power); + cap->sys_cap_info = le32_to_cpu(ev->sys_cap_info); + cap->min_pkt_size_enable = le32_to_cpu(ev->min_pkt_size_enable); + cap->max_bcn_ie_size = le32_to_cpu(ev->max_bcn_ie_size); + cap->max_num_scan_channels = le32_to_cpu(ev->max_num_scan_channels); + cap->max_supported_macs = le32_to_cpu(ev->max_supported_macs); + cap->wmi_fw_sub_feat_caps = le32_to_cpu(ev->wmi_fw_sub_feat_caps); + cap->txrx_chainmask = le32_to_cpu(ev->txrx_chainmask); + cap->default_dbs_hw_mode_index = le32_to_cpu(ev->default_dbs_hw_mode_index); + cap->num_msdu_desc = le32_to_cpu(ev->num_msdu_desc); return 0; } @@ -561,13 +577,13 @@ static int ath11k_pull_service_ready_tlv(struct ath11k_base *ab, * 4-byte word. */ static void ath11k_wmi_service_bitmap_copy(struct ath11k_pdev_wmi *wmi, - const u32 *wmi_svc_bm) + const __le32 *wmi_svc_bm) { int i, j; for (i = 0, j = 0; i < WMI_SERVICE_BM_SIZE && j < WMI_MAX_SERVICE; i++) { do { - if (wmi_svc_bm[i] & BIT(j % WMI_SERVICE_BITS_IN_SIZE32)) + if (le32_to_cpu(wmi_svc_bm[i]) & BIT(j % WMI_SERVICE_BITS_IN_SIZE32)) set_bit(j, wmi->wmi_ab->svc_map); } while (++j % WMI_SERVICE_BITS_IN_SIZE32); } @@ -683,30 +699,32 @@ int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, return -ENOMEM; cmd = (struct wmi_mgmt_send_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MGMT_TX_SEND_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->desc_id = buf_id; - cmd->chanfreq = ath11k_wmi_mgmt_get_freq(ar, info); - cmd->paddr_lo = lower_32_bits(ATH11K_SKB_CB(frame)->paddr); - cmd->paddr_hi = upper_32_bits(ATH11K_SKB_CB(frame)->paddr); - cmd->frame_len = frame->len; - cmd->buf_len = buf_len; - cmd->tx_params_valid = !!tx_params_valid; + cmd->tlv_header = le32_encode_bits(WMI_TAG_MGMT_TX_SEND_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->desc_id = cpu_to_le32(buf_id); + cmd->chanfreq = cpu_to_le32(ath11k_wmi_mgmt_get_freq(ar, info)); + cmd->paddr_lo = cpu_to_le32(lower_32_bits(ATH11K_SKB_CB(frame)->paddr)); + cmd->paddr_hi = cpu_to_le32(upper_32_bits(ATH11K_SKB_CB(frame)->paddr)); + cmd->frame_len = cpu_to_le32(frame->len); + cmd->buf_len = cpu_to_le32(buf_len); + cmd->tx_params_valid = cpu_to_le32(!!tx_params_valid); frame_tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); - frame_tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, buf_len); + frame_tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(buf_len, WMI_TLV_LEN); memcpy(frame_tlv->value, frame->data, buf_len); if (tx_params_valid) { params = (struct wmi_mgmt_send_params *)(skb->data + (len - sizeof(*params))); - params->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TX_SEND_PARAMS) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*params) - TLV_HDR_SIZE); - params->tx_params_dword1 |= WMI_TX_PARAMS_DWORD1_CFR_CAPTURE; + params->tlv_header = + le32_encode_bits(WMI_TAG_TX_SEND_PARAMS, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*params) - TLV_HDR_SIZE, + WMI_TLV_LEN); + params->tx_params_dword1 |= + cpu_to_le32(WMI_TX_PARAMS_DWORD1_CFR_CAPTURE); } ret = ath11k_wmi_cmd_send(wmi, skb, WMI_MGMT_TX_SEND_CMDID); @@ -744,16 +762,18 @@ int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr, return -ENOMEM; cmd = (struct wmi_vdev_create_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_CREATE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - - cmd->vdev_id = param->if_id; - cmd->vdev_type = param->type; - cmd->vdev_subtype = param->subtype; - cmd->num_cfg_txrx_streams = WMI_NUM_SUPPORTED_BAND_MAX; - cmd->pdev_id = param->pdev_id; - cmd->mbssid_flags = param->mbssid_flags; - cmd->mbssid_tx_vdev_id = param->mbssid_tx_vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_CREATE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + + cmd->vdev_id = cpu_to_le32(param->if_id); + cmd->vdev_type = cpu_to_le32(param->type); + cmd->vdev_subtype = cpu_to_le32(param->subtype); + cmd->num_cfg_txrx_streams = cpu_to_le32(WMI_NUM_SUPPORTED_BAND_MAX); + cmd->pdev_id = cpu_to_le32(param->pdev_id); + cmd->mbssid_flags = cpu_to_le32(param->mbssid_flags); + cmd->mbssid_tx_vdev_id = cpu_to_le32(param->mbssid_tx_vdev_id); ether_addr_copy(cmd->vdev_macaddr.addr, macaddr); @@ -761,30 +781,30 @@ int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr, len = WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; txrx_streams = ptr; len = sizeof(*txrx_streams); txrx_streams->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_TXRX_STREAMS) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + le32_encode_bits(WMI_TAG_VDEV_TXRX_STREAMS, WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); txrx_streams->band = WMI_TPC_CHAINMASK_CONFIG_BAND_2G; txrx_streams->supported_tx_streams = - param->chains[NL80211_BAND_2GHZ].tx; + cpu_to_le32(param->chains[NL80211_BAND_2GHZ].tx); txrx_streams->supported_rx_streams = - param->chains[NL80211_BAND_2GHZ].rx; + cpu_to_le32(param->chains[NL80211_BAND_2GHZ].rx); txrx_streams++; txrx_streams->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_TXRX_STREAMS) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - txrx_streams->band = WMI_TPC_CHAINMASK_CONFIG_BAND_5G; + le32_encode_bits(WMI_TAG_VDEV_TXRX_STREAMS, WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + txrx_streams->band = cpu_to_le32(WMI_TPC_CHAINMASK_CONFIG_BAND_5G); txrx_streams->supported_tx_streams = - param->chains[NL80211_BAND_5GHZ].tx; + cpu_to_le32(param->chains[NL80211_BAND_5GHZ].tx); txrx_streams->supported_rx_streams = - param->chains[NL80211_BAND_5GHZ].rx; + cpu_to_le32(param->chains[NL80211_BAND_5GHZ].rx); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_CREATE_CMDID); if (ret) { @@ -813,9 +833,11 @@ int ath11k_wmi_vdev_delete(struct ath11k *ar, u8 vdev_id) return -ENOMEM; cmd = (struct wmi_vdev_delete_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_DELETE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_DELETE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_DELETE_CMDID); if (ret) { @@ -841,9 +863,10 @@ int ath11k_wmi_vdev_stop(struct ath11k *ar, u8 vdev_id) cmd = (struct wmi_vdev_stop_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_STOP_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_STOP_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_STOP_CMDID); if (ret) { @@ -869,9 +892,10 @@ int ath11k_wmi_vdev_down(struct ath11k *ar, u8 vdev_id) cmd = (struct wmi_vdev_down_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_DOWN_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_DOWN_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_DOWN_CMDID); if (ret) { @@ -891,51 +915,51 @@ static void ath11k_wmi_put_wmi_channel(struct wmi_channel *chan, memset(chan, 0, sizeof(*chan)); - chan->mhz = arg->channel.freq; - chan->band_center_freq1 = arg->channel.band_center_freq1; + chan->mhz = cpu_to_le32(arg->channel.freq); + chan->band_center_freq1 = cpu_to_le32(arg->channel.band_center_freq1); if (arg->channel.mode == MODE_11AX_HE160) { if (arg->channel.freq > arg->channel.band_center_freq1) - chan->band_center_freq1 = center_freq1 + 40; + chan->band_center_freq1 = cpu_to_le32(center_freq1 + 40); else - chan->band_center_freq1 = center_freq1 - 40; + chan->band_center_freq1 = cpu_to_le32(center_freq1 - 40); - chan->band_center_freq2 = arg->channel.band_center_freq1; + chan->band_center_freq2 = cpu_to_le32(arg->channel.band_center_freq1); } else if ((arg->channel.mode == MODE_11AC_VHT80_80) || (arg->channel.mode == MODE_11AX_HE80_80)) { - chan->band_center_freq2 = arg->channel.band_center_freq2; + chan->band_center_freq2 = cpu_to_le32(arg->channel.band_center_freq2); } else { chan->band_center_freq2 = 0; } - chan->info |= FIELD_PREP(WMI_CHAN_INFO_MODE, arg->channel.mode); + chan->info |= le32_encode_bits(arg->channel.mode, WMI_CHAN_INFO_MODE); if (arg->channel.passive) - chan->info |= WMI_CHAN_INFO_PASSIVE; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_PASSIVE); if (arg->channel.allow_ibss) - chan->info |= WMI_CHAN_INFO_ADHOC_ALLOWED; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_ADHOC_ALLOWED); if (arg->channel.allow_ht) - chan->info |= WMI_CHAN_INFO_ALLOW_HT; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HT); if (arg->channel.allow_vht) - chan->info |= WMI_CHAN_INFO_ALLOW_VHT; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_VHT); if (arg->channel.allow_he) - chan->info |= WMI_CHAN_INFO_ALLOW_HE; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HE); if (arg->channel.ht40plus) - chan->info |= WMI_CHAN_INFO_HT40_PLUS; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_HT40_PLUS); if (arg->channel.chan_radar) - chan->info |= WMI_CHAN_INFO_DFS; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_DFS); if (arg->channel.freq2_radar) - chan->info |= WMI_CHAN_INFO_DFS_FREQ2; + chan->info |= cpu_to_le32(WMI_CHAN_INFO_DFS_FREQ2); - chan->reg_info_1 = FIELD_PREP(WMI_CHAN_REG_INFO1_MAX_PWR, - arg->channel.max_power) | - FIELD_PREP(WMI_CHAN_REG_INFO1_MAX_REG_PWR, - arg->channel.max_reg_power); + chan->reg_info_1 = le32_encode_bits(arg->channel.max_power, + WMI_CHAN_REG_INFO1_MAX_PWR) | + le32_encode_bits(arg->channel.max_reg_power, + WMI_CHAN_REG_INFO1_MAX_REG_PWR); - chan->reg_info_2 = FIELD_PREP(WMI_CHAN_REG_INFO2_ANT_MAX, - arg->channel.max_antenna_gain) | - FIELD_PREP(WMI_CHAN_REG_INFO2_MAX_TX_PWR, - arg->channel.max_power); + chan->reg_info_2 = le32_encode_bits(arg->channel.max_antenna_gain, + WMI_CHAN_REG_INFO2_ANT_MAX) | + le32_encode_bits(arg->channel.max_power, + WMI_CHAN_REG_INFO2_MAX_TX_PWR); } int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg, @@ -959,50 +983,51 @@ int ath11k_wmi_vdev_start(struct ath11k *ar, struct wmi_vdev_start_req_arg *arg, return -ENOMEM; cmd = (struct wmi_vdev_start_request_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_VDEV_START_REQUEST_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = arg->vdev_id; - cmd->beacon_interval = arg->bcn_intval; - cmd->bcn_tx_rate = arg->bcn_tx_rate; - cmd->dtim_period = arg->dtim_period; - cmd->num_noa_descriptors = arg->num_noa_descriptors; - cmd->preferred_rx_streams = arg->pref_rx_streams; - cmd->preferred_tx_streams = arg->pref_tx_streams; - cmd->cac_duration_ms = arg->cac_duration_ms; - cmd->regdomain = arg->regdomain; - cmd->he_ops = arg->he_ops; - cmd->mbssid_flags = arg->mbssid_flags; - cmd->mbssid_tx_vdev_id = arg->mbssid_tx_vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_START_REQUEST_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(arg->vdev_id); + cmd->beacon_interval = cpu_to_le32(arg->bcn_intval); + cmd->bcn_tx_rate = cpu_to_le32(arg->bcn_tx_rate); + cmd->dtim_period = cpu_to_le32(arg->dtim_period); + cmd->num_noa_descriptors = cpu_to_le32(arg->num_noa_descriptors); + cmd->preferred_rx_streams = cpu_to_le32(arg->pref_rx_streams); + cmd->preferred_tx_streams = cpu_to_le32(arg->pref_tx_streams); + cmd->cac_duration_ms = cpu_to_le32(arg->cac_duration_ms); + cmd->regdomain = cpu_to_le32(arg->regdomain); + cmd->he_ops = cpu_to_le32(arg->he_ops); + cmd->mbssid_flags = cpu_to_le32(arg->mbssid_flags); + cmd->mbssid_tx_vdev_id = cpu_to_le32(arg->mbssid_tx_vdev_id); if (!restart) { if (arg->ssid) { - cmd->ssid.ssid_len = arg->ssid_len; + cmd->ssid.ssid_len = cpu_to_le32(arg->ssid_len); memcpy(cmd->ssid.ssid, arg->ssid, arg->ssid_len); } if (arg->hidden_ssid) - cmd->flags |= WMI_VDEV_START_HIDDEN_SSID; + cmd->flags |= cpu_to_le32(WMI_VDEV_START_HIDDEN_SSID); if (arg->pmf_enabled) - cmd->flags |= WMI_VDEV_START_PMF_ENABLED; + cmd->flags |= cpu_to_le32(WMI_VDEV_START_PMF_ENABLED); } - cmd->flags |= WMI_VDEV_START_LDPC_RX_ENABLED; + cmd->flags |= cpu_to_le32(WMI_VDEV_START_LDPC_RX_ENABLED); if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) - cmd->flags |= WMI_VDEV_START_HW_ENCRYPTION_DISABLED; + cmd->flags |= cpu_to_le32(WMI_VDEV_START_HW_ENCRYPTION_DISABLED); ptr = skb->data + sizeof(*cmd); chan = ptr; ath11k_wmi_put_wmi_channel(chan, arg); - chan->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_CHANNEL) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*chan) - TLV_HDR_SIZE); + chan->tlv_header = le32_encode_bits(WMI_TAG_CHANNEL, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*chan) - TLV_HDR_SIZE, + WMI_TLV_LEN); ptr += sizeof(*chan); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, 0); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(0, WMI_TLV_LEN); /* Note: This is a nested TLV containing: * [wmi_tlv][ath11k_wmi_p2p_noa_descriptor][wmi_tlv].. @@ -1047,15 +1072,16 @@ int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid, cmd = (struct wmi_vdev_up_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_UP_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->vdev_assoc_id = aid; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_UP_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->vdev_assoc_id = cpu_to_le32(aid); ether_addr_copy(cmd->vdev_bssid.addr, bssid); - cmd->nontx_profile_idx = nontx_profile_idx; - cmd->nontx_profile_cnt = nontx_profile_cnt; + cmd->nontx_profile_idx = cpu_to_le32(nontx_profile_idx); + cmd->nontx_profile_cnt = cpu_to_le32(nontx_profile_cnt); if (tx_bssid) ether_addr_copy(cmd->tx_vdev_bssid.addr, tx_bssid); @@ -1065,8 +1091,8 @@ int ath11k_wmi_vdev_up(struct ath11k *ar, u32 vdev_id, u32 aid, const u8 *bssid, if (bss_conf->nontransmitted) { ether_addr_copy(cmd->tx_vdev_bssid.addr, bss_conf->transmitter_bssid); - cmd->nontx_profile_idx = bss_conf->bssid_index; - cmd->nontx_profile_cnt = bss_conf->bssid_indicator; + cmd->nontx_profile_idx = cpu_to_le32(bss_conf->bssid_index); + cmd->nontx_profile_cnt = cpu_to_le32(bss_conf->bssid_indicator); } } @@ -1096,12 +1122,14 @@ int ath11k_wmi_send_peer_create_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_peer_create_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_CREATE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PEER_CREATE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ether_addr_copy(cmd->peer_macaddr.addr, param->peer_addr); - cmd->peer_type = param->peer_type; - cmd->vdev_id = param->vdev_id; + cmd->peer_type = cpu_to_le32(param->peer_type); + cmd->vdev_id = cpu_to_le32(param->vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_CREATE_CMDID); if (ret) { @@ -1129,11 +1157,13 @@ int ath11k_wmi_send_peer_delete_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_peer_delete_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_DELETE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PEER_DELETE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); - cmd->vdev_id = vdev_id; + cmd->vdev_id = cpu_to_le32(vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_DELETE_CMDID); if (ret) { @@ -1161,17 +1191,18 @@ int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_pdev_set_regdomain_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_SET_REGDOMAIN_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - - cmd->reg_domain = param->current_rd_in_use; - cmd->reg_domain_2g = param->current_rd_2g; - cmd->reg_domain_5g = param->current_rd_5g; - cmd->conformance_test_limit_2g = param->ctl_2g; - cmd->conformance_test_limit_5g = param->ctl_5g; - cmd->dfs_domain = param->dfs_domain; - cmd->pdev_id = param->pdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SET_REGDOMAIN_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + + cmd->reg_domain = cpu_to_le32(param->current_rd_in_use); + cmd->reg_domain_2g = cpu_to_le32(param->current_rd_2g); + cmd->reg_domain_5g = cpu_to_le32(param->current_rd_5g); + cmd->conformance_test_limit_2g = cpu_to_le32(param->ctl_2g); + cmd->conformance_test_limit_5g = cpu_to_le32(param->ctl_5g); + cmd->dfs_domain = cpu_to_le32(param->dfs_domain); + cmd->pdev_id = cpu_to_le32(param->pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_REGDOMAIN_CMDID); if (ret) { @@ -1201,12 +1232,14 @@ int ath11k_wmi_set_peer_param(struct ath11k *ar, const u8 *peer_addr, return -ENOMEM; cmd = (struct wmi_peer_set_param_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_SET_PARAM_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PEER_SET_PARAM_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); - cmd->vdev_id = vdev_id; - cmd->param_id = param_id; - cmd->param_value = param_val; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->param_id = cpu_to_le32(param_id); + cmd->param_value = cpu_to_le32(param_val); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_SET_PARAM_CMDID); if (ret) { @@ -1235,12 +1268,14 @@ int ath11k_wmi_send_peer_flush_tids_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_peer_flush_tids_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_FLUSH_TIDS_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PEER_FLUSH_TIDS_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); - cmd->peer_tid_bitmap = param->peer_tid_bitmap; - cmd->vdev_id = param->vdev_id; + cmd->peer_tid_bitmap = cpu_to_le32(param->peer_tid_bitmap); + cmd->vdev_id = cpu_to_le32(param->vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_FLUSH_TIDS_CMDID); if (ret) { @@ -1271,18 +1306,19 @@ int ath11k_wmi_peer_rx_reorder_queue_setup(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_peer_reorder_queue_setup_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_REORDER_QUEUE_SETUP_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_REORDER_QUEUE_SETUP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ether_addr_copy(cmd->peer_macaddr.addr, addr); - cmd->vdev_id = vdev_id; - cmd->tid = tid; - cmd->queue_ptr_lo = lower_32_bits(paddr); - cmd->queue_ptr_hi = upper_32_bits(paddr); - cmd->queue_no = tid; - cmd->ba_window_size_valid = ba_window_size_valid; - cmd->ba_window_size = ba_window_size; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->tid = cpu_to_le32(tid); + cmd->queue_ptr_lo = cpu_to_le32(lower_32_bits(paddr)); + cmd->queue_ptr_hi = cpu_to_le32(upper_32_bits(paddr)); + cmd->queue_no = cpu_to_le32(tid); + cmd->ba_window_size_valid = cpu_to_le32(ba_window_size_valid); + cmd->ba_window_size = cpu_to_le32(ba_window_size); ret = ath11k_wmi_cmd_send(ar->wmi, skb, WMI_PEER_REORDER_QUEUE_SETUP_CMDID); @@ -1313,13 +1349,14 @@ ath11k_wmi_rx_reord_queue_remove(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_peer_reorder_queue_remove_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_REORDER_QUEUE_REMOVE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_REORDER_QUEUE_REMOVE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ether_addr_copy(cmd->peer_macaddr.addr, param->peer_macaddr); - cmd->vdev_id = param->vdev_id; - cmd->tid_mask = param->peer_tid_bitmap; + cmd->vdev_id = cpu_to_le32(param->vdev_id); + cmd->tid_mask = cpu_to_le32(param->peer_tid_bitmap); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_REORDER_QUEUE_REMOVE_CMDID); @@ -1349,11 +1386,13 @@ int ath11k_wmi_pdev_set_param(struct ath11k *ar, u32 param_id, return -ENOMEM; cmd = (struct wmi_pdev_set_param_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_PARAM_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->pdev_id = pdev_id; - cmd->param_id = param_id; - cmd->param_value = param_value; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SET_PARAM_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(pdev_id); + cmd->param_id = cpu_to_le32(param_id); + cmd->param_value = cpu_to_le32(param_value); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_PARAM_CMDID); if (ret) { @@ -1381,10 +1420,12 @@ int ath11k_wmi_pdev_set_ps_mode(struct ath11k *ar, int vdev_id, return -ENOMEM; cmd = (struct wmi_pdev_set_ps_mode_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_STA_POWERSAVE_MODE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->sta_ps_mode = psmode; + cmd->tlv_header = le32_encode_bits(WMI_TAG_STA_POWERSAVE_MODE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->sta_ps_mode = cpu_to_le32(psmode); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_MODE_CMDID); if (ret) { @@ -1413,11 +1454,13 @@ int ath11k_wmi_pdev_suspend(struct ath11k *ar, u32 suspend_opt, cmd = (struct wmi_pdev_suspend_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SUSPEND_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SUSPEND_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->suspend_opt = suspend_opt; - cmd->pdev_id = pdev_id; + cmd->suspend_opt = cpu_to_le32(suspend_opt); + cmd->pdev_id = cpu_to_le32(pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SUSPEND_CMDID); if (ret) { @@ -1444,9 +1487,11 @@ int ath11k_wmi_pdev_resume(struct ath11k *ar, u32 pdev_id) cmd = (struct wmi_pdev_resume_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_RESUME_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->pdev_id = pdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_RESUME_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_RESUME_CMDID); if (ret) { @@ -1478,11 +1523,12 @@ int ath11k_wmi_pdev_bss_chan_info_request(struct ath11k *ar, cmd = (struct wmi_pdev_bss_chan_info_req_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->req_type = type; - cmd->pdev_id = ar->pdev->pdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->req_type = cpu_to_le32(type); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_BSS_CHAN_INFO_REQUEST_CMDID); @@ -1511,13 +1557,15 @@ int ath11k_wmi_send_set_ap_ps_param_cmd(struct ath11k *ar, u8 *peer_addr, return -ENOMEM; cmd = (struct wmi_ap_ps_peer_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_AP_PS_PEER_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_AP_PS_PEER_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = param->vdev_id; + cmd->vdev_id = cpu_to_le32(param->vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); - cmd->param = param->param; - cmd->value = param->value; + cmd->param = cpu_to_le32(param->param); + cmd->value = cpu_to_le32(param->value); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_AP_PS_PEER_PARAM_CMDID); if (ret) { @@ -1546,13 +1594,14 @@ int ath11k_wmi_set_sta_ps_param(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_sta_powersave_param_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_STA_POWERSAVE_PARAM_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_STA_POWERSAVE_PARAM_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->param = param; - cmd->value = param_value; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->param = cpu_to_le32(param); + cmd->value = cpu_to_le32(param_value); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_STA_POWERSAVE_PARAM_CMDID); if (ret) { @@ -1581,11 +1630,12 @@ int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms) return -ENOMEM; cmd = (struct wmi_force_fw_hang_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_FORCE_FW_HANG_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_FORCE_FW_HANG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->type = type; - cmd->delay_time_ms = delay_time_ms; + cmd->type = cpu_to_le32(type); + cmd->delay_time_ms = cpu_to_le32(delay_time_ms); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_FORCE_FW_HANG_CMDID); @@ -1612,12 +1662,14 @@ int ath11k_wmi_vdev_set_param_cmd(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_vdev_set_param_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_PARAM_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_SET_PARAM_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->param_id = param_id; - cmd->param_value = param_value; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->param_id = cpu_to_le32(param_id); + cmd->param_value = cpu_to_le32(param_value); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_SET_PARAM_CMDID); if (ret) { @@ -1646,12 +1698,14 @@ int ath11k_wmi_send_stats_request_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_request_stats_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_REQUEST_STATS_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_REQUEST_STATS_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->stats_id = param->stats_id; - cmd->vdev_id = param->vdev_id; - cmd->pdev_id = param->pdev_id; + cmd->stats_id = cpu_to_le32(param->stats_id); + cmd->vdev_id = cpu_to_le32(param->vdev_id); + cmd->pdev_id = cpu_to_le32(param->pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_REQUEST_STATS_CMDID); if (ret) { @@ -1678,9 +1732,11 @@ int ath11k_wmi_send_pdev_temperature_cmd(struct ath11k *ar) return -ENOMEM; cmd = (struct wmi_get_pdev_temperature_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_GET_TEMPERATURE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_GET_TEMPERATURE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_GET_TEMPERATURE_CMDID); if (ret) { @@ -1707,12 +1763,13 @@ int ath11k_wmi_send_bcn_offload_control_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_bcn_offload_ctrl_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_BCN_OFFLOAD_CTRL_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_BCN_OFFLOAD_CTRL_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->bcn_ctrl_op = bcn_ctrl_op; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->bcn_ctrl_op = cpu_to_le32(bcn_ctrl_op); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_BCN_OFFLOAD_CTRL_CMDID); if (ret) { @@ -1748,14 +1805,16 @@ int ath11k_wmi_p2p_go_bcn_ie(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_p2p_go_set_beacon_ie_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_P2P_GO_SET_BEACON_IE) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->ie_buf_len = p2p_ie_len; + cmd->tlv_header = le32_encode_bits(WMI_TAG_P2P_GO_SET_BEACON_IE, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->ie_buf_len = cpu_to_le32(p2p_ie_len); tlv = (struct wmi_tlv *)cmd->tlv; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, aligned_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(aligned_len, WMI_TLV_LEN); memcpy(tlv->value, p2p_ie, p2p_ie_len); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_P2P_GO_SET_BEACON_IE); @@ -1796,35 +1855,37 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_bcn_tmpl_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_BCN_TMPL_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->tim_ie_offset = offs->tim_offset; + cmd->tlv_header = le32_encode_bits(WMI_TAG_BCN_TMPL_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->tim_ie_offset = cpu_to_le32(offs->tim_offset); if (vif->bss_conf.csa_active) { - cmd->csa_switch_count_offset = offs->cntdwn_counter_offs[0]; - cmd->ext_csa_switch_count_offset = offs->cntdwn_counter_offs[1]; + cmd->csa_switch_count_offset = cpu_to_le32(offs->cntdwn_counter_offs[0]); + cmd->ext_csa_switch_count_offset = cpu_to_le32(offs->cntdwn_counter_offs[1]); } - cmd->buf_len = bcn->len; - cmd->mbssid_ie_offset = offs->mbssid_off; - cmd->ema_params = ema_params; + cmd->buf_len = cpu_to_le32(bcn->len); + cmd->mbssid_ie_offset = cpu_to_le32(offs->mbssid_off); + cmd->ema_params = cpu_to_le32(ema_params); ptr = skb->data + sizeof(*cmd); bcn_prb_info = ptr; len = sizeof(*bcn_prb_info); - bcn_prb_info->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_BCN_PRB_INFO) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + bcn_prb_info->tlv_header = le32_encode_bits(WMI_TAG_BCN_PRB_INFO, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, + WMI_TLV_LEN); bcn_prb_info->caps = 0; bcn_prb_info->erp = 0; ptr += sizeof(*bcn_prb_info); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, aligned_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(aligned_len, WMI_TLV_LEN); memcpy(tlv->value, bcn->data, bcn->len); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_BCN_TMPL_CMDID); @@ -1855,24 +1916,29 @@ int ath11k_wmi_vdev_install_key(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_vdev_install_key_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_INSTALL_KEY_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = arg->vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_INSTALL_KEY_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(arg->vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, arg->macaddr); - cmd->key_idx = arg->key_idx; - cmd->key_flags = arg->key_flags; - cmd->key_cipher = arg->key_cipher; - cmd->key_len = arg->key_len; - cmd->key_txmic_len = arg->key_txmic_len; - cmd->key_rxmic_len = arg->key_rxmic_len; + cmd->key_idx = cpu_to_le32(arg->key_idx); + cmd->key_flags = cpu_to_le32(arg->key_flags); + cmd->key_cipher = cpu_to_le32(arg->key_cipher); + cmd->key_len = cpu_to_le32(arg->key_len); + cmd->key_txmic_len = cpu_to_le32(arg->key_txmic_len); + cmd->key_rxmic_len = cpu_to_le32(arg->key_rxmic_len); - if (arg->key_rsc_counter) - memcpy(&cmd->key_rsc_counter, &arg->key_rsc_counter, - sizeof(struct wmi_key_seq_counter)); + if (arg->key_rsc_counter) { + cmd->key_rsc_counter.key_seq_counter_l = + cpu_to_le32(lower_32_bits(arg->key_rsc_counter)); + cmd->key_rsc_counter.key_seq_counter_h = + cpu_to_le32(upper_32_bits(arg->key_rsc_counter)); + } tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, key_len_aligned); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(key_len_aligned, WMI_TLV_LEN); if (arg->key_data) memcpy(tlv->value, (u8 *)arg->key_data, key_len_aligned); @@ -1899,44 +1965,44 @@ ath11k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd, if (param->is_wme_set) { if (param->qos_flag) - cmd->peer_flags |= WMI_PEER_QOS; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_QOS); if (param->apsd_flag) - cmd->peer_flags |= WMI_PEER_APSD; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_APSD); if (param->ht_flag) - cmd->peer_flags |= WMI_PEER_HT; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_HT); if (param->bw_40) - cmd->peer_flags |= WMI_PEER_40MHZ; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_40MHZ); if (param->bw_80) - cmd->peer_flags |= WMI_PEER_80MHZ; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_80MHZ); if (param->bw_160) - cmd->peer_flags |= WMI_PEER_160MHZ; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_160MHZ); /* Typically if STBC is enabled for VHT it should be enabled * for HT as well **/ if (param->stbc_flag) - cmd->peer_flags |= WMI_PEER_STBC; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_STBC); /* Typically if LDPC is enabled for VHT it should be enabled * for HT as well **/ if (param->ldpc_flag) - cmd->peer_flags |= WMI_PEER_LDPC; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_LDPC); if (param->static_mimops_flag) - cmd->peer_flags |= WMI_PEER_STATIC_MIMOPS; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_STATIC_MIMOPS); if (param->dynamic_mimops_flag) - cmd->peer_flags |= WMI_PEER_DYN_MIMOPS; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_DYN_MIMOPS); if (param->spatial_mux_flag) - cmd->peer_flags |= WMI_PEER_SPATIAL_MUX; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_SPATIAL_MUX); if (param->vht_flag) - cmd->peer_flags |= WMI_PEER_VHT; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_VHT); if (param->he_flag) - cmd->peer_flags |= WMI_PEER_HE; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_HE); if (param->twt_requester) - cmd->peer_flags |= WMI_PEER_TWT_REQ; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_TWT_REQ); if (param->twt_responder) - cmd->peer_flags |= WMI_PEER_TWT_RESP; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_TWT_RESP); } /* Suppress authorization for all AUTH modes that need 4-way handshake @@ -1944,21 +2010,21 @@ ath11k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd, * Authorization will be done for these modes on key installation. */ if (param->auth_flag) - cmd->peer_flags |= WMI_PEER_AUTH; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_AUTH); if (param->need_ptk_4_way) { - cmd->peer_flags |= WMI_PEER_NEED_PTK_4_WAY; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_NEED_PTK_4_WAY); if (!hw_crypto_disabled && param->is_assoc) - cmd->peer_flags &= ~WMI_PEER_AUTH; + cmd->peer_flags &= cpu_to_le32(~WMI_PEER_AUTH); } if (param->need_gtk_2_way) - cmd->peer_flags |= WMI_PEER_NEED_GTK_2_WAY; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_NEED_GTK_2_WAY); /* safe mode bypass the 4-way handshake */ if (param->safe_mode_enabled) - cmd->peer_flags &= ~(WMI_PEER_NEED_PTK_4_WAY | - WMI_PEER_NEED_GTK_2_WAY); + cmd->peer_flags &= cpu_to_le32(~(WMI_PEER_NEED_PTK_4_WAY | + WMI_PEER_NEED_GTK_2_WAY)); if (param->is_pmf_enabled) - cmd->peer_flags |= WMI_PEER_PMF; + cmd->peer_flags |= cpu_to_le32(WMI_PEER_PMF); /* Disable AMSDU for station transmit, if user configures it */ /* Disable AMSDU for AP transmit to 11n Stations, if user configures @@ -1971,7 +2037,7 @@ ath11k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd, * iwpriv **/ if (param->peer_ht_rates.num_rates == 0) - cmd->peer_flags &= ~WMI_PEER_HT; + cmd->peer_flags &= cpu_to_le32(~WMI_PEER_HT); } int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar, @@ -2006,14 +2072,15 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar, ptr = skb->data; cmd = ptr; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PEER_ASSOC_COMPLETE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PEER_ASSOC_COMPLETE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = param->vdev_id; + cmd->vdev_id = cpu_to_le32(param->vdev_id); - cmd->peer_new_assoc = param->peer_new_assoc; - cmd->peer_associd = param->peer_associd; + cmd->peer_new_assoc = cpu_to_le32(param->peer_new_assoc); + cmd->peer_associd = cpu_to_le32(param->peer_associd); ath11k_wmi_copy_peer_flags(cmd, param, test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, @@ -2021,36 +2088,39 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar, ether_addr_copy(cmd->peer_macaddr.addr, param->peer_mac); - cmd->peer_rate_caps = param->peer_rate_caps; - cmd->peer_caps = param->peer_caps; - cmd->peer_listen_intval = param->peer_listen_intval; - cmd->peer_ht_caps = param->peer_ht_caps; - cmd->peer_max_mpdu = param->peer_max_mpdu; - cmd->peer_mpdu_density = param->peer_mpdu_density; - cmd->peer_vht_caps = param->peer_vht_caps; - cmd->peer_phymode = param->peer_phymode; + cmd->peer_rate_caps = cpu_to_le32(param->peer_rate_caps); + cmd->peer_caps = cpu_to_le32(param->peer_caps); + cmd->peer_listen_intval = cpu_to_le32(param->peer_listen_intval); + cmd->peer_ht_caps = cpu_to_le32(param->peer_ht_caps); + cmd->peer_max_mpdu = cpu_to_le32(param->peer_max_mpdu); + cmd->peer_mpdu_density = cpu_to_le32(param->peer_mpdu_density); + cmd->peer_vht_caps = cpu_to_le32(param->peer_vht_caps); + cmd->peer_phymode = cpu_to_le32(param->peer_phymode); /* Update 11ax capabilities */ cmd->peer_he_cap_info = param->peer_he_cap_macinfo[0]; cmd->peer_he_cap_info_ext = param->peer_he_cap_macinfo[1]; - cmd->peer_he_cap_info_internal = param->peer_he_cap_macinfo_internal; - cmd->peer_he_caps_6ghz = param->peer_he_caps_6ghz; - cmd->peer_he_ops = param->peer_he_ops; + cmd->peer_he_cap_info_internal = cpu_to_le32(param->peer_he_cap_macinfo_internal); + cmd->peer_he_caps_6ghz = cpu_to_le32(param->peer_he_caps_6ghz); + cmd->peer_he_ops = cpu_to_le32(param->peer_he_ops); memcpy(&cmd->peer_he_cap_phy, ¶m->peer_he_cap_phyinfo, sizeof(param->peer_he_cap_phyinfo)); - memcpy(&cmd->peer_ppet, ¶m->peer_ppet, - sizeof(param->peer_ppet)); + cmd->peer_ppet.numss_m1 = cpu_to_le32(param->peer_ppet.numss_m1); + cmd->peer_ppet.ru_mask = cpu_to_le32(param->peer_ppet.ru_bit_mask); + for (i = 0; i < ARRAY_SIZE(cmd->peer_ppet.ppet16_ppet8_ru3_ru0); i++) + cmd->peer_ppet.ppet16_ppet8_ru3_ru0[i] = + cpu_to_le32(param->peer_ppet.ppet16_ppet8_ru3_ru0[i]); /* Update peer legacy rate information */ ptr += sizeof(*cmd); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, peer_legacy_rates_align); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(peer_legacy_rates_align, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; - cmd->num_peer_legacy_rates = param->peer_legacy_rates.num_rates; + cmd->num_peer_legacy_rates = cpu_to_le32(param->peer_legacy_rates.num_rates); memcpy(ptr, param->peer_legacy_rates.rates, param->peer_legacy_rates.num_rates); @@ -2058,10 +2128,10 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar, ptr += peer_legacy_rates_align; tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, peer_ht_rates_align); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(peer_ht_rates_align, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; - cmd->num_peer_ht_rates = param->peer_ht_rates.num_rates; + cmd->num_peer_ht_rates = cpu_to_le32(param->peer_ht_rates.num_rates); memcpy(ptr, param->peer_ht_rates.rates, param->peer_ht_rates.num_rates); @@ -2070,51 +2140,52 @@ int ath11k_wmi_send_peer_assoc_cmd(struct ath11k *ar, mcs = ptr; - mcs->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VHT_RATE_SET) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*mcs) - TLV_HDR_SIZE); + mcs->tlv_header = le32_encode_bits(WMI_TAG_VHT_RATE_SET, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*mcs) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->peer_nss = param->peer_nss; + cmd->peer_nss = cpu_to_le32(param->peer_nss); /* Update bandwidth-NSS mapping */ cmd->peer_bw_rxnss_override = 0; - cmd->peer_bw_rxnss_override |= param->peer_bw_rxnss_override; + cmd->peer_bw_rxnss_override |= cpu_to_le32(param->peer_bw_rxnss_override); if (param->vht_capable) { /* firmware interprets mcs->tx_mcs_set field as peer's * RX capability */ - mcs->tx_max_rate = param->rx_max_rate; - mcs->tx_mcs_set = param->rx_mcs_set; - mcs->rx_max_rate = param->tx_max_rate; - mcs->rx_mcs_set = param->tx_mcs_set; + mcs->tx_max_rate = cpu_to_le32(param->rx_max_rate); + mcs->tx_mcs_set = cpu_to_le32(param->rx_mcs_set); + mcs->rx_max_rate = cpu_to_le32(param->tx_max_rate); + mcs->rx_mcs_set = cpu_to_le32(param->tx_mcs_set); } /* HE Rates */ - cmd->peer_he_mcs = param->peer_he_mcs_count; - cmd->min_data_rate = param->min_data_rate; + cmd->peer_he_mcs = cpu_to_le32(param->peer_he_mcs_count); + cmd->min_data_rate = cpu_to_le32(param->min_data_rate); ptr += sizeof(*mcs); len = param->peer_he_mcs_count * sizeof(*he_mcs); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; /* Loop through the HE rate set */ for (i = 0; i < param->peer_he_mcs_count; i++) { he_mcs = ptr; - he_mcs->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_HE_RATE_SET) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*he_mcs) - TLV_HDR_SIZE); + he_mcs->tlv_header = le32_encode_bits(WMI_TAG_HE_RATE_SET, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*he_mcs) - TLV_HDR_SIZE, + WMI_TLV_LEN); /* firmware interprets mcs->rx_mcs_set field as peer's * RX capability */ - he_mcs->rx_mcs_set = param->peer_he_rx_mcs_set[i]; - he_mcs->tx_mcs_set = param->peer_he_tx_mcs_set[i]; + he_mcs->rx_mcs_set = cpu_to_le32(param->peer_he_rx_mcs_set[i]); + he_mcs->tx_mcs_set = cpu_to_le32(param->peer_he_tx_mcs_set[i]); ptr += sizeof(*he_mcs); } @@ -2188,75 +2259,76 @@ ath11k_wmi_copy_scan_event_cntrl_flags(struct wmi_start_scan_cmd *cmd, { /* Scan events subscription */ if (param->scan_ev_started) - cmd->notify_scan_events |= WMI_SCAN_EVENT_STARTED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_STARTED); if (param->scan_ev_completed) - cmd->notify_scan_events |= WMI_SCAN_EVENT_COMPLETED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_COMPLETED); if (param->scan_ev_bss_chan) - cmd->notify_scan_events |= WMI_SCAN_EVENT_BSS_CHANNEL; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_BSS_CHANNEL); if (param->scan_ev_foreign_chan) - cmd->notify_scan_events |= WMI_SCAN_EVENT_FOREIGN_CHAN; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_FOREIGN_CHAN); if (param->scan_ev_dequeued) - cmd->notify_scan_events |= WMI_SCAN_EVENT_DEQUEUED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_DEQUEUED); if (param->scan_ev_preempted) - cmd->notify_scan_events |= WMI_SCAN_EVENT_PREEMPTED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_PREEMPTED); if (param->scan_ev_start_failed) - cmd->notify_scan_events |= WMI_SCAN_EVENT_START_FAILED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_START_FAILED); if (param->scan_ev_restarted) - cmd->notify_scan_events |= WMI_SCAN_EVENT_RESTARTED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_RESTARTED); if (param->scan_ev_foreign_chn_exit) - cmd->notify_scan_events |= WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT); if (param->scan_ev_suspended) - cmd->notify_scan_events |= WMI_SCAN_EVENT_SUSPENDED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_SUSPENDED); if (param->scan_ev_resumed) - cmd->notify_scan_events |= WMI_SCAN_EVENT_RESUMED; + cmd->notify_scan_events |= cpu_to_le32(WMI_SCAN_EVENT_RESUMED); /** Set scan control flags */ cmd->scan_ctrl_flags = 0; if (param->scan_f_passive) - cmd->scan_ctrl_flags |= WMI_SCAN_FLAG_PASSIVE; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_PASSIVE); if (param->scan_f_strict_passive_pch) - cmd->scan_ctrl_flags |= WMI_SCAN_FLAG_STRICT_PASSIVE_ON_PCHN; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_STRICT_PASSIVE_ON_PCHN); if (param->scan_f_promisc_mode) - cmd->scan_ctrl_flags |= WMI_SCAN_FILTER_PROMISCUOS; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FILTER_PROMISCUOS); if (param->scan_f_capture_phy_err) - cmd->scan_ctrl_flags |= WMI_SCAN_CAPTURE_PHY_ERROR; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_CAPTURE_PHY_ERROR); if (param->scan_f_half_rate) - cmd->scan_ctrl_flags |= WMI_SCAN_FLAG_HALF_RATE_SUPPORT; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_HALF_RATE_SUPPORT); if (param->scan_f_quarter_rate) - cmd->scan_ctrl_flags |= WMI_SCAN_FLAG_QUARTER_RATE_SUPPORT; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_QUARTER_RATE_SUPPORT); if (param->scan_f_cck_rates) - cmd->scan_ctrl_flags |= WMI_SCAN_ADD_CCK_RATES; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_CCK_RATES); if (param->scan_f_ofdm_rates) - cmd->scan_ctrl_flags |= WMI_SCAN_ADD_OFDM_RATES; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_OFDM_RATES); if (param->scan_f_chan_stat_evnt) - cmd->scan_ctrl_flags |= WMI_SCAN_CHAN_STAT_EVENT; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_CHAN_STAT_EVENT); if (param->scan_f_filter_prb_req) - cmd->scan_ctrl_flags |= WMI_SCAN_FILTER_PROBE_REQ; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FILTER_PROBE_REQ); if (param->scan_f_bcast_probe) - cmd->scan_ctrl_flags |= WMI_SCAN_ADD_BCAST_PROBE_REQ; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_BCAST_PROBE_REQ); if (param->scan_f_offchan_mgmt_tx) - cmd->scan_ctrl_flags |= WMI_SCAN_OFFCHAN_MGMT_TX; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_OFFCHAN_MGMT_TX); if (param->scan_f_offchan_data_tx) - cmd->scan_ctrl_flags |= WMI_SCAN_OFFCHAN_DATA_TX; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_OFFCHAN_DATA_TX); if (param->scan_f_force_active_dfs_chn) - cmd->scan_ctrl_flags |= WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS); if (param->scan_f_add_tpc_ie_in_probe) - cmd->scan_ctrl_flags |= WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_TPC_IE_IN_PROBE_REQ); if (param->scan_f_add_ds_ie_in_probe) - cmd->scan_ctrl_flags |= WMI_SCAN_ADD_DS_IE_IN_PROBE_REQ; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_DS_IE_IN_PROBE_REQ); if (param->scan_f_add_spoofed_mac_in_probe) - cmd->scan_ctrl_flags |= WMI_SCAN_ADD_SPOOF_MAC_IN_PROBE_REQ; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_ADD_SPOOF_MAC_IN_PROBE_REQ); if (param->scan_f_add_rand_seq_in_probe) - cmd->scan_ctrl_flags |= WMI_SCAN_RANDOM_SEQ_NO_IN_PROBE_REQ; + cmd->scan_ctrl_flags |= cpu_to_le32(WMI_SCAN_RANDOM_SEQ_NO_IN_PROBE_REQ); if (param->scan_f_en_ie_whitelist_in_probe) cmd->scan_ctrl_flags |= - WMI_SCAN_ENABLE_IE_WHTELIST_IN_PROBE_REQ; + cpu_to_le32(WMI_SCAN_ENABLE_IE_WHTELIST_IN_PROBE_REQ); /* for adaptive scan mode using 3 bits (21 - 23 bits) */ - WMI_SCAN_SET_DWELL_MODE(cmd->scan_ctrl_flags, - param->adaptive_dwell_time_mode); + cmd->scan_ctrl_flags |= + cpu_to_le32((param->adaptive_dwell_time_mode << + WMI_SCAN_DWELL_MODE_SHIFT) & WMI_SCAN_DWELL_MODE_MASK); - cmd->scan_ctrl_flags_ext = param->scan_ctrl_flags_ext; + cmd->scan_ctrl_flags_ext = cpu_to_le32(param->scan_ctrl_flags_ext); } int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, @@ -2264,13 +2336,13 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, { struct ath11k_pdev_wmi *wmi = ar->wmi; struct wmi_start_scan_cmd *cmd; - struct wmi_ssid *ssid = NULL; + struct wmi_ssid_params *ssid = NULL; struct wmi_mac_addr *bssid; struct sk_buff *skb; struct wmi_tlv *tlv; void *ptr; int i, ret, len; - u32 *tmp_ptr; + __le32 *tmp_ptr; u16 extraie_len_with_pad = 0; struct hint_short_ssid *s_ssid = NULL; struct hint_bssid *hint_bssid = NULL; @@ -2310,35 +2382,37 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, ptr = skb->data; cmd = ptr; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_START_SCAN_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_START_SCAN_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->scan_id = params->scan_id; - cmd->scan_req_id = params->scan_req_id; - cmd->vdev_id = params->vdev_id; - cmd->scan_priority = params->scan_priority; - cmd->notify_scan_events = params->notify_scan_events; + cmd->scan_id = cpu_to_le32(params->scan_id); + cmd->scan_req_id = cpu_to_le32(params->scan_req_id); + cmd->vdev_id = cpu_to_le32(params->vdev_id); + cmd->scan_priority = cpu_to_le32(params->scan_priority); + cmd->notify_scan_events = cpu_to_le32(params->notify_scan_events); ath11k_wmi_copy_scan_event_cntrl_flags(cmd, params); - cmd->dwell_time_active = params->dwell_time_active; - cmd->dwell_time_active_2g = params->dwell_time_active_2g; - cmd->dwell_time_passive = params->dwell_time_passive; - cmd->dwell_time_active_6g = params->dwell_time_active_6g; - cmd->dwell_time_passive_6g = params->dwell_time_passive_6g; - cmd->min_rest_time = params->min_rest_time; - cmd->max_rest_time = params->max_rest_time; - cmd->repeat_probe_time = params->repeat_probe_time; - cmd->probe_spacing_time = params->probe_spacing_time; - cmd->idle_time = params->idle_time; - cmd->max_scan_time = params->max_scan_time; - cmd->probe_delay = params->probe_delay; - cmd->burst_duration = params->burst_duration; - cmd->num_chan = params->num_chan; - cmd->num_bssid = params->num_bssid; - cmd->num_ssids = params->num_ssids; - cmd->ie_len = params->extraie.len; - cmd->n_probes = params->n_probes; + cmd->dwell_time_active = cpu_to_le32(params->dwell_time_active); + cmd->dwell_time_active_2g = cpu_to_le32(params->dwell_time_active_2g); + cmd->dwell_time_passive = cpu_to_le32(params->dwell_time_passive); + cmd->dwell_time_active_6g = cpu_to_le32(params->dwell_time_active_6g); + cmd->dwell_time_passive_6g = cpu_to_le32(params->dwell_time_passive_6g); + cmd->min_rest_time = cpu_to_le32(params->min_rest_time); + cmd->max_rest_time = cpu_to_le32(params->max_rest_time); + cmd->repeat_probe_time = cpu_to_le32(params->repeat_probe_time); + cmd->probe_spacing_time = cpu_to_le32(params->probe_spacing_time); + cmd->idle_time = cpu_to_le32(params->idle_time); + cmd->max_scan_time = cpu_to_le32(params->max_scan_time); + cmd->probe_delay = cpu_to_le32(params->probe_delay); + cmd->burst_duration = cpu_to_le32(params->burst_duration); + cmd->num_chan = cpu_to_le32(params->num_chan); + cmd->num_bssid = cpu_to_le32(params->num_bssid); + cmd->num_ssids = cpu_to_le32(params->num_ssids); + cmd->ie_len = cpu_to_le32(params->extraie.len); + cmd->n_probes = cpu_to_le32(params->n_probes); ether_addr_copy(cmd->mac_addr.addr, params->mac_addr.addr); ether_addr_copy(cmd->mac_mask.addr, params->mac_mask.addr); @@ -2347,27 +2421,28 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, len = params->num_chan * sizeof(u32); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_UINT32, WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; tmp_ptr = ptr; for (i = 0; i < params->num_chan; ++i) - tmp_ptr[i] = params->chan_list[i]; + tmp_ptr[i] = cpu_to_le32(params->chan_list[i]); ptr += len; len = params->num_ssids * sizeof(*ssid); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_FIXED_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_FIXED_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; if (params->num_ssids) { ssid = ptr; for (i = 0; i < params->num_ssids; ++i) { - ssid->ssid_len = params->ssid[i].length; + ssid->ssid_len = cpu_to_le32(params->ssid[i].length); memcpy(ssid->ssid, params->ssid[i].ssid, params->ssid[i].length); ssid++; @@ -2377,8 +2452,9 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, ptr += (params->num_ssids * sizeof(*ssid)); len = params->num_bssid * sizeof(*bssid); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_FIXED_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_FIXED_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; bssid = ptr; @@ -2395,8 +2471,8 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, len = extraie_len_with_pad; tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; if (extraie_len_with_pad) @@ -2408,8 +2484,9 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, if (params->num_hint_s_ssid) { len = params->num_hint_s_ssid * sizeof(struct hint_short_ssid); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_FIXED_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_FIXED_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; s_ssid = ptr; for (i = 0; i < params->num_hint_s_ssid; ++i) { @@ -2423,8 +2500,9 @@ int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, if (params->num_hint_bssid) { len = params->num_hint_bssid * sizeof(struct hint_bssid); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_FIXED_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_FIXED_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; hint_bssid = ptr; for (i = 0; i < params->num_hint_bssid; ++i) { @@ -2470,12 +2548,14 @@ int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar, ptr = skb->data; cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_TPC_POWER_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->psd_power = param->is_psd_power; - cmd->eirp_power = param->eirp_power; - cmd->power_type_6ghz = param->ap_power_type; + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_SET_TPC_POWER_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->psd_power = cpu_to_le32(param->is_psd_power); + cmd->eirp_power = cpu_to_le32(param->eirp_power); + cmd->power_type_6ghz = cpu_to_le32(param->ap_power_type); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tpc vdev id %d is psd power %d eirp power %d 6 ghz power type %d\n", @@ -2483,20 +2563,20 @@ int ath11k_wmi_send_vdev_set_tpc_power(struct ath11k *ar, ptr += sizeof(*cmd); tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, array_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(array_len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; ch = (struct wmi_vdev_ch_power_info *)ptr; for (i = 0; i < param->num_pwr_levels; i++, ch++) { - ch->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_VDEV_CH_POWER_INFO) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*ch) - TLV_HDR_SIZE); + ch->tlv_header = le32_encode_bits(WMI_TAG_VDEV_CH_POWER_INFO, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*ch) - TLV_HDR_SIZE, + WMI_TLV_LEN); - ch->chan_cfreq = param->chan_power_info[i].chan_cfreq; - ch->tx_power = param->chan_power_info[i].tx_power; + ch->chan_cfreq = cpu_to_le32(param->chan_power_info[i].chan_cfreq); + ch->tx_power = cpu_to_le32(param->chan_power_info[i].tx_power); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tpc chan freq %d TX power %d\n", ch->chan_cfreq, ch->tx_power); @@ -2526,20 +2606,21 @@ int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar, cmd = (struct wmi_stop_scan_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_STOP_SCAN_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_STOP_SCAN_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = param->vdev_id; - cmd->requestor = param->requester; - cmd->scan_id = param->scan_id; - cmd->pdev_id = param->pdev_id; + cmd->vdev_id = cpu_to_le32(param->vdev_id); + cmd->requestor = cpu_to_le32(param->requester); + cmd->scan_id = cpu_to_le32(param->scan_id); + cmd->pdev_id = cpu_to_le32(param->pdev_id); /* stop the scan with the corresponding scan_id */ if (param->req_type == WLAN_SCAN_CANCEL_PDEV_ALL) { /* Cancelling all scans */ - cmd->req_type = WMI_SCAN_STOP_ALL; + cmd->req_type = cpu_to_le32(WMI_SCAN_STOP_ALL); } else if (param->req_type == WLAN_SCAN_CANCEL_VDEV_ALL) { /* Cancelling VAP scans */ - cmd->req_type = WMI_SCN_STOP_VAP_ALL; + cmd->req_type = cpu_to_le32(WMI_SCN_STOP_VAP_ALL); } else if (param->req_type == WLAN_SCAN_CANCEL_SINGLE) { /* Cancelling specific scan */ cmd->req_type = WMI_SCAN_STOP_ONE; @@ -2574,7 +2655,7 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar, void *ptr; int i, ret, len; u16 num_send_chans, num_sends = 0, max_chan_limit = 0; - u32 *reg1, *reg2; + __le32 *reg1, *reg2; tchan_info = chan_list->ch_param; while (chan_list->nallchans) { @@ -2595,12 +2676,14 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_scan_chan_list_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_SCAN_CHAN_LIST_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->pdev_id = chan_list->pdev_id; - cmd->num_scan_chans = num_send_chans; + cmd->tlv_header = le32_encode_bits(WMI_TAG_SCAN_CHAN_LIST_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(chan_list->pdev_id); + cmd->num_scan_chans = cpu_to_le32(num_send_chans); if (num_sends) - cmd->flags |= WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG; + cmd->flags |= cpu_to_le32(WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "no.of chan = %d len = %d pdev_id = %d num_sends = %d\n", @@ -2610,56 +2693,57 @@ int ath11k_wmi_send_scan_chan_list_cmd(struct ath11k *ar, len = sizeof(*chan_info) * num_send_chans; tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; for (i = 0; i < num_send_chans; ++i) { chan_info = ptr; memset(chan_info, 0, sizeof(*chan_info)); len = sizeof(*chan_info); - chan_info->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_CHANNEL) | - FIELD_PREP(WMI_TLV_LEN, - len - TLV_HDR_SIZE); + chan_info->tlv_header = le32_encode_bits(WMI_TAG_CHANNEL, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, + WMI_TLV_LEN); reg1 = &chan_info->reg_info_1; reg2 = &chan_info->reg_info_2; - chan_info->mhz = tchan_info->mhz; - chan_info->band_center_freq1 = tchan_info->cfreq1; - chan_info->band_center_freq2 = tchan_info->cfreq2; + chan_info->mhz = cpu_to_le32(tchan_info->mhz); + chan_info->band_center_freq1 = cpu_to_le32(tchan_info->cfreq1); + chan_info->band_center_freq2 = cpu_to_le32(tchan_info->cfreq2); if (tchan_info->is_chan_passive) - chan_info->info |= WMI_CHAN_INFO_PASSIVE; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_PASSIVE); if (tchan_info->allow_he) - chan_info->info |= WMI_CHAN_INFO_ALLOW_HE; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HE); else if (tchan_info->allow_vht) - chan_info->info |= WMI_CHAN_INFO_ALLOW_VHT; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_VHT); else if (tchan_info->allow_ht) - chan_info->info |= WMI_CHAN_INFO_ALLOW_HT; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HT); if (tchan_info->half_rate) - chan_info->info |= WMI_CHAN_INFO_HALF_RATE; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_HALF_RATE); if (tchan_info->quarter_rate) - chan_info->info |= WMI_CHAN_INFO_QUARTER_RATE; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_QUARTER_RATE); if (tchan_info->psc_channel) - chan_info->info |= WMI_CHAN_INFO_PSC; + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_PSC); if (tchan_info->dfs_set) - chan_info->info |= WMI_CHAN_INFO_DFS; - - chan_info->info |= FIELD_PREP(WMI_CHAN_INFO_MODE, - tchan_info->phy_mode); - *reg1 |= FIELD_PREP(WMI_CHAN_REG_INFO1_MIN_PWR, - tchan_info->minpower); - *reg1 |= FIELD_PREP(WMI_CHAN_REG_INFO1_MAX_PWR, - tchan_info->maxpower); - *reg1 |= FIELD_PREP(WMI_CHAN_REG_INFO1_MAX_REG_PWR, - tchan_info->maxregpower); - *reg1 |= FIELD_PREP(WMI_CHAN_REG_INFO1_REG_CLS, - tchan_info->reg_class_id); - *reg2 |= FIELD_PREP(WMI_CHAN_REG_INFO2_ANT_MAX, - tchan_info->antennamax); - *reg2 |= FIELD_PREP(WMI_CHAN_REG_INFO2_MAX_TX_PWR, - tchan_info->maxregpower); + chan_info->info |= cpu_to_le32(WMI_CHAN_INFO_DFS); + + chan_info->info |= le32_encode_bits(tchan_info->phy_mode, + WMI_CHAN_INFO_MODE); + *reg1 |= le32_encode_bits(tchan_info->minpower, + WMI_CHAN_REG_INFO1_MIN_PWR); + *reg1 |= le32_encode_bits(tchan_info->maxpower, + WMI_CHAN_REG_INFO1_MAX_PWR); + *reg1 |= le32_encode_bits(tchan_info->maxregpower, + WMI_CHAN_REG_INFO1_MAX_REG_PWR); + *reg1 |= le32_encode_bits(tchan_info->reg_class_id, + WMI_CHAN_REG_INFO1_REG_CLS); + *reg2 |= le32_encode_bits(tchan_info->antennamax, + WMI_CHAN_REG_INFO2_ANT_MAX); + *reg2 |= le32_encode_bits(tchan_info->maxregpower, + WMI_CHAN_REG_INFO2_MAX_TX_PWR); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "chan scan list chan[%d] = %u, chan_info->info %8x\n", @@ -2702,12 +2786,11 @@ int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_vdev_set_wmm_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_VDEV_SET_WMM_PARAMS_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_SET_WMM_PARAMS_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->wmm_param_type = wmm_param_type; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->wmm_param_type = cpu_to_le32(wmm_param_type); for (ac = 0; ac < WME_NUM_AC; ac++) { switch (ac) { @@ -2727,17 +2810,17 @@ int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id, wmm_param = (struct wmi_wmm_params *)&cmd->wmm_params[ac]; wmm_param->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_VDEV_SET_WMM_PARAMS_CMD) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*wmm_param) - TLV_HDR_SIZE); - - wmm_param->aifs = wmi_wmm_arg->aifs; - wmm_param->cwmin = wmi_wmm_arg->cwmin; - wmm_param->cwmax = wmi_wmm_arg->cwmax; - wmm_param->txoplimit = wmi_wmm_arg->txop; - wmm_param->acm = wmi_wmm_arg->acm; - wmm_param->no_ack = wmi_wmm_arg->no_ack; + le32_encode_bits(WMI_TAG_VDEV_SET_WMM_PARAMS_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*wmm_param) - TLV_HDR_SIZE, + WMI_TLV_LEN); + + wmm_param->aifs = cpu_to_le32(wmi_wmm_arg->aifs); + wmm_param->cwmin = cpu_to_le32(wmi_wmm_arg->cwmin); + wmm_param->cwmax = cpu_to_le32(wmi_wmm_arg->cwmax); + wmm_param->txoplimit = cpu_to_le32(wmi_wmm_arg->txop); + wmm_param->acm = cpu_to_le32(wmi_wmm_arg->acm); + wmm_param->no_ack = cpu_to_le32(wmi_wmm_arg->no_ack); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "wmm set type %d ac %d aifs %d cwmin %d cwmax %d txop %d acm %d no_ack %d\n", @@ -2772,11 +2855,11 @@ int ath11k_wmi_send_dfs_phyerr_offload_enable_cmd(struct ath11k *ar, cmd = (struct wmi_dfs_phyerr_offload_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + le32_encode_bits(WMI_TAG_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->pdev_id = pdev_id; + cmd->pdev_id = cpu_to_le32(pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_DFS_PHYERR_OFFLOAD_ENABLE_CMDID); @@ -2805,13 +2888,15 @@ int ath11k_wmi_delba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac, return -ENOMEM; cmd = (struct wmi_delba_send_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_DELBA_SEND_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_DELBA_SEND_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, mac); - cmd->tid = tid; - cmd->initiator = initiator; - cmd->reasoncode = reason; + cmd->tid = cpu_to_le32(tid); + cmd->initiator = cpu_to_le32(initiator); + cmd->reasoncode = cpu_to_le32(reason); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_DELBA_SEND_CMDID); @@ -2842,12 +2927,12 @@ int ath11k_wmi_addba_set_resp(struct ath11k *ar, u32 vdev_id, const u8 *mac, cmd = (struct wmi_addba_setresponse_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ADDBA_SETRESPONSE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + le32_encode_bits(WMI_TAG_ADDBA_SETRESPONSE_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, mac); - cmd->tid = tid; - cmd->statuscode = status; + cmd->tid = cpu_to_le32(tid); + cmd->statuscode = cpu_to_le32(status); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ADDBA_SET_RESP_CMDID); @@ -2877,12 +2962,13 @@ int ath11k_wmi_addba_send(struct ath11k *ar, u32 vdev_id, const u8 *mac, return -ENOMEM; cmd = (struct wmi_addba_send_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ADDBA_SEND_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_ADDBA_SEND_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, mac); - cmd->tid = tid; - cmd->buffersize = buf_size; + cmd->tid = cpu_to_le32(tid); + cmd->buffersize = cpu_to_le32(buf_size); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ADDBA_SEND_CMDID); @@ -2912,9 +2998,9 @@ int ath11k_wmi_addba_clear_resp(struct ath11k *ar, u32 vdev_id, const u8 *mac) cmd = (struct wmi_addba_clear_resp_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ADDBA_CLEAR_RESP_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; + le32_encode_bits(WMI_TAG_ADDBA_CLEAR_RESP_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, mac); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_ADDBA_CLEAR_RESP_CMDID); @@ -2949,26 +3035,29 @@ int ath11k_wmi_pdev_peer_pktlog_filter(struct ath11k *ar, u8 *addr, u8 enable) cmd = (struct wmi_pdev_pktlog_filter_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->pdev_id = DP_HW2SW_MACID(ar->pdev->pdev_id); - cmd->num_mac = 1; - cmd->enable = enable; + cmd->pdev_id = cpu_to_le32(DP_HW2SW_MACID(ar->pdev->pdev_id)); + cmd->num_mac = cpu_to_le32(1); + cmd->enable = cpu_to_le32(enable); ptr = skb->data + sizeof(*cmd); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*info)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*info), WMI_TLV_LEN); ptr += TLV_HDR_SIZE; info = ptr; ether_addr_copy(info->peer_macaddr.addr, addr); - info->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*info) - TLV_HDR_SIZE); + info->tlv_header = le32_encode_bits(WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*info) - TLV_HDR_SIZE, + WMI_TLV_LEN); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_PKTLOG_FILTER_CMDID); @@ -2997,11 +3086,10 @@ ath11k_wmi_send_init_country_cmd(struct ath11k *ar, cmd = (struct wmi_init_country_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_SET_INIT_COUNTRY_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + le32_encode_bits(WMI_TAG_SET_INIT_COUNTRY_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->pdev_id = ar->pdev->pdev_id; + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); switch (init_cc_params.flags) { case ALPHA_IS_SET: @@ -3010,12 +3098,12 @@ ath11k_wmi_send_init_country_cmd(struct ath11k *ar, init_cc_params.cc_info.alpha2, 3); break; case CC_IS_SET: - cmd->init_cc_type = WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE; - cmd->cc_info.country_code = init_cc_params.cc_info.country_code; + cmd->init_cc_type = cpu_to_le32(WMI_COUNTRY_INFO_TYPE_COUNTRY_CODE); + cmd->cc_info.country_code = cpu_to_le32(init_cc_params.cc_info.country_code); break; case REGDMN_IS_SET: - cmd->init_cc_type = WMI_COUNTRY_INFO_TYPE_REGDOMAIN; - cmd->cc_info.regdom_id = init_cc_params.cc_info.regdom_id; + cmd->init_cc_type = cpu_to_le32(WMI_COUNTRY_INFO_TYPE_REGDOMAIN); + cmd->cc_info.regdom_id = cpu_to_le32(init_cc_params.cc_info.regdom_id); break; default: ath11k_warn(ar->ab, "unknown cc params flags: 0x%x", @@ -3056,10 +3144,10 @@ int ath11k_wmi_send_set_current_country_cmd(struct ath11k *ar, cmd = (struct wmi_set_current_country_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_SET_CURRENT_COUNTRY_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + le32_encode_bits(WMI_TAG_SET_CURRENT_COUNTRY_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->pdev_id = ar->pdev->pdev_id; + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); memcpy(&cmd->new_alpha2, ¶m->alpha2, 3); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_SET_CURRENT_COUNTRY_CMDID); @@ -3098,33 +3186,36 @@ ath11k_wmi_send_thermal_mitigation_param_cmd(struct ath11k *ar, cmd = (struct wmi_therm_throt_config_request_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_THERM_THROT_CONFIG_REQUEST) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_THERM_THROT_CONFIG_REQUEST, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->pdev_id = ar->pdev->pdev_id; - cmd->enable = param->enable; - cmd->dc = param->dc; - cmd->dc_per_event = param->dc_per_event; - cmd->therm_throt_levels = THERMAL_LEVELS; + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->enable = cpu_to_le32(param->enable); + cmd->dc = cpu_to_le32(param->dc); + cmd->dc_per_event = cpu_to_le32(param->dc_per_event); + cmd->therm_throt_levels = cpu_to_le32(THERMAL_LEVELS); tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, - (THERMAL_LEVELS * - sizeof(struct wmi_therm_throt_level_config_info))); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits((THERMAL_LEVELS * + sizeof(struct wmi_therm_throt_level_config_info)), WMI_TLV_LEN); lvl_conf = (struct wmi_therm_throt_level_config_info *)(skb->data + sizeof(*cmd) + TLV_HDR_SIZE); for (i = 0; i < THERMAL_LEVELS; i++) { lvl_conf->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_THERM_THROT_LEVEL_CONFIG_INFO) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*lvl_conf) - TLV_HDR_SIZE); - - lvl_conf->temp_lwm = param->levelconf[i].tmplwm; - lvl_conf->temp_hwm = param->levelconf[i].tmphwm; - lvl_conf->dc_off_percent = param->levelconf[i].dcoffpercent; - lvl_conf->prio = param->levelconf[i].priority; + le32_encode_bits(WMI_TAG_THERM_THROT_LEVEL_CONFIG_INFO, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*lvl_conf) - TLV_HDR_SIZE, + WMI_TLV_LEN); + + lvl_conf->temp_lwm = cpu_to_le32(param->levelconf[i].tmplwm); + lvl_conf->temp_hwm = cpu_to_le32(param->levelconf[i].tmphwm); + lvl_conf->dc_off_percent = cpu_to_le32(param->levelconf[i].dcoffpercent); + lvl_conf->prio = cpu_to_le32(param->levelconf[i].priority); lvl_conf++; } @@ -3156,12 +3247,12 @@ int ath11k_wmi_send_11d_scan_start_cmd(struct ath11k *ar, cmd = (struct wmi_11d_scan_start_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_11D_SCAN_START_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + le32_encode_bits(WMI_TAG_11D_SCAN_START_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = param->vdev_id; - cmd->scan_period_msec = param->scan_period_msec; - cmd->start_interval_msec = param->start_interval_msec; + cmd->vdev_id = cpu_to_le32(param->vdev_id); + cmd->scan_period_msec = cpu_to_le32(param->scan_period_msec); + cmd->start_interval_msec = cpu_to_le32(param->start_interval_msec); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_11D_SCAN_START_CMDID); if (ret) { @@ -3192,10 +3283,10 @@ int ath11k_wmi_send_11d_scan_stop_cmd(struct ath11k *ar, u32 vdev_id) cmd = (struct wmi_11d_scan_stop_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, WMI_TAG_11D_SCAN_STOP_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + le32_encode_bits(WMI_TAG_11D_SCAN_STOP_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = vdev_id; + cmd->vdev_id = cpu_to_le32(vdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_11D_SCAN_STOP_CMDID); if (ret) { @@ -3224,12 +3315,14 @@ int ath11k_wmi_pdev_pktlog_enable(struct ath11k *ar, u32 pktlog_filter) cmd = (struct wmi_pktlog_enable_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PKTLOG_ENABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_PKTLOG_ENABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->pdev_id = DP_HW2SW_MACID(ar->pdev->pdev_id); - cmd->evlist = pktlog_filter; - cmd->enable = ATH11K_WMI_PKTLOG_ENABLE_FORCE; + cmd->pdev_id = cpu_to_le32(DP_HW2SW_MACID(ar->pdev->pdev_id)); + cmd->evlist = cpu_to_le32(pktlog_filter); + cmd->enable = cpu_to_le32(ATH11K_WMI_PKTLOG_ENABLE_FORCE); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_PKTLOG_ENABLE_CMDID); @@ -3256,10 +3349,12 @@ int ath11k_wmi_pdev_pktlog_disable(struct ath11k *ar) cmd = (struct wmi_pktlog_disable_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_PKTLOG_DISABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_PKTLOG_DISABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->pdev_id = DP_HW2SW_MACID(ar->pdev->pdev_id); + cmd->pdev_id = cpu_to_le32(DP_HW2SW_MACID(ar->pdev->pdev_id)); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_PKTLOG_DISABLE_CMDID); @@ -3315,25 +3410,26 @@ int ath11k_wmi_send_twt_enable_cmd(struct ath11k *ar, u32 pdev_id, return -ENOMEM; cmd = (struct wmi_twt_enable_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_ENABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = pdev_id; - cmd->sta_cong_timer_ms = params->sta_cong_timer_ms; - cmd->default_slot_size = params->default_slot_size; - cmd->congestion_thresh_setup = params->congestion_thresh_setup; - cmd->congestion_thresh_teardown = params->congestion_thresh_teardown; - cmd->congestion_thresh_critical = params->congestion_thresh_critical; - cmd->interference_thresh_teardown = params->interference_thresh_teardown; - cmd->interference_thresh_setup = params->interference_thresh_setup; - cmd->min_no_sta_setup = params->min_no_sta_setup; - cmd->min_no_sta_teardown = params->min_no_sta_teardown; - cmd->no_of_bcast_mcast_slots = params->no_of_bcast_mcast_slots; - cmd->min_no_twt_slots = params->min_no_twt_slots; - cmd->max_no_sta_twt = params->max_no_sta_twt; - cmd->mode_check_interval = params->mode_check_interval; - cmd->add_sta_slot_interval = params->add_sta_slot_interval; - cmd->remove_sta_slot_interval = params->remove_sta_slot_interval; - cmd->mbss_support = params->mbss_support; + cmd->tlv_header = le32_encode_bits(WMI_TAG_TWT_ENABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(pdev_id); + cmd->sta_cong_timer_ms = cpu_to_le32(params->sta_cong_timer_ms); + cmd->default_slot_size = cpu_to_le32(params->default_slot_size); + cmd->congestion_thresh_setup = cpu_to_le32(params->congestion_thresh_setup); + cmd->congestion_thresh_teardown = cpu_to_le32(params->congestion_thresh_teardown); + cmd->congestion_thresh_critical = cpu_to_le32(params->congestion_thresh_critical); + cmd->interference_thresh_teardown = cpu_to_le32(params->interference_thresh_teardown); + cmd->interference_thresh_setup = cpu_to_le32(params->interference_thresh_setup); + cmd->min_no_sta_setup = cpu_to_le32(params->min_no_sta_setup); + cmd->min_no_sta_teardown = cpu_to_le32(params->min_no_sta_teardown); + cmd->no_of_bcast_mcast_slots = cpu_to_le32(params->no_of_bcast_mcast_slots); + cmd->min_no_twt_slots = cpu_to_le32(params->min_no_twt_slots); + cmd->max_no_sta_twt = cpu_to_le32(params->max_no_sta_twt); + cmd->mode_check_interval = cpu_to_le32(params->mode_check_interval); + cmd->add_sta_slot_interval = cpu_to_le32(params->add_sta_slot_interval); + cmd->remove_sta_slot_interval = cpu_to_le32(params->remove_sta_slot_interval); + cmd->mbss_support = cpu_to_le32(params->mbss_support); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_ENABLE_CMDID); if (ret) { @@ -3365,9 +3461,10 @@ ath11k_wmi_send_twt_disable_cmd(struct ath11k *ar, u32 pdev_id) return -ENOMEM; cmd = (struct wmi_twt_disable_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_DISABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = pdev_id; + cmd->tlv_header = le32_encode_bits(WMI_TAG_TWT_DISABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(pdev_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_DISABLE_CMDID); if (ret) { @@ -3399,25 +3496,26 @@ int ath11k_wmi_send_twt_add_dialog_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_twt_add_dialog_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_ADD_DIALOG_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_TWT_ADD_DIALOG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = params->vdev_id; + cmd->vdev_id = cpu_to_le32(params->vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); - cmd->dialog_id = params->dialog_id; - cmd->wake_intvl_us = params->wake_intvl_us; - cmd->wake_intvl_mantis = params->wake_intvl_mantis; - cmd->wake_dura_us = params->wake_dura_us; - cmd->sp_offset_us = params->sp_offset_us; - cmd->flags = params->twt_cmd; + cmd->dialog_id = cpu_to_le32(params->dialog_id); + cmd->wake_intvl_us = cpu_to_le32(params->wake_intvl_us); + cmd->wake_intvl_mantis = cpu_to_le32(params->wake_intvl_mantis); + cmd->wake_dura_us = cpu_to_le32(params->wake_dura_us); + cmd->sp_offset_us = cpu_to_le32(params->sp_offset_us); + cmd->flags = cpu_to_le32(params->twt_cmd); if (params->flag_bcast) - cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_BCAST; + cmd->flags |= cpu_to_le32(WMI_TWT_ADD_DIALOG_FLAG_BCAST); if (params->flag_trigger) - cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_TRIGGER; + cmd->flags |= cpu_to_le32(WMI_TWT_ADD_DIALOG_FLAG_TRIGGER); if (params->flag_flow_type) - cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE; + cmd->flags |= cpu_to_le32(WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE); if (params->flag_protection) - cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_PROTECTION; + cmd->flags |= cpu_to_le32(WMI_TWT_ADD_DIALOG_FLAG_PROTECTION); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_ADD_DIALOG_CMDID); if (ret) { @@ -3453,12 +3551,13 @@ int ath11k_wmi_send_twt_del_dialog_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_twt_del_dialog_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_DEL_DIALOG_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_TWT_DEL_DIALOG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = params->vdev_id; + cmd->vdev_id = cpu_to_le32(params->vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); - cmd->dialog_id = params->dialog_id; + cmd->dialog_id = cpu_to_le32(params->dialog_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_DEL_DIALOG_CMDID); if (ret) { @@ -3492,13 +3591,13 @@ int ath11k_wmi_send_twt_pause_dialog_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_twt_pause_dialog_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_TWT_PAUSE_DIALOG_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_TWT_PAUSE_DIALOG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = params->vdev_id; + cmd->vdev_id = cpu_to_le32(params->vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); - cmd->dialog_id = params->dialog_id; + cmd->dialog_id = cpu_to_le32(params->dialog_id); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_PAUSE_DIALOG_CMDID); if (ret) { @@ -3532,15 +3631,15 @@ int ath11k_wmi_send_twt_resume_dialog_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_twt_resume_dialog_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_TWT_RESUME_DIALOG_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_TWT_RESUME_DIALOG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = params->vdev_id; + cmd->vdev_id = cpu_to_le32(params->vdev_id); ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); - cmd->dialog_id = params->dialog_id; - cmd->sp_offset_us = params->sp_offset_us; - cmd->next_twt_size = params->next_twt_size; + cmd->dialog_id = cpu_to_le32(params->dialog_id); + cmd->sp_offset_us = cpu_to_le32(params->sp_offset_us); + cmd->next_twt_size = cpu_to_le32(params->next_twt_size); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_TWT_RESUME_DIALOG_CMDID); if (ret) { @@ -3576,13 +3675,13 @@ ath11k_wmi_send_obss_spr_cmd(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_obss_spatial_reuse_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_OBSS_SPATIAL_REUSE_SET_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->enable = he_obss_pd->enable; - cmd->obss_min = he_obss_pd->min_offset; - cmd->obss_max = he_obss_pd->max_offset; + cmd->tlv_header = le32_encode_bits(WMI_TAG_OBSS_SPATIAL_REUSE_SET_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->enable = cpu_to_le32(he_obss_pd->enable); + cmd->obss_min = cpu_to_le32((u32)he_obss_pd->min_offset); + cmd->obss_max = cpu_to_le32((u32)he_obss_pd->max_offset); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID); @@ -3614,11 +3713,12 @@ ath11k_wmi_pdev_set_srg_bss_color_bitmap(struct ath11k *ar, u32 *bitmap) return -ENOMEM; cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_SRG_BSS_COLOR_BITMAP_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SRG_BSS_COLOR_BITMAP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->bitmap[0] = cpu_to_le32(bitmap[0]); + cmd->bitmap[1] = cpu_to_le32(bitmap[1]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID); @@ -3653,11 +3753,12 @@ ath11k_wmi_pdev_set_srg_patial_bssid_bitmap(struct ath11k *ar, u32 *bitmap) cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_SRG_PARTIAL_BSSID_BITMAP_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + le32_encode_bits(WMI_TAG_PDEV_SRG_PARTIAL_BSSID_BITMAP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->bitmap[0] = cpu_to_le32(bitmap[0]); + cmd->bitmap[1] = cpu_to_le32(bitmap[1]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID); @@ -3692,11 +3793,12 @@ ath11k_wmi_pdev_srg_obss_color_enable_bitmap(struct ath11k *ar, u32 *bitmap) cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + le32_encode_bits(WMI_TAG_PDEV_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->bitmap[0] = cpu_to_le32(bitmap[0]); + cmd->bitmap[1] = cpu_to_le32(bitmap[1]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID); @@ -3731,11 +3833,12 @@ ath11k_wmi_pdev_srg_obss_bssid_enable_bitmap(struct ath11k *ar, u32 *bitmap) cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + le32_encode_bits(WMI_TAG_PDEV_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->bitmap[0] = cpu_to_le32(bitmap[0]); + cmd->bitmap[1] = cpu_to_le32(bitmap[1]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID); @@ -3770,11 +3873,12 @@ ath11k_wmi_pdev_non_srg_obss_color_enable_bitmap(struct ath11k *ar, u32 *bitmap) cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + le32_encode_bits(WMI_TAG_PDEV_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->bitmap[0] = cpu_to_le32(bitmap[0]); + cmd->bitmap[1] = cpu_to_le32(bitmap[1]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID); @@ -3809,11 +3913,12 @@ ath11k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath11k *ar, u32 *bitmap) cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; cmd->tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + le32_encode_bits(WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->bitmap[0] = cpu_to_le32(bitmap[0]); + cmd->bitmap[1] = cpu_to_le32(bitmap[1]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID); @@ -3849,15 +3954,15 @@ ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_obss_color_collision_cfg_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_OBSS_COLOR_COLLISION_DET_CONFIG) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->evt_type = enable ? ATH11K_OBSS_COLOR_COLLISION_DETECTION : - ATH11K_OBSS_COLOR_COLLISION_DETECTION_DISABLE; - cmd->current_bss_color = bss_color; - cmd->detection_period_ms = period; - cmd->scan_period_ms = ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS; + cmd->tlv_header = le32_encode_bits(WMI_TAG_OBSS_COLOR_COLLISION_DET_CONFIG, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->evt_type = cpu_to_le32(enable ? ATH11K_OBSS_COLOR_COLLISION_DETECTION : + ATH11K_OBSS_COLOR_COLLISION_DETECTION_DISABLE); + cmd->current_bss_color = cpu_to_le32(bss_color); + cmd->detection_period_ms = cpu_to_le32(period); + cmd->scan_period_ms = cpu_to_le32(ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS); cmd->free_slot_expiry_time_ms = 0; cmd->flags = 0; @@ -3893,10 +3998,11 @@ int ath11k_wmi_send_bss_color_change_enable_cmd(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_bss_color_change_enable_params_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_BSS_COLOR_CHANGE_ENABLE) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->enable = enable ? 1 : 0; + cmd->tlv_header = le32_encode_bits(WMI_TAG_BSS_COLOR_CHANGE_ENABLE, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->enable = cpu_to_le32(enable ? 1 : 0); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_BSS_COLOR_CHANGE_ENABLE_CMDID); @@ -3934,16 +4040,17 @@ int ath11k_wmi_fils_discovery_tmpl(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_fils_discovery_tmpl_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_FILS_DISCOVERY_TMPL_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->buf_len = tmpl->len; + cmd->tlv_header = le32_encode_bits(WMI_TAG_FILS_DISCOVERY_TMPL_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->buf_len = cpu_to_le32(tmpl->len); ptr = skb->data + sizeof(*cmd); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, aligned_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(aligned_len, WMI_TLV_LEN); memcpy(tlv->value, tmpl->data, tmpl->len); ret = ath11k_wmi_cmd_send(ar->wmi, skb, WMI_FILS_DISCOVERY_TMPL_CMDID); @@ -4022,26 +4129,28 @@ int ath11k_wmi_probe_resp_tmpl(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_probe_tmpl_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PRB_TMPL_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->buf_len = tmpl->len; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PRB_TMPL_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->buf_len = cpu_to_le32(tmpl->len); ptr = skb->data + sizeof(*cmd); probe_info = ptr; len = sizeof(*probe_info); - probe_info->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_BCN_PRB_INFO) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + probe_info->tlv_header = le32_encode_bits(WMI_TAG_BCN_PRB_INFO, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, + WMI_TLV_LEN); probe_info->caps = 0; probe_info->erp = 0; ptr += sizeof(*probe_info); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, aligned_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(aligned_len, WMI_TLV_LEN); memcpy(tlv->value, tmpl->data, tmpl->len); ret = ath11k_wmi_cmd_send(ar->wmi, skb, WMI_PRB_TMPL_CMDID); @@ -4077,11 +4186,12 @@ int ath11k_wmi_fils_discovery(struct ath11k *ar, u32 vdev_id, u32 interval, return -ENOMEM; cmd = (struct wmi_fils_discovery_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ENABLE_FILS_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); - cmd->vdev_id = vdev_id; - cmd->interval = interval; - cmd->config = unsol_bcast_probe_resp_enabled; + cmd->tlv_header = le32_encode_bits(WMI_TAG_ENABLE_FILS_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->interval = cpu_to_le32(interval); + cmd->config = cpu_to_le32(unsol_bcast_probe_resp_enabled); ret = ath11k_wmi_cmd_send(ar->wmi, skb, WMI_ENABLE_FILS_CMDID); if (ret) { @@ -4122,20 +4232,23 @@ ath11k_wmi_obss_color_collision_event(struct ath11k_base *ab, struct sk_buff *sk goto exit; } - arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id); + arvif = ath11k_mac_get_arvif_by_vdev_id(ab, le32_to_cpu(ev->vdev_id)); if (!arvif) { - ath11k_warn(ab, "failed to find arvif with vedv id %d in obss_color_collision_event\n", - ev->vdev_id); + ath11k_warn(ab, + "failed to find arvif with vedv id %d in obss_color_collision_event\n", + le32_to_cpu(ev->vdev_id)); goto exit; } - switch (ev->evt_type) { + switch (le32_to_cpu(ev->evt_type)) { case WMI_BSS_COLOR_COLLISION_DETECTION: - ieee80211_obss_color_collision_notify(arvif->vif, ev->obss_color_bitmap, + ieee80211_obss_color_collision_notify(arvif->vif, + le64_to_cpu(ev->obss_color_bitmap), 0); ath11k_dbg(ab, ATH11K_DBG_WMI, "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n", - ev->vdev_id, ev->evt_type, ev->obss_color_bitmap); + le32_to_cpu(ev->vdev_id), le32_to_cpu(ev->evt_type), + le64_to_cpu(ev->obss_color_bitmap)); break; case WMI_BSS_COLOR_COLLISION_DISABLE: case WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY: @@ -4186,71 +4299,71 @@ static void ath11k_wmi_copy_resource_config(struct wmi_resource_config *wmi_cfg, struct target_resource_config *tg_cfg) { - wmi_cfg->num_vdevs = tg_cfg->num_vdevs; - wmi_cfg->num_peers = tg_cfg->num_peers; - wmi_cfg->num_offload_peers = tg_cfg->num_offload_peers; - wmi_cfg->num_offload_reorder_buffs = tg_cfg->num_offload_reorder_buffs; - wmi_cfg->num_peer_keys = tg_cfg->num_peer_keys; - wmi_cfg->num_tids = tg_cfg->num_tids; - wmi_cfg->ast_skid_limit = tg_cfg->ast_skid_limit; - wmi_cfg->tx_chain_mask = tg_cfg->tx_chain_mask; - wmi_cfg->rx_chain_mask = tg_cfg->rx_chain_mask; - wmi_cfg->rx_timeout_pri[0] = tg_cfg->rx_timeout_pri[0]; - wmi_cfg->rx_timeout_pri[1] = tg_cfg->rx_timeout_pri[1]; - wmi_cfg->rx_timeout_pri[2] = tg_cfg->rx_timeout_pri[2]; - wmi_cfg->rx_timeout_pri[3] = tg_cfg->rx_timeout_pri[3]; - wmi_cfg->rx_decap_mode = tg_cfg->rx_decap_mode; - wmi_cfg->scan_max_pending_req = tg_cfg->scan_max_pending_req; - wmi_cfg->bmiss_offload_max_vdev = tg_cfg->bmiss_offload_max_vdev; - wmi_cfg->roam_offload_max_vdev = tg_cfg->roam_offload_max_vdev; + wmi_cfg->num_vdevs = cpu_to_le32(tg_cfg->num_vdevs); + wmi_cfg->num_peers = cpu_to_le32(tg_cfg->num_peers); + wmi_cfg->num_offload_peers = cpu_to_le32(tg_cfg->num_offload_peers); + wmi_cfg->num_offload_reorder_buffs = cpu_to_le32(tg_cfg->num_offload_reorder_buffs); + wmi_cfg->num_peer_keys = cpu_to_le32(tg_cfg->num_peer_keys); + wmi_cfg->num_tids = cpu_to_le32(tg_cfg->num_tids); + wmi_cfg->ast_skid_limit = cpu_to_le32(tg_cfg->ast_skid_limit); + wmi_cfg->tx_chain_mask = cpu_to_le32(tg_cfg->tx_chain_mask); + wmi_cfg->rx_chain_mask = cpu_to_le32(tg_cfg->rx_chain_mask); + wmi_cfg->rx_timeout_pri[0] = cpu_to_le32(tg_cfg->rx_timeout_pri[0]); + wmi_cfg->rx_timeout_pri[1] = cpu_to_le32(tg_cfg->rx_timeout_pri[1]); + wmi_cfg->rx_timeout_pri[2] = cpu_to_le32(tg_cfg->rx_timeout_pri[2]); + wmi_cfg->rx_timeout_pri[3] = cpu_to_le32(tg_cfg->rx_timeout_pri[3]); + wmi_cfg->rx_decap_mode = cpu_to_le32(tg_cfg->rx_decap_mode); + wmi_cfg->scan_max_pending_req = cpu_to_le32(tg_cfg->scan_max_pending_req); + wmi_cfg->bmiss_offload_max_vdev = cpu_to_le32(tg_cfg->bmiss_offload_max_vdev); + wmi_cfg->roam_offload_max_vdev = cpu_to_le32(tg_cfg->roam_offload_max_vdev); wmi_cfg->roam_offload_max_ap_profiles = - tg_cfg->roam_offload_max_ap_profiles; - wmi_cfg->num_mcast_groups = tg_cfg->num_mcast_groups; - wmi_cfg->num_mcast_table_elems = tg_cfg->num_mcast_table_elems; - wmi_cfg->mcast2ucast_mode = tg_cfg->mcast2ucast_mode; - wmi_cfg->tx_dbg_log_size = tg_cfg->tx_dbg_log_size; - wmi_cfg->num_wds_entries = tg_cfg->num_wds_entries; - wmi_cfg->dma_burst_size = tg_cfg->dma_burst_size; - wmi_cfg->mac_aggr_delim = tg_cfg->mac_aggr_delim; + cpu_to_le32(tg_cfg->roam_offload_max_ap_profiles); + wmi_cfg->num_mcast_groups = cpu_to_le32(tg_cfg->num_mcast_groups); + wmi_cfg->num_mcast_table_elems = cpu_to_le32(tg_cfg->num_mcast_table_elems); + wmi_cfg->mcast2ucast_mode = cpu_to_le32(tg_cfg->mcast2ucast_mode); + wmi_cfg->tx_dbg_log_size = cpu_to_le32(tg_cfg->tx_dbg_log_size); + wmi_cfg->num_wds_entries = cpu_to_le32(tg_cfg->num_wds_entries); + wmi_cfg->dma_burst_size = cpu_to_le32(tg_cfg->dma_burst_size); + wmi_cfg->mac_aggr_delim = cpu_to_le32(tg_cfg->mac_aggr_delim); wmi_cfg->rx_skip_defrag_timeout_dup_detection_check = - tg_cfg->rx_skip_defrag_timeout_dup_detection_check; - wmi_cfg->vow_config = tg_cfg->vow_config; - wmi_cfg->gtk_offload_max_vdev = tg_cfg->gtk_offload_max_vdev; - wmi_cfg->num_msdu_desc = tg_cfg->num_msdu_desc; - wmi_cfg->max_frag_entries = tg_cfg->max_frag_entries; - wmi_cfg->num_tdls_vdevs = tg_cfg->num_tdls_vdevs; + cpu_to_le32(tg_cfg->rx_skip_defrag_timeout_dup_detection_check); + wmi_cfg->vow_config = cpu_to_le32(tg_cfg->vow_config); + wmi_cfg->gtk_offload_max_vdev = cpu_to_le32(tg_cfg->gtk_offload_max_vdev); + wmi_cfg->num_msdu_desc = cpu_to_le32(tg_cfg->num_msdu_desc); + wmi_cfg->max_frag_entries = cpu_to_le32(tg_cfg->max_frag_entries); + wmi_cfg->num_tdls_vdevs = cpu_to_le32(tg_cfg->num_tdls_vdevs); wmi_cfg->num_tdls_conn_table_entries = - tg_cfg->num_tdls_conn_table_entries; + cpu_to_le32(tg_cfg->num_tdls_conn_table_entries); wmi_cfg->beacon_tx_offload_max_vdev = - tg_cfg->beacon_tx_offload_max_vdev; + cpu_to_le32(tg_cfg->beacon_tx_offload_max_vdev); wmi_cfg->num_multicast_filter_entries = - tg_cfg->num_multicast_filter_entries; - wmi_cfg->num_wow_filters = tg_cfg->num_wow_filters; - wmi_cfg->num_keep_alive_pattern = tg_cfg->num_keep_alive_pattern; - wmi_cfg->keep_alive_pattern_size = tg_cfg->keep_alive_pattern_size; + cpu_to_le32(tg_cfg->num_multicast_filter_entries); + wmi_cfg->num_wow_filters = cpu_to_le32(tg_cfg->num_wow_filters); + wmi_cfg->num_keep_alive_pattern = cpu_to_le32(tg_cfg->num_keep_alive_pattern); + wmi_cfg->keep_alive_pattern_size = cpu_to_le32(tg_cfg->keep_alive_pattern_size); wmi_cfg->max_tdls_concurrent_sleep_sta = - tg_cfg->max_tdls_concurrent_sleep_sta; + cpu_to_le32(tg_cfg->max_tdls_concurrent_sleep_sta); wmi_cfg->max_tdls_concurrent_buffer_sta = - tg_cfg->max_tdls_concurrent_buffer_sta; - wmi_cfg->wmi_send_separate = tg_cfg->wmi_send_separate; - wmi_cfg->num_ocb_vdevs = tg_cfg->num_ocb_vdevs; - wmi_cfg->num_ocb_channels = tg_cfg->num_ocb_channels; - wmi_cfg->num_ocb_schedules = tg_cfg->num_ocb_schedules; - wmi_cfg->bpf_instruction_size = tg_cfg->bpf_instruction_size; - wmi_cfg->max_bssid_rx_filters = tg_cfg->max_bssid_rx_filters; - wmi_cfg->use_pdev_id = tg_cfg->use_pdev_id; - wmi_cfg->flag1 = tg_cfg->flag1; - wmi_cfg->peer_map_unmap_v2_support = tg_cfg->peer_map_unmap_v2_support; - wmi_cfg->sched_params = tg_cfg->sched_params; - wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count; - wmi_cfg->twt_ap_sta_count = tg_cfg->twt_ap_sta_count; + cpu_to_le32(tg_cfg->max_tdls_concurrent_buffer_sta); + wmi_cfg->wmi_send_separate = cpu_to_le32(tg_cfg->wmi_send_separate); + wmi_cfg->num_ocb_vdevs = cpu_to_le32(tg_cfg->num_ocb_vdevs); + wmi_cfg->num_ocb_channels = cpu_to_le32(tg_cfg->num_ocb_channels); + wmi_cfg->num_ocb_schedules = cpu_to_le32(tg_cfg->num_ocb_schedules); + wmi_cfg->bpf_instruction_size = cpu_to_le32(tg_cfg->bpf_instruction_size); + wmi_cfg->max_bssid_rx_filters = cpu_to_le32(tg_cfg->max_bssid_rx_filters); + wmi_cfg->use_pdev_id = cpu_to_le32(tg_cfg->use_pdev_id); + wmi_cfg->flag1 = cpu_to_le32(tg_cfg->flag1); + wmi_cfg->peer_map_unmap_v2_support = cpu_to_le32(tg_cfg->peer_map_unmap_v2_support); + wmi_cfg->sched_params = cpu_to_le32(tg_cfg->sched_params); + wmi_cfg->twt_ap_pdev_count = cpu_to_le32(tg_cfg->twt_ap_pdev_count); + wmi_cfg->twt_ap_sta_count = cpu_to_le32(tg_cfg->twt_ap_sta_count); wmi_cfg->host_service_flags &= - ~(1 << WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT); - wmi_cfg->host_service_flags |= (tg_cfg->is_reg_cc_ext_event_supported << - WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT); - wmi_cfg->flags2 = WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET; - wmi_cfg->ema_max_vap_cnt = tg_cfg->ema_max_vap_cnt; - wmi_cfg->ema_max_profile_period = tg_cfg->ema_max_profile_period; + cpu_to_le32(~(1 << WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT)); + wmi_cfg->host_service_flags |= cpu_to_le32((tg_cfg->is_reg_cc_ext_event_supported << + WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT)); + wmi_cfg->flags2 = cpu_to_le32(WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET); + wmi_cfg->ema_max_vap_cnt = cpu_to_le32(tg_cfg->ema_max_vap_cnt); + wmi_cfg->ema_max_profile_period = cpu_to_le32(tg_cfg->ema_max_profile_period); } static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, @@ -4269,9 +4382,9 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, u32 hw_mode_len = 0; u16 idx; - if (param->hw_mode_id != WMI_HOST_HW_MODE_MAX) + if (le32_to_cpu(param->hw_mode_id) != WMI_HOST_HW_MODE_MAX) hw_mode_len = sizeof(*hw_mode) + TLV_HDR_SIZE + - (param->num_band_to_mac * sizeof(*band_to_mac)); + (le32_to_cpu(param->num_band_to_mac) * sizeof(*band_to_mac)); len = sizeof(*cmd) + TLV_HDR_SIZE + sizeof(*cfg) + hw_mode_len + (param->num_mem_chunks ? (sizeof(*host_mem_chunks) * WMI_MAX_MEM_REQS) : 0); @@ -4282,16 +4395,19 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, cmd = (struct wmi_init_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_INIT_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_INIT_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ptr = skb->data + sizeof(*cmd); cfg = ptr; ath11k_wmi_copy_resource_config(cfg, param->res_cfg); - cfg->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_RESOURCE_CONFIG) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cfg) - TLV_HDR_SIZE); + cfg->tlv_header = le32_encode_bits(WMI_TAG_RESOURCE_CONFIG, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cfg) - TLV_HDR_SIZE, + WMI_TLV_LEN); ptr += sizeof(*cfg); host_mem_chunks = ptr + TLV_HDR_SIZE; @@ -4299,13 +4415,13 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, for (idx = 0; idx < param->num_mem_chunks; ++idx) { host_mem_chunks[idx].tlv_header = - FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_WLAN_HOST_MEMORY_CHUNK) | - FIELD_PREP(WMI_TLV_LEN, len); + le32_encode_bits(WMI_TAG_WLAN_HOST_MEMORY_CHUNK, + WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); - host_mem_chunks[idx].ptr = param->mem_chunks[idx].paddr; - host_mem_chunks[idx].size = param->mem_chunks[idx].len; - host_mem_chunks[idx].req_id = param->mem_chunks[idx].req_id; + host_mem_chunks[idx].ptr = cpu_to_le32(param->mem_chunks[idx].paddr); + host_mem_chunks[idx].size = cpu_to_le32(param->mem_chunks[idx].len); + host_mem_chunks[idx].req_id = cpu_to_le32(param->mem_chunks[idx].req_id); ath11k_dbg(ab, ATH11K_DBG_WMI, "host mem chunk req_id %d paddr 0x%llx len %d\n", @@ -4313,47 +4429,48 @@ static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, (u64)param->mem_chunks[idx].paddr, param->mem_chunks[idx].len); } - cmd->num_host_mem_chunks = param->num_mem_chunks; + cmd->num_host_mem_chunks = cpu_to_le32(param->num_mem_chunks); len = sizeof(struct wlan_host_mem_chunk) * param->num_mem_chunks; /* num_mem_chunks is zero */ tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE + len; - if (param->hw_mode_id != WMI_HOST_HW_MODE_MAX) { + if (le32_to_cpu(param->hw_mode_id) != WMI_HOST_HW_MODE_MAX) { hw_mode = ptr; - hw_mode->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_SET_HW_MODE_CMD) | - FIELD_PREP(WMI_TLV_LEN, - sizeof(*hw_mode) - TLV_HDR_SIZE); + hw_mode->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SET_HW_MODE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*hw_mode) - TLV_HDR_SIZE, + WMI_TLV_LEN); hw_mode->hw_mode_index = param->hw_mode_id; hw_mode->num_band_to_mac = param->num_band_to_mac; ptr += sizeof(*hw_mode); - len = param->num_band_to_mac * sizeof(*band_to_mac); + len = le32_to_cpu(param->num_band_to_mac) * sizeof(*band_to_mac); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; len = sizeof(*band_to_mac); - for (idx = 0; idx < param->num_band_to_mac; idx++) { + for (idx = 0; idx < le32_to_cpu(param->num_band_to_mac); idx++) { band_to_mac = ptr; - band_to_mac->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_PDEV_BAND_TO_MAC) | - FIELD_PREP(WMI_TLV_LEN, - len - TLV_HDR_SIZE); - band_to_mac->pdev_id = param->band_to_mac[idx].pdev_id; + band_to_mac->tlv_header = le32_encode_bits(WMI_TAG_PDEV_BAND_TO_MAC, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, + WMI_TLV_LEN); + band_to_mac->pdev_id = cpu_to_le32(param->band_to_mac[idx].pdev_id); band_to_mac->start_freq = - param->band_to_mac[idx].start_freq; + cpu_to_le32(param->band_to_mac[idx].start_freq); band_to_mac->end_freq = - param->band_to_mac[idx].end_freq; + cpu_to_le32(param->band_to_mac[idx].end_freq); ptr += sizeof(*band_to_mac); } } @@ -4382,13 +4499,14 @@ int ath11k_wmi_pdev_lro_cfg(struct ath11k *ar, return -ENOMEM; cmd = (struct ath11k_wmi_pdev_lro_config_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_LRO_INFO_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_LRO_INFO_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); get_random_bytes(cmd->th_4, sizeof(uint32_t) * ATH11K_IPV4_TH_SEED_SIZE); get_random_bytes(cmd->th_6, sizeof(uint32_t) * ATH11K_IPV6_TH_SEED_SIZE); - cmd->pdev_id = pdev_id; + cmd->pdev_id = cpu_to_le32(pdev_id); ret = ath11k_wmi_cmd_send(ar->wmi, skb, WMI_LRO_CONFIG_CMDID); if (ret) { @@ -4446,11 +4564,13 @@ int ath11k_wmi_set_hw_mode(struct ath11k_base *ab, cmd = (struct wmi_pdev_set_hw_mode_cmd_param *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_HW_MODE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SET_HW_MODE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); cmd->pdev_id = WMI_PDEV_ID_SOC; - cmd->hw_mode_index = mode; + cmd->hw_mode_index = cpu_to_le32(mode); ret = ath11k_wmi_cmd_send(&wmi_ab->wmi[0], skb, WMI_PDEV_SET_HW_MODE_CMDID); if (ret) { @@ -4483,13 +4603,13 @@ int ath11k_wmi_cmd_init(struct ath11k_base *ab) init_param.res_cfg = &wmi_ab->wlan_resource_config; init_param.num_mem_chunks = wmi_ab->num_mem_chunks; - init_param.hw_mode_id = wmi_ab->preferred_hw_mode; + init_param.hw_mode_id = cpu_to_le32(wmi_ab->preferred_hw_mode); init_param.mem_chunks = wmi_ab->mem_chunks; if (ab->hw_params.single_pdev_only) - init_param.hw_mode_id = WMI_HOST_HW_MODE_MAX; + init_param.hw_mode_id = cpu_to_le32(WMI_HOST_HW_MODE_MAX); - init_param.num_band_to_mac = ab->num_radios; + init_param.num_band_to_mac = cpu_to_le32(ab->num_radios); ath11k_fill_band_to_mac_param(ab, init_param.band_to_mac); return ath11k_init_cmd_send(&wmi_ab->wmi[0], &init_param); @@ -4507,9 +4627,10 @@ int ath11k_wmi_vdev_spectral_conf(struct ath11k *ar, return -ENOMEM; cmd = (struct ath11k_wmi_vdev_spectral_conf_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_VDEV_SPECTRAL_CONFIGURE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_SPECTRAL_CONFIGURE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); memcpy(&cmd->param, param, sizeof(*param)); @@ -4543,13 +4664,14 @@ int ath11k_wmi_vdev_spectral_enable(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct ath11k_wmi_vdev_spectral_enable_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_VDEV_SPECTRAL_ENABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_VDEV_SPECTRAL_ENABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->trigger_cmd = trigger; - cmd->enable_cmd = enable; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->trigger_cmd = cpu_to_le32(trigger); + cmd->enable_cmd = cpu_to_le32(enable); ret = ath11k_wmi_cmd_send(ar->wmi, skb, WMI_VDEV_SPECTRAL_SCAN_ENABLE_CMDID); @@ -4581,8 +4703,10 @@ int ath11k_wmi_pdev_dma_ring_cfg(struct ath11k *ar, return -ENOMEM; cmd = (struct ath11k_wmi_pdev_dma_ring_cfg_req_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_DMA_RING_CFG_REQ) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_DMA_RING_CFG_REQ, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); cmd->pdev_id = param->pdev_id; cmd->module_id = param->module_id; @@ -4624,7 +4748,7 @@ static int ath11k_wmi_tlv_dma_buf_entry_parse(struct ath11k_base *soc, if (tag != WMI_TAG_DMA_BUF_RELEASE_ENTRY) return -EPROTO; - if (parse->num_buf_entry >= parse->fixed.num_buf_release_entry) + if (parse->num_buf_entry >= le32_to_cpu(parse->fixed.num_buf_release_entry)) return -ENOBUFS; parse->num_buf_entry++; @@ -4640,7 +4764,7 @@ static int ath11k_wmi_tlv_dma_buf_meta_parse(struct ath11k_base *soc, if (tag != WMI_TAG_DMA_BUF_RELEASE_SPECTRAL_META_DATA) return -EPROTO; - if (parse->num_meta >= parse->fixed.num_meta_data_entry) + if (parse->num_meta >= le32_to_cpu(parse->fixed.num_meta_data_entry)) return -ENOBUFS; parse->num_meta++; @@ -4658,7 +4782,8 @@ static int ath11k_wmi_tlv_dma_buf_parse(struct ath11k_base *ab, case WMI_TAG_DMA_BUF_RELEASE: memcpy(&parse->fixed, ptr, sizeof(struct ath11k_wmi_dma_buf_release_fixed_param)); - parse->fixed.pdev_id = DP_HW2SW_MACID(parse->fixed.pdev_id); + parse->fixed.pdev_id = + cpu_to_le32(DP_HW2SW_MACID(le32_to_cpu(parse->fixed.pdev_id))); break; case WMI_TAG_ARRAY_STRUCT: if (!parse->buf_entry_done) { @@ -4745,7 +4870,7 @@ static int ath11k_wmi_tlv_hw_mode_caps_parse(struct ath11k_base *soc, hw_mode_id); svc_rdy_ext->n_hw_mode_caps++; - phy_map = hw_mode_cap->phy_id_map; + phy_map = le32_to_cpu(hw_mode_cap->phy_id_map); while (phy_map) { svc_rdy_ext->tot_phy_id++; phy_map = phy_map >> 1; @@ -4777,7 +4902,7 @@ static int ath11k_wmi_tlv_hw_mode_caps(struct ath11k_base *soc, i = 0; while (i < svc_rdy_ext->n_hw_mode_caps) { hw_mode_caps = &svc_rdy_ext->hw_mode_caps[i]; - mode = hw_mode_caps->hw_mode_id; + mode = le32_to_cpu(hw_mode_caps->hw_mode_id); pref = soc->wmi_ab.preferred_hw_mode; if (ath11k_hw_mode_pri_map[mode] < ath11k_hw_mode_pri_map[pref]) { @@ -4885,17 +5010,17 @@ static int ath11k_wmi_tlv_ext_soc_hal_reg_caps_parse(struct ath11k_base *soc, { struct ath11k_pdev_wmi *wmi_handle = &soc->wmi_ab.wmi[0]; struct wmi_tlv_svc_rdy_ext_parse *svc_rdy_ext = data; - u8 hw_mode_id = svc_rdy_ext->pref_hw_mode_caps.hw_mode_id; + u8 hw_mode_id = le32_to_cpu(svc_rdy_ext->pref_hw_mode_caps.hw_mode_id); u32 phy_id_map; int pdev_index = 0; int ret; svc_rdy_ext->soc_hal_reg_caps = (struct wmi_soc_hal_reg_capabilities *)ptr; - svc_rdy_ext->param.num_phy = svc_rdy_ext->soc_hal_reg_caps->num_phy; + svc_rdy_ext->param.num_phy = le32_to_cpu(svc_rdy_ext->soc_hal_reg_caps->num_phy); soc->num_radios = 0; soc->target_pdev_count = 0; - phy_id_map = svc_rdy_ext->pref_hw_mode_caps.phy_id_map; + phy_id_map = le32_to_cpu(svc_rdy_ext->pref_hw_mode_caps.phy_id_map); while (phy_id_map && soc->num_radios < MAX_RADIOS) { ret = ath11k_pull_mac_phy_cap_svc_ready_ext(wmi_handle, @@ -5012,17 +5137,18 @@ static int ath11k_wmi_tlv_dma_ring_caps(struct ath11k_base *ab, dir_buff_caps = ab->db_caps; for (i = 0; i < dma_caps_parse->n_dma_ring_caps; i++) { - if (dma_caps[i].module_id >= WMI_DIRECT_BUF_MAX) { - ath11k_warn(ab, "Invalid module id %d\n", dma_caps[i].module_id); + if (le32_to_cpu(dma_caps[i].module_id) >= WMI_DIRECT_BUF_MAX) { + ath11k_warn(ab, "Invalid module id %d\n", + dma_caps[i].module_id); ret = -EINVAL; goto free_dir_buff; } - dir_buff_caps[i].id = dma_caps[i].module_id; - dir_buff_caps[i].pdev_id = DP_HW2SW_MACID(dma_caps[i].pdev_id); - dir_buff_caps[i].min_elem = dma_caps[i].min_elem; - dir_buff_caps[i].min_buf_sz = dma_caps[i].min_buf_sz; - dir_buff_caps[i].min_buf_align = dma_caps[i].min_buf_align; + dir_buff_caps[i].id = le32_to_cpu(dma_caps[i].module_id); + dir_buff_caps[i].pdev_id = DP_HW2SW_MACID(le32_to_cpu(dma_caps[i].pdev_id)); + dir_buff_caps[i].min_elem = le32_to_cpu(dma_caps[i].min_elem); + dir_buff_caps[i].min_buf_sz = le32_to_cpu(dma_caps[i].min_buf_sz); + dir_buff_caps[i].min_buf_align = le32_to_cpu(dma_caps[i].min_buf_align); } return 0; @@ -5052,7 +5178,7 @@ static int ath11k_wmi_tlv_svc_rdy_ext_parse(struct ath11k_base *ab, case WMI_TAG_SOC_MAC_PHY_HW_MODE_CAPS: svc_rdy_ext->hw_caps = (struct wmi_soc_mac_phy_hw_mode_caps *)ptr; - svc_rdy_ext->param.num_hw_modes = svc_rdy_ext->hw_caps->num_hw_modes; + svc_rdy_ext->param.num_hw_modes = le32_to_cpu(svc_rdy_ext->hw_caps->num_hw_modes); break; case WMI_TAG_SOC_HAL_REG_CAPABILITIES: @@ -5269,23 +5395,23 @@ static struct cur_reg_rule for (count = 0; count < num_reg_rules; count++) { reg_rule_ptr[count].start_freq = - FIELD_GET(REG_RULE_START_FREQ, - wmi_reg_rule[count].freq_info); + le32_get_bits(wmi_reg_rule[count].freq_info, + REG_RULE_START_FREQ); reg_rule_ptr[count].end_freq = - FIELD_GET(REG_RULE_END_FREQ, - wmi_reg_rule[count].freq_info); + le32_get_bits(wmi_reg_rule[count].freq_info, + REG_RULE_END_FREQ); reg_rule_ptr[count].max_bw = - FIELD_GET(REG_RULE_MAX_BW, - wmi_reg_rule[count].bw_pwr_info); + le32_get_bits(wmi_reg_rule[count].bw_pwr_info, + REG_RULE_MAX_BW); reg_rule_ptr[count].reg_power = - FIELD_GET(REG_RULE_REG_PWR, - wmi_reg_rule[count].bw_pwr_info); + le32_get_bits(wmi_reg_rule[count].bw_pwr_info, + REG_RULE_REG_PWR); reg_rule_ptr[count].ant_gain = - FIELD_GET(REG_RULE_ANT_GAIN, - wmi_reg_rule[count].bw_pwr_info); + le32_get_bits(wmi_reg_rule[count].bw_pwr_info, + REG_RULE_ANT_GAIN); reg_rule_ptr[count].flags = - FIELD_GET(REG_RULE_FLAGS, - wmi_reg_rule[count].flag_info); + le32_get_bits(wmi_reg_rule[count].flag_info, + REG_RULE_FLAGS); } return reg_rule_ptr; @@ -5317,8 +5443,8 @@ static int ath11k_pull_reg_chan_list_update_ev(struct ath11k_base *ab, return -EPROTO; } - reg_info->num_2ghz_reg_rules = chan_list_event_hdr->num_2ghz_reg_rules; - reg_info->num_5ghz_reg_rules = chan_list_event_hdr->num_5ghz_reg_rules; + reg_info->num_2ghz_reg_rules = le32_to_cpu(chan_list_event_hdr->num_2ghz_reg_rules); + reg_info->num_5ghz_reg_rules = le32_to_cpu(chan_list_event_hdr->num_5ghz_reg_rules); if (!(reg_info->num_2ghz_reg_rules + reg_info->num_5ghz_reg_rules)) { ath11k_warn(ab, "No regulatory rules available in the event info\n"); @@ -5328,26 +5454,26 @@ static int ath11k_pull_reg_chan_list_update_ev(struct ath11k_base *ab, memcpy(reg_info->alpha2, &chan_list_event_hdr->alpha2, REG_ALPHA2_LEN); - reg_info->dfs_region = chan_list_event_hdr->dfs_region; - reg_info->phybitmap = chan_list_event_hdr->phybitmap; - reg_info->num_phy = chan_list_event_hdr->num_phy; - reg_info->phy_id = chan_list_event_hdr->phy_id; - reg_info->ctry_code = chan_list_event_hdr->country_id; - reg_info->reg_dmn_pair = chan_list_event_hdr->domain_code; + reg_info->dfs_region = le32_to_cpu(chan_list_event_hdr->dfs_region); + reg_info->phybitmap = le32_to_cpu(chan_list_event_hdr->phybitmap); + reg_info->num_phy = le32_to_cpu(chan_list_event_hdr->num_phy); + reg_info->phy_id = le32_to_cpu(chan_list_event_hdr->phy_id); + reg_info->ctry_code = le32_to_cpu(chan_list_event_hdr->country_id); + reg_info->reg_dmn_pair = le32_to_cpu(chan_list_event_hdr->domain_code); ath11k_dbg(ab, ATH11K_DBG_WMI, "status_code %s", ath11k_cc_status_to_str(reg_info->status_code)); reg_info->status_code = - ath11k_wmi_cc_setting_code_to_reg(chan_list_event_hdr->status_code); + ath11k_wmi_cc_setting_code_to_reg(le32_to_cpu(chan_list_event_hdr->status_code)); reg_info->is_ext_reg_event = false; - reg_info->min_bw_2ghz = chan_list_event_hdr->min_bw_2ghz; - reg_info->max_bw_2ghz = chan_list_event_hdr->max_bw_2ghz; - reg_info->min_bw_5ghz = chan_list_event_hdr->min_bw_5ghz; - reg_info->max_bw_5ghz = chan_list_event_hdr->max_bw_5ghz; + reg_info->min_bw_2ghz = le32_to_cpu(chan_list_event_hdr->min_bw_2ghz); + reg_info->max_bw_2ghz = le32_to_cpu(chan_list_event_hdr->max_bw_2ghz); + reg_info->min_bw_5ghz = le32_to_cpu(chan_list_event_hdr->min_bw_5ghz); + reg_info->max_bw_5ghz = le32_to_cpu(chan_list_event_hdr->max_bw_5ghz); num_2ghz_reg_rules = reg_info->num_2ghz_reg_rules; num_5ghz_reg_rules = reg_info->num_5ghz_reg_rules; @@ -5418,29 +5544,29 @@ static struct cur_reg_rule for (count = 0; count < num_reg_rules; count++) { reg_rule_ptr[count].start_freq = - u32_get_bits(wmi_reg_rule[count].freq_info, - REG_RULE_START_FREQ); + le32_get_bits(wmi_reg_rule[count].freq_info, + REG_RULE_START_FREQ); reg_rule_ptr[count].end_freq = - u32_get_bits(wmi_reg_rule[count].freq_info, - REG_RULE_END_FREQ); + le32_get_bits(wmi_reg_rule[count].freq_info, + REG_RULE_END_FREQ); reg_rule_ptr[count].max_bw = - u32_get_bits(wmi_reg_rule[count].bw_pwr_info, - REG_RULE_MAX_BW); + le32_get_bits(wmi_reg_rule[count].bw_pwr_info, + REG_RULE_MAX_BW); reg_rule_ptr[count].reg_power = - u32_get_bits(wmi_reg_rule[count].bw_pwr_info, - REG_RULE_REG_PWR); + le32_get_bits(wmi_reg_rule[count].bw_pwr_info, + REG_RULE_REG_PWR); reg_rule_ptr[count].ant_gain = - u32_get_bits(wmi_reg_rule[count].bw_pwr_info, - REG_RULE_ANT_GAIN); + le32_get_bits(wmi_reg_rule[count].bw_pwr_info, + REG_RULE_ANT_GAIN); reg_rule_ptr[count].flags = - u32_get_bits(wmi_reg_rule[count].flag_info, - REG_RULE_FLAGS); + le32_get_bits(wmi_reg_rule[count].flag_info, + REG_RULE_FLAGS); reg_rule_ptr[count].psd_flag = - u32_get_bits(wmi_reg_rule[count].psd_power_info, - REG_RULE_PSD_INFO); + le32_get_bits(wmi_reg_rule[count].psd_power_info, + REG_RULE_PSD_INFO); reg_rule_ptr[count].psd_eirp = - u32_get_bits(wmi_reg_rule[count].psd_power_info, - REG_RULE_PSD_EIRP); + le32_get_bits(wmi_reg_rule[count].psd_power_info, + REG_RULE_PSD_EIRP); } return reg_rule_ptr; @@ -5454,8 +5580,8 @@ ath11k_invalid_5ghz_reg_ext_rules_from_wmi(u32 num_reg_rules, u32 count, start_freq; for (count = 0; count < num_reg_rules; count++) { - start_freq = u32_get_bits(rule[count].freq_info, - REG_RULE_START_FREQ); + start_freq = le32_get_bits(rule[count].freq_info, + REG_RULE_START_FREQ); if (start_freq >= ATH11K_MIN_6G_FREQ) num_invalid_5ghz_rules++; @@ -5493,22 +5619,22 @@ static int ath11k_pull_reg_chan_list_ext_update_ev(struct ath11k_base *ab, return -EPROTO; } - reg_info->num_2ghz_reg_rules = ev->num_2ghz_reg_rules; - reg_info->num_5ghz_reg_rules = ev->num_5ghz_reg_rules; + reg_info->num_2ghz_reg_rules = le32_to_cpu(ev->num_2ghz_reg_rules); + reg_info->num_5ghz_reg_rules = le32_to_cpu(ev->num_5ghz_reg_rules); reg_info->num_6ghz_rules_ap[WMI_REG_INDOOR_AP] = - ev->num_6ghz_reg_rules_ap_lpi; + le32_to_cpu(ev->num_6ghz_reg_rules_ap_lpi); reg_info->num_6ghz_rules_ap[WMI_REG_STANDARD_POWER_AP] = - ev->num_6ghz_reg_rules_ap_sp; + le32_to_cpu(ev->num_6ghz_reg_rules_ap_sp); reg_info->num_6ghz_rules_ap[WMI_REG_VERY_LOW_POWER_AP] = - ev->num_6ghz_reg_rules_ap_vlp; + le32_to_cpu(ev->num_6ghz_reg_rules_ap_vlp); for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++) { reg_info->num_6ghz_rules_client[WMI_REG_INDOOR_AP][i] = - ev->num_6ghz_reg_rules_client_lpi[i]; + le32_to_cpu(ev->num_6ghz_reg_rules_client_lpi[i]); reg_info->num_6ghz_rules_client[WMI_REG_STANDARD_POWER_AP][i] = - ev->num_6ghz_reg_rules_client_sp[i]; + le32_to_cpu(ev->num_6ghz_reg_rules_client_sp[i]); reg_info->num_6ghz_rules_client[WMI_REG_VERY_LOW_POWER_AP][i] = - ev->num_6ghz_reg_rules_client_vlp[i]; + le32_to_cpu(ev->num_6ghz_reg_rules_client_vlp[i]); } num_2ghz_reg_rules = reg_info->num_2ghz_reg_rules; @@ -5572,39 +5698,39 @@ static int ath11k_pull_reg_chan_list_ext_update_ev(struct ath11k_base *ab, memcpy(reg_info->alpha2, &ev->alpha2, REG_ALPHA2_LEN); - reg_info->dfs_region = ev->dfs_region; - reg_info->phybitmap = ev->phybitmap; - reg_info->num_phy = ev->num_phy; - reg_info->phy_id = ev->phy_id; - reg_info->ctry_code = ev->country_id; - reg_info->reg_dmn_pair = ev->domain_code; + reg_info->dfs_region = le32_to_cpu(ev->dfs_region); + reg_info->phybitmap = le32_to_cpu(ev->phybitmap); + reg_info->num_phy = le32_to_cpu(ev->num_phy); + reg_info->phy_id = le32_to_cpu(ev->phy_id); + reg_info->ctry_code = le32_to_cpu(ev->country_id); + reg_info->reg_dmn_pair = le32_to_cpu(ev->domain_code); ath11k_dbg(ab, ATH11K_DBG_WMI, "status_code %s", ath11k_cc_status_to_str(reg_info->status_code)); reg_info->status_code = - ath11k_wmi_cc_setting_code_to_reg(ev->status_code); + ath11k_wmi_cc_setting_code_to_reg(le32_to_cpu(ev->status_code)); reg_info->is_ext_reg_event = true; - reg_info->min_bw_2ghz = ev->min_bw_2ghz; - reg_info->max_bw_2ghz = ev->max_bw_2ghz; - reg_info->min_bw_5ghz = ev->min_bw_5ghz; - reg_info->max_bw_5ghz = ev->max_bw_5ghz; + reg_info->min_bw_2ghz = le32_to_cpu(ev->min_bw_2ghz); + reg_info->max_bw_2ghz = le32_to_cpu(ev->max_bw_2ghz); + reg_info->min_bw_5ghz = le32_to_cpu(ev->min_bw_5ghz); + reg_info->max_bw_5ghz = le32_to_cpu(ev->max_bw_5ghz); reg_info->min_bw_6ghz_ap[WMI_REG_INDOOR_AP] = - ev->min_bw_6ghz_ap_lpi; + le32_to_cpu(ev->min_bw_6ghz_ap_lpi); reg_info->max_bw_6ghz_ap[WMI_REG_INDOOR_AP] = - ev->max_bw_6ghz_ap_lpi; + le32_to_cpu(ev->max_bw_6ghz_ap_lpi); reg_info->min_bw_6ghz_ap[WMI_REG_STANDARD_POWER_AP] = - ev->min_bw_6ghz_ap_sp; + le32_to_cpu(ev->min_bw_6ghz_ap_sp); reg_info->max_bw_6ghz_ap[WMI_REG_STANDARD_POWER_AP] = - ev->max_bw_6ghz_ap_sp; + le32_to_cpu(ev->max_bw_6ghz_ap_sp); reg_info->min_bw_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP] = - ev->min_bw_6ghz_ap_vlp; + le32_to_cpu(ev->min_bw_6ghz_ap_vlp); reg_info->max_bw_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP] = - ev->max_bw_6ghz_ap_vlp; + le32_to_cpu(ev->max_bw_6ghz_ap_vlp); ath11k_dbg(ab, ATH11K_DBG_WMI, "6 GHz AP BW: LPI (%d - %d), SP (%d - %d), VLP (%d - %d)\n", @@ -5617,17 +5743,17 @@ static int ath11k_pull_reg_chan_list_ext_update_ev(struct ath11k_base *ab, for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++) { reg_info->min_bw_6ghz_client[WMI_REG_INDOOR_AP][i] = - ev->min_bw_6ghz_client_lpi[i]; + le32_to_cpu(ev->min_bw_6ghz_client_lpi[i]); reg_info->max_bw_6ghz_client[WMI_REG_INDOOR_AP][i] = - ev->max_bw_6ghz_client_lpi[i]; + le32_to_cpu(ev->max_bw_6ghz_client_lpi[i]); reg_info->min_bw_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] = - ev->min_bw_6ghz_client_sp[i]; + le32_to_cpu(ev->min_bw_6ghz_client_sp[i]); reg_info->max_bw_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] = - ev->max_bw_6ghz_client_sp[i]; + le32_to_cpu(ev->max_bw_6ghz_client_sp[i]); reg_info->min_bw_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] = - ev->min_bw_6ghz_client_vlp[i]; + le32_to_cpu(ev->min_bw_6ghz_client_vlp[i]); reg_info->max_bw_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] = - ev->max_bw_6ghz_client_vlp[i]; + le32_to_cpu(ev->max_bw_6ghz_client_vlp[i]); ath11k_dbg(ab, ATH11K_DBG_WMI, "6 GHz %s BW: LPI (%d - %d), SP (%d - %d), VLP (%d - %d)\n", @@ -5778,44 +5904,44 @@ static int ath11k_pull_reg_chan_list_ext_update_ev(struct ath11k_base *ab, } } - reg_info->client_type = ev->client_type; + reg_info->client_type = le32_to_cpu(ev->client_type); reg_info->rnr_tpe_usable = ev->rnr_tpe_usable; reg_info->unspecified_ap_usable = ev->unspecified_ap_usable; reg_info->domain_code_6ghz_ap[WMI_REG_INDOOR_AP] = - ev->domain_code_6ghz_ap_lpi; + le32_to_cpu(ev->domain_code_6ghz_ap_lpi); reg_info->domain_code_6ghz_ap[WMI_REG_STANDARD_POWER_AP] = - ev->domain_code_6ghz_ap_sp; + le32_to_cpu(ev->domain_code_6ghz_ap_sp); reg_info->domain_code_6ghz_ap[WMI_REG_VERY_LOW_POWER_AP] = - ev->domain_code_6ghz_ap_vlp; + le32_to_cpu(ev->domain_code_6ghz_ap_vlp); ath11k_dbg(ab, ATH11K_DBG_WMI, "6 GHz reg info client type %s rnr_tpe_usable %d unspecified_ap_usable %d AP sub domain: lpi %s, sp %s, vlp %s\n", ath11k_6ghz_client_type_to_str(reg_info->client_type), reg_info->rnr_tpe_usable, reg_info->unspecified_ap_usable, - ath11k_sub_reg_6ghz_to_str(ev->domain_code_6ghz_ap_lpi), - ath11k_sub_reg_6ghz_to_str(ev->domain_code_6ghz_ap_sp), - ath11k_sub_reg_6ghz_to_str(ev->domain_code_6ghz_ap_vlp)); + ath11k_sub_reg_6ghz_to_str(le32_to_cpu(ev->domain_code_6ghz_ap_lpi)), + ath11k_sub_reg_6ghz_to_str(le32_to_cpu(ev->domain_code_6ghz_ap_sp)), + ath11k_sub_reg_6ghz_to_str(le32_to_cpu(ev->domain_code_6ghz_ap_vlp))); for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++) { - reg_info->domain_code_6ghz_client[WMI_REG_INDOOR_AP][i] = - ev->domain_code_6ghz_client_lpi[i]; - reg_info->domain_code_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] = - ev->domain_code_6ghz_client_sp[i]; - reg_info->domain_code_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] = - ev->domain_code_6ghz_client_vlp[i]; + u32 lpi = le32_to_cpu(ev->domain_code_6ghz_client_lpi[i]); + u32 sp = le32_to_cpu(ev->domain_code_6ghz_client_sp[i]); + u32 vlp = le32_to_cpu(ev->domain_code_6ghz_client_vlp[i]); + + reg_info->domain_code_6ghz_client[WMI_REG_INDOOR_AP][i] = lpi; + reg_info->domain_code_6ghz_client[WMI_REG_STANDARD_POWER_AP][i] = sp; + reg_info->domain_code_6ghz_client[WMI_REG_VERY_LOW_POWER_AP][i] = vlp; ath11k_dbg(ab, ATH11K_DBG_WMI, "6 GHz client type %s client sub domain: lpi %s, sp %s, vlp %s\n", ath11k_6ghz_client_type_to_str(i), - ath11k_sub_reg_6ghz_to_str(ev->domain_code_6ghz_client_lpi[i]), - ath11k_sub_reg_6ghz_to_str(ev->domain_code_6ghz_client_sp[i]), - ath11k_sub_reg_6ghz_to_str(ev->domain_code_6ghz_client_vlp[i]) - ); + ath11k_sub_reg_6ghz_to_str(lpi), + ath11k_sub_reg_6ghz_to_str(sp), + ath11k_sub_reg_6ghz_to_str(vlp)); } - reg_info->domain_code_6ghz_super_id = ev->domain_code_6ghz_super_id; + reg_info->domain_code_6ghz_super_id = le32_to_cpu(ev->domain_code_6ghz_super_id); ath11k_dbg(ab, ATH11K_DBG_WMI, "6 GHz client_type %s 6 GHz super domain %s", @@ -5881,7 +6007,7 @@ static int ath11k_pull_vdev_del_resp_ev(struct ath11k_base *ab, return -EPROTO; } - *vdev_id = ev->vdev_id; + *vdev_id = le32_to_cpu(ev->vdev_id); kfree(tb); return 0; @@ -5909,8 +6035,8 @@ static int ath11k_pull_bcn_tx_status_ev(struct ath11k_base *ab, return -EPROTO; } - *vdev_id = ev->vdev_id; - *tx_status = ev->tx_status; + *vdev_id = le32_to_cpu(ev->vdev_id); + *tx_status = le32_to_cpu(ev->tx_status); kfree(tb); return 0; @@ -5937,7 +6063,7 @@ static int ath11k_pull_vdev_stopped_param_tlv(struct ath11k_base *ab, struct sk_ return -EPROTO; } - *vdev_id = ev->vdev_id; + *vdev_id = le32_to_cpu(ev->vdev_id); kfree(tb); return 0; @@ -5989,17 +6115,17 @@ static int ath11k_pull_mgmt_rx_params_tlv(struct ath11k_base *ab, return -EPROTO; } - hdr->pdev_id = ev->pdev_id; - hdr->chan_freq = ev->chan_freq; - hdr->channel = ev->channel; - hdr->snr = ev->snr; - hdr->rate = ev->rate; - hdr->phy_mode = ev->phy_mode; - hdr->buf_len = ev->buf_len; - hdr->status = ev->status; - hdr->flags = ev->flags; - hdr->rssi = ev->rssi; - hdr->tsf_delta = ev->tsf_delta; + hdr->pdev_id = le32_to_cpu(ev->pdev_id); + hdr->chan_freq = le32_to_cpu(ev->chan_freq); + hdr->channel = le32_to_cpu(ev->channel); + hdr->snr = le32_to_cpu(ev->snr); + hdr->rate = le32_to_cpu(ev->rate); + hdr->phy_mode = le32_to_cpu(ev->phy_mode); + hdr->buf_len = le32_to_cpu(ev->buf_len); + hdr->status = le32_to_cpu(ev->status); + hdr->flags = le32_to_cpu(ev->flags); + hdr->rssi = le32_to_cpu(ev->rssi); + hdr->tsf_delta = le32_to_cpu(ev->tsf_delta); memcpy(hdr->rssi_ctl, ev->rssi_ctl, sizeof(hdr->rssi_ctl)); if (hdr->buf_len < sizeof(struct ieee80211_hdr_3addr) || @@ -6026,7 +6152,7 @@ static int wmi_process_mgmt_tx_comp(struct ath11k *ar, int num_mgmt; spin_lock_bh(&ar->txmgmt_idr_lock); - msdu = idr_find(&ar->txmgmt_idr, tx_compl_param->desc_id); + msdu = idr_find(&ar->txmgmt_idr, le32_to_cpu(tx_compl_param->desc_id)); if (!msdu) { ath11k_warn(ar->ab, "received mgmt tx compl for invalid msdu_id: %d\n", @@ -6035,7 +6161,7 @@ static int wmi_process_mgmt_tx_comp(struct ath11k *ar, return -ENOENT; } - idr_remove(&ar->txmgmt_idr, tx_compl_param->desc_id); + idr_remove(&ar->txmgmt_idr, le32_to_cpu(tx_compl_param->desc_id)); spin_unlock_bh(&ar->txmgmt_idr_lock); skb_cb = ATH11K_SKB_CB(msdu); @@ -6050,7 +6176,7 @@ static int wmi_process_mgmt_tx_comp(struct ath11k *ar, info->flags |= IEEE80211_TX_STAT_ACK; if (test_bit(WMI_TLV_SERVICE_TX_DATA_MGMT_ACK_RSSI, ar->ab->wmi_ab.svc_map)) - info->status.ack_signal = tx_compl_param->ack_rssi; + info->status.ack_signal = le32_to_cpu(tx_compl_param->ack_rssi); } ieee80211_tx_status_irqsafe(ar->hw, msdu); @@ -6456,11 +6582,11 @@ ath11k_pull_vdev_install_key_compl_ev(struct ath11k_base *ab, struct sk_buff *sk return -EPROTO; } - arg->vdev_id = ev->vdev_id; + arg->vdev_id = le32_to_cpu(ev->vdev_id); arg->macaddr = ev->peer_macaddr.addr; - arg->key_idx = ev->key_idx; - arg->key_flags = ev->key_flags; - arg->status = ev->status; + arg->key_idx = le32_to_cpu(ev->key_idx); + arg->key_flags = le32_to_cpu(ev->key_flags); + arg->status = le32_to_cpu(ev->status); kfree(tb); return 0; @@ -6487,7 +6613,7 @@ static int ath11k_pull_peer_assoc_conf_ev(struct ath11k_base *ab, struct sk_buff return -EPROTO; } - peer_assoc_conf->vdev_id = ev->vdev_id; + peer_assoc_conf->vdev_id = le32_to_cpu(ev->vdev_id); peer_assoc_conf->macaddr = ev->peer_macaddr.addr; kfree(tb); @@ -6497,74 +6623,74 @@ static int ath11k_pull_peer_assoc_conf_ev(struct ath11k_base *ab, struct sk_buff static void ath11k_wmi_pull_pdev_stats_base(const struct wmi_pdev_stats_base *src, struct ath11k_fw_stats_pdev *dst) { - dst->ch_noise_floor = src->chan_nf; - dst->tx_frame_count = src->tx_frame_count; - dst->rx_frame_count = src->rx_frame_count; - dst->rx_clear_count = src->rx_clear_count; - dst->cycle_count = src->cycle_count; - dst->phy_err_count = src->phy_err_count; - dst->chan_tx_power = src->chan_tx_pwr; + dst->ch_noise_floor = le32_to_cpu(src->chan_nf); + dst->tx_frame_count = le32_to_cpu(src->tx_frame_count); + dst->rx_frame_count = le32_to_cpu(src->rx_frame_count); + dst->rx_clear_count = le32_to_cpu(src->rx_clear_count); + dst->cycle_count = le32_to_cpu(src->cycle_count); + dst->phy_err_count = le32_to_cpu(src->phy_err_count); + dst->chan_tx_power = le32_to_cpu(src->chan_tx_pwr); } static void ath11k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src, struct ath11k_fw_stats_pdev *dst) { - dst->comp_queued = src->comp_queued; - dst->comp_delivered = src->comp_delivered; - dst->msdu_enqued = src->msdu_enqued; - dst->mpdu_enqued = src->mpdu_enqued; - dst->wmm_drop = src->wmm_drop; - dst->local_enqued = src->local_enqued; - dst->local_freed = src->local_freed; - dst->hw_queued = src->hw_queued; - dst->hw_reaped = src->hw_reaped; - dst->underrun = src->underrun; - dst->hw_paused = src->hw_paused; - dst->tx_abort = src->tx_abort; - dst->mpdus_requeued = src->mpdus_requeued; - dst->tx_ko = src->tx_ko; - dst->tx_xretry = src->tx_xretry; - dst->data_rc = src->data_rc; - dst->self_triggers = src->self_triggers; - dst->sw_retry_failure = src->sw_retry_failure; - dst->illgl_rate_phy_err = src->illgl_rate_phy_err; - dst->pdev_cont_xretry = src->pdev_cont_xretry; - dst->pdev_tx_timeout = src->pdev_tx_timeout; - dst->pdev_resets = src->pdev_resets; - dst->stateless_tid_alloc_failure = src->stateless_tid_alloc_failure; - dst->phy_underrun = src->phy_underrun; - dst->txop_ovf = src->txop_ovf; - dst->seq_posted = src->seq_posted; - dst->seq_failed_queueing = src->seq_failed_queueing; - dst->seq_completed = src->seq_completed; - dst->seq_restarted = src->seq_restarted; - dst->mu_seq_posted = src->mu_seq_posted; - dst->mpdus_sw_flush = src->mpdus_sw_flush; - dst->mpdus_hw_filter = src->mpdus_hw_filter; - dst->mpdus_truncated = src->mpdus_truncated; - dst->mpdus_ack_failed = src->mpdus_ack_failed; - dst->mpdus_expired = src->mpdus_expired; + dst->comp_queued = le32_to_cpu(src->comp_queued); + dst->comp_delivered = le32_to_cpu(src->comp_delivered); + dst->msdu_enqued = le32_to_cpu(src->msdu_enqued); + dst->mpdu_enqued = le32_to_cpu(src->mpdu_enqued); + dst->wmm_drop = le32_to_cpu(src->wmm_drop); + dst->local_enqued = le32_to_cpu(src->local_enqued); + dst->local_freed = le32_to_cpu(src->local_freed); + dst->hw_queued = le32_to_cpu(src->hw_queued); + dst->hw_reaped = le32_to_cpu(src->hw_reaped); + dst->underrun = le32_to_cpu(src->underrun); + dst->hw_paused = le32_to_cpu(src->hw_paused); + dst->tx_abort = le32_to_cpu(src->tx_abort); + dst->mpdus_requeued = le32_to_cpu(src->mpdus_requeued); + dst->tx_ko = le32_to_cpu(src->tx_ko); + dst->tx_xretry = le32_to_cpu(src->tx_xretry); + dst->data_rc = le32_to_cpu(src->data_rc); + dst->self_triggers = le32_to_cpu(src->self_triggers); + dst->sw_retry_failure = le32_to_cpu(src->sw_retry_failure); + dst->illgl_rate_phy_err = le32_to_cpu(src->illgl_rate_phy_err); + dst->pdev_cont_xretry = le32_to_cpu(src->pdev_cont_xretry); + dst->pdev_tx_timeout = le32_to_cpu(src->pdev_tx_timeout); + dst->pdev_resets = le32_to_cpu(src->pdev_resets); + dst->stateless_tid_alloc_failure = le32_to_cpu(src->stateless_tid_alloc_failure); + dst->phy_underrun = le32_to_cpu(src->phy_underrun); + dst->txop_ovf = le32_to_cpu(src->txop_ovf); + dst->seq_posted = le32_to_cpu(src->seq_posted); + dst->seq_failed_queueing = le32_to_cpu(src->seq_failed_queueing); + dst->seq_completed = le32_to_cpu(src->seq_completed); + dst->seq_restarted = le32_to_cpu(src->seq_restarted); + dst->mu_seq_posted = le32_to_cpu(src->mu_seq_posted); + dst->mpdus_sw_flush = le32_to_cpu(src->mpdus_sw_flush); + dst->mpdus_hw_filter = le32_to_cpu(src->mpdus_hw_filter); + dst->mpdus_truncated = le32_to_cpu(src->mpdus_truncated); + dst->mpdus_ack_failed = le32_to_cpu(src->mpdus_ack_failed); + dst->mpdus_expired = le32_to_cpu(src->mpdus_expired); } static void ath11k_wmi_pull_pdev_stats_rx(const struct wmi_pdev_stats_rx *src, struct ath11k_fw_stats_pdev *dst) { - dst->mid_ppdu_route_change = src->mid_ppdu_route_change; - dst->status_rcvd = src->status_rcvd; - dst->r0_frags = src->r0_frags; - dst->r1_frags = src->r1_frags; - dst->r2_frags = src->r2_frags; - dst->r3_frags = src->r3_frags; - dst->htt_msdus = src->htt_msdus; - dst->htt_mpdus = src->htt_mpdus; - dst->loc_msdus = src->loc_msdus; - dst->loc_mpdus = src->loc_mpdus; - dst->oversize_amsdu = src->oversize_amsdu; - dst->phy_errs = src->phy_errs; - dst->phy_err_drop = src->phy_err_drop; - dst->mpdu_errs = src->mpdu_errs; - dst->rx_ovfl_errs = src->rx_ovfl_errs; + dst->mid_ppdu_route_change = le32_to_cpu(src->mid_ppdu_route_change); + dst->status_rcvd = le32_to_cpu(src->status_rcvd); + dst->r0_frags = le32_to_cpu(src->r0_frags); + dst->r1_frags = le32_to_cpu(src->r1_frags); + dst->r2_frags = le32_to_cpu(src->r2_frags); + dst->r3_frags = le32_to_cpu(src->r3_frags); + dst->htt_msdus = le32_to_cpu(src->htt_msdus); + dst->htt_mpdus = le32_to_cpu(src->htt_mpdus); + dst->loc_msdus = le32_to_cpu(src->loc_msdus); + dst->loc_mpdus = le32_to_cpu(src->loc_mpdus); + dst->oversize_amsdu = le32_to_cpu(src->oversize_amsdu); + dst->phy_errs = le32_to_cpu(src->phy_errs); + dst->phy_err_drop = le32_to_cpu(src->phy_err_drop); + dst->mpdu_errs = le32_to_cpu(src->mpdu_errs); + dst->rx_ovfl_errs = le32_to_cpu(src->rx_ovfl_errs); } static void @@ -6573,39 +6699,39 @@ ath11k_wmi_pull_vdev_stats(const struct wmi_vdev_stats *src, { int i; - dst->vdev_id = src->vdev_id; - dst->beacon_snr = src->beacon_snr; - dst->data_snr = src->data_snr; - dst->num_rx_frames = src->num_rx_frames; - dst->num_rts_fail = src->num_rts_fail; - dst->num_rts_success = src->num_rts_success; - dst->num_rx_err = src->num_rx_err; - dst->num_rx_discard = src->num_rx_discard; - dst->num_tx_not_acked = src->num_tx_not_acked; + dst->vdev_id = le32_to_cpu(src->vdev_id); + dst->beacon_snr = le32_to_cpu(src->beacon_snr); + dst->data_snr = le32_to_cpu(src->data_snr); + dst->num_rx_frames = le32_to_cpu(src->num_rx_frames); + dst->num_rts_fail = le32_to_cpu(src->num_rts_fail); + dst->num_rts_success = le32_to_cpu(src->num_rts_success); + dst->num_rx_err = le32_to_cpu(src->num_rx_err); + dst->num_rx_discard = le32_to_cpu(src->num_rx_discard); + dst->num_tx_not_acked = le32_to_cpu(src->num_tx_not_acked); for (i = 0; i < ARRAY_SIZE(src->num_tx_frames); i++) - dst->num_tx_frames[i] = src->num_tx_frames[i]; + dst->num_tx_frames[i] = le32_to_cpu(src->num_tx_frames[i]); for (i = 0; i < ARRAY_SIZE(src->num_tx_frames_retries); i++) - dst->num_tx_frames_retries[i] = src->num_tx_frames_retries[i]; + dst->num_tx_frames_retries[i] = le32_to_cpu(src->num_tx_frames_retries[i]); for (i = 0; i < ARRAY_SIZE(src->num_tx_frames_failures); i++) - dst->num_tx_frames_failures[i] = src->num_tx_frames_failures[i]; + dst->num_tx_frames_failures[i] = le32_to_cpu(src->num_tx_frames_failures[i]); for (i = 0; i < ARRAY_SIZE(src->tx_rate_history); i++) - dst->tx_rate_history[i] = src->tx_rate_history[i]; + dst->tx_rate_history[i] = le32_to_cpu(src->tx_rate_history[i]); for (i = 0; i < ARRAY_SIZE(src->beacon_rssi_history); i++) - dst->beacon_rssi_history[i] = src->beacon_rssi_history[i]; + dst->beacon_rssi_history[i] = le32_to_cpu(src->beacon_rssi_history[i]); } static void ath11k_wmi_pull_bcn_stats(const struct wmi_bcn_stats *src, struct ath11k_fw_stats_bcn *dst) { - dst->vdev_id = src->vdev_id; - dst->tx_bcn_succ_cnt = src->tx_bcn_succ_cnt; - dst->tx_bcn_outage_cnt = src->tx_bcn_outage_cnt; + dst->vdev_id = le32_to_cpu(src->vdev_id); + dst->tx_bcn_succ_cnt = le32_to_cpu(src->tx_bcn_succ_cnt); + dst->tx_bcn_outage_cnt = le32_to_cpu(src->tx_bcn_outage_cnt); } static int ath11k_wmi_tlv_rssi_chain_parse(struct ath11k_base *ab, @@ -6627,17 +6753,17 @@ static int ath11k_wmi_tlv_rssi_chain_parse(struct ath11k_base *ab, rcu_read_lock(); - ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + ar = ath11k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev->pdev_id)); stats->stats_id = WMI_REQUEST_RSSI_PER_CHAIN_STAT; ath11k_dbg(ab, ATH11K_DBG_WMI, "stats vdev id %d mac %pM\n", - stats_rssi->vdev_id, stats_rssi->peer_macaddr.addr); + le32_to_cpu(stats_rssi->vdev_id), stats_rssi->peer_macaddr.addr); - arvif = ath11k_mac_get_arvif(ar, stats_rssi->vdev_id); + arvif = ath11k_mac_get_arvif(ar, le32_to_cpu(stats_rssi->vdev_id)); if (!arvif) { ath11k_warn(ab, "not found vif for vdev id %d\n", - stats_rssi->vdev_id); + le32_to_cpu(stats_rssi->vdev_id)); ret = -EPROTO; goto exit; } @@ -6662,13 +6788,13 @@ static int ath11k_wmi_tlv_rssi_chain_parse(struct ath11k_base *ab, ARRAY_SIZE(stats_rssi->rssi_avg_beacon)); for (j = 0; j < ARRAY_SIZE(arsta->chain_signal); j++) { - arsta->chain_signal[j] = stats_rssi->rssi_avg_beacon[j]; + arsta->chain_signal[j] = le32_to_cpu(stats_rssi->rssi_avg_beacon[j]); ath11k_dbg(ab, ATH11K_DBG_WMI, "stats beacon rssi[%d] %d data rssi[%d] %d\n", j, - stats_rssi->rssi_avg_beacon[j], + le32_to_cpu(stats_rssi->rssi_avg_beacon[j]), j, - stats_rssi->rssi_avg_data[j]); + le32_to_cpu(stats_rssi->rssi_avg_data[j])); } exit: @@ -6699,9 +6825,9 @@ static int ath11k_wmi_tlv_fw_stats_data_parse(struct ath11k_base *ab, rcu_read_lock(); - ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + ar = ath11k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev->pdev_id)); - for (i = 0; i < ev->num_pdev_stats; i++) { + for (i = 0; i < le32_to_cpu(ev->num_pdev_stats); i++) { const struct wmi_pdev_stats *src; struct ath11k_fw_stats_pdev *dst; @@ -6726,7 +6852,7 @@ static int ath11k_wmi_tlv_fw_stats_data_parse(struct ath11k_base *ab, list_add_tail(&dst->list, &stats->pdevs); } - for (i = 0; i < ev->num_vdev_stats; i++) { + for (i = 0; i < le32_to_cpu(ev->num_vdev_stats); i++) { const struct wmi_vdev_stats *src; struct ath11k_fw_stats_vdev *dst; @@ -6738,17 +6864,18 @@ static int ath11k_wmi_tlv_fw_stats_data_parse(struct ath11k_base *ab, stats->stats_id = WMI_REQUEST_VDEV_STAT; - arvif = ath11k_mac_get_arvif(ar, src->vdev_id); + arvif = ath11k_mac_get_arvif(ar, le32_to_cpu(src->vdev_id)); if (arvif) { sta = ieee80211_find_sta_by_ifaddr(ar->hw, arvif->bssid, NULL); if (sta) { arsta = ath11k_sta_to_arsta(sta); - arsta->rssi_beacon = src->beacon_snr; + arsta->rssi_beacon = le32_to_cpu(src->beacon_snr); ath11k_dbg(ab, ATH11K_DBG_WMI, "stats vdev id %d snr %d\n", - src->vdev_id, src->beacon_snr); + le32_to_cpu(src->vdev_id), + le32_to_cpu(src->beacon_snr)); } else { ath11k_dbg(ab, ATH11K_DBG_WMI, "not found station of bssid %pM for vdev stat\n", @@ -6767,7 +6894,7 @@ static int ath11k_wmi_tlv_fw_stats_data_parse(struct ath11k_base *ab, list_add_tail(&dst->list, &stats->vdevs); } - for (i = 0; i < ev->num_bcn_stats; i++) { + for (i = 0; i < le32_to_cpu(ev->num_bcn_stats); i++) { const struct wmi_bcn_stats *src; struct ath11k_fw_stats_bcn *dst; @@ -6805,7 +6932,7 @@ static int ath11k_wmi_tlv_fw_stats_parse(struct ath11k_base *ab, switch (tag) { case WMI_TAG_STATS_EVENT: parse->ev = (struct wmi_stats_event *)ptr; - parse->stats->pdev_id = parse->ev->pdev_id; + parse->stats->pdev_id = le32_to_cpu(parse->ev->pdev_id); break; case WMI_TAG_ARRAY_BYTE: ret = ath11k_wmi_tlv_fw_stats_data_parse(ab, parse, ptr, len); @@ -6813,12 +6940,12 @@ static int ath11k_wmi_tlv_fw_stats_parse(struct ath11k_base *ab, case WMI_TAG_PER_CHAIN_RSSI_STATS: parse->rssi = (struct wmi_per_chain_rssi_stats *)ptr; - if (parse->ev->stats_id & WMI_REQUEST_RSSI_PER_CHAIN_STAT) - parse->rssi_num = parse->rssi->num_per_chain_rssi_stats; + if (le32_to_cpu(parse->ev->stats_id) & WMI_REQUEST_RSSI_PER_CHAIN_STAT) + parse->rssi_num = le32_to_cpu(parse->rssi->num_per_chain_rssi_stats); ath11k_dbg(ab, ATH11K_DBG_WMI, "stats id 0x%x num chain %d\n", - parse->ev->stats_id, + le32_to_cpu(parse->ev->stats_id), parse->rssi_num); break; case WMI_TAG_ARRAY_STRUCT: @@ -7314,11 +7441,11 @@ static int ath11k_wmi_tlv_rdy_parse(struct ath11k_base *ab, u16 tag, u16 len, memcpy(&fixed_param, (struct wmi_ready_event *)ptr, min_t(u16, sizeof(fixed_param), len)); rdy_parse->num_extra_mac_addr = - fixed_param.ready_event_min.num_extra_mac_addr; + le32_to_cpu(fixed_param.ready_event_min.num_extra_mac_addr); ether_addr_copy(ab->mac_addr, fixed_param.ready_event_min.mac_addr.addr); - ab->pktlog_defs_checksum = fixed_param.pktlog_defs_checksum; + ab->pktlog_defs_checksum = le32_to_cpu(fixed_param.pktlog_defs_checksum); break; case WMI_TAG_ARRAY_FIXED_STRUCT: addr_list = (struct wmi_mac_addr *)ptr; @@ -7371,7 +7498,8 @@ static void ath11k_peer_delete_resp_event(struct ath11k_base *ab, struct sk_buff ath11k_dbg(ab, ATH11K_DBG_WMI, "event peer delete resp"); rcu_read_lock(); - ar = ath11k_mac_get_ar_by_vdev_id(ab, peer_del_resp.vdev_id); + ar = ath11k_mac_get_ar_by_vdev_id(ab, + le32_to_cpu(peer_del_resp.vdev_id)); if (!ar) { ath11k_warn(ab, "invalid vdev id in peer delete resp ev %d", peer_del_resp.vdev_id); @@ -7443,17 +7571,18 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff ath11k_dbg(ab, ATH11K_DBG_WMI, "event start resp event"); rcu_read_lock(); - ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_start_resp.vdev_id); + ar = ath11k_mac_get_ar_by_vdev_id(ab, + le32_to_cpu(vdev_start_resp.vdev_id)); if (!ar) { ath11k_warn(ab, "invalid vdev id in vdev start resp ev %d", - vdev_start_resp.vdev_id); + le32_to_cpu(vdev_start_resp.vdev_id)); rcu_read_unlock(); return; } ar->last_wmi_vdev_start_status = 0; - ar->max_allowed_tx_power = vdev_start_resp.max_allowed_tx_power; - status = vdev_start_resp.status; + ar->max_allowed_tx_power = (s32)le32_to_cpu(vdev_start_resp.max_allowed_tx_power); + status = le32_to_cpu(vdev_start_resp.status); if (WARN_ON_ONCE(status)) { ath11k_warn(ab, "vdev start resp error status %d (%s)\n", @@ -7466,7 +7595,7 @@ static void ath11k_vdev_start_resp_event(struct ath11k_base *ab, struct sk_buff rcu_read_unlock(); ath11k_dbg(ab, ATH11K_DBG_WMI, "vdev start resp for vdev id %d", - vdev_start_resp.vdev_id); + le32_to_cpu(vdev_start_resp.vdev_id)); } static void ath11k_bcn_tx_status_event(struct ath11k_base *ab, struct sk_buff *skb) @@ -7523,9 +7652,10 @@ static void ath11k_wmi_event_peer_sta_ps_state_chg(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "event peer sta ps change ev addr %pM state %u sup_bitmap %x ps_valid %u ts %u\n", - ev->peer_macaddr.addr, ev->peer_ps_state, - ev->ps_supported_bitmap, ev->peer_ps_valid, - ev->peer_ps_timestamp); + ev->peer_macaddr.addr, le32_to_cpu(ev->peer_ps_state), + le32_to_cpu(ev->ps_supported_bitmap), + le32_to_cpu(ev->peer_ps_valid), + le32_to_cpu(ev->peer_ps_timestamp)); rcu_read_lock(); @@ -7564,28 +7694,28 @@ static void ath11k_wmi_event_peer_sta_ps_state_chg(struct ath11k_base *ab, spin_lock_bh(&ar->data_lock); peer_previous_ps_state = arsta->peer_ps_state; - arsta->peer_ps_state = ev->peer_ps_state; - arsta->peer_current_ps_valid = !!ev->peer_ps_valid; + arsta->peer_ps_state = le32_to_cpu(ev->peer_ps_state); + arsta->peer_current_ps_valid = !!le32_to_cpu(ev->peer_ps_valid); if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT, ar->ab->wmi_ab.svc_map)) { - if (!(ev->ps_supported_bitmap & WMI_PEER_PS_VALID) || - !(ev->ps_supported_bitmap & WMI_PEER_PS_STATE_TIMESTAMP) || - !ev->peer_ps_valid) + if (!(le32_to_cpu(ev->ps_supported_bitmap) & WMI_PEER_PS_VALID) || + !(le32_to_cpu(ev->ps_supported_bitmap) & WMI_PEER_PS_STATE_TIMESTAMP) || + !le32_to_cpu(ev->peer_ps_valid)) goto out; if (arsta->peer_ps_state == WMI_PEER_PS_STATE_ON) { - arsta->ps_start_time = ev->peer_ps_timestamp; + arsta->ps_start_time = le32_to_cpu(ev->peer_ps_timestamp); arsta->ps_start_jiffies = jiffies; } else if (arsta->peer_ps_state == WMI_PEER_PS_STATE_OFF && peer_previous_ps_state == WMI_PEER_PS_STATE_ON) { arsta->ps_total_duration = arsta->ps_total_duration + - (ev->peer_ps_timestamp - arsta->ps_start_time); + (le32_to_cpu(ev->peer_ps_timestamp) - arsta->ps_start_time); } if (ar->ps_timekeeper_enable) trace_ath11k_ps_timekeeper(ar, ev->peer_macaddr.addr, - ev->peer_ps_timestamp, + le32_to_cpu(ev->peer_ps_timestamp), arsta->peer_ps_state); } @@ -7750,7 +7880,8 @@ static void ath11k_mgmt_tx_compl_event(struct ath11k_base *ab, struct sk_buff *s } rcu_read_lock(); - ar = ath11k_mac_get_ar_by_pdev_id(ab, tx_compl_param.pdev_id); + ar = ath11k_mac_get_ar_by_pdev_id(ab, + le32_to_cpu(tx_compl_param.pdev_id)); if (!ar) { ath11k_warn(ab, "invalid pdev id %d in mgmt_tx_compl_event\n", tx_compl_param.pdev_id); @@ -7811,15 +7942,18 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb) * search 'ar' if the corresponding 'ar' scan is ABORTING and the * aborting scan's vdev id matches this event info. */ - if (scan_ev.event_type == WMI_SCAN_EVENT_COMPLETED && - scan_ev.reason == WMI_SCAN_REASON_CANCELLED) { - ar = ath11k_get_ar_on_scan_state(ab, scan_ev.vdev_id, + if (le32_to_cpu(scan_ev.event_type) == WMI_SCAN_EVENT_COMPLETED && + le32_to_cpu(scan_ev.reason) == WMI_SCAN_REASON_CANCELLED) { + ar = ath11k_get_ar_on_scan_state(ab, + le32_to_cpu(scan_ev.vdev_id), ATH11K_SCAN_ABORTING); if (!ar) - ar = ath11k_get_ar_on_scan_state(ab, scan_ev.vdev_id, + ar = ath11k_get_ar_on_scan_state(ab, + le32_to_cpu(scan_ev.vdev_id), ATH11K_SCAN_RUNNING); } else { - ar = ath11k_mac_get_ar_by_vdev_id(ab, scan_ev.vdev_id); + ar = ath11k_mac_get_ar_by_vdev_id(ab, + le32_to_cpu(scan_ev.vdev_id)); } if (!ar) { @@ -7832,12 +7966,14 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb) ath11k_dbg(ab, ATH11K_DBG_WMI, "event scan %s type %d reason %d freq %d req_id %d scan_id %d vdev_id %d state %s (%d)\n", - ath11k_wmi_event_scan_type_str(scan_ev.event_type, scan_ev.reason), - scan_ev.event_type, scan_ev.reason, scan_ev.channel_freq, - scan_ev.scan_req_id, scan_ev.scan_id, scan_ev.vdev_id, + ath11k_wmi_event_scan_type_str(le32_to_cpu(scan_ev.event_type), + le32_to_cpu(scan_ev.reason)), + le32_to_cpu(scan_ev.event_type), le32_to_cpu(scan_ev.reason), + le32_to_cpu(scan_ev.channel_freq), le32_to_cpu(scan_ev.scan_req_id), + le32_to_cpu(scan_ev.scan_id), le32_to_cpu(scan_ev.vdev_id), ath11k_scan_state_str(ar->scan.state), ar->scan.state); - switch (scan_ev.event_type) { + switch (le32_to_cpu(scan_ev.event_type)) { case WMI_SCAN_EVENT_STARTED: ath11k_wmi_event_scan_started(ar); break; @@ -7848,7 +7984,8 @@ static void ath11k_scan_event(struct ath11k_base *ab, struct sk_buff *skb) ath11k_wmi_event_scan_bss_chan(ar); break; case WMI_SCAN_EVENT_FOREIGN_CHAN: - ath11k_wmi_event_scan_foreign_chan(ar, scan_ev.channel_freq); + ath11k_wmi_event_scan_foreign_chan(ar, + le32_to_cpu(scan_ev.channel_freq)); break; case WMI_SCAN_EVENT_START_FAILED: ath11k_warn(ab, "received scan start failure event\n"); @@ -7938,7 +8075,7 @@ static void ath11k_roam_event(struct ath11k_base *ab, struct sk_buff *skb) roam_ev.vdev_id, roam_ev.reason, roam_ev.rssi); rcu_read_lock(); - ar = ath11k_mac_get_ar_by_vdev_id(ab, roam_ev.vdev_id); + ar = ath11k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(roam_ev.vdev_id)); if (!ar) { ath11k_warn(ab, "invalid vdev id in roam ev %d", roam_ev.vdev_id); @@ -7946,13 +8083,14 @@ static void ath11k_roam_event(struct ath11k_base *ab, struct sk_buff *skb) return; } - if (roam_ev.reason >= WMI_ROAM_REASON_MAX) - ath11k_warn(ab, "ignoring unknown roam event reason %d on vdev %i\n", + if (le32_to_cpu(roam_ev.reason) >= WMI_ROAM_REASON_MAX) + ath11k_warn(ab, + "ignoring unknown roam event reason %d on vdev %i\n", roam_ev.reason, roam_ev.vdev_id); - switch (roam_ev.reason) { + switch (le32_to_cpu(roam_ev.reason)) { case WMI_ROAM_REASON_BEACON_MISS: - ath11k_mac_handle_beacon_miss(ar, roam_ev.vdev_id); + ath11k_mac_handle_beacon_miss(ar, le32_to_cpu(roam_ev.vdev_id)); break; case WMI_ROAM_REASON_BETTER_AP: case WMI_ROAM_REASON_LOW_RSSI: @@ -7987,13 +8125,13 @@ static void ath11k_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) ch_info_ev.rx_clear_count, ch_info_ev.cycle_count, ch_info_ev.mac_clk_mhz); - if (ch_info_ev.cmd_flags == WMI_CHAN_INFO_END_RESP) { + if (le32_to_cpu(ch_info_ev.cmd_flags) == WMI_CHAN_INFO_END_RESP) { ath11k_dbg(ab, ATH11K_DBG_WMI, "chan info report completed\n"); return; } rcu_read_lock(); - ar = ath11k_mac_get_ar_by_vdev_id(ab, ch_info_ev.vdev_id); + ar = ath11k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(ch_info_ev.vdev_id)); if (!ar) { ath11k_warn(ab, "invalid vdev id in chan info ev %d", ch_info_ev.vdev_id); @@ -8012,7 +8150,7 @@ static void ath11k_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) break; } - idx = freq_to_idx(ar, ch_info_ev.freq); + idx = freq_to_idx(ar, le32_to_cpu(ch_info_ev.freq)); if (idx >= ARRAY_SIZE(ar->survey)) { ath11k_warn(ab, "chan info: invalid frequency %d (idx %d out of bounds)\n", ch_info_ev.freq, idx); @@ -8023,16 +8161,18 @@ static void ath11k_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) * HW channel counters frequency value */ if (ch_info_ev.mac_clk_mhz) - cc_freq_hz = (ch_info_ev.mac_clk_mhz * 1000); + cc_freq_hz = (le32_to_cpu(ch_info_ev.mac_clk_mhz) * 1000); - if (ch_info_ev.cmd_flags == WMI_CHAN_INFO_START_RESP) { + if (le32_to_cpu(ch_info_ev.cmd_flags) == WMI_CHAN_INFO_START_RESP) { survey = &ar->survey[idx]; memset(survey, 0, sizeof(*survey)); - survey->noise = ch_info_ev.noise_floor; + survey->noise = le32_to_cpu(ch_info_ev.noise_floor); survey->filled = SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME | SURVEY_INFO_TIME_BUSY; - survey->time = div_u64(ch_info_ev.cycle_count, cc_freq_hz); - survey->time_busy = div_u64(ch_info_ev.rx_clear_count, cc_freq_hz); + survey->time = div_u64(le32_to_cpu(ch_info_ev.cycle_count), + cc_freq_hz); + survey->time_busy = div_u64(le32_to_cpu(ch_info_ev.rx_clear_count), + cc_freq_hz); } exit: spin_unlock_bh(&ar->data_lock); @@ -8054,20 +8194,20 @@ ath11k_pdev_bss_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) return; } - busy = (u64)(bss_ch_info_ev.rx_clear_count_high) << 32 | - bss_ch_info_ev.rx_clear_count_low; + busy = (u64)le32_to_cpu(bss_ch_info_ev.rx_clear_count_high) << 32 | + le32_to_cpu(bss_ch_info_ev.rx_clear_count_low); - total = (u64)(bss_ch_info_ev.cycle_count_high) << 32 | - bss_ch_info_ev.cycle_count_low; + total = (u64)le32_to_cpu(bss_ch_info_ev.cycle_count_high) << 32 | + le32_to_cpu(bss_ch_info_ev.cycle_count_low); - tx = (u64)(bss_ch_info_ev.tx_cycle_count_high) << 32 | - bss_ch_info_ev.tx_cycle_count_low; + tx = (u64)le32_to_cpu(bss_ch_info_ev.tx_cycle_count_high) << 32 | + le32_to_cpu(bss_ch_info_ev.tx_cycle_count_low); - rx = (u64)(bss_ch_info_ev.rx_cycle_count_high) << 32 | - bss_ch_info_ev.rx_cycle_count_low; + rx = (u64)le32_to_cpu(bss_ch_info_ev.rx_cycle_count_high) << 32 | + le32_to_cpu(bss_ch_info_ev.rx_cycle_count_low); - rx_bss = (u64)(bss_ch_info_ev.rx_bss_cycle_count_high) << 32 | - bss_ch_info_ev.rx_bss_cycle_count_low; + rx_bss = (u64)le32_to_cpu(bss_ch_info_ev.rx_bss_cycle_count_high) << 32 | + le32_to_cpu(bss_ch_info_ev.rx_bss_cycle_count_low); ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev bss chan info:\n pdev_id: %d freq: %d noise: %d cycle: busy %llu total %llu tx %llu rx %llu rx_bss %llu\n", @@ -8076,7 +8216,8 @@ ath11k_pdev_bss_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) tx, rx, rx_bss); rcu_read_lock(); - ar = ath11k_mac_get_ar_by_pdev_id(ab, bss_ch_info_ev.pdev_id); + ar = ath11k_mac_get_ar_by_pdev_id(ab, + le32_to_cpu(bss_ch_info_ev.pdev_id)); if (!ar) { ath11k_warn(ab, "invalid pdev id %d in bss_chan_info event\n", @@ -8086,7 +8227,7 @@ ath11k_pdev_bss_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) } spin_lock_bh(&ar->data_lock); - idx = freq_to_idx(ar, bss_ch_info_ev.freq); + idx = freq_to_idx(ar, le32_to_cpu(bss_ch_info_ev.freq)); if (idx >= ARRAY_SIZE(ar->survey)) { ath11k_warn(ab, "bss chan info: invalid frequency %d (idx %d out of bounds)\n", bss_ch_info_ev.freq, idx); @@ -8095,7 +8236,7 @@ ath11k_pdev_bss_chan_info_event(struct ath11k_base *ab, struct sk_buff *skb) survey = &ar->survey[idx]; - survey->noise = bss_ch_info_ev.noise_floor; + survey->noise = le32_to_cpu(bss_ch_info_ev.noise_floor); survey->time = div_u64(total, cc_freq_hz); survey->time_busy = div_u64(busy, cc_freq_hz); survey->time_rx = div_u64(rx_bss, cc_freq_hz); @@ -8154,7 +8295,7 @@ static int ath11k_wmi_tlv_services_parser(struct ath11k_base *ab, const void *ptr, void *data) { const struct wmi_service_available_event *ev; - u32 *wmi_ext2_service_bitmap; + __le32 *wmi_ext2_service_bitmap; int i, j; switch (tag) { @@ -8164,7 +8305,7 @@ static int ath11k_wmi_tlv_services_parser(struct ath11k_base *ab, i < WMI_SERVICE_SEGMENT_BM_SIZE32 && j < WMI_MAX_EXT_SERVICE; i++) { do { - if (ev->wmi_service_segment_bitmap[i] & + if (le32_to_cpu(ev->wmi_service_segment_bitmap[i]) & BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32)) set_bit(j, ab->wmi_ab.svc_map); } while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32); @@ -8172,18 +8313,18 @@ static int ath11k_wmi_tlv_services_parser(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "wmi_ext_service_bitmap 0:0x%04x, 1:0x%04x, 2:0x%04x, 3:0x%04x", - ev->wmi_service_segment_bitmap[0], - ev->wmi_service_segment_bitmap[1], - ev->wmi_service_segment_bitmap[2], - ev->wmi_service_segment_bitmap[3]); + le32_to_cpu(ev->wmi_service_segment_bitmap[0]), + le32_to_cpu(ev->wmi_service_segment_bitmap[1]), + le32_to_cpu(ev->wmi_service_segment_bitmap[2]), + le32_to_cpu(ev->wmi_service_segment_bitmap[3])); break; case WMI_TAG_ARRAY_UINT32: - wmi_ext2_service_bitmap = (u32 *)ptr; + wmi_ext2_service_bitmap = (__le32 *)ptr; for (i = 0, j = WMI_MAX_EXT_SERVICE; i < WMI_SERVICE_SEGMENT_BM_SIZE32 && j < WMI_MAX_EXT2_SERVICE; i++) { do { - if (wmi_ext2_service_bitmap[i] & + if (le32_to_cpu(wmi_ext2_service_bitmap[i]) & BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32)) set_bit(j, ab->wmi_ab.svc_map); } while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32); @@ -8191,8 +8332,10 @@ static int ath11k_wmi_tlv_services_parser(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "wmi_ext2_service__bitmap 0:0x%04x, 1:0x%04x, 2:0x%04x, 3:0x%04x", - wmi_ext2_service_bitmap[0], wmi_ext2_service_bitmap[1], - wmi_ext2_service_bitmap[2], wmi_ext2_service_bitmap[3]); + le32_to_cpu(wmi_ext2_service_bitmap[0]), + le32_to_cpu(wmi_ext2_service_bitmap[1]), + le32_to_cpu(wmi_ext2_service_bitmap[2]), + le32_to_cpu(wmi_ext2_service_bitmap[3])); break; } return 0; @@ -8378,12 +8521,12 @@ ath11k_wmi_process_csa_switch_count_event(struct ath11k_base *ab, const u32 *vdev_ids) { u32 vdev_ids_len = ath11k_wmi_tlv_data_len(vdev_ids); - u32 num_vdevs = ev->num_vdevs; + u32 num_vdevs = le32_to_cpu(ev->num_vdevs); struct ath11k_vif *arvif; int i; /* Finish CSA once the switch count becomes NULL */ - if (ev->current_switch_count) + if (le32_to_cpu(ev->current_switch_count)) return; if (num_vdevs > vdev_ids_len / sizeof(*vdev_ids)) { @@ -8435,8 +8578,9 @@ ath11k_wmi_pdev_csa_switch_count_status_event(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev csa switch count %d for pdev %d, num_vdevs %d", - ev->current_switch_count, ev->pdev_id, - ev->num_vdevs); + le32_to_cpu(ev->current_switch_count), + le32_to_cpu(ev->pdev_id), + le32_to_cpu(ev->num_vdevs)); ath11k_wmi_process_csa_switch_count_event(ab, ev, vdev_ids); @@ -8468,22 +8612,25 @@ ath11k_wmi_pdev_dfs_radar_detected_event(struct ath11k_base *ab, struct sk_buff ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev dfs radar detected on pdev %d, detection mode %d, chan freq %d, chan_width %d, detector id %d, seg id %d, timestamp %d, chirp %d, freq offset %d, sidx %d", - ev->pdev_id, ev->detection_mode, ev->chan_freq, ev->chan_width, - ev->detector_id, ev->segment_id, ev->timestamp, ev->is_chirp, - ev->freq_offset, ev->sidx); + le32_to_cpu(ev->pdev_id), le32_to_cpu(ev->detection_mode), + le32_to_cpu(ev->chan_freq), le32_to_cpu(ev->chan_width), + le32_to_cpu(ev->detector_id), le32_to_cpu(ev->segment_id), + le32_to_cpu(ev->timestamp), le32_to_cpu(ev->is_chirp), + (s32)le32_to_cpu(ev->freq_offset), + (s32)le32_to_cpu(ev->sidx)); rcu_read_lock(); - ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + ar = ath11k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev->pdev_id)); if (!ar) { ath11k_warn(ab, "radar detected in invalid pdev %d\n", - ev->pdev_id); + le32_to_cpu(ev->pdev_id)); goto exit; } ath11k_dbg(ar->ab, ATH11K_DBG_REG, "DFS Radar Detected in pdev %d\n", - ev->pdev_id); + le32_to_cpu(ev->pdev_id)); if (ar->dfs_block_radar_events) ath11k_info(ab, "DFS Radar detected, but ignored as requested\n"); @@ -8520,17 +8667,18 @@ ath11k_wmi_pdev_temperature_event(struct ath11k_base *ab, } ath11k_dbg(ab, ATH11K_DBG_WMI, "event pdev temperature ev temp %d pdev_id %d\n", - ev->temp, ev->pdev_id); + (s32)le32_to_cpu(ev->temp), le32_to_cpu(ev->pdev_id)); rcu_read_lock(); - ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + ar = ath11k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev->pdev_id)); if (!ar) { - ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev->pdev_id); + ath11k_warn(ab, "invalid pdev id in pdev temperature ev %d", + le32_to_cpu(ev->pdev_id)); goto exit; } - ath11k_thermal_event_temperature(ar, ev->temp); + ath11k_thermal_event_temperature(ar, (s32)le32_to_cpu(ev->temp)); exit: rcu_read_unlock(); @@ -8720,11 +8868,11 @@ static void ath11k_wmi_twt_add_dialog_event(struct ath11k_base *ab, goto exit; } - if (ev->status) + if (le32_to_cpu(ev->status)) ath11k_warn(ab, "wmi add twt dialog event vdev %d dialog id %d status %s\n", - ev->vdev_id, ev->dialog_id, - ath11k_wmi_twt_add_dialog_event_status(ev->status)); + le32_to_cpu(ev->vdev_id), le32_to_cpu(ev->dialog_id), + ath11k_wmi_twt_add_dialog_event_status(le32_to_cpu(ev->status))); exit: kfree(tb); @@ -8756,7 +8904,7 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab, rcu_read_lock(); - arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id); + arvif = ath11k_mac_get_arvif_by_vdev_id(ab, le32_to_cpu(ev->vdev_id)); if (!arvif) { ath11k_warn(ab, "failed to get arvif for vdev_id:%d\n", ev->vdev_id); @@ -8805,8 +8953,8 @@ static void ath11k_wmi_p2p_noa_event(struct ath11k_base *ab, if (!ev || !noa) goto out; - vdev_id = ev->vdev_id; - noa_descriptors = u32_get_bits(noa->noa_attr, + vdev_id = le32_to_cpu(ev->vdev_id); + noa_descriptors = u32_get_bits(le32_to_cpu(noa->noa_attr), WMI_P2P_NOA_INFO_DESC_NUM); if (noa_descriptors > WMI_P2P_MAX_NOA_DESCRIPTORS) { @@ -8931,7 +9079,7 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) goto out; cmd_hdr = (struct wmi_cmd_hdr *)skb->data; - id = FIELD_GET(WMI_CMD_HDR_CMD_ID, (cmd_hdr->cmd_id)); + id = le32_get_bits((cmd_hdr->cmd_id), WMI_CMD_HDR_CMD_ID); trace_ath11k_wmi_event(ab, id, skb->data, skb->len); @@ -9113,12 +9261,12 @@ ath11k_wmi_send_unit_test_cmd(struct ath11k *ar, struct sk_buff *skb; struct wmi_tlv *tlv; void *ptr; - u32 *ut_cmd_args; + __le32 *ut_cmd_args; int buf_len, arg_len; int ret; int i; - arg_len = sizeof(u32) * ut_cmd.num_args; + arg_len = sizeof(u32) * le32_to_cpu(ut_cmd.num_args); buf_len = sizeof(ut_cmd) + arg_len + TLV_HDR_SIZE; skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, buf_len); @@ -9126,8 +9274,9 @@ ath11k_wmi_send_unit_test_cmd(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_unit_test_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_UNIT_TEST_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(ut_cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_UNIT_TEST_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(ut_cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); cmd->vdev_id = ut_cmd.vdev_id; cmd->module_id = ut_cmd.module_id; @@ -9137,14 +9286,14 @@ ath11k_wmi_send_unit_test_cmd(struct ath11k *ar, ptr = skb->data + sizeof(ut_cmd); tlv = ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | - FIELD_PREP(WMI_TLV_LEN, arg_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_UINT32, WMI_TLV_TAG) | + le32_encode_bits(arg_len, WMI_TLV_LEN); ptr += TLV_HDR_SIZE; ut_cmd_args = ptr; - for (i = 0; i < ut_cmd.num_args; i++) - ut_cmd_args[i] = test_args[i]; + for (i = 0; i < le32_to_cpu(ut_cmd.num_args); i++) + ut_cmd_args[i] = cpu_to_le32(test_args[i]); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_UNIT_TEST_CMDID); @@ -9187,10 +9336,10 @@ int ath11k_wmi_simulate_radar(struct ath11k *ar) */ dfs_args[DFS_TEST_RADAR_PARAM] = 0; - wmi_ut.vdev_id = arvif->vdev_id; - wmi_ut.module_id = DFS_UNIT_TEST_MODULE; - wmi_ut.num_args = DFS_MAX_TEST_ARGS; - wmi_ut.diag_token = DFS_UNIT_TEST_TOKEN; + wmi_ut.vdev_id = cpu_to_le32(arvif->vdev_id); + wmi_ut.module_id = cpu_to_le32(DFS_UNIT_TEST_MODULE); + wmi_ut.num_args = cpu_to_le32(DFS_MAX_TEST_ARGS); + wmi_ut.diag_token = cpu_to_le32(DFS_UNIT_TEST_TOKEN); ath11k_dbg(ar->ab, ATH11K_DBG_REG, "Triggering Radar Simulation\n"); @@ -9212,24 +9361,27 @@ int ath11k_wmi_fw_dbglog_cfg(struct ath11k *ar, u32 *module_id_bitmap, return -ENOMEM; cmd = (struct wmi_debug_log_config_cmd_fixed_param *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_DEBUG_LOG_CONFIG_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->dbg_log_param = dbglog->param; + cmd->tlv_header = le32_encode_bits(WMI_TAG_DEBUG_LOG_CONFIG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->dbg_log_param = cpu_to_le32(dbglog->param); tlv = (struct wmi_tlv *)((u8 *)cmd + sizeof(*cmd)); - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | - FIELD_PREP(WMI_TLV_LEN, MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_UINT32, WMI_TLV_TAG) | + le32_encode_bits(MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32), + WMI_TLV_LEN); switch (dbglog->param) { case WMI_DEBUG_LOG_PARAM_LOG_LEVEL: case WMI_DEBUG_LOG_PARAM_VDEV_ENABLE: case WMI_DEBUG_LOG_PARAM_VDEV_DISABLE: case WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP: - cmd->value = dbglog->value; + cmd->value = cpu_to_le32(dbglog->value); break; case WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP: case WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP: - cmd->value = dbglog->value; + cmd->value = cpu_to_le32(dbglog->value); memcpy(tlv->value, module_id_bitmap, MAX_MODULE_ID_BITMAP_WORDS * sizeof(u32)); /* clear current config to be used for next user config */ @@ -9342,17 +9494,19 @@ int ath11k_wmi_hw_data_filter_cmd(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_hw_data_filter_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_HW_DATA_FILTER_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_HW_DATA_FILTER_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->enable = enable; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->enable = cpu_to_le32(enable); /* Set all modes in case of disable */ if (cmd->enable) - cmd->hw_filter_bitmap = filter_bitmap; + cmd->hw_filter_bitmap = cpu_to_le32(filter_bitmap); else - cmd->hw_filter_bitmap = ((u32)~0U); + cmd->hw_filter_bitmap = cpu_to_le32(((u32)~0U)); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "hw data filter enable %d filter_bitmap 0x%x\n", @@ -9380,9 +9534,10 @@ int ath11k_wmi_wow_host_wakeup_ind(struct ath11k *ar) return -ENOMEM; cmd = (struct wmi_wow_host_wakeup_ind *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_WOW_HOSTWAKEUP_FROM_SLEEP_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_WOW_HOSTWAKEUP_FROM_SLEEP_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv wow host wakeup ind\n"); @@ -9407,10 +9562,12 @@ int ath11k_wmi_wow_enable(struct ath11k *ar) return -ENOMEM; cmd = (struct wmi_wow_enable_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_WOW_ENABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_WOW_ENABLE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->enable = 1; + cmd->enable = cpu_to_le32(1); cmd->pause_iface_config = WOW_IFACE_PAUSE_ENABLED; ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv wow enable\n"); @@ -9440,10 +9597,11 @@ int ath11k_wmi_scan_prob_req_oui(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_scan_prob_req_oui_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_SCAN_PROB_REQ_OUI_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->prob_req_oui = prob_req_oui; + cmd->tlv_header = le32_encode_bits(WMI_TAG_SCAN_PROB_REQ_OUI_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->prob_req_oui = cpu_to_le32(prob_req_oui); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "scan prob req oui %d\n", prob_req_oui); @@ -9472,12 +9630,14 @@ int ath11k_wmi_wow_add_wakeup_event(struct ath11k *ar, u32 vdev_id, return -ENOMEM; cmd = (struct wmi_wow_add_del_event_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_WOW_ADD_DEL_EVT_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_WOW_ADD_DEL_EVT_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->is_add = enable; - cmd->event_bitmap = (1 << event); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->is_add = cpu_to_le32(enable); + cmd->event_bitmap = cpu_to_le32((1 << event)); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv wow add wakeup event %s enable %d vdev_id %d\n", wow_wakeup_event(event), enable, vdev_id); @@ -9519,75 +9679,71 @@ int ath11k_wmi_wow_add_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id, /* cmd */ ptr = (u8 *)skb->data; cmd = (struct wmi_wow_add_pattern_cmd *)ptr; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_WOW_ADD_PATTERN_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_WOW_ADD_PATTERN_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->pattern_id = pattern_id; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->pattern_id = cpu_to_le32(pattern_id); cmd->pattern_type = WOW_BITMAP_PATTERN; ptr += sizeof(*cmd); /* bitmap */ tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*bitmap)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*bitmap), WMI_TLV_LEN); ptr += sizeof(*tlv); bitmap = (struct wmi_wow_bitmap_pattern *)ptr; - bitmap->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_WOW_BITMAP_PATTERN_T) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*bitmap) - TLV_HDR_SIZE); + bitmap->tlv_header = le32_encode_bits(WMI_TAG_WOW_BITMAP_PATTERN_T, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*bitmap) - TLV_HDR_SIZE, + WMI_TLV_LEN); memcpy(bitmap->patternbuf, pattern, pattern_len); memcpy(bitmap->bitmaskbuf, mask, pattern_len); - bitmap->pattern_offset = pattern_offset; - bitmap->pattern_len = pattern_len; - bitmap->bitmask_len = pattern_len; - bitmap->pattern_id = pattern_id; + bitmap->pattern_offset = cpu_to_le32(pattern_offset); + bitmap->pattern_len = cpu_to_le32(pattern_len); + bitmap->bitmask_len = cpu_to_le32(pattern_len); + bitmap->pattern_id = cpu_to_le32(pattern_id); ptr += sizeof(*bitmap); /* ipv4 sync */ tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, 0); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(0, WMI_TLV_LEN); ptr += sizeof(*tlv); /* ipv6 sync */ tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, 0); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(0, WMI_TLV_LEN); ptr += sizeof(*tlv); /* magic */ tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, 0); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(0, WMI_TLV_LEN); ptr += sizeof(*tlv); /* pattern info timeout */ tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_UINT32) | - FIELD_PREP(WMI_TLV_LEN, 0); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_UINT32, WMI_TLV_TAG) | + le32_encode_bits(0, WMI_TLV_LEN); ptr += sizeof(*tlv); /* ratelimit interval */ tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_UINT32) | - FIELD_PREP(WMI_TLV_LEN, sizeof(u32)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_UINT32, WMI_TLV_TAG) | + le32_encode_bits(sizeof(u32), WMI_TLV_LEN); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv wow add pattern vdev_id %d pattern_id %d pattern_offset %d\n", vdev_id, pattern_id, pattern_offset); @@ -9614,12 +9770,13 @@ int ath11k_wmi_wow_del_pattern(struct ath11k *ar, u32 vdev_id, u32 pattern_id) return -ENOMEM; cmd = (struct wmi_wow_del_pattern_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_WOW_DEL_PATTERN_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_WOW_DEL_PATTERN_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->pattern_id = pattern_id; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->pattern_id = cpu_to_le32(pattern_id); cmd->pattern_type = WOW_BITMAP_PATTERN; ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv wow del pattern vdev_id %d pattern_id %d\n", @@ -9643,7 +9800,7 @@ ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar, struct wmi_wow_nlo_config_cmd *cmd; struct wmi_tlv *tlv; struct sk_buff *skb; - u32 *channel_list; + __le32 *channel_list; size_t len, nlo_list_len, channel_list_len; u8 *ptr; u32 i; @@ -9668,27 +9825,29 @@ ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar, ptr = (u8 *)skb->data; cmd = (struct wmi_wow_nlo_config_cmd *)ptr; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NLO_CONFIG_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_NLO_CONFIG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = pno->vdev_id; - cmd->flags = WMI_NLO_CONFIG_START | WMI_NLO_CONFIG_SSID_HIDE_EN; + cmd->vdev_id = cpu_to_le32(pno->vdev_id); + cmd->flags = cpu_to_le32(WMI_NLO_CONFIG_START | WMI_NLO_CONFIG_SSID_HIDE_EN); /* current FW does not support min-max range for dwell time */ - cmd->active_dwell_time = pno->active_max_time; - cmd->passive_dwell_time = pno->passive_max_time; + cmd->active_dwell_time = cpu_to_le32(pno->active_max_time); + cmd->passive_dwell_time = cpu_to_le32(pno->passive_max_time); if (pno->do_passive_scan) - cmd->flags |= WMI_NLO_CONFIG_SCAN_PASSIVE; + cmd->flags |= cpu_to_le32(WMI_NLO_CONFIG_SCAN_PASSIVE); - cmd->fast_scan_period = pno->fast_scan_period; - cmd->slow_scan_period = pno->slow_scan_period; - cmd->fast_scan_max_cycles = pno->fast_scan_max_cycles; - cmd->delay_start_time = pno->delay_start_time; + cmd->fast_scan_period = cpu_to_le32(pno->fast_scan_period); + cmd->slow_scan_period = cpu_to_le32(pno->slow_scan_period); + cmd->fast_scan_max_cycles = cpu_to_le32(pno->fast_scan_max_cycles); + cmd->delay_start_time = cpu_to_le32(pno->delay_start_time); if (pno->enable_pno_scan_randomization) { - cmd->flags |= WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ | - WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ; + cmd->flags |= cpu_to_le32(WMI_NLO_CONFIG_SPOOFED_MAC_IN_PROBE_REQ | + WMI_NLO_CONFIG_RANDOM_SEQ_NO_IN_PROBE_REQ); ether_addr_copy(cmd->mac_addr.addr, pno->mac_addr); ether_addr_copy(cmd->mac_mask.addr, pno->mac_addr_mask); } @@ -9696,24 +9855,25 @@ ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar, ptr += sizeof(*cmd); /* nlo_configured_parameters(nlo_list) */ - cmd->no_of_ssids = pno->uc_networks_count; + cmd->no_of_ssids = cpu_to_le32(pno->uc_networks_count); tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, nlo_list_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(nlo_list_len, WMI_TLV_LEN); ptr += sizeof(*tlv); nlo_list = (struct nlo_configured_parameters *)ptr; - for (i = 0; i < cmd->no_of_ssids; i++) { + for (i = 0; i < le32_to_cpu(cmd->no_of_ssids); i++) { tlv = (struct wmi_tlv *)(&nlo_list[i].tlv_header); - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*nlo_list) - sizeof(*tlv)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*nlo_list) - sizeof(*tlv), + WMI_TLV_LEN); nlo_list[i].ssid.valid = true; - nlo_list[i].ssid.ssid.ssid_len = pno->a_networks[i].ssid.ssid_len; + nlo_list[i].ssid.ssid.ssid_len = cpu_to_le32(pno->a_networks[i].ssid.ssid_len); memcpy(nlo_list[i].ssid.ssid.ssid, pno->a_networks[i].ssid.ssid, - nlo_list[i].ssid.ssid.ssid_len); + pno->a_networks[i].ssid.ssid_len); if (pno->a_networks[i].rssi_threshold && pno->a_networks[i].rssi_threshold > -300) { @@ -9728,14 +9888,14 @@ ath11k_wmi_op_gen_config_pno_start(struct ath11k *ar, } ptr += nlo_list_len; - cmd->num_of_channels = pno->a_networks[0].channel_count; + cmd->num_of_channels = cpu_to_le32(pno->a_networks[0].channel_count); tlv = (struct wmi_tlv *)ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | - FIELD_PREP(WMI_TLV_LEN, channel_list_len); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_UINT32, WMI_TLV_TAG) | + le32_encode_bits(channel_list_len, WMI_TLV_LEN); ptr += sizeof(*tlv); - channel_list = (u32 *)ptr; - for (i = 0; i < cmd->num_of_channels; i++) - channel_list[i] = pno->a_networks[0].channels[i]; + channel_list = (__le32 *)ptr; + for (i = 0; i < le32_to_cpu(cmd->num_of_channels); i++) + channel_list[i] = cpu_to_le32(pno->a_networks[0].channels[i]); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv start pno config vdev_id %d\n", vdev_id); @@ -9756,11 +9916,12 @@ static struct sk_buff *ath11k_wmi_op_gen_config_pno_stop(struct ath11k *ar, return ERR_PTR(-ENOMEM); cmd = (struct wmi_wow_nlo_config_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NLO_CONFIG_CMD) | - FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_NLO_CONFIG_CMD, + WMI_TLV_TAG) | + le32_encode_bits(len - TLV_HDR_SIZE, WMI_TLV_LEN); - cmd->vdev_id = vdev_id; - cmd->flags = WMI_NLO_CONFIG_STOP; + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->flags = cpu_to_le32(WMI_NLO_CONFIG_STOP); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "tlv stop pno config vdev_id %d\n", vdev_id); @@ -9808,13 +9969,17 @@ static void ath11k_wmi_fill_ns_offload(struct ath11k *ar, if (ext) { ns_ext_tuples = offload->ipv6_count - WMI_MAX_NS_OFFLOADS; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, ns_ext_tuples * sizeof(*ns)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(ns_ext_tuples * sizeof(*ns), + WMI_TLV_LEN); i = WMI_MAX_NS_OFFLOADS; max_offloads = offload->ipv6_count; } else { - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, WMI_MAX_NS_OFFLOADS * sizeof(*ns)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, + WMI_TLV_TAG) | + le32_encode_bits(WMI_MAX_NS_OFFLOADS * sizeof(*ns), + WMI_TLV_LEN); i = 0; max_offloads = WMI_MAX_NS_OFFLOADS; } @@ -9823,24 +9988,26 @@ static void ath11k_wmi_fill_ns_offload(struct ath11k *ar, for (; i < max_offloads; i++) { ns = (struct wmi_ns_offload_tuple *)buf_ptr; - ns->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_NS_OFFLOAD_TUPLE) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*ns) - TLV_HDR_SIZE); + ns->tlv_header = le32_encode_bits(WMI_TAG_NS_OFFLOAD_TUPLE, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*ns) - TLV_HDR_SIZE, + WMI_TLV_LEN); if (enable) { if (i < ns_cnt) - ns->flags |= WMI_NSOL_FLAGS_VALID; + ns->flags |= cpu_to_le32(WMI_NSOL_FLAGS_VALID); memcpy(ns->target_ipaddr[0], offload->ipv6_addr[i], 16); memcpy(ns->solicitation_ipaddr, offload->self_ipv6_addr[i], 16); if (offload->ipv6_type[i]) - ns->flags |= WMI_NSOL_FLAGS_IS_IPV6_ANYCAST; + ns->flags |= cpu_to_le32(WMI_NSOL_FLAGS_IS_IPV6_ANYCAST); memcpy(ns->target_mac.addr, offload->mac_addr, ETH_ALEN); if (ns->target_mac.word0 != 0 || ns->target_mac.word1 != 0) { - ns->flags |= WMI_NSOL_FLAGS_MAC_VALID; + ns->flags |= cpu_to_le32(WMI_NSOL_FLAGS_MAC_VALID); } ath11k_dbg(ar->ab, ATH11K_DBG_WMI, @@ -9867,18 +10034,21 @@ static void ath11k_wmi_fill_arp_offload(struct ath11k *ar, /* fill arp tuple */ tlv = (struct wmi_tlv *)buf_ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | - FIELD_PREP(WMI_TLV_LEN, WMI_MAX_ARP_OFFLOADS * sizeof(*arp)); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_STRUCT, WMI_TLV_TAG) | + le32_encode_bits(WMI_MAX_ARP_OFFLOADS * sizeof(*arp), + WMI_TLV_LEN); buf_ptr += sizeof(*tlv); for (i = 0; i < WMI_MAX_ARP_OFFLOADS; i++) { arp = (struct wmi_arp_offload_tuple *)buf_ptr; - arp->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARP_OFFLOAD_TUPLE) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*arp) - TLV_HDR_SIZE); + arp->tlv_header = le32_encode_bits(WMI_TAG_ARP_OFFLOAD_TUPLE, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*arp) - TLV_HDR_SIZE, + WMI_TLV_LEN); if (enable && i < offload->ipv4_count) { /* Copy the target ip addr and flags */ - arp->flags = WMI_ARPOL_FLAGS_VALID; + arp->flags = cpu_to_le32(WMI_ARPOL_FLAGS_VALID); memcpy(arp->target_ipaddr, offload->ipv4_addr[i], 4); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "arp offload address %pI4", @@ -9924,13 +10094,14 @@ int ath11k_wmi_arp_ns_offload(struct ath11k *ar, buf_ptr = skb->data; cmd = (struct wmi_set_arp_ns_offload_cmd *)buf_ptr; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_SET_ARP_NS_OFFLOAD_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_SET_ARP_NS_OFFLOAD_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); cmd->flags = 0; - cmd->vdev_id = arvif->vdev_id; - cmd->num_ns_ext_tuples = ns_ext_tuples; + cmd->vdev_id = cpu_to_le32(arvif->vdev_id); + cmd->num_ns_ext_tuples = cpu_to_le32(ns_ext_tuples); buf_ptr += sizeof(*cmd); @@ -9964,13 +10135,15 @@ int ath11k_wmi_gtk_rekey_offload(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_gtk_rekey_offload_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_GTK_OFFLOAD_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_GTK_OFFLOAD_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = arvif->vdev_id; + cmd->vdev_id = cpu_to_le32(arvif->vdev_id); if (enable) { - cmd->flags = GTK_OFFLOAD_ENABLE_OPCODE; + cmd->flags = cpu_to_le32(GTK_OFFLOAD_ENABLE_OPCODE); /* the length in rekey_data and cmd is equal */ memcpy(cmd->kck, rekey_data->kck, sizeof(cmd->kck)); @@ -9980,7 +10153,7 @@ int ath11k_wmi_gtk_rekey_offload(struct ath11k *ar, memcpy(cmd->replay_ctr, &replay_ctr, sizeof(replay_ctr)); } else { - cmd->flags = GTK_OFFLOAD_DISABLE_OPCODE; + cmd->flags = cpu_to_le32(GTK_OFFLOAD_DISABLE_OPCODE); } ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "offload gtk rekey vdev: %d %d\n", @@ -10007,11 +10180,13 @@ int ath11k_wmi_gtk_rekey_getinfo(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_gtk_rekey_offload_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_GTK_OFFLOAD_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->tlv_header = le32_encode_bits(WMI_TAG_GTK_OFFLOAD_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); - cmd->vdev_id = arvif->vdev_id; - cmd->flags = GTK_OFFLOAD_REQUEST_STATUS_OPCODE; + cmd->vdev_id = cpu_to_le32(arvif->vdev_id); + cmd->flags = cpu_to_le32(GTK_OFFLOAD_REQUEST_STATUS_OPCODE); ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "get gtk rekey vdev_id: %d\n", arvif->vdev_id); @@ -10044,23 +10219,23 @@ int ath11k_wmi_pdev_set_bios_sar_table_param(struct ath11k *ar, const u8 *sar_va return -ENOMEM; cmd = (struct wmi_pdev_set_sar_table_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - cmd->sar_len = BIOS_SAR_TABLE_LEN; - cmd->rsvd_len = BIOS_SAR_RSVD1_LEN; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->sar_len = cpu_to_le32(BIOS_SAR_TABLE_LEN); + cmd->rsvd_len = cpu_to_le32(BIOS_SAR_RSVD1_LEN); buf_ptr = skb->data + sizeof(*cmd); tlv = (struct wmi_tlv *)buf_ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, sar_len_aligned); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(sar_len_aligned, WMI_TLV_LEN); buf_ptr += TLV_HDR_SIZE; memcpy(buf_ptr, sar_val, BIOS_SAR_TABLE_LEN); buf_ptr += sar_len_aligned; tlv = (struct wmi_tlv *)buf_ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, rsvd_len_aligned); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(rsvd_len_aligned, WMI_TLV_LEN); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_BIOS_SAR_TABLE_CMDID); if (ret) { @@ -10089,15 +10264,15 @@ int ath11k_wmi_pdev_set_bios_geo_table_param(struct ath11k *ar) return -ENOMEM; cmd = (struct wmi_pdev_set_geo_table_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->pdev_id = ar->pdev->pdev_id; - cmd->rsvd_len = BIOS_SAR_RSVD2_LEN; + cmd->tlv_header = le32_encode_bits(WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD, WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, WMI_TLV_LEN); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->rsvd_len = cpu_to_le32(BIOS_SAR_RSVD2_LEN); buf_ptr = skb->data + sizeof(*cmd); tlv = (struct wmi_tlv *)buf_ptr; - tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | - FIELD_PREP(WMI_TLV_LEN, rsvd_len_aligned); + tlv->header = le32_encode_bits(WMI_TAG_ARRAY_BYTE, WMI_TLV_TAG) | + le32_encode_bits(rsvd_len_aligned, WMI_TLV_LEN); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_SET_BIOS_GEO_TABLE_CMDID); if (ret) { @@ -10124,23 +10299,25 @@ int ath11k_wmi_sta_keepalive(struct ath11k *ar, return -ENOMEM; cmd = (struct wmi_sta_keepalive_cmd *)skb->data; - cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_STA_KEEPALIVE_CMD) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); - cmd->vdev_id = arg->vdev_id; - cmd->enabled = arg->enabled; - cmd->interval = arg->interval; - cmd->method = arg->method; + cmd->tlv_header = le32_encode_bits(WMI_TAG_STA_KEEPALIVE_CMD, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*cmd) - TLV_HDR_SIZE, + WMI_TLV_LEN); + cmd->vdev_id = cpu_to_le32(arg->vdev_id); + cmd->enabled = cpu_to_le32(arg->enabled); + cmd->interval = cpu_to_le32(arg->interval); + cmd->method = cpu_to_le32(arg->method); arp = (struct wmi_sta_keepalive_arp_resp *)(cmd + 1); - arp->tlv_header = FIELD_PREP(WMI_TLV_TAG, - WMI_TAG_STA_KEEPALIVE_ARP_RESPONSE) | - FIELD_PREP(WMI_TLV_LEN, sizeof(*arp) - TLV_HDR_SIZE); + arp->tlv_header = le32_encode_bits(WMI_TAG_STA_KEEPALIVE_ARP_RESPONSE, + WMI_TLV_TAG) | + le32_encode_bits(sizeof(*arp) - TLV_HDR_SIZE, + WMI_TLV_LEN); if (arg->method == WMI_STA_KEEPALIVE_METHOD_UNSOLICITED_ARP_RESPONSE || arg->method == WMI_STA_KEEPALIVE_METHOD_GRATUITOUS_ARP_REQUEST) { - arp->src_ip4_addr = arg->src_ip4_addr; - arp->dest_ip4_addr = arg->dest_ip4_addr; + arp->src_ip4_addr = cpu_to_le32(arg->src_ip4_addr); + arp->dest_ip4_addr = cpu_to_le32(arg->dest_ip4_addr); ether_addr_copy(arp->dest_mac_addr.addr, arg->dest_mac_addr); } diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h index b2dade0516ac..7ceb8decc169 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -40,11 +40,11 @@ struct ath11k_reg_tpc_power_info; #define WMI_TLV_VDEV_PARAM_UNSUPPORTED 0 struct wmi_cmd_hdr { - u32 cmd_id; + __le32 cmd_id; } __packed; struct wmi_tlv { - u32 header; + __le32 header; u8 value[]; } __packed; @@ -2289,10 +2289,10 @@ struct ath11k_hal_reg_capabilities_ext { #define WMI_HOST_MAX_PDEV 3 struct wlan_host_mem_chunk { - u32 tlv_header; - u32 req_id; - u32 ptr; - u32 size; + __le32 tlv_header; + __le32 req_id; + __le32 ptr; + __le32 size; } __packed; struct wmi_host_mem_chunk { @@ -2303,36 +2303,36 @@ struct wmi_host_mem_chunk { }; struct wmi_init_cmd_param { - u32 tlv_header; + __le32 tlv_header; struct target_resource_config *res_cfg; u8 num_mem_chunks; struct wmi_host_mem_chunk *mem_chunks; - u32 hw_mode_id; - u32 num_band_to_mac; + __le32 hw_mode_id; + __le32 num_band_to_mac; struct wmi_host_pdev_band_to_mac band_to_mac[WMI_HOST_MAX_PDEV]; }; struct wmi_pdev_band_to_mac { - u32 tlv_header; - u32 pdev_id; - u32 start_freq; - u32 end_freq; + __le32 tlv_header; + __le32 pdev_id; + __le32 start_freq; + __le32 end_freq; } __packed; struct wmi_pdev_set_hw_mode_cmd_param { - u32 tlv_header; - u32 pdev_id; - u32 hw_mode_index; - u32 num_band_to_mac; + __le32 tlv_header; + __le32 pdev_id; + __le32 hw_mode_index; + __le32 num_band_to_mac; } __packed; struct wmi_ppe_threshold { - u32 numss_m1; /** NSS - 1*/ + __le32 numss_m1; /** NSS - 1*/ union { - u32 ru_count; - u32 ru_mask; + __le32 ru_count; + __le32 ru_mask; } __packed; - u32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS]; + __le32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS]; } __packed; #define HW_BD_INFO_SIZE 5 @@ -2347,9 +2347,9 @@ struct wmi_abi_version { } __packed; struct wmi_init_cmd { - u32 tlv_header; + __le32 tlv_header; struct wmi_abi_version host_abi_vers; - u32 num_host_mem_chunks; + __le32 num_host_mem_chunks; } __packed; #define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5) @@ -2359,108 +2359,108 @@ struct wmi_init_cmd { #define WMI_CFG_HOST_SERVICE_FLAG_REG_CC_EXT 4 struct wmi_resource_config { - u32 tlv_header; - u32 num_vdevs; - u32 num_peers; - u32 num_offload_peers; - u32 num_offload_reorder_buffs; - u32 num_peer_keys; - u32 num_tids; - u32 ast_skid_limit; - u32 tx_chain_mask; - u32 rx_chain_mask; - u32 rx_timeout_pri[4]; - u32 rx_decap_mode; - u32 scan_max_pending_req; - u32 bmiss_offload_max_vdev; - u32 roam_offload_max_vdev; - u32 roam_offload_max_ap_profiles; - u32 num_mcast_groups; - u32 num_mcast_table_elems; - u32 mcast2ucast_mode; - u32 tx_dbg_log_size; - u32 num_wds_entries; - u32 dma_burst_size; - u32 mac_aggr_delim; - u32 rx_skip_defrag_timeout_dup_detection_check; - u32 vow_config; - u32 gtk_offload_max_vdev; - u32 num_msdu_desc; - u32 max_frag_entries; - u32 num_tdls_vdevs; - u32 num_tdls_conn_table_entries; - u32 beacon_tx_offload_max_vdev; - u32 num_multicast_filter_entries; - u32 num_wow_filters; - u32 num_keep_alive_pattern; - u32 keep_alive_pattern_size; - u32 max_tdls_concurrent_sleep_sta; - u32 max_tdls_concurrent_buffer_sta; - u32 wmi_send_separate; - u32 num_ocb_vdevs; - u32 num_ocb_channels; - u32 num_ocb_schedules; - u32 flag1; - u32 smart_ant_cap; - u32 bk_minfree; - u32 be_minfree; - u32 vi_minfree; - u32 vo_minfree; - u32 alloc_frag_desc_for_data_pkt; - u32 num_ns_ext_tuples_cfg; - u32 bpf_instruction_size; - u32 max_bssid_rx_filters; - u32 use_pdev_id; - u32 max_num_dbs_scan_duty_cycle; - u32 max_num_group_keys; - u32 peer_map_unmap_v2_support; - u32 sched_params; - u32 twt_ap_pdev_count; - u32 twt_ap_sta_count; - u32 max_nlo_ssids; - u32 num_pkt_filters; - u32 num_max_sta_vdevs; - u32 max_bssid_indicator; - u32 ul_resp_config; - u32 msdu_flow_override_config0; - u32 msdu_flow_override_config1; - u32 flags2; - u32 host_service_flags; - u32 max_rnr_neighbours; - u32 ema_max_vap_cnt; - u32 ema_max_profile_period; + __le32 tlv_header; + __le32 num_vdevs; + __le32 num_peers; + __le32 num_offload_peers; + __le32 num_offload_reorder_buffs; + __le32 num_peer_keys; + __le32 num_tids; + __le32 ast_skid_limit; + __le32 tx_chain_mask; + __le32 rx_chain_mask; + __le32 rx_timeout_pri[4]; + __le32 rx_decap_mode; + __le32 scan_max_pending_req; + __le32 bmiss_offload_max_vdev; + __le32 roam_offload_max_vdev; + __le32 roam_offload_max_ap_profiles; + __le32 num_mcast_groups; + __le32 num_mcast_table_elems; + __le32 mcast2ucast_mode; + __le32 tx_dbg_log_size; + __le32 num_wds_entries; + __le32 dma_burst_size; + __le32 mac_aggr_delim; + __le32 rx_skip_defrag_timeout_dup_detection_check; + __le32 vow_config; + __le32 gtk_offload_max_vdev; + __le32 num_msdu_desc; + __le32 max_frag_entries; + __le32 num_tdls_vdevs; + __le32 num_tdls_conn_table_entries; + __le32 beacon_tx_offload_max_vdev; + __le32 num_multicast_filter_entries; + __le32 num_wow_filters; + __le32 num_keep_alive_pattern; + __le32 keep_alive_pattern_size; + __le32 max_tdls_concurrent_sleep_sta; + __le32 max_tdls_concurrent_buffer_sta; + __le32 wmi_send_separate; + __le32 num_ocb_vdevs; + __le32 num_ocb_channels; + __le32 num_ocb_schedules; + __le32 flag1; + __le32 smart_ant_cap; + __le32 bk_minfree; + __le32 be_minfree; + __le32 vi_minfree; + __le32 vo_minfree; + __le32 alloc_frag_desc_for_data_pkt; + __le32 num_ns_ext_tuples_cfg; + __le32 bpf_instruction_size; + __le32 max_bssid_rx_filters; + __le32 use_pdev_id; + __le32 max_num_dbs_scan_duty_cycle; + __le32 max_num_group_keys; + __le32 peer_map_unmap_v2_support; + __le32 sched_params; + __le32 twt_ap_pdev_count; + __le32 twt_ap_sta_count; + __le32 max_nlo_ssids; + __le32 num_pkt_filters; + __le32 num_max_sta_vdevs; + __le32 max_bssid_indicator; + __le32 ul_resp_config; + __le32 msdu_flow_override_config0; + __le32 msdu_flow_override_config1; + __le32 flags2; + __le32 host_service_flags; + __le32 max_rnr_neighbours; + __le32 ema_max_vap_cnt; + __le32 ema_max_profile_period; } __packed; struct wmi_service_ready_event { - u32 fw_build_vers; + __le32 fw_build_vers; struct wmi_abi_version fw_abi_vers; - u32 phy_capability; - u32 max_frag_entry; - u32 num_rf_chains; - u32 ht_cap_info; - u32 vht_cap_info; - u32 vht_supp_mcs; - u32 hw_min_tx_power; - u32 hw_max_tx_power; - u32 sys_cap_info; - u32 min_pkt_size_enable; - u32 max_bcn_ie_size; - u32 num_mem_reqs; - u32 max_num_scan_channels; - u32 hw_bd_id; - u32 hw_bd_info[HW_BD_INFO_SIZE]; - u32 max_supported_macs; - u32 wmi_fw_sub_feat_caps; - u32 num_dbs_hw_modes; + __le32 phy_capability; + __le32 max_frag_entry; + __le32 num_rf_chains; + __le32 ht_cap_info; + __le32 vht_cap_info; + __le32 vht_supp_mcs; + __le32 hw_min_tx_power; + __le32 hw_max_tx_power; + __le32 sys_cap_info; + __le32 min_pkt_size_enable; + __le32 max_bcn_ie_size; + __le32 num_mem_reqs; + __le32 max_num_scan_channels; + __le32 hw_bd_id; + __le32 hw_bd_info[HW_BD_INFO_SIZE]; + __le32 max_supported_macs; + __le32 wmi_fw_sub_feat_caps; + __le32 num_dbs_hw_modes; /* txrx_chainmask * [7:0] - 2G band tx chain mask * [15:8] - 2G band rx chain mask * [23:16] - 5G band tx chain mask * [31:24] - 5G band rx chain mask */ - u32 txrx_chainmask; - u32 default_dbs_hw_mode_index; - u32 num_msdu_desc; + __le32 txrx_chainmask; + __le32 default_dbs_hw_mode_index; + __le32 num_msdu_desc; } __packed; #define WMI_SERVICE_BM_SIZE ((WMI_MAX_SERVICE + sizeof(u32) - 1) / sizeof(u32)) @@ -2471,28 +2471,28 @@ struct wmi_service_ready_event { #define WMI_SERVICE_BITS_IN_SIZE32 4 struct wmi_service_ready_ext_event { - u32 default_conc_scan_config_bits; - u32 default_fw_config_bits; + __le32 default_conc_scan_config_bits; + __le32 default_fw_config_bits; struct wmi_ppe_threshold ppet; - u32 he_cap_info; - u32 mpdu_density; - u32 max_bssid_rx_filters; - u32 fw_build_vers_ext; - u32 max_nlo_ssids; - u32 max_bssid_indicator; - u32 he_cap_info_ext; + __le32 he_cap_info; + __le32 mpdu_density; + __le32 max_bssid_rx_filters; + __le32 fw_build_vers_ext; + __le32 max_nlo_ssids; + __le32 max_bssid_indicator; + __le32 he_cap_info_ext; } __packed; struct wmi_soc_mac_phy_hw_mode_caps { - u32 num_hw_modes; - u32 num_chainmask_tables; + __le32 num_hw_modes; + __le32 num_chainmask_tables; } __packed; struct wmi_hw_mode_capabilities { - u32 tlv_header; - u32 hw_mode_id; - u32 phy_id_map; - u32 hw_mode_config_type; + __le32 tlv_header; + __le32 hw_mode_id; + __le32 phy_id_map; + __le32 hw_mode_config_type; } __packed; #define WMI_MAX_HECAP_PHY_SIZE (3) @@ -2504,61 +2504,61 @@ struct wmi_hw_mode_capabilities { FIELD_GET(WMI_NSS_RATIO_INFO_BITPOS, _val) struct wmi_mac_phy_capabilities { - u32 hw_mode_id; - u32 pdev_id; - u32 phy_id; - u32 supported_flags; - u32 supported_bands; - u32 ampdu_density; - u32 max_bw_supported_2g; - u32 ht_cap_info_2g; - u32 vht_cap_info_2g; - u32 vht_supp_mcs_2g; - u32 he_cap_info_2g; - u32 he_supp_mcs_2g; - u32 tx_chain_mask_2g; - u32 rx_chain_mask_2g; - u32 max_bw_supported_5g; - u32 ht_cap_info_5g; - u32 vht_cap_info_5g; - u32 vht_supp_mcs_5g; - u32 he_cap_info_5g; - u32 he_supp_mcs_5g; - u32 tx_chain_mask_5g; - u32 rx_chain_mask_5g; - u32 he_cap_phy_info_2g[WMI_MAX_HECAP_PHY_SIZE]; - u32 he_cap_phy_info_5g[WMI_MAX_HECAP_PHY_SIZE]; + __le32 hw_mode_id; + __le32 pdev_id; + __le32 phy_id; + __le32 supported_flags; + __le32 supported_bands; + __le32 ampdu_density; + __le32 max_bw_supported_2g; + __le32 ht_cap_info_2g; + __le32 vht_cap_info_2g; + __le32 vht_supp_mcs_2g; + __le32 he_cap_info_2g; + __le32 he_supp_mcs_2g; + __le32 tx_chain_mask_2g; + __le32 rx_chain_mask_2g; + __le32 max_bw_supported_5g; + __le32 ht_cap_info_5g; + __le32 vht_cap_info_5g; + __le32 vht_supp_mcs_5g; + __le32 he_cap_info_5g; + __le32 he_supp_mcs_5g; + __le32 tx_chain_mask_5g; + __le32 rx_chain_mask_5g; + __le32 he_cap_phy_info_2g[WMI_MAX_HECAP_PHY_SIZE]; + __le32 he_cap_phy_info_5g[WMI_MAX_HECAP_PHY_SIZE]; struct wmi_ppe_threshold he_ppet2g; struct wmi_ppe_threshold he_ppet5g; - u32 chainmask_table_id; - u32 lmac_id; - u32 he_cap_info_2g_ext; - u32 he_cap_info_5g_ext; - u32 he_cap_info_internal; - u32 wireless_modes; - u32 low_2ghz_chan_freq; - u32 high_2ghz_chan_freq; - u32 low_5ghz_chan_freq; - u32 high_5ghz_chan_freq; - u32 nss_ratio; + __le32 chainmask_table_id; + __le32 lmac_id; + __le32 he_cap_info_2g_ext; + __le32 he_cap_info_5g_ext; + __le32 he_cap_info_internal; + __le32 wireless_modes; + __le32 low_2ghz_chan_freq; + __le32 high_2ghz_chan_freq; + __le32 low_5ghz_chan_freq; + __le32 high_5ghz_chan_freq; + __le32 nss_ratio; } __packed; struct wmi_hal_reg_capabilities_ext { - u32 tlv_header; - u32 phy_id; - u32 eeprom_reg_domain; - u32 eeprom_reg_domain_ext; - u32 regcap1; - u32 regcap2; - u32 wireless_modes; - u32 low_2ghz_chan; - u32 high_2ghz_chan; - u32 low_5ghz_chan; - u32 high_5ghz_chan; + __le32 tlv_header; + __le32 phy_id; + __le32 eeprom_reg_domain; + __le32 eeprom_reg_domain_ext; + __le32 regcap1; + __le32 regcap2; + __le32 wireless_modes; + __le32 low_2ghz_chan; + __le32 high_2ghz_chan; + __le32 low_5ghz_chan; + __le32 high_5ghz_chan; } __packed; struct wmi_soc_hal_reg_capabilities { - u32 num_phy; + __le32 num_phy; } __packed; /* 2 word representation of MAC addr */ @@ -2573,33 +2573,33 @@ struct wmi_mac_addr { } __packed; struct wmi_dma_ring_capabilities { - u32 tlv_header; - u32 pdev_id; - u32 module_id; - u32 min_elem; - u32 min_buf_sz; - u32 min_buf_align; + __le32 tlv_header; + __le32 pdev_id; + __le32 module_id; + __le32 min_elem; + __le32 min_buf_sz; + __le32 min_buf_align; } __packed; struct wmi_ready_event_min { struct wmi_abi_version fw_abi_vers; struct wmi_mac_addr mac_addr; - u32 status; - u32 num_dscp_table; - u32 num_extra_mac_addr; - u32 num_total_peers; - u32 num_extra_peers; + __le32 status; + __le32 num_dscp_table; + __le32 num_extra_mac_addr; + __le32 num_total_peers; + __le32 num_extra_peers; } __packed; struct wmi_ready_event { struct wmi_ready_event_min ready_event_min; - u32 max_ast_index; - u32 pktlog_defs_checksum; + __le32 max_ast_index; + __le32 pktlog_defs_checksum; } __packed; struct wmi_service_available_event { - u32 wmi_service_segment_offset; - u32 wmi_service_segment_bitmap[WMI_SERVICE_SEGMENT_BM_SIZE32]; + __le32 wmi_service_segment_offset; + __le32 wmi_service_segment_bitmap[WMI_SERVICE_SEGMENT_BM_SIZE32]; } __packed; struct ath11k_pdev_wmi { @@ -2623,47 +2623,47 @@ struct vdev_create_params { }; struct wmi_vdev_create_cmd { - u32 tlv_header; - u32 vdev_id; - u32 vdev_type; - u32 vdev_subtype; + __le32 tlv_header; + __le32 vdev_id; + __le32 vdev_type; + __le32 vdev_subtype; struct wmi_mac_addr vdev_macaddr; - u32 num_cfg_txrx_streams; - u32 pdev_id; - u32 mbssid_flags; - u32 mbssid_tx_vdev_id; + __le32 num_cfg_txrx_streams; + __le32 pdev_id; + __le32 mbssid_flags; + __le32 mbssid_tx_vdev_id; } __packed; struct wmi_vdev_txrx_streams { - u32 tlv_header; - u32 band; - u32 supported_tx_streams; - u32 supported_rx_streams; + __le32 tlv_header; + __le32 band; + __le32 supported_tx_streams; + __le32 supported_rx_streams; } __packed; struct wmi_vdev_delete_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; } __packed; struct wmi_vdev_up_cmd { - u32 tlv_header; - u32 vdev_id; - u32 vdev_assoc_id; + __le32 tlv_header; + __le32 vdev_id; + __le32 vdev_assoc_id; struct wmi_mac_addr vdev_bssid; struct wmi_mac_addr tx_vdev_bssid; - u32 nontx_profile_idx; - u32 nontx_profile_cnt; + __le32 nontx_profile_idx; + __le32 nontx_profile_cnt; } __packed; struct wmi_vdev_stop_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; } __packed; struct wmi_vdev_down_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; } __packed; #define WMI_VDEV_START_HIDDEN_SSID BIT(0) @@ -2676,28 +2676,33 @@ struct wmi_ssid { u32 ssid[8]; } __packed; +struct wmi_ssid_params { + __le32 ssid_len; + u32 ssid[8]; +} __packed; + #define ATH11K_VDEV_SETUP_TIMEOUT_HZ (1 * HZ) struct wmi_vdev_start_request_cmd { - u32 tlv_header; - u32 vdev_id; - u32 requestor_id; - u32 beacon_interval; - u32 dtim_period; - u32 flags; - struct wmi_ssid ssid; - u32 bcn_tx_rate; - u32 bcn_txpower; - u32 num_noa_descriptors; - u32 disable_hw_ack; - u32 preferred_tx_streams; - u32 preferred_rx_streams; - u32 he_ops; - u32 cac_duration_ms; - u32 regdomain; - u32 min_data_rate; - u32 mbssid_flags; - u32 mbssid_tx_vdev_id; + __le32 tlv_header; + __le32 vdev_id; + __le32 requestor_id; + __le32 beacon_interval; + __le32 dtim_period; + __le32 flags; + struct wmi_ssid_params ssid; + __le32 bcn_tx_rate; + __le32 bcn_txpower; + __le32 num_noa_descriptors; + __le32 disable_hw_ack; + __le32 preferred_tx_streams; + __le32 preferred_rx_streams; + __le32 he_ops; + __le32 cac_duration_ms; + __le32 regdomain; + __le32 min_data_rate; + __le32 mbssid_flags; + __le32 mbssid_tx_vdev_id; } __packed; #define MGMT_TX_DL_FRM_LEN 64 @@ -3000,35 +3005,35 @@ enum wmi_peer_type { }; struct wmi_peer_create_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 peer_type; + __le32 peer_type; } __packed; struct wmi_peer_delete_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; } __packed; struct wmi_peer_reorder_queue_setup_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 tid; - u32 queue_ptr_lo; - u32 queue_ptr_hi; - u32 queue_no; - u32 ba_window_size_valid; - u32 ba_window_size; + __le32 tid; + __le32 queue_ptr_lo; + __le32 queue_ptr_hi; + __le32 queue_no; + __le32 ba_window_size_valid; + __le32 ba_window_size; } __packed; struct wmi_peer_reorder_queue_remove_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 tid_mask; + __le32 tid_mask; } __packed; struct gpio_config_params { @@ -3059,11 +3064,11 @@ enum wmi_bss_chan_info_req_type { }; struct wmi_gpio_config_cmd_param { - u32 tlv_header; - u32 gpio_num; - u32 input; - u32 pull_type; - u32 intr_mode; + __le32 tlv_header; + __le32 gpio_num; + __le32 input; + __le32 pull_type; + __le32 intr_mode; }; struct gpio_output_params { @@ -3072,9 +3077,9 @@ struct gpio_output_params { }; struct wmi_gpio_output_cmd_param { - u32 tlv_header; - u32 gpio_num; - u32 set; + __le32 tlv_header; + __le32 gpio_num; + __le32 set; }; struct set_fwtest_params { @@ -3083,92 +3088,92 @@ struct set_fwtest_params { }; struct wmi_fwtest_set_param_cmd_param { - u32 tlv_header; - u32 param_id; - u32 param_value; + __le32 tlv_header; + __le32 param_id; + __le32 param_value; }; struct wmi_pdev_set_param_cmd { - u32 tlv_header; - u32 pdev_id; - u32 param_id; - u32 param_value; + __le32 tlv_header; + __le32 pdev_id; + __le32 param_id; + __le32 param_value; } __packed; struct wmi_pdev_set_ps_mode_cmd { - u32 tlv_header; - u32 vdev_id; - u32 sta_ps_mode; + __le32 tlv_header; + __le32 vdev_id; + __le32 sta_ps_mode; } __packed; struct wmi_pdev_suspend_cmd { - u32 tlv_header; - u32 pdev_id; - u32 suspend_opt; + __le32 tlv_header; + __le32 pdev_id; + __le32 suspend_opt; } __packed; struct wmi_pdev_resume_cmd { - u32 tlv_header; - u32 pdev_id; + __le32 tlv_header; + __le32 pdev_id; } __packed; struct wmi_pdev_bss_chan_info_req_cmd { - u32 tlv_header; + __le32 tlv_header; /* ref wmi_bss_chan_info_req_type */ - u32 req_type; - u32 pdev_id; + __le32 req_type; + __le32 pdev_id; } __packed; struct wmi_ap_ps_peer_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 param; - u32 value; + __le32 param; + __le32 value; } __packed; struct wmi_sta_powersave_param_cmd { - u32 tlv_header; - u32 vdev_id; - u32 param; - u32 value; + __le32 tlv_header; + __le32 vdev_id; + __le32 param; + __le32 value; } __packed; struct wmi_pdev_set_regdomain_cmd { - u32 tlv_header; - u32 pdev_id; - u32 reg_domain; - u32 reg_domain_2g; - u32 reg_domain_5g; - u32 conformance_test_limit_2g; - u32 conformance_test_limit_5g; - u32 dfs_domain; + __le32 tlv_header; + __le32 pdev_id; + __le32 reg_domain; + __le32 reg_domain_2g; + __le32 reg_domain_5g; + __le32 conformance_test_limit_2g; + __le32 conformance_test_limit_5g; + __le32 dfs_domain; } __packed; struct wmi_peer_set_param_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 param_id; - u32 param_value; + __le32 param_id; + __le32 param_value; } __packed; struct wmi_peer_flush_tids_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 peer_tid_bitmap; + __le32 peer_tid_bitmap; } __packed; struct wmi_dfs_phyerr_offload_cmd { - u32 tlv_header; - u32 pdev_id; + __le32 tlv_header; + __le32 pdev_id; } __packed; struct wmi_bcn_offload_ctrl_cmd { - u32 tlv_header; - u32 vdev_id; - u32 bcn_ctrl_op; + __le32 tlv_header; + __le32 vdev_id; + __le32 bcn_ctrl_op; } __packed; enum scan_dwelltime_adaptive_mode { @@ -3192,29 +3197,29 @@ struct wlan_ssid { }; struct wmi_vdev_ch_power_info { - u32 tlv_header; + __le32 tlv_header; /* Channel center frequency (MHz) */ - u32 chan_cfreq; + __le32 chan_cfreq; /* Unit: dBm, either PSD/EIRP power for this frequency or * incremental for non-PSD BW */ - u32 tx_power; + __le32 tx_power; } __packed; struct wmi_vdev_set_tpc_power_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; /* Value: 0 or 1, is PSD power or not */ - u32 psd_power; + __le32 psd_power; /* Maximum EIRP power (dBm units), valid only if power is PSD */ - u32 eirp_power; + __le32 eirp_power; /* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */ - u32 power_type_6ghz; + __le32 power_type_6ghz; /* This fixed_param TLV is followed by the below TLVs: * num_pwr_levels of wmi_vdev_ch_power_info @@ -3276,37 +3281,37 @@ enum wmi_scan_completion_reason { }; struct wmi_start_scan_cmd { - u32 tlv_header; - u32 scan_id; - u32 scan_req_id; - u32 vdev_id; - u32 scan_priority; - u32 notify_scan_events; - u32 dwell_time_active; - u32 dwell_time_passive; - u32 min_rest_time; - u32 max_rest_time; - u32 repeat_probe_time; - u32 probe_spacing_time; - u32 idle_time; - u32 max_scan_time; - u32 probe_delay; - u32 scan_ctrl_flags; - u32 burst_duration; - u32 num_chan; - u32 num_bssid; - u32 num_ssids; - u32 ie_len; - u32 n_probes; + __le32 tlv_header; + __le32 scan_id; + __le32 scan_req_id; + __le32 vdev_id; + __le32 scan_priority; + __le32 notify_scan_events; + __le32 dwell_time_active; + __le32 dwell_time_passive; + __le32 min_rest_time; + __le32 max_rest_time; + __le32 repeat_probe_time; + __le32 probe_spacing_time; + __le32 idle_time; + __le32 max_scan_time; + __le32 probe_delay; + __le32 scan_ctrl_flags; + __le32 burst_duration; + __le32 num_chan; + __le32 num_bssid; + __le32 num_ssids; + __le32 ie_len; + __le32 n_probes; struct wmi_mac_addr mac_addr; struct wmi_mac_addr mac_mask; - u32 ie_bitmap[WMI_IE_BITMAP_SIZE]; - u32 num_vendor_oui; - u32 scan_ctrl_flags_ext; - u32 dwell_time_active_2g; - u32 dwell_time_active_6g; - u32 dwell_time_passive_6g; - u32 scan_start_offset; + __le32 ie_bitmap[WMI_IE_BITMAP_SIZE]; + __le32 num_vendor_oui; + __le32 scan_ctrl_flags_ext; + __le32 dwell_time_active_2g; + __le32 dwell_time_active_6g; + __le32 dwell_time_passive_6g; + __le32 scan_start_offset; } __packed; #define WMI_SCAN_FLAG_PASSIVE 0x1 @@ -3494,13 +3499,13 @@ struct scan_cancel_param { #define WMI_CHAN_REG_INFO2_MAX_TX_PWR GENMASK(15, 8) struct wmi_channel { - u32 tlv_header; - u32 mhz; - u32 band_center_freq1; - u32 band_center_freq2; - u32 info; - u32 reg_info_1; - u32 reg_info_2; + __le32 tlv_header; + __le32 mhz; + __le32 band_center_freq1; + __le32 band_center_freq2; + __le32 info; + __le32 reg_info_1; + __le32 reg_info_2; } __packed; struct wmi_mgmt_params { @@ -3530,16 +3535,16 @@ enum wmi_sta_ps_mode { */ struct wmi_force_fw_hang_cmd { - u32 tlv_header; - u32 type; - u32 delay_time_ms; + __le32 tlv_header; + __le32 type; + __le32 delay_time_ms; }; struct wmi_vdev_set_param_cmd { - u32 tlv_header; - u32 vdev_id; - u32 param_id; - u32 param_value; + __le32 tlv_header; + __le32 vdev_id; + __le32 param_id; + __le32 param_value; } __packed; enum wmi_stats_id { @@ -3560,28 +3565,28 @@ enum wmi_stats_id { }; struct wmi_request_stats_cmd { - u32 tlv_header; - enum wmi_stats_id stats_id; - u32 vdev_id; + __le32 tlv_header; + __le32 stats_id; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 pdev_id; + __le32 pdev_id; } __packed; struct wmi_get_pdev_temperature_cmd { - u32 tlv_header; - u32 param; - u32 pdev_id; + __le32 tlv_header; + __le32 param; + __le32 pdev_id; } __packed; struct wmi_ftm_seg_hdr { - u32 len; - u32 msgref; - u32 segmentinfo; - u32 pdev_id; + __le32 len; + __le32 msgref; + __le32 segmentinfo; + __le32 pdev_id; } __packed; struct wmi_ftm_cmd { - u32 tlv_header; + __le32 tlv_header; struct wmi_ftm_seg_hdr seg_hdr; u8 data[]; } __packed; @@ -3594,14 +3599,14 @@ struct wmi_ftm_event_msg { #define WMI_P2P_MAX_NOA_DESCRIPTORS 4 struct wmi_p2p_noa_event { - u32 vdev_id; + __le32 vdev_id; } __packed; struct ath11k_wmi_p2p_noa_descriptor { - u32 type_count; /* 255: continuous schedule, 0: reserved */ - u32 duration; /* Absent period duration in micro seconds */ - u32 interval; /* Absent period interval in micro seconds */ - u32 start_time; /* 32 bit tsf time when in starts */ + __le32 type_count; /* 255: continuous schedule, 0: reserved */ + __le32 duration; /* Absent period duration in micro seconds */ + __le32 interval; /* Absent period interval in micro seconds */ + __le32 start_time; /* 32 bit tsf time when in starts */ } __packed; #define WMI_P2P_NOA_INFO_CHANGED_FLAG BIT(0) @@ -3618,7 +3623,7 @@ struct ath11k_wmi_p2p_noa_info { * Bits 23-17 - Ctwindow in TUs * Bits 31-24 - Number of NOA descriptors */ - u32 noa_attr; + __le32 noa_attr; struct ath11k_wmi_p2p_noa_descriptor descriptors[WMI_P2P_MAX_NOA_DESCRIPTORS]; } __packed; @@ -3629,51 +3634,51 @@ struct ath11k_wmi_p2p_noa_info { #define WMI_EMA_LAST_TMPL_SHIFT 24 struct wmi_bcn_tmpl_cmd { - u32 tlv_header; - u32 vdev_id; - u32 tim_ie_offset; - u32 buf_len; - u32 csa_switch_count_offset; - u32 ext_csa_switch_count_offset; - u32 csa_event_bitmap; - u32 mbssid_ie_offset; - u32 esp_ie_offset; - u32 csc_switch_count_offset; - u32 csc_event_bitmap; - u32 mu_edca_ie_offset; - u32 feature_enable_bitmap; - u32 ema_params; + __le32 tlv_header; + __le32 vdev_id; + __le32 tim_ie_offset; + __le32 buf_len; + __le32 csa_switch_count_offset; + __le32 ext_csa_switch_count_offset; + __le32 csa_event_bitmap; + __le32 mbssid_ie_offset; + __le32 esp_ie_offset; + __le32 csc_switch_count_offset; + __le32 csc_event_bitmap; + __le32 mu_edca_ie_offset; + __le32 feature_enable_bitmap; + __le32 ema_params; } __packed; struct wmi_p2p_go_set_beacon_ie_cmd { - u32 tlv_header; - u32 vdev_id; - u32 ie_buf_len; + __le32 tlv_header; + __le32 vdev_id; + __le32 ie_buf_len; u8 tlv[]; } __packed; struct wmi_key_seq_counter { - u32 key_seq_counter_l; - u32 key_seq_counter_h; + __le32 key_seq_counter_l; + __le32 key_seq_counter_h; } __packed; struct wmi_vdev_install_key_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 key_idx; - u32 key_flags; - u32 key_cipher; + __le32 key_idx; + __le32 key_flags; + __le32 key_cipher; struct wmi_key_seq_counter key_rsc_counter; struct wmi_key_seq_counter key_global_rsc_counter; struct wmi_key_seq_counter key_tsc_counter; u8 wpi_key_rsc_counter[16]; u8 wpi_key_tsc_counter[16]; - u32 key_len; - u32 key_txmic_len; - u32 key_rxmic_len; - u32 is_group_key_id_valid; - u32 group_key_id; + __le32 key_len; + __le32 key_txmic_len; + __le32 key_rxmic_len; + __le32 is_group_key_id_valid; + __le32 group_key_id; /* Followed by key_data containing key followed by * tx mic and then rx mic @@ -3755,11 +3760,11 @@ struct peer_assoc_params { u8 peer_mac[ETH_ALEN]; bool he_flag; - u32 peer_he_cap_macinfo[2]; + __le32 peer_he_cap_macinfo[2]; u32 peer_he_cap_macinfo_internal; u32 peer_he_caps_6ghz; u32 peer_he_ops; - u32 peer_he_cap_phyinfo[WMI_HOST_MAX_HECAP_PHY_SIZE]; + __le32 peer_he_cap_phyinfo[WMI_HOST_MAX_HECAP_PHY_SIZE]; u32 peer_he_mcs_count; u32 peer_he_rx_mcs_set[WMI_HOST_MAX_HE_RATE_SET]; u32 peer_he_tx_mcs_set[WMI_HOST_MAX_HE_RATE_SET]; @@ -3770,43 +3775,43 @@ struct peer_assoc_params { }; struct wmi_peer_assoc_complete_cmd { - u32 tlv_header; + __le32 tlv_header; struct wmi_mac_addr peer_macaddr; - u32 vdev_id; - u32 peer_new_assoc; - u32 peer_associd; - u32 peer_flags; - u32 peer_caps; - u32 peer_listen_intval; - u32 peer_ht_caps; - u32 peer_max_mpdu; - u32 peer_mpdu_density; - u32 peer_rate_caps; - u32 peer_nss; - u32 peer_vht_caps; - u32 peer_phymode; - u32 peer_ht_info[2]; - u32 num_peer_legacy_rates; - u32 num_peer_ht_rates; - u32 peer_bw_rxnss_override; + __le32 vdev_id; + __le32 peer_new_assoc; + __le32 peer_associd; + __le32 peer_flags; + __le32 peer_caps; + __le32 peer_listen_intval; + __le32 peer_ht_caps; + __le32 peer_max_mpdu; + __le32 peer_mpdu_density; + __le32 peer_rate_caps; + __le32 peer_nss; + __le32 peer_vht_caps; + __le32 peer_phymode; + __le32 peer_ht_info[2]; + __le32 num_peer_legacy_rates; + __le32 num_peer_ht_rates; + __le32 peer_bw_rxnss_override; struct wmi_ppe_threshold peer_ppet; - u32 peer_he_cap_info; - u32 peer_he_ops; - u32 peer_he_cap_phy[WMI_MAX_HECAP_PHY_SIZE]; - u32 peer_he_mcs; - u32 peer_he_cap_info_ext; - u32 peer_he_cap_info_internal; - u32 min_data_rate; - u32 peer_he_caps_6ghz; + __le32 peer_he_cap_info; + __le32 peer_he_ops; + __le32 peer_he_cap_phy[WMI_MAX_HECAP_PHY_SIZE]; + __le32 peer_he_mcs; + __le32 peer_he_cap_info_ext; + __le32 peer_he_cap_info_internal; + __le32 min_data_rate; + __le32 peer_he_caps_6ghz; } __packed; struct wmi_stop_scan_cmd { - u32 tlv_header; - u32 requestor; - u32 scan_id; - u32 req_type; - u32 vdev_id; - u32 pdev_id; + __le32 tlv_header; + __le32 requestor; + __le32 scan_id; + __le32 req_type; + __le32 vdev_id; + __le32 pdev_id; }; struct scan_chan_list_params { @@ -3817,15 +3822,15 @@ struct scan_chan_list_params { }; struct wmi_scan_chan_list_cmd { - u32 tlv_header; - u32 num_scan_chans; - u32 flags; - u32 pdev_id; + __le32 tlv_header; + __le32 num_scan_chans; + __le32 flags; + __le32 pdev_id; } __packed; struct wmi_scan_prob_req_oui_cmd { - u32 tlv_header; - u32 prob_req_oui; + __le32 tlv_header; + __le32 prob_req_oui; } __packed; #define WMI_MGMT_SEND_DOWNLD_LEN 64 @@ -3843,21 +3848,21 @@ struct wmi_scan_prob_req_oui_cmd { #define WMI_TX_PARAMS_DWORD1_RSVD GENMASK(31, 22) struct wmi_mgmt_send_params { - u32 tlv_header; - u32 tx_params_dword0; - u32 tx_params_dword1; + __le32 tlv_header; + __le32 tx_params_dword0; + __le32 tx_params_dword1; }; struct wmi_mgmt_send_cmd { - u32 tlv_header; - u32 vdev_id; - u32 desc_id; - u32 chanfreq; - u32 paddr_lo; - u32 paddr_hi; - u32 frame_len; - u32 buf_len; - u32 tx_params_valid; + __le32 tlv_header; + __le32 vdev_id; + __le32 desc_id; + __le32 chanfreq; + __le32 paddr_lo; + __le32 paddr_hi; + __le32 frame_len; + __le32 buf_len; + __le32 tx_params_valid; /* This TLV is followed by struct wmi_mgmt_frame */ @@ -3865,28 +3870,28 @@ struct wmi_mgmt_send_cmd { } __packed; struct wmi_sta_powersave_mode_cmd { - u32 tlv_header; - u32 vdev_id; - u32 sta_ps_mode; + __le32 tlv_header; + __le32 vdev_id; + __le32 sta_ps_mode; }; struct wmi_sta_smps_force_mode_cmd { - u32 tlv_header; - u32 vdev_id; - u32 forced_mode; + __le32 tlv_header; + __le32 vdev_id; + __le32 forced_mode; }; struct wmi_sta_smps_param_cmd { - u32 tlv_header; - u32 vdev_id; - u32 param; - u32 value; + __le32 tlv_header; + __le32 vdev_id; + __le32 param; + __le32 value; }; struct wmi_bcn_prb_info { - u32 tlv_header; - u32 caps; - u32 erp; + __le32 tlv_header; + __le32 caps; + __le32 erp; } __packed; enum { @@ -3899,9 +3904,9 @@ struct green_ap_ps_params { }; struct wmi_pdev_green_ap_ps_enable_cmd_param { - u32 tlv_header; - u32 pdev_id; - u32 enable; + __le32 tlv_header; + __le32 pdev_id; + __le32 enable; }; struct ap_ps_params { @@ -3927,9 +3932,9 @@ struct wmi_set_current_country_params { }; struct wmi_set_current_country_cmd { - u32 tlv_header; - u32 pdev_id; - u32 new_alpha2; + __le32 tlv_header; + __le32 pdev_id; + __le32 new_alpha2; } __packed; enum set_init_cc_type { @@ -3955,13 +3960,13 @@ struct wmi_init_country_params { }; struct wmi_init_country_cmd { - u32 tlv_header; - u32 pdev_id; - u32 init_cc_type; + __le32 tlv_header; + __le32 pdev_id; + __le32 init_cc_type; union { - u32 country_code; - u32 regdom_id; - u32 alpha2; + __le32 country_code; + __le32 regdom_id; + __le32 alpha2; } cc_info; } __packed; @@ -3972,19 +3977,19 @@ struct wmi_11d_scan_start_params { }; struct wmi_11d_scan_start_cmd { - u32 tlv_header; - u32 vdev_id; - u32 scan_period_msec; - u32 start_interval_msec; + __le32 tlv_header; + __le32 vdev_id; + __le32 scan_period_msec; + __le32 start_interval_msec; } __packed; struct wmi_11d_scan_stop_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; } __packed; struct wmi_11d_new_cc_ev { - u32 new_alpha2; + __le32 new_alpha2; } __packed; #define THERMAL_LEVELS 1 @@ -4004,64 +4009,64 @@ struct thermal_mitigation_params { }; struct wmi_therm_throt_config_request_cmd { - u32 tlv_header; - u32 pdev_id; - u32 enable; - u32 dc; - u32 dc_per_event; - u32 therm_throt_levels; + __le32 tlv_header; + __le32 pdev_id; + __le32 enable; + __le32 dc; + __le32 dc_per_event; + __le32 therm_throt_levels; } __packed; struct wmi_therm_throt_level_config_info { - u32 tlv_header; - u32 temp_lwm; - u32 temp_hwm; - u32 dc_off_percent; - u32 prio; + __le32 tlv_header; + __le32 temp_lwm; + __le32 temp_hwm; + __le32 dc_off_percent; + __le32 prio; } __packed; struct wmi_delba_send_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 tid; - u32 initiator; - u32 reasoncode; + __le32 tid; + __le32 initiator; + __le32 reasoncode; } __packed; struct wmi_addba_setresponse_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 tid; - u32 statuscode; + __le32 tid; + __le32 statuscode; } __packed; struct wmi_addba_send_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 tid; - u32 buffersize; + __le32 tid; + __le32 buffersize; } __packed; struct wmi_addba_clear_resp_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; } __packed; struct wmi_pdev_pktlog_filter_info { - u32 tlv_header; + __le32 tlv_header; struct wmi_mac_addr peer_macaddr; } __packed; struct wmi_pdev_pktlog_filter_cmd { - u32 tlv_header; - u32 pdev_id; - u32 enable; - u32 filter_type; - u32 num_mac; + __le32 tlv_header; + __le32 pdev_id; + __le32 enable; + __le32 filter_type; + __le32 num_mac; } __packed; enum ath11k_wmi_pktlog_enable { @@ -4070,15 +4075,15 @@ enum ath11k_wmi_pktlog_enable { }; struct wmi_pktlog_enable_cmd { - u32 tlv_header; - u32 pdev_id; - u32 evlist; /* WMI_PKTLOG_EVENT */ - u32 enable; + __le32 tlv_header; + __le32 pdev_id; + __le32 evlist; /* WMI_PKTLOG_EVENT */ + __le32 enable; } __packed; struct wmi_pktlog_disable_cmd { - u32 tlv_header; - u32 pdev_id; + __le32 tlv_header; + __le32 pdev_id; } __packed; #define DFS_PHYERR_UNIT_TEST_CMD 0 @@ -4099,11 +4104,11 @@ struct wmi_dfs_unit_test_arg { }; struct wmi_unit_test_cmd { - u32 tlv_header; - u32 vdev_id; - u32 module_id; - u32 num_args; - u32 diag_token; + __le32 tlv_header; + __le32 vdev_id; + __le32 module_id; + __le32 num_args; + __le32 diag_token; /* Followed by test args*/ } __packed; @@ -4125,24 +4130,24 @@ struct wmi_rate_set { }; struct wmi_vht_rate_set { - u32 tlv_header; - u32 rx_max_rate; + __le32 tlv_header; + __le32 rx_max_rate; /* MCS at which the peer can transmit */ - u32 rx_mcs_set; - u32 tx_max_rate; + __le32 rx_mcs_set; + __le32 tx_max_rate; /* MCS at which the peer can receive */ - u32 tx_mcs_set; - u32 tx_max_mcs_nss; + __le32 tx_mcs_set; + __le32 tx_max_mcs_nss; } __packed; struct wmi_he_rate_set { - u32 tlv_header; + __le32 tlv_header; /* MCS at which the peer can receive */ - u32 rx_mcs_set; + __le32 rx_mcs_set; /* MCS at which the peer can transmit */ - u32 tx_mcs_set; + __le32 tx_mcs_set; } __packed; #define MAX_REG_RULES 10 @@ -4155,19 +4160,19 @@ enum wmi_start_event_param { }; struct wmi_vdev_start_resp_event { - u32 vdev_id; - u32 requestor_id; - enum wmi_start_event_param resp_type; - u32 status; - u32 chain_mask; - u32 smps_mode; + __le32 vdev_id; + __le32 requestor_id; + __le32 resp_type; + __le32 status; + __le32 chain_mask; + __le32 smps_mode; union { - u32 mac_id; - u32 pdev_id; + __le32 mac_id; + __le32 pdev_id; }; - u32 cfgd_tx_streams; - u32 cfgd_rx_streams; - s32 max_allowed_tx_power; + __le32 cfgd_tx_streams; + __le32 cfgd_rx_streams; + __le32 max_allowed_tx_power; } __packed; /* VDEV start response status codes */ @@ -4530,131 +4535,131 @@ struct cur_regulatory_info { }; struct wmi_reg_chan_list_cc_event { - u32 status_code; - u32 phy_id; - u32 alpha2; - u32 num_phy; - u32 country_id; - u32 domain_code; - u32 dfs_region; - u32 phybitmap; - u32 min_bw_2ghz; - u32 max_bw_2ghz; - u32 min_bw_5ghz; - u32 max_bw_5ghz; - u32 num_2ghz_reg_rules; - u32 num_5ghz_reg_rules; + __le32 status_code; + __le32 phy_id; + __le32 alpha2; + __le32 num_phy; + __le32 country_id; + __le32 domain_code; + __le32 dfs_region; + __le32 phybitmap; + __le32 min_bw_2ghz; + __le32 max_bw_2ghz; + __le32 min_bw_5ghz; + __le32 max_bw_5ghz; + __le32 num_2ghz_reg_rules; + __le32 num_5ghz_reg_rules; } __packed; struct wmi_regulatory_rule_struct { - u32 tlv_header; - u32 freq_info; - u32 bw_pwr_info; - u32 flag_info; + __le32 tlv_header; + __le32 freq_info; + __le32 bw_pwr_info; + __le32 flag_info; }; #define WMI_REG_CLIENT_MAX 4 struct wmi_reg_chan_list_cc_ext_event { - u32 status_code; - u32 phy_id; - u32 alpha2; - u32 num_phy; - u32 country_id; - u32 domain_code; - u32 dfs_region; - u32 phybitmap; - u32 min_bw_2ghz; - u32 max_bw_2ghz; - u32 min_bw_5ghz; - u32 max_bw_5ghz; - u32 num_2ghz_reg_rules; - u32 num_5ghz_reg_rules; - u32 client_type; - u32 rnr_tpe_usable; - u32 unspecified_ap_usable; - u32 domain_code_6ghz_ap_lpi; - u32 domain_code_6ghz_ap_sp; - u32 domain_code_6ghz_ap_vlp; - u32 domain_code_6ghz_client_lpi[WMI_REG_CLIENT_MAX]; - u32 domain_code_6ghz_client_sp[WMI_REG_CLIENT_MAX]; - u32 domain_code_6ghz_client_vlp[WMI_REG_CLIENT_MAX]; - u32 domain_code_6ghz_super_id; - u32 min_bw_6ghz_ap_sp; - u32 max_bw_6ghz_ap_sp; - u32 min_bw_6ghz_ap_lpi; - u32 max_bw_6ghz_ap_lpi; - u32 min_bw_6ghz_ap_vlp; - u32 max_bw_6ghz_ap_vlp; - u32 min_bw_6ghz_client_sp[WMI_REG_CLIENT_MAX]; - u32 max_bw_6ghz_client_sp[WMI_REG_CLIENT_MAX]; - u32 min_bw_6ghz_client_lpi[WMI_REG_CLIENT_MAX]; - u32 max_bw_6ghz_client_lpi[WMI_REG_CLIENT_MAX]; - u32 min_bw_6ghz_client_vlp[WMI_REG_CLIENT_MAX]; - u32 max_bw_6ghz_client_vlp[WMI_REG_CLIENT_MAX]; - u32 num_6ghz_reg_rules_ap_sp; - u32 num_6ghz_reg_rules_ap_lpi; - u32 num_6ghz_reg_rules_ap_vlp; - u32 num_6ghz_reg_rules_client_sp[WMI_REG_CLIENT_MAX]; - u32 num_6ghz_reg_rules_client_lpi[WMI_REG_CLIENT_MAX]; - u32 num_6ghz_reg_rules_client_vlp[WMI_REG_CLIENT_MAX]; + __le32 status_code; + __le32 phy_id; + __le32 alpha2; + __le32 num_phy; + __le32 country_id; + __le32 domain_code; + __le32 dfs_region; + __le32 phybitmap; + __le32 min_bw_2ghz; + __le32 max_bw_2ghz; + __le32 min_bw_5ghz; + __le32 max_bw_5ghz; + __le32 num_2ghz_reg_rules; + __le32 num_5ghz_reg_rules; + __le32 client_type; + __le32 rnr_tpe_usable; + __le32 unspecified_ap_usable; + __le32 domain_code_6ghz_ap_lpi; + __le32 domain_code_6ghz_ap_sp; + __le32 domain_code_6ghz_ap_vlp; + __le32 domain_code_6ghz_client_lpi[WMI_REG_CLIENT_MAX]; + __le32 domain_code_6ghz_client_sp[WMI_REG_CLIENT_MAX]; + __le32 domain_code_6ghz_client_vlp[WMI_REG_CLIENT_MAX]; + __le32 domain_code_6ghz_super_id; + __le32 min_bw_6ghz_ap_sp; + __le32 max_bw_6ghz_ap_sp; + __le32 min_bw_6ghz_ap_lpi; + __le32 max_bw_6ghz_ap_lpi; + __le32 min_bw_6ghz_ap_vlp; + __le32 max_bw_6ghz_ap_vlp; + __le32 min_bw_6ghz_client_sp[WMI_REG_CLIENT_MAX]; + __le32 max_bw_6ghz_client_sp[WMI_REG_CLIENT_MAX]; + __le32 min_bw_6ghz_client_lpi[WMI_REG_CLIENT_MAX]; + __le32 max_bw_6ghz_client_lpi[WMI_REG_CLIENT_MAX]; + __le32 min_bw_6ghz_client_vlp[WMI_REG_CLIENT_MAX]; + __le32 max_bw_6ghz_client_vlp[WMI_REG_CLIENT_MAX]; + __le32 num_6ghz_reg_rules_ap_sp; + __le32 num_6ghz_reg_rules_ap_lpi; + __le32 num_6ghz_reg_rules_ap_vlp; + __le32 num_6ghz_reg_rules_client_sp[WMI_REG_CLIENT_MAX]; + __le32 num_6ghz_reg_rules_client_lpi[WMI_REG_CLIENT_MAX]; + __le32 num_6ghz_reg_rules_client_vlp[WMI_REG_CLIENT_MAX]; } __packed; struct wmi_regulatory_ext_rule { - u32 tlv_header; - u32 freq_info; - u32 bw_pwr_info; - u32 flag_info; - u32 psd_power_info; + __le32 tlv_header; + __le32 freq_info; + __le32 bw_pwr_info; + __le32 flag_info; + __le32 psd_power_info; } __packed; struct wmi_vdev_delete_resp_event { - u32 vdev_id; + __le32 vdev_id; } __packed; struct wmi_peer_delete_resp_event { - u32 vdev_id; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; } __packed; struct wmi_bcn_tx_status_event { - u32 vdev_id; - u32 tx_status; + __le32 vdev_id; + __le32 tx_status; } __packed; struct wmi_vdev_stopped_event { - u32 vdev_id; + __le32 vdev_id; } __packed; struct wmi_pdev_bss_chan_info_event { - u32 freq; /* Units in MHz */ - u32 noise_floor; /* units are dBm */ + __le32 freq; /* Units in MHz */ + __le32 noise_floor; /* units are dBm */ /* rx clear - how often the channel was unused */ - u32 rx_clear_count_low; - u32 rx_clear_count_high; + __le32 rx_clear_count_low; + __le32 rx_clear_count_high; /* cycle count - elapsed time during measured period, in clock ticks */ - u32 cycle_count_low; - u32 cycle_count_high; + __le32 cycle_count_low; + __le32 cycle_count_high; /* tx cycle count - elapsed time spent in tx, in clock ticks */ - u32 tx_cycle_count_low; - u32 tx_cycle_count_high; + __le32 tx_cycle_count_low; + __le32 tx_cycle_count_high; /* rx cycle count - elapsed time spent in rx, in clock ticks */ - u32 rx_cycle_count_low; - u32 rx_cycle_count_high; + __le32 rx_cycle_count_low; + __le32 rx_cycle_count_high; /*rx_cycle cnt for my bss in 64bits format */ - u32 rx_bss_cycle_count_low; - u32 rx_bss_cycle_count_high; - u32 pdev_id; + __le32 rx_bss_cycle_count_low; + __le32 rx_bss_cycle_count_high; + __le32 pdev_id; } __packed; #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0 struct wmi_vdev_install_key_compl_event { - u32 vdev_id; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 key_idx; - u32 key_flags; - u32 status; + __le32 key_idx; + __le32 key_flags; + __le32 status; } __packed; struct wmi_vdev_install_key_complete_arg { @@ -4666,7 +4671,7 @@ struct wmi_vdev_install_key_complete_arg { }; struct wmi_peer_assoc_conf_event { - u32 vdev_id; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; } __packed; @@ -4676,183 +4681,183 @@ struct wmi_peer_assoc_conf_arg { }; struct wmi_fils_discovery_event { - u32 vdev_id; - u32 fils_tt; - u32 tbtt; + __le32 vdev_id; + __le32 fils_tt; + __le32 tbtt; } __packed; struct wmi_probe_resp_tx_status_event { - u32 vdev_id; - u32 tx_status; + __le32 vdev_id; + __le32 tx_status; } __packed; /* * PDEV statistics */ struct wmi_pdev_stats_base { - s32 chan_nf; - u32 tx_frame_count; /* Cycles spent transmitting frames */ - u32 rx_frame_count; /* Cycles spent receiving frames */ - u32 rx_clear_count; /* Total channel busy time, evidently */ - u32 cycle_count; /* Total on-channel time */ - u32 phy_err_count; - u32 chan_tx_pwr; + __le32 chan_nf; + __le32 tx_frame_count; /* Cycles spent transmitting frames */ + __le32 rx_frame_count; /* Cycles spent receiving frames */ + __le32 rx_clear_count; /* Total channel busy time, evidently */ + __le32 cycle_count; /* Total on-channel time */ + __le32 phy_err_count; + __le32 chan_tx_pwr; } __packed; struct wmi_pdev_stats_extra { - u32 ack_rx_bad; - u32 rts_bad; - u32 rts_good; - u32 fcs_bad; - u32 no_beacons; - u32 mib_int_count; + __le32 ack_rx_bad; + __le32 rts_bad; + __le32 rts_good; + __le32 fcs_bad; + __le32 no_beacons; + __le32 mib_int_count; } __packed; struct wmi_pdev_stats_tx { /* Num HTT cookies queued to dispatch list */ - s32 comp_queued; + __le32 comp_queued; /* Num HTT cookies dispatched */ - s32 comp_delivered; + __le32 comp_delivered; /* Num MSDU queued to WAL */ - s32 msdu_enqued; + __le32 msdu_enqued; /* Num MPDU queue to WAL */ - s32 mpdu_enqued; + __le32 mpdu_enqued; /* Num MSDUs dropped by WMM limit */ - s32 wmm_drop; + __le32 wmm_drop; /* Num Local frames queued */ - s32 local_enqued; + __le32 local_enqued; /* Num Local frames done */ - s32 local_freed; + __le32 local_freed; /* Num queued to HW */ - s32 hw_queued; + __le32 hw_queued; /* Num PPDU reaped from HW */ - s32 hw_reaped; + __le32 hw_reaped; /* Num underruns */ - s32 underrun; + __le32 underrun; /* Num hw paused */ - u32 hw_paused; + __le32 hw_paused; /* Num PPDUs cleaned up in TX abort */ - s32 tx_abort; + __le32 tx_abort; /* Num MPDUs requeued by SW */ - s32 mpdus_requeued; + __le32 mpdus_requeued; /* excessive retries */ - u32 tx_ko; + __le32 tx_ko; - u32 tx_xretry; + __le32 tx_xretry; /* data hw rate code */ - u32 data_rc; + __le32 data_rc; /* Scheduler self triggers */ - u32 self_triggers; + __le32 self_triggers; /* frames dropped due to excessive sw retries */ - u32 sw_retry_failure; + __le32 sw_retry_failure; /* illegal rate phy errors */ - u32 illgl_rate_phy_err; + __le32 illgl_rate_phy_err; /* wal pdev continuous xretry */ - u32 pdev_cont_xretry; + __le32 pdev_cont_xretry; /* wal pdev tx timeouts */ - u32 pdev_tx_timeout; + __le32 pdev_tx_timeout; /* wal pdev resets */ - u32 pdev_resets; + __le32 pdev_resets; /* frames dropped due to non-availability of stateless TIDs */ - u32 stateless_tid_alloc_failure; + __le32 stateless_tid_alloc_failure; /* PhY/BB underrun */ - u32 phy_underrun; + __le32 phy_underrun; /* MPDU is more than txop limit */ - u32 txop_ovf; + __le32 txop_ovf; /* Num sequences posted */ - u32 seq_posted; + __le32 seq_posted; /* Num sequences failed in queueing */ - u32 seq_failed_queueing; + __le32 seq_failed_queueing; /* Num sequences completed */ - u32 seq_completed; + __le32 seq_completed; /* Num sequences restarted */ - u32 seq_restarted; + __le32 seq_restarted; /* Num of MU sequences posted */ - u32 mu_seq_posted; + __le32 mu_seq_posted; /* Num MPDUs flushed by SW, HWPAUSED, SW TXABORT * (Reset,channel change) */ - s32 mpdus_sw_flush; + __le32 mpdus_sw_flush; /* Num MPDUs filtered by HW, all filter condition (TTL expired) */ - s32 mpdus_hw_filter; + __le32 mpdus_hw_filter; /* Num MPDUs truncated by PDG (TXOP, TBTT, * PPDU_duration based on rate, dyn_bw) */ - s32 mpdus_truncated; + __le32 mpdus_truncated; /* Num MPDUs that was tried but didn't receive ACK or BA */ - s32 mpdus_ack_failed; + __le32 mpdus_ack_failed; /* Num MPDUs that was dropped du to expiry. */ - s32 mpdus_expired; + __le32 mpdus_expired; } __packed; struct wmi_pdev_stats_rx { /* Cnts any change in ring routing mid-ppdu */ - s32 mid_ppdu_route_change; + __le32 mid_ppdu_route_change; /* Total number of statuses processed */ - s32 status_rcvd; + __le32 status_rcvd; /* Extra frags on rings 0-3 */ - s32 r0_frags; - s32 r1_frags; - s32 r2_frags; - s32 r3_frags; + __le32 r0_frags; + __le32 r1_frags; + __le32 r2_frags; + __le32 r3_frags; /* MSDUs / MPDUs delivered to HTT */ - s32 htt_msdus; - s32 htt_mpdus; + __le32 htt_msdus; + __le32 htt_mpdus; /* MSDUs / MPDUs delivered to local stack */ - s32 loc_msdus; - s32 loc_mpdus; + __le32 loc_msdus; + __le32 loc_mpdus; /* AMSDUs that have more MSDUs than the status ring size */ - s32 oversize_amsdu; + __le32 oversize_amsdu; /* Number of PHY errors */ - s32 phy_errs; + __le32 phy_errs; /* Number of PHY errors drops */ - s32 phy_err_drop; + __le32 phy_err_drop; /* Number of mpdu errors - FCS, MIC, ENC etc. */ - s32 mpdu_errs; + __le32 mpdu_errs; /* Num overflow errors */ - s32 rx_ovfl_errs; + __le32 rx_ovfl_errs; } __packed; struct wmi_pdev_stats { @@ -4866,81 +4871,81 @@ struct wmi_pdev_stats { #define MAX_TX_RATE_VALUES 10 struct wmi_vdev_stats { - u32 vdev_id; - u32 beacon_snr; - u32 data_snr; - u32 num_tx_frames[WLAN_MAX_AC]; - u32 num_rx_frames; - u32 num_tx_frames_retries[WLAN_MAX_AC]; - u32 num_tx_frames_failures[WLAN_MAX_AC]; - u32 num_rts_fail; - u32 num_rts_success; - u32 num_rx_err; - u32 num_rx_discard; - u32 num_tx_not_acked; - u32 tx_rate_history[MAX_TX_RATE_VALUES]; - u32 beacon_rssi_history[MAX_TX_RATE_VALUES]; + __le32 vdev_id; + __le32 beacon_snr; + __le32 data_snr; + __le32 num_tx_frames[WLAN_MAX_AC]; + __le32 num_rx_frames; + __le32 num_tx_frames_retries[WLAN_MAX_AC]; + __le32 num_tx_frames_failures[WLAN_MAX_AC]; + __le32 num_rts_fail; + __le32 num_rts_success; + __le32 num_rx_err; + __le32 num_rx_discard; + __le32 num_tx_not_acked; + __le32 tx_rate_history[MAX_TX_RATE_VALUES]; + __le32 beacon_rssi_history[MAX_TX_RATE_VALUES]; } __packed; struct wmi_bcn_stats { - u32 vdev_id; - u32 tx_bcn_succ_cnt; - u32 tx_bcn_outage_cnt; + __le32 vdev_id; + __le32 tx_bcn_succ_cnt; + __le32 tx_bcn_outage_cnt; } __packed; struct wmi_stats_event { - u32 stats_id; - u32 num_pdev_stats; - u32 num_vdev_stats; - u32 num_peer_stats; - u32 num_bcnflt_stats; - u32 num_chan_stats; - u32 num_mib_stats; - u32 pdev_id; - u32 num_bcn_stats; - u32 num_peer_extd_stats; - u32 num_peer_extd2_stats; + __le32 stats_id; + __le32 num_pdev_stats; + __le32 num_vdev_stats; + __le32 num_peer_stats; + __le32 num_bcnflt_stats; + __le32 num_chan_stats; + __le32 num_mib_stats; + __le32 pdev_id; + __le32 num_bcn_stats; + __le32 num_peer_extd_stats; + __le32 num_peer_extd2_stats; } __packed; struct wmi_rssi_stats { - u32 vdev_id; - u32 rssi_avg_beacon[WMI_MAX_CHAINS]; - u32 rssi_avg_data[WMI_MAX_CHAINS]; + __le32 vdev_id; + __le32 rssi_avg_beacon[WMI_MAX_CHAINS]; + __le32 rssi_avg_data[WMI_MAX_CHAINS]; struct wmi_mac_addr peer_macaddr; } __packed; struct wmi_per_chain_rssi_stats { - u32 num_per_chain_rssi_stats; + __le32 num_per_chain_rssi_stats; } __packed; struct wmi_pdev_ctl_failsafe_chk_event { - u32 pdev_id; - u32 ctl_failsafe_status; + __le32 pdev_id; + __le32 ctl_failsafe_status; } __packed; struct wmi_pdev_csa_switch_ev { - u32 pdev_id; - u32 current_switch_count; - u32 num_vdevs; + __le32 pdev_id; + __le32 current_switch_count; + __le32 num_vdevs; } __packed; struct wmi_pdev_radar_ev { - u32 pdev_id; - u32 detection_mode; - u32 chan_freq; - u32 chan_width; - u32 detector_id; - u32 segment_id; - u32 timestamp; - u32 is_chirp; - s32 freq_offset; - s32 sidx; + __le32 pdev_id; + __le32 detection_mode; + __le32 chan_freq; + __le32 chan_width; + __le32 detector_id; + __le32 segment_id; + __le32 timestamp; + __le32 is_chirp; + __le32 freq_offset; + __le32 sidx; } __packed; struct wmi_pdev_temperature_event { /* temperature value in Celsius degree */ - s32 temp; - u32 pdev_id; + __le32 temp; + __le32 pdev_id; } __packed; #define WMI_RX_STATUS_OK 0x00 @@ -4969,50 +4974,50 @@ struct mgmt_rx_event_params { #define ATH_MAX_ANTENNA 4 struct wmi_mgmt_rx_hdr { - u32 channel; - u32 snr; - u32 rate; - u32 phy_mode; - u32 buf_len; - u32 status; - u32 rssi_ctl[ATH_MAX_ANTENNA]; - u32 flags; - int rssi; - u32 tsf_delta; - u32 rx_tsf_l32; - u32 rx_tsf_u32; - u32 pdev_id; - u32 chan_freq; + __le32 channel; + __le32 snr; + __le32 rate; + __le32 phy_mode; + __le32 buf_len; + __le32 status; + __le32 rssi_ctl[ATH_MAX_ANTENNA]; + __le32 flags; + __le32 rssi; + __le32 tsf_delta; + __le32 rx_tsf_l32; + __le32 rx_tsf_u32; + __le32 pdev_id; + __le32 chan_freq; } __packed; #define MAX_ANTENNA_EIGHT 8 struct wmi_rssi_ctl_ext { - u32 tlv_header; - u32 rssi_ctl_ext[MAX_ANTENNA_EIGHT - ATH_MAX_ANTENNA]; + __le32 tlv_header; + __le32 rssi_ctl_ext[MAX_ANTENNA_EIGHT - ATH_MAX_ANTENNA]; }; struct wmi_mgmt_tx_compl_event { - u32 desc_id; - u32 status; - u32 pdev_id; - u32 ppdu_id; - u32 ack_rssi; + __le32 desc_id; + __le32 status; + __le32 pdev_id; + __le32 ppdu_id; + __le32 ack_rssi; } __packed; struct wmi_scan_event { - u32 event_type; /* %WMI_SCAN_EVENT_ */ - u32 reason; /* %WMI_SCAN_REASON_ */ - u32 channel_freq; /* only valid for WMI_SCAN_EVENT_FOREIGN_CHANNEL */ - u32 scan_req_id; - u32 scan_id; - u32 vdev_id; + __le32 event_type; /* %WMI_SCAN_EVENT_ */ + __le32 reason; /* %WMI_SCAN_REASON_ */ + __le32 channel_freq; /* only valid for WMI_SCAN_EVENT_FOREIGN_CHANNEL */ + __le32 scan_req_id; + __le32 scan_id; + __le32 vdev_id; /* TSF Timestamp when the scan event (%WMI_SCAN_EVENT_) is completed * In case of AP it is TSF of the AP vdev * In case of STA connected state, this is the TSF of the AP * In case of STA not connected, it will be the free running HW timer */ - u32 tsf_timestamp; + __le32 tsf_timestamp; } __packed; struct wmi_peer_sta_kickout_arg { @@ -5035,29 +5040,29 @@ enum wmi_roam_reason { }; struct wmi_roam_event { - u32 vdev_id; - u32 reason; - u32 rssi; + __le32 vdev_id; + __le32 reason; + __le32 rssi; } __packed; #define WMI_CHAN_INFO_START_RESP 0 #define WMI_CHAN_INFO_END_RESP 1 struct wmi_chan_info_event { - u32 err_code; - u32 freq; - u32 cmd_flags; - u32 noise_floor; - u32 rx_clear_count; - u32 cycle_count; - u32 chan_tx_pwr_range; - u32 chan_tx_pwr_tp; - u32 rx_frame_count; - u32 my_bss_rx_cycle_count; - u32 rx_11b_mode_data_duration; - u32 tx_frame_cnt; - u32 mac_clk_mhz; - u32 vdev_id; + __le32 err_code; + __le32 freq; + __le32 cmd_flags; + __le32 noise_floor; + __le32 rx_clear_count; + __le32 cycle_count; + __le32 chan_tx_pwr_range; + __le32 chan_tx_pwr_tp; + __le32 rx_frame_count; + __le32 my_bss_rx_cycle_count; + __le32 rx_11b_mode_data_duration; + __le32 tx_frame_cnt; + __le32 mac_clk_mhz; + __le32 vdev_id; } __packed; struct ath11k_targ_cap { @@ -5344,13 +5349,13 @@ enum ath11k_hw_txrx_mode { }; struct wmi_wmm_params { - u32 tlv_header; - u32 cwmin; - u32 cwmax; - u32 aifs; - u32 txoplimit; - u32 acm; - u32 no_ack; + __le32 tlv_header; + __le32 cwmin; + __le32 cwmax; + __le32 aifs; + __le32 txoplimit; + __le32 acm; + __le32 no_ack; } __packed; struct wmi_wmm_params_arg { @@ -5363,10 +5368,10 @@ struct wmi_wmm_params_arg { }; struct wmi_vdev_set_wmm_params_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_wmm_params wmm_params[4]; - u32 wmm_param_type; + __le32 wmm_param_type; } __packed; struct wmi_wmm_params_all_arg { @@ -5412,29 +5417,29 @@ struct wmi_twt_enable_params { }; struct wmi_twt_enable_params_cmd { - u32 tlv_header; - u32 pdev_id; - u32 sta_cong_timer_ms; - u32 mbss_support; - u32 default_slot_size; - u32 congestion_thresh_setup; - u32 congestion_thresh_teardown; - u32 congestion_thresh_critical; - u32 interference_thresh_teardown; - u32 interference_thresh_setup; - u32 min_no_sta_setup; - u32 min_no_sta_teardown; - u32 no_of_bcast_mcast_slots; - u32 min_no_twt_slots; - u32 max_no_sta_twt; - u32 mode_check_interval; - u32 add_sta_slot_interval; - u32 remove_sta_slot_interval; + __le32 tlv_header; + __le32 pdev_id; + __le32 sta_cong_timer_ms; + __le32 mbss_support; + __le32 default_slot_size; + __le32 congestion_thresh_setup; + __le32 congestion_thresh_teardown; + __le32 congestion_thresh_critical; + __le32 interference_thresh_teardown; + __le32 interference_thresh_setup; + __le32 min_no_sta_setup; + __le32 min_no_sta_teardown; + __le32 no_of_bcast_mcast_slots; + __le32 min_no_twt_slots; + __le32 max_no_sta_twt; + __le32 mode_check_interval; + __le32 add_sta_slot_interval; + __le32 remove_sta_slot_interval; } __packed; struct wmi_twt_disable_params_cmd { - u32 tlv_header; - u32 pdev_id; + __le32 tlv_header; + __le32 pdev_id; } __packed; enum WMI_HOST_TWT_COMMAND { @@ -5454,15 +5459,15 @@ enum WMI_HOST_TWT_COMMAND { #define WMI_TWT_ADD_DIALOG_FLAG_PROTECTION BIT(11) struct wmi_twt_add_dialog_params_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 dialog_id; - u32 wake_intvl_us; - u32 wake_intvl_mantis; - u32 wake_dura_us; - u32 sp_offset_us; - u32 flags; + __le32 dialog_id; + __le32 wake_intvl_us; + __le32 wake_intvl_mantis; + __le32 wake_dura_us; + __le32 sp_offset_us; + __le32 flags; } __packed; struct wmi_twt_add_dialog_params { @@ -5494,10 +5499,10 @@ enum wmi_twt_add_dialog_status { }; struct wmi_twt_add_dialog_event { - u32 vdev_id; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 dialog_id; - u32 status; + __le32 dialog_id; + __le32 status; } __packed; struct wmi_twt_del_dialog_params { @@ -5507,10 +5512,10 @@ struct wmi_twt_del_dialog_params { } __packed; struct wmi_twt_del_dialog_params_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 dialog_id; + __le32 dialog_id; } __packed; struct wmi_twt_pause_dialog_params { @@ -5520,10 +5525,10 @@ struct wmi_twt_pause_dialog_params { } __packed; struct wmi_twt_pause_dialog_params_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 dialog_id; + __le32 dialog_id; } __packed; struct wmi_twt_resume_dialog_params { @@ -5535,27 +5540,27 @@ struct wmi_twt_resume_dialog_params { } __packed; struct wmi_twt_resume_dialog_params_cmd { - u32 tlv_header; - u32 vdev_id; + __le32 tlv_header; + __le32 vdev_id; struct wmi_mac_addr peer_macaddr; - u32 dialog_id; - u32 sp_offset_us; - u32 next_twt_size; + __le32 dialog_id; + __le32 sp_offset_us; + __le32 next_twt_size; } __packed; struct wmi_obss_spatial_reuse_params_cmd { - u32 tlv_header; - u32 pdev_id; - u32 enable; - s32 obss_min; - s32 obss_max; - u32 vdev_id; + __le32 tlv_header; + __le32 pdev_id; + __le32 enable; + __le32 obss_min; + __le32 obss_max; + __le32 vdev_id; } __packed; struct wmi_pdev_obss_pd_bitmap_cmd { - u32 tlv_header; - u32 pdev_id; - u32 bitmap[2]; + __le32 tlv_header; + __le32 pdev_id; + __le32 bitmap[2]; } __packed; #define ATH11K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS 200 @@ -5573,38 +5578,38 @@ enum wmi_bss_color_collision { }; struct wmi_obss_color_collision_cfg_params_cmd { - u32 tlv_header; - u32 vdev_id; - u32 flags; - u32 evt_type; - u32 current_bss_color; - u32 detection_period_ms; - u32 scan_period_ms; - u32 free_slot_expiry_time_ms; + __le32 tlv_header; + __le32 vdev_id; + __le32 flags; + __le32 evt_type; + __le32 current_bss_color; + __le32 detection_period_ms; + __le32 scan_period_ms; + __le32 free_slot_expiry_time_ms; } __packed; struct wmi_bss_color_change_enable_params_cmd { - u32 tlv_header; - u32 vdev_id; - u32 enable; + __le32 tlv_header; + __le32 vdev_id; + __le32 enable; } __packed; struct wmi_obss_color_collision_event { - u32 vdev_id; - u32 evt_type; - u64 obss_color_bitmap; + __le32 vdev_id; + __le32 evt_type; + __le64 obss_color_bitmap; } __packed; #define ATH11K_IPV4_TH_SEED_SIZE 5 #define ATH11K_IPV6_TH_SEED_SIZE 11 struct ath11k_wmi_pdev_lro_config_cmd { - u32 tlv_header; - u32 lro_enable; - u32 res; - u32 th_4[ATH11K_IPV4_TH_SEED_SIZE]; - u32 th_6[ATH11K_IPV6_TH_SEED_SIZE]; - u32 pdev_id; + __le32 tlv_header; + __le32 lro_enable; + __le32 res; + __le32 th_4[ATH11K_IPV4_TH_SEED_SIZE]; + __le32 th_6[ATH11K_IPV6_TH_SEED_SIZE]; + __le32 pdev_id; } __packed; #define ATH11K_WMI_SPECTRAL_COUNT_DEFAULT 0 @@ -5649,7 +5654,7 @@ struct ath11k_wmi_vdev_spectral_conf_param { } __packed; struct ath11k_wmi_vdev_spectral_conf_cmd { - u32 tlv_header; + __le32 tlv_header; struct ath11k_wmi_vdev_spectral_conf_param param; } __packed; @@ -5659,49 +5664,49 @@ struct ath11k_wmi_vdev_spectral_conf_cmd { #define ATH11K_WMI_SPECTRAL_ENABLE_CMD_DISABLE 2 struct ath11k_wmi_vdev_spectral_enable_cmd { - u32 tlv_header; - u32 vdev_id; - u32 trigger_cmd; - u32 enable_cmd; + __le32 tlv_header; + __le32 vdev_id; + __le32 trigger_cmd; + __le32 enable_cmd; } __packed; struct ath11k_wmi_pdev_dma_ring_cfg_req_cmd { - u32 tlv_header; - u32 pdev_id; - u32 module_id; /* see enum wmi_direct_buffer_module */ - u32 base_paddr_lo; - u32 base_paddr_hi; - u32 head_idx_paddr_lo; - u32 head_idx_paddr_hi; - u32 tail_idx_paddr_lo; - u32 tail_idx_paddr_hi; - u32 num_elems; /* Number of elems in the ring */ - u32 buf_size; /* size of allocated buffer in bytes */ + __le32 tlv_header; + __le32 pdev_id; + __le32 module_id; /* see enum wmi_direct_buffer_module */ + __le32 base_paddr_lo; + __le32 base_paddr_hi; + __le32 head_idx_paddr_lo; + __le32 head_idx_paddr_hi; + __le32 tail_idx_paddr_lo; + __le32 tail_idx_paddr_hi; + __le32 num_elems; /* Number of elems in the ring */ + __le32 buf_size; /* size of allocated buffer in bytes */ /* Number of wmi_dma_buf_release_entry packed together */ - u32 num_resp_per_event; + __le32 num_resp_per_event; /* Target should timeout and send whatever resp * it has if this time expires, units in milliseconds */ - u32 event_timeout_ms; + __le32 event_timeout_ms; } __packed; struct ath11k_wmi_dma_buf_release_fixed_param { - u32 pdev_id; - u32 module_id; - u32 num_buf_release_entry; - u32 num_meta_data_entry; + __le32 pdev_id; + __le32 module_id; + __le32 num_buf_release_entry; + __le32 num_meta_data_entry; } __packed; struct wmi_dma_buf_release_entry { - u32 tlv_header; - u32 paddr_lo; + __le32 tlv_header; + __le32 paddr_lo; /* Bits 11:0: address of data * Bits 31:12: host context data */ - u32 paddr_hi; + __le32 paddr_hi; } __packed; #define WMI_SPECTRAL_META_INFO1_FREQ1 GENMASK(15, 0) @@ -5710,12 +5715,12 @@ struct wmi_dma_buf_release_entry { #define WMI_SPECTRAL_META_INFO2_CHN_WIDTH GENMASK(7, 0) struct wmi_dma_buf_release_meta_data { - u32 tlv_header; - s32 noise_floor[WMI_MAX_CHAINS]; - u32 reset_delay; - u32 freq1; - u32 freq2; - u32 ch_width; + __le32 tlv_header; + __le32 noise_floor[WMI_MAX_CHAINS]; + __le32 reset_delay; + __le32 freq1; + __le32 freq2; + __le32 ch_width; } __packed; enum wmi_fils_discovery_cmd_type { @@ -5724,22 +5729,22 @@ enum wmi_fils_discovery_cmd_type { }; struct wmi_fils_discovery_cmd { - u32 tlv_header; - u32 vdev_id; - u32 interval; - u32 config; /* enum wmi_fils_discovery_cmd_type */ + __le32 tlv_header; + __le32 vdev_id; + __le32 interval; + __le32 config; /* enum wmi_fils_discovery_cmd_type */ } __packed; struct wmi_fils_discovery_tmpl_cmd { - u32 tlv_header; - u32 vdev_id; - u32 buf_len; + __le32 tlv_header; + __le32 vdev_id; + __le32 buf_len; } __packed; struct wmi_probe_tmpl_cmd { - u32 tlv_header; - u32 vdev_id; - u32 buf_len; + __le32 tlv_header; + __le32 vdev_id; + __le32 buf_len; } __packed; struct target_resource_config { @@ -5819,9 +5824,9 @@ enum wmi_debug_log_param { }; struct wmi_debug_log_config_cmd_fixed_param { - u32 tlv_header; - u32 dbg_log_param; - u32 value; + __le32 tlv_header; + __le32 dbg_log_param; + __le32 value; } __packed; #define MAX_RADIOS 3 @@ -5843,10 +5848,10 @@ enum wmi_peer_ps_supported_bitmap { struct wmi_peer_sta_ps_state_chg_event { struct wmi_mac_addr peer_macaddr; - u32 peer_ps_state; - u32 ps_supported_bitmap; - u32 peer_ps_valid; - u32 peer_ps_timestamp; + __le32 peer_ps_state; + __le32 ps_supported_bitmap; + __le32 peer_ps_valid; + __le32 peer_ps_timestamp; } __packed; struct ath11k_wmi_base { @@ -5876,10 +5881,10 @@ enum hw_data_filter_type { }; struct wmi_hw_data_filter_cmd { - u32 tlv_header; - u32 vdev_id; - u32 enable; - u32 hw_filter_bitmap; + __le32 tlv_header; + __le32 vdev_id; + __le32 enable; + __le32 hw_filter_bitmap; } __packed; /* WOW structures */ @@ -6059,22 +6064,22 @@ enum wmi_tlv_pattern_type { offsetof(struct ieee80211_hdr_3addr, addr1)) struct wmi_wow_add_del_event_cmd { - u32 tlv_header; - u32 vdev_id; - u32 is_add; - u32 event_bitmap; + __le32 tlv_header; + __le32 vdev_id; + __le32 is_add; + __le32 event_bitmap; } __packed; struct wmi_wow_enable_cmd { - u32 tlv_header; - u32 enable; - u32 pause_iface_config; - u32 flags; + __le32 tlv_header; + __le32 enable; + __le32 pause_iface_config; + __le32 flags; } __packed; struct wmi_wow_host_wakeup_ind { - u32 tlv_header; - u32 reserved; + __le32 tlv_header; + __le32 reserved; } __packed; struct wmi_tlv_wow_event_info { @@ -6085,27 +6090,27 @@ struct wmi_tlv_wow_event_info { } __packed; struct wmi_wow_bitmap_pattern { - u32 tlv_header; + __le32 tlv_header; u8 patternbuf[WOW_DEFAULT_BITMAP_PATTERN_SIZE]; u8 bitmaskbuf[WOW_DEFAULT_BITMASK_SIZE]; - u32 pattern_offset; - u32 pattern_len; - u32 bitmask_len; - u32 pattern_id; + __le32 pattern_offset; + __le32 pattern_len; + __le32 bitmask_len; + __le32 pattern_id; } __packed; struct wmi_wow_add_pattern_cmd { - u32 tlv_header; - u32 vdev_id; - u32 pattern_id; - u32 pattern_type; + __le32 tlv_header; + __le32 vdev_id; + __le32 pattern_id; + __le32 pattern_type; } __packed; struct wmi_wow_del_pattern_cmd { - u32 tlv_header; - u32 vdev_id; - u32 pattern_id; - u32 pattern_type; + __le32 tlv_header; + __le32 vdev_id; + __le32 pattern_id; + __le32 pattern_type; } __packed; #define WMI_PNO_MAX_SCHED_SCAN_PLANS 2 @@ -6155,7 +6160,7 @@ enum wmi_ssid_bcast_type { struct wmi_nlo_ssid_param { u32 valid; - struct wmi_ssid ssid; + struct wmi_ssid_params ssid; } __packed; struct wmi_nlo_enc_param { @@ -6180,7 +6185,7 @@ struct wmi_nlo_rssi_param { struct nlo_configured_parameters { /* TLV tag and len;*/ - u32 tlv_header; + __le32 tlv_header; struct wmi_nlo_ssid_param ssid; struct wmi_nlo_enc_param enc_type; struct wmi_nlo_auth_param auth_type; @@ -6224,35 +6229,35 @@ struct wmi_pno_scan_req { }; struct wmi_wow_nlo_config_cmd { - u32 tlv_header; - u32 flags; - u32 vdev_id; - u32 fast_scan_max_cycles; - u32 active_dwell_time; - u32 passive_dwell_time; - u32 probe_bundle_size; + __le32 tlv_header; + __le32 flags; + __le32 vdev_id; + __le32 fast_scan_max_cycles; + __le32 active_dwell_time; + __le32 passive_dwell_time; + __le32 probe_bundle_size; /* ART = IRT */ - u32 rest_time; + __le32 rest_time; /* Max value that can be reached after SBM */ - u32 max_rest_time; + __le32 max_rest_time; /* SBM */ - u32 scan_backoff_multiplier; + __le32 scan_backoff_multiplier; /* SCBM */ - u32 fast_scan_period; + __le32 fast_scan_period; /* specific to windows */ - u32 slow_scan_period; + __le32 slow_scan_period; - u32 no_of_ssids; + __le32 no_of_ssids; - u32 num_of_channels; + __le32 num_of_channels; /* NLO scan start delay time in milliseconds */ - u32 delay_start_time; + __le32 delay_start_time; /* MAC Address to use in Probe Req as SA */ struct wmi_mac_addr mac_addr; @@ -6261,13 +6266,13 @@ struct wmi_wow_nlo_config_cmd { struct wmi_mac_addr mac_mask; /* IE bitmap to use in Probe Req */ - u32 ie_bitmap[8]; + __le32 ie_bitmap[8]; /* Number of vendor OUIs. In the TLV vendor_oui[] */ - u32 num_vendor_oui; + __le32 num_vendor_oui; /* Number of connected NLO band preferences */ - u32 num_cnlo_band_pref; + __le32 num_cnlo_band_pref; /* The TLVs will follow. * nlo_configured_parameters nlo_list[]; @@ -6283,8 +6288,8 @@ struct wmi_wow_nlo_config_cmd { #define WMI_ARPOL_FLAGS_REMOTE_IP_VALID BIT(2) struct wmi_arp_offload_tuple { - u32 tlv_header; - u32 flags; + __le32 tlv_header; + __le32 flags; u8 target_ipaddr[4]; u8 remote_ipaddr[4]; struct wmi_mac_addr target_mac; @@ -6298,8 +6303,8 @@ struct wmi_arp_offload_tuple { #define WMI_NSOL_MAX_TARGET_IPS 2 struct wmi_ns_offload_tuple { - u32 tlv_header; - u32 flags; + __le32 tlv_header; + __le32 flags; u8 target_ipaddr[WMI_NSOL_MAX_TARGET_IPS][16]; u8 solicitation_ipaddr[16]; u8 remote_ipaddr[16]; @@ -6307,10 +6312,10 @@ struct wmi_ns_offload_tuple { } __packed; struct wmi_set_arp_ns_offload_cmd { - u32 tlv_header; - u32 flags; - u32 vdev_id; - u32 num_ns_ext_tuples; + __le32 tlv_header; + __le32 flags; + __le32 vdev_id; + __le32 num_ns_ext_tuples; /* The TLVs follow: * wmi_ns_offload_tuple ns_tuples[WMI_MAX_NS_OFFLOADS]; * wmi_arp_offload_tuple arp_tuples[WMI_MAX_ARP_OFFLOADS]; @@ -6340,9 +6345,9 @@ struct wmi_replayc_cnt { } __packed; struct wmi_gtk_offload_status_event { - u32 vdev_id; - u32 flags; - u32 refresh_cnt; + __le32 vdev_id; + __le32 flags; + __le32 refresh_cnt; struct wmi_replayc_cnt replay_ctr; u8 igtk_key_index; u8 igtk_key_length; @@ -6355,9 +6360,9 @@ struct wmi_gtk_offload_status_event { } __packed; struct wmi_gtk_rekey_offload_cmd { - u32 tlv_header; - u32 vdev_id; - u32 flags; + __le32 tlv_header; + __le32 vdev_id; + __le32 flags; u8 kek[GTK_OFFLOAD_KEK_BYTES]; u8 kck[GTK_OFFLOAD_KCK_BYTES]; u8 replay_ctr[GTK_REPLAY_COUNTER_BYTES]; @@ -6368,28 +6373,28 @@ struct wmi_gtk_rekey_offload_cmd { #define BIOS_SAR_RSVD2_LEN (18) struct wmi_pdev_set_sar_table_cmd { - u32 tlv_header; - u32 pdev_id; - u32 sar_len; - u32 rsvd_len; + __le32 tlv_header; + __le32 pdev_id; + __le32 sar_len; + __le32 rsvd_len; } __packed; struct wmi_pdev_set_geo_table_cmd { - u32 tlv_header; - u32 pdev_id; - u32 rsvd_len; + __le32 tlv_header; + __le32 pdev_id; + __le32 rsvd_len; } __packed; struct wmi_sta_keepalive_cmd { - u32 tlv_header; - u32 vdev_id; - u32 enabled; + __le32 tlv_header; + __le32 vdev_id; + __le32 enabled; /* WMI_STA_KEEPALIVE_METHOD_ */ - u32 method; + __le32 method; /* in seconds */ - u32 interval; + __le32 interval; /* following this structure is the TLV for struct * wmi_sta_keepalive_arp_resp @@ -6397,9 +6402,9 @@ struct wmi_sta_keepalive_cmd { } __packed; struct wmi_sta_keepalive_arp_resp { - u32 tlv_header; - u32 src_ip4_addr; - u32 dest_ip4_addr; + __le32 tlv_header; + __le32 src_ip4_addr; + __le32 dest_ip4_addr; struct wmi_mac_addr dest_mac_addr; } __packed; -- 2.53.0 The target CE pipe configuration and the service to pipe mapping tables in hw.c are stored as __le32 values. When sending the WLAN config request, these values are copied unchanged into the QMI request structures, which are declared as __le32 as well. However, the QMI encoder serializes the request structures itself and expects the elements in host byte order, converting them to little endian on the wire. On big endian hosts the values are therefore swapped twice and the firmware receives a wrong CE and service configuration. Declare the QMI target CE and service pipe configuration elements as u32 and convert the table values with le32_to_cpu() when filling the request. Signed-off-by: Alexander Wilhelm --- drivers/net/wireless/ath/ath11k/qmi.c | 24 ++++++++++++++++-------- drivers/net/wireless/ath/ath11k/qmi.h | 16 ++++++++-------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c index 7dc07339b957..a379b0904794 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c @@ -2718,20 +2718,28 @@ static int ath11k_qmi_wlanfw_wlan_cfg_send(struct ath11k_base *ab) /* This is number of CE configs */ req->tgt_cfg_len = ab->qmi.ce_cfg.tgt_ce_len; for (pipe_num = 0; pipe_num < req->tgt_cfg_len ; pipe_num++) { - req->tgt_cfg[pipe_num].pipe_num = ce_cfg[pipe_num].pipenum; - req->tgt_cfg[pipe_num].pipe_dir = ce_cfg[pipe_num].pipedir; - req->tgt_cfg[pipe_num].nentries = ce_cfg[pipe_num].nentries; - req->tgt_cfg[pipe_num].nbytes_max = ce_cfg[pipe_num].nbytes_max; - req->tgt_cfg[pipe_num].flags = ce_cfg[pipe_num].flags; + req->tgt_cfg[pipe_num].pipe_num = + le32_to_cpu(ce_cfg[pipe_num].pipenum); + req->tgt_cfg[pipe_num].pipe_dir = + le32_to_cpu(ce_cfg[pipe_num].pipedir); + req->tgt_cfg[pipe_num].nentries = + le32_to_cpu(ce_cfg[pipe_num].nentries); + req->tgt_cfg[pipe_num].nbytes_max = + le32_to_cpu(ce_cfg[pipe_num].nbytes_max); + req->tgt_cfg[pipe_num].flags = + le32_to_cpu(ce_cfg[pipe_num].flags); } req->svc_cfg_valid = 1; /* This is number of Service/CE configs */ req->svc_cfg_len = ab->qmi.ce_cfg.svc_to_ce_map_len; for (pipe_num = 0; pipe_num < req->svc_cfg_len; pipe_num++) { - req->svc_cfg[pipe_num].service_id = svc_cfg[pipe_num].service_id; - req->svc_cfg[pipe_num].pipe_dir = svc_cfg[pipe_num].pipedir; - req->svc_cfg[pipe_num].pipe_num = svc_cfg[pipe_num].pipenum; + req->svc_cfg[pipe_num].service_id = + le32_to_cpu(svc_cfg[pipe_num].service_id); + req->svc_cfg[pipe_num].pipe_dir = + le32_to_cpu(svc_cfg[pipe_num].pipedir); + req->svc_cfg[pipe_num].pipe_num = + le32_to_cpu(svc_cfg[pipe_num].pipenum); } req->shadow_reg_valid = 0; diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h index 350816c81ee5..1f799183a010 100644 --- a/drivers/net/wireless/ath/ath11k/qmi.h +++ b/drivers/net/wireless/ath/ath11k/qmi.h @@ -315,17 +315,17 @@ enum qmi_wlanfw_pipedir_enum_v01 { }; struct qmi_wlanfw_ce_tgt_pipe_cfg_s_v01 { - __le32 pipe_num; - __le32 pipe_dir; - __le32 nentries; - __le32 nbytes_max; - __le32 flags; + u32 pipe_num; + u32 pipe_dir; + u32 nentries; + u32 nbytes_max; + u32 flags; }; struct qmi_wlanfw_ce_svc_pipe_cfg_s_v01 { - __le32 service_id; - __le32 pipe_dir; - __le32 pipe_num; + u32 service_id; + u32 pipe_dir; + u32 pipe_num; }; struct qmi_wlanfw_shadow_reg_cfg_s_v01 { -- 2.53.0