Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9afcf1e6 authored by Lior David's avatar Lior David Committed by Maya Erez
Browse files

wil6210: switch to generated wmi.h 



Switch to auto-generated version of wmi.h which is maintained
by FW team. This will allow better sync between teams in the
future and avoid bugs because of unexpected API changes.
The wmi.h will have many differences but most are cosmetic.
It also includes these real differences:
1. is_go parameter added to BCON_CTRL and START_PCP commands.
2. max_rx_pl_per_desc added to CFG_RX_CHAIN command.
3. various small API updates that are not currently used by
driver.

Change-Id: I20921a97b02dce0507f58c4951ce539a2aae5597
Signed-off-by: default avatarLior David <qca_liord@qca.qualcomm.com>
Signed-off-by: default avatarMaya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
Git-commit: b874ddecae0a087aee024ef808c63060434a2d50
Git-repo: https://github.com/kvalo/ath.git


CRs-Fixed: 987415
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
parent 02ba903f

drivers/net/wireless/ath/wil6210/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ int wil_cid_fill_sinfo(struct wil6210_priv *wil, int cid, 
		.interval_usec = 0,

	};

	struct {

		struct wil6210_mbox_hdr_wmi wmi;

		struct wmi_cmd_hdr wmi;

		struct wmi_notify_req_done_event evt;

	} __packed reply;

	struct wil_net_stats *stats = &wil->sta[cid].stats;
@@ -575,7 +575,7 @@ int wil_cfg80211_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev, 
	struct ieee80211_mgmt *mgmt_frame = (void *)buf;

	struct wmi_sw_tx_req_cmd *cmd;

	struct {

		struct wil6210_mbox_hdr_wmi wmi;

		struct wmi_cmd_hdr wmi;

		struct wmi_sw_tx_complete_event evt;

	} __packed evt;

drivers/net/wireless/ath/wil6210/debugfs.c

+4 −4
Original line number Diff line number Diff line
@@ -837,9 +837,9 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, 
				  size_t len, loff_t *ppos)

{

	struct wil6210_priv *wil = file->private_data;

	struct wil6210_mbox_hdr_wmi *wmi;

	struct wmi_cmd_hdr *wmi;

	void *cmd;

	int cmdlen = len - sizeof(struct wil6210_mbox_hdr_wmi);

	int cmdlen = len - sizeof(struct wmi_cmd_hdr);

	u16 cmdid;

	int rc, rc1;
@@ -857,7 +857,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, 
	}



	cmd = &wmi[1];

	cmdid = le16_to_cpu(wmi->id);

	cmdid = le16_to_cpu(wmi->command_id);



	rc1 = wmi_send(wil, cmdid, cmd, cmdlen);

	kfree(wmi);
@@ -1017,7 +1017,7 @@ static int wil_bf_debugfs_show(struct seq_file *s, void *data) 
		.interval_usec = 0,

	};

	struct {

		struct wil6210_mbox_hdr_wmi wmi;

		struct wmi_cmd_hdr wmi;

		struct wmi_notify_req_done_event evt;

	} __packed reply;

drivers/net/wireless/ath/wil6210/trace.h

+10 −9
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 Qualcomm Atheros, Inc.

 * Copyright (c) 2013-2016 Qualcomm Atheros, Inc.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above
@@ -37,39 +37,40 @@ static inline void trace_ ## name(proto) {} 
#endif /* !CONFIG_WIL6210_TRACING || defined(__CHECKER__) */



DECLARE_EVENT_CLASS(wil6210_wmi,

	TP_PROTO(struct wil6210_mbox_hdr_wmi *wmi, void *buf, u16 buf_len),

	TP_PROTO(struct wmi_cmd_hdr *wmi, void *buf, u16 buf_len),



	TP_ARGS(wmi, buf, buf_len),



	TP_STRUCT__entry(

		__field(u8, mid)

		__field(u16, id)

		__field(u32, timestamp)

		__field(u16, command_id)

		__field(u32, fw_timestamp)

		__field(u16, buf_len)

		__dynamic_array(u8, buf, buf_len)

	),



	TP_fast_assign(

		__entry->mid = wmi->mid;

		__entry->id = le16_to_cpu(wmi->id);

		__entry->timestamp = le32_to_cpu(wmi->timestamp);

		__entry->command_id = le16_to_cpu(wmi->command_id);

		__entry->fw_timestamp = le32_to_cpu(wmi->fw_timestamp);

		__entry->buf_len = buf_len;

		memcpy(__get_dynamic_array(buf), buf, buf_len);

	),



	TP_printk(

		"MID %d id 0x%04x len %d timestamp %d",

		__entry->mid, __entry->id, __entry->buf_len, __entry->timestamp

		__entry->mid, __entry->command_id, __entry->buf_len,

		__entry->fw_timestamp

	)

);



DEFINE_EVENT(wil6210_wmi, wil6210_wmi_cmd,

	TP_PROTO(struct wil6210_mbox_hdr_wmi *wmi, void *buf, u16 buf_len),

	TP_PROTO(struct wmi_cmd_hdr *wmi, void *buf, u16 buf_len),

	TP_ARGS(wmi, buf, buf_len)

);



DEFINE_EVENT(wil6210_wmi, wil6210_wmi_event,

	TP_PROTO(struct wil6210_mbox_hdr_wmi *wmi, void *buf, u16 buf_len),

	TP_PROTO(struct wmi_cmd_hdr *wmi, void *buf, u16 buf_len),

	TP_ARGS(wmi, buf, buf_len)

);

drivers/net/wireless/ath/wil6210/txrx.c

+2 −2
Original line number Diff line number Diff line
@@ -820,7 +820,7 @@ int wil_vring_init_tx(struct wil6210_priv *wil, int id, int size, 
		},

	};

	struct {

		struct wil6210_mbox_hdr_wmi wmi;

		struct wmi_cmd_hdr wmi;

		struct wmi_vring_cfg_done_event cmd;

	} __packed reply;

	struct vring *vring = &wil->vring_tx[id];
@@ -897,7 +897,7 @@ int wil_vring_init_bcast(struct wil6210_priv *wil, int id, int size) 
		},

	};

	struct {

		struct wil6210_mbox_hdr_wmi wmi;

		struct wmi_cmd_hdr wmi;

		struct wmi_vring_cfg_done_event cmd;

	} __packed reply;

	struct vring *vring = &wil->vring_tx[id];

drivers/net/wireless/ath/wil6210/wil6210.h

+2 −19
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <net/cfg80211.h>

#include <linux/timex.h>

#include <linux/types.h>

#include "wmi.h"

#include "wil_platform.h"



extern bool no_fw_recovery;
@@ -334,29 +335,11 @@ struct wil6210_mbox_hdr { 
/* max. value for wil6210_mbox_hdr.len */

#define MAX_MBOXITEM_SIZE   (240)



/**

 * struct wil6210_mbox_hdr_wmi - WMI header

 *

 * @mid: MAC ID

 *	00 - default, created by FW

 *	01..0f - WiFi ports, driver to create

 *	10..fe - debug

 *	ff - broadcast

 * @id: command/event ID

 * @timestamp: FW fills for events, free-running msec timer

 */

struct wil6210_mbox_hdr_wmi {

	u8 mid;

	u8 reserved;

	__le16 id;

	__le32 timestamp;

} __packed;



struct pending_wmi_event {

	struct list_head list;

	struct {

		struct wil6210_mbox_hdr hdr;

		struct wil6210_mbox_hdr_wmi wmi;

		struct wmi_cmd_hdr wmi;

		u8 data[0];

	} __packed event;

};