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

Commit f988b23f authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by John W. Linville
Browse files

wil6210: Align WMI header with latest FW 



FW guys changed header structure; align driver code

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent d02433d1

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

+13 −9
Original line number Diff line number Diff line
@@ -37,36 +37,40 @@ static inline void trace_ ## name(proto) {} 
#endif /* !CONFIG_WIL6210_TRACING || defined(__CHECKER__) */



DECLARE_EVENT_CLASS(wil6210_wmi,

	TP_PROTO(u16 id, void *buf, u16 buf_len),

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



	TP_ARGS(id, buf, buf_len),

	TP_ARGS(wmi, buf, buf_len),



	TP_STRUCT__entry(

		__field(u8, mid)

		__field(u16, id)

		__field(u32, timestamp)

		__field(u16, buf_len)

		__dynamic_array(u8, buf, buf_len)

	),



	TP_fast_assign(

		__entry->id = id;

		__entry->mid = wmi->mid;

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

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

		__entry->buf_len = buf_len;

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

	),



	TP_printk(

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

		__entry->id, __entry->buf_len

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

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

	)

);



DEFINE_EVENT(wil6210_wmi, wil6210_wmi_cmd,

	TP_PROTO(u16 id, void *buf, u16 buf_len),

	TP_ARGS(id, buf, buf_len)

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

	TP_ARGS(wmi, buf, buf_len)

);



DEFINE_EVENT(wil6210_wmi, wil6210_wmi_event,

	TP_PROTO(u16 id, void *buf, u16 buf_len),

	TP_ARGS(id, buf, buf_len)

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

	TP_ARGS(wmi, buf, buf_len)

);



#define WIL6210_MSG_MAX (200)

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

+14 −3
Original line number Diff line number Diff line
@@ -156,11 +156,22 @@ 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 reserved0[2];

	u8 mid;

	u8 reserved;

	__le16 id;

	__le16 info1; /* bits [0..3] - device_id, rest - unused */

	u8 reserved1[2];

	__le32 timestamp;

} __packed;



struct pending_wmi_event {

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

+9 −5
Original line number Diff line number Diff line
@@ -172,8 +172,8 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len) 
			.len = cpu_to_le16(sizeof(cmd.wmi) + len),

		},

		.wmi = {

			.mid = 0,

			.id = cpu_to_le16(cmdid),

			.info1 = 0,

		},

	};

	struct wil6210_mbox_ring *r = &wil->mbox_ctl.tx;
@@ -248,7 +248,7 @@ static int __wmi_send(struct wil6210_priv *wil, u16 cmdid, void *buf, u16 len) 
	iowrite32(r->head = next_head, wil->csr + HOST_MBOX +

		  offsetof(struct wil6210_mbox_ctl, tx.head));



	trace_wil6210_wmi_cmd(cmdid, buf, len);

	trace_wil6210_wmi_cmd(&cmd.wmi, buf, len);



	/* interrupt to FW */

	iowrite32(SW_INT_MBOX, wil->csr + HOST_SW_INT);
@@ -640,9 +640,13 @@ void wmi_recv_cmd(struct wil6210_priv *wil) 
			    hdr.flags);

		if ((hdr.type == WIL_MBOX_HDR_TYPE_WMI) &&

		    (len >= sizeof(struct wil6210_mbox_hdr_wmi))) {

			u16 id = le16_to_cpu(evt->event.wmi.id);

			wil_dbg_wmi(wil, "WMI event 0x%04x\n", id);

			trace_wil6210_wmi_event(id, &evt->event.wmi, len);

			struct wil6210_mbox_hdr_wmi *wmi = &evt->event.wmi;

			u16 id = le16_to_cpu(wmi->id);

			u32 tstamp = le32_to_cpu(wmi->timestamp);

			wil_dbg_wmi(wil, "WMI event 0x%04x MID %d @%d msec\n",

				    id, wmi->mid, tstamp);

			trace_wil6210_wmi_event(wmi, &wmi[1],

						len - sizeof(*wmi));

		}

		wil_hex_dump_wmi("evt ", DUMP_PREFIX_OFFSET, 16, 1,

				 &evt->event.hdr, sizeof(hdr) + len, true);