ath10k: WMI overhaul
PATCH 1/2 ath10k: WMI overhaul
From: Sujith Manoharan <[email protected]>
Sync with internal WMI changes.
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath10k/wmi.c | 15 +- drivers/net/wireless/ath/ath10k/wmi.h | 278 ++++++++++++++++------------------ 2 files changed, 136 insertions(+), 157 deletions(-)
drivers/net/wireless/ath/ath10k/wmi.c +9 -6
@@ -108,14 +108,17 @@ static int wmi_cmd_send(struct ath10k *ar, struct sk_buff *skb,struct wmi_struct *wmi = ar->modules.wmi;struct wmi_cmd_hdr *cmd_hdr;int status; +u32 cmd =0 ;if (skb_push (skb,sizeof (struct wmi_cmd_hdr )) ==NULL ) {ath10k_warn ("%s: skb_push failed\n" , __func__);return -ENOMEM ; } + cmd |=SM (cmd_id,WMI_CMD_HDR_CMD_ID ); + cmd_hdr = (struct wmi_cmd_hdr *)skb->data; - cmd_hdr->cmd_id =__cpu_to_le16 (cmd_id); + cmd_hdr->cmd_id =__cpu_to_le32 (cmd);if (atomic_add_return (1 , &wmi->pending_tx_count) >WMI_MAX_PENDING_TX_COUNT ) {
@@ -842,17 +845,15 @@ static void wmi_event_process(struct wmi_struct *wmi, struct sk_buff *skb) {struct ath10k *ar = wmi->ar;struct wmi_cmd_hdr *cmd_hdr; -u16 id; -u8 *event; +enum wmi_event_id id;u16 len; cmd_hdr = (struct wmi_cmd_hdr *)skb->data; - id =__le16_to_cpu (cmd_hdr->cmd_id); + id =MS (__le32_to_cpu (cmd_hdr->cmd_id),WMI_CMD_HDR_CMD_ID );if (skb_pull (skb,sizeof (struct wmi_cmd_hdr )) ==NULL )return ; - event = skb->data; len = skb->len;trace_ath10k_wmi_event (id, skb->data, skb->len);
@@ -985,7 +986,9 @@ static void wmi_process_rx(void *ptr, struct sk_buff *skb) {struct wmi_struct *wmi = ptr;struct wmi_cmd_hdr *cmd_hdr = (struct wmi_cmd_hdr *)skb->data; -enum wmi_event_id event_id =__le16_to_cpu (cmd_hdr->cmd_id); +enum wmi_event_id event_id; + + event_id =MS (__le32_to_cpu (cmd_hdr->cmd_id),WMI_CMD_HDR_CMD_ID );if (!skb) {ath10k_warn ("%s: missing skb\n" , __func__);
drivers/net/wireless/ath/ath10k/wmi.h +127 -151
419 lines not on this page · raw message
Signature · 1 line
1.8.2.1
PATCH 2/2 ath10k: Reduce maximum VDEV count
From: Sujith Manoharan <[email protected]>
Fix this at 8 until the large-ap feature is ported to ath10k. Tested with FW ver 604 using CUS223 v1 and v2.
Signed-off-by Sujith Manoharan <[email protected]>
--- drivers/net/wireless/ath/ath10k/hw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath10k/hw.h +1 -1
@@ -42,7 +42,7 @@#define AR9888_HW_2_0_BOARD_DATA_FILE "fakeBoardData_AR9888v2.bin"#define AR9888_HW_2_0_PATCH_LOAD_ADDR 0x1234 -#define TARGET_NUM_VDEV 16 +#define TARGET_NUM_VDEV 8#define TARGET_NUM_PEER_AST 2#define TARGET_WDS_ENTRIES 32#define TARGET_DMA_BURST_SIZE 0
Signature · 1 line
1.8.2.1
PATCH 1/2 ath10k: WMI overhaul
In reply to Sujith ManoharanQuoted 5 lines · Sujith Manoharan
From: Sujith Manoharan <[email protected]>
Sync with internal WMI changes.
Signed-off-by Sujith Manoharan <[email protected]>
Thanks, both patches applied.
Signature · 1 line
Kalle Valo