kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wil6210: Align WMI header with latest FW

Browse source 
FW guys changed header structure; align driver code

Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Vladimir Kondratiev 2013-07-11 18:03:37 +03:00 committed by John W. Linville
parent d02433d155
commit f988b23f7a
3 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/net/wireless/ath/wil6210/trace.h
View file

@ -37,36 +37,40 @@ static inline void trace_ ## name(proto) {}
#endif /* !CONFIG_WIL6210_TRACING || defined(__CHECKER__) */ #endif /* !CONFIG_WIL6210_TRACING || defined(__CHECKER__) */
DECLARE_EVENT_CLASS(wil6210_wmi, 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( TP_STRUCT__entry(
__field(u8, mid)
__field(u16, id) __field(u16, id)
__field(u32, timestamp)
__field(u16, buf_len) __field(u16, buf_len)
__dynamic_array(u8, buf, buf_len) __dynamic_array(u8, buf, buf_len)
), ),
TP_fast_assign( 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; __entry->buf_len = buf_len;
memcpy(__get_dynamic_array(buf), buf, buf_len); memcpy(__get_dynamic_array(buf), buf, buf_len);
), ),
TP_printk( TP_printk(
"id 0x%04x len %d", "MID %d id 0x%04x len %d timestamp %d",
__entry->id, __entry->buf_len __entry->mid, __entry->id, __entry->buf_len, __entry->timestamp
) )
); );
DEFINE_EVENT(wil6210_wmi, wil6210_wmi_cmd, DEFINE_EVENT(wil6210_wmi, wil6210_wmi_cmd,
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)
); );
DEFINE_EVENT(wil6210_wmi, wil6210_wmi_event, DEFINE_EVENT(wil6210_wmi, wil6210_wmi_event,
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)
); );
#define WIL6210_MSG_MAX (200) #define WIL6210_MSG_MAX (200)

17
drivers/net/wireless/ath/wil6210/wil6210.h
View file

@ -156,11 +156,22 @@ struct wil6210_mbox_hdr {
/* max. value for wil6210_mbox_hdr.len */ /* max. value for wil6210_mbox_hdr.len */
#define MAX_MBOXITEM_SIZE (240) #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 { struct wil6210_mbox_hdr_wmi {
u8 reserved0[2]; u8 mid;
u8 reserved;
__le16 id; __le16 id;
__le16 info1; /* bits [0..3] - device_id, rest - unused */ __le32 timestamp;
u8 reserved1[2];
} __packed; } __packed;
struct pending_wmi_event { struct pending_wmi_event {

14
drivers/net/wireless/ath/wil6210/wmi.c
View file

@ -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), .len = cpu_to_le16(sizeof(cmd.wmi) + len),
}, },
.wmi = { .wmi = {
.mid = 0,
.id = cpu_to_le16(cmdid), .id = cpu_to_le16(cmdid),
.info1 = 0,
}, },
}; };
struct wil6210_mbox_ring *r = &wil->mbox_ctl.tx; 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 + iowrite32(r->head = next_head, wil->csr + HOST_MBOX +
offsetof(struct wil6210_mbox_ctl, tx.head)); 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 */ /* interrupt to FW */
iowrite32(SW_INT_MBOX, wil->csr + HOST_SW_INT); iowrite32(SW_INT_MBOX, wil->csr + HOST_SW_INT);
@ -640,9 +640,13 @@ void wmi_recv_cmd(struct wil6210_priv *wil)
hdr.flags); hdr.flags);
if ((hdr.type == WIL_MBOX_HDR_TYPE_WMI) && if ((hdr.type == WIL_MBOX_HDR_TYPE_WMI) &&
(len >= sizeof(struct wil6210_mbox_hdr_wmi))) { (len >= sizeof(struct wil6210_mbox_hdr_wmi))) {
u16 id = le16_to_cpu(evt->event.wmi.id); struct wil6210_mbox_hdr_wmi *wmi = &evt->event.wmi;
wil_dbg_wmi(wil, "WMI event 0x%04x\n", id); u16 id = le16_to_cpu(wmi->id);
trace_wil6210_wmi_event(id, &evt->event.wmi, len); 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, wil_hex_dump_wmi("evt ", DUMP_PREFIX_OFFSET, 16, 1,
&evt->event.hdr, sizeof(hdr) + len, true); &evt->event.hdr, sizeof(hdr) + len, true);