From: Erik Stromdahl <erik.stromdahl@gmail.com> To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Cc: Erik Stromdahl <erik.stromdahl@gmail.com> Subject: [RFC 02/12] ath10k: htc: rx trailer lookahead support Date: Mon, 14 Nov 2016 17:33:32 +0100 [thread overview] Message-ID: <1479141222-8493-3-git-send-email-erik.stromdahl@gmail.com> (raw) In-Reply-To: <1479141222-8493-1-git-send-email-erik.stromdahl@gmail.com> The RX trailer parsing is now capable of parsing lookahead reports. This is needed by SDIO/mbox. Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> --- drivers/net/wireless/ath/ath10k/htc.c | 91 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/htc.h | 30 +++++++++-- 2 files changed, 116 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index 26b1e15..e3f7bf4 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -228,10 +228,74 @@ void ath10k_htc_tx_completion_handler(struct ath10k *ar, struct sk_buff *skb) spin_unlock_bh(&htc->tx_lock); } +static int +ath10k_htc_process_lookahead(struct ath10k_htc *htc, + const struct ath10k_htc_lookahead_report *report, + int len, + enum ath10k_htc_ep_id eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len) +{ + struct ath10k *ar = htc->ar; + + if (report->pre_valid != ((~report->post_valid) & 0xFF)) + /* Invalid lookahead flags are actually transmitted by + * the target in the HTC control message. + * Since this will happen at every boot we silently ignore + * the lookahead in this case + */ + return 0; + + if (next_lk_ahds && next_lk_ahds_len) { + ath10k_dbg(ar, ATH10K_DBG_HTC, + "htc rx lk_ahd found pre_valid 0x%x post_valid 0x%x\n", + report->pre_valid, report->post_valid); + + /* look ahead bytes are valid, copy them over */ + memcpy((u8 *)&next_lk_ahds[0], report->lk_ahd, 4); + + *next_lk_ahds_len = 1; + } + + return 0; +} + +static int +ath10k_htc_process_lookahead_bundle(struct ath10k_htc *htc, + const struct ath10k_htc_lookahead_report_bundle *report, + int len, + enum ath10k_htc_ep_id eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len) +{ + int bundle_cnt = len / sizeof(*report); + + if (!bundle_cnt || (bundle_cnt > HTC_HOST_MAX_MSG_PER_BUNDLE)) { + WARN_ON(1); + return -EINVAL; + } + + if (next_lk_ahds && next_lk_ahds_len) { + int i; + + for (i = 0; i < bundle_cnt; i++) { + memcpy((u8 *)&next_lk_ahds[i], report->lk_ahd, + sizeof(u32)); + report++; + } + + *next_lk_ahds_len = bundle_cnt; + } + + return 0; +} + int ath10k_htc_process_trailer(struct ath10k_htc *htc, u8 *buffer, int length, - enum ath10k_htc_ep_id src_eid) + enum ath10k_htc_ep_id src_eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len) { struct ath10k *ar = htc->ar; int status = 0; @@ -272,6 +336,28 @@ int ath10k_htc_process_trailer(struct ath10k_htc *htc, record->hdr.len, src_eid); break; + case ATH10K_HTC_RECORD_LOOKAHEAD: + len = sizeof(struct ath10k_htc_lookahead_report); + if (record->hdr.len < len) { + ath10k_warn(ar, "Lookahead report too long\n"); + status = -EINVAL; + break; + } + status = ath10k_htc_process_lookahead(htc, + record->lkahd_report, + record->hdr.len, + src_eid, + next_lk_ahds, + next_lk_ahds_len); + break; + case ATH10K_HTC_RECORD_LOOKAHEAD_BUNDLE: + status = ath10k_htc_process_lookahead_bundle(htc, + record->lkahd_bundle, + record->hdr.len, + src_eid, + next_lk_ahds, + next_lk_ahds_len); + break; default: ath10k_warn(ar, "Unhandled record: id:%d length:%d\n", record->hdr.id, record->hdr.len); @@ -359,7 +445,8 @@ void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb) trailer += payload_len; trailer -= trailer_len; status = ath10k_htc_process_trailer(htc, trailer, - trailer_len, hdr->eid); + trailer_len, hdr->eid, + NULL, NULL); if (status) goto out; diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h index 858e19f..589800a 100644 --- a/drivers/net/wireless/ath/ath10k/htc.h +++ b/drivers/net/wireless/ath/ath10k/htc.h @@ -50,6 +50,8 @@ * 4-byte aligned. */ +#define HTC_HOST_MAX_MSG_PER_BUNDLE 8 + enum ath10k_htc_tx_flags { ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01, ATH10K_HTC_FLAG_SEND_BUNDLE = 0x02 @@ -174,8 +176,10 @@ struct ath10k_htc_msg { } __packed __aligned(4); enum ath10k_ath10k_htc_record_id { - ATH10K_HTC_RECORD_NULL = 0, - ATH10K_HTC_RECORD_CREDITS = 1 + ATH10K_HTC_RECORD_NULL = 0, + ATH10K_HTC_RECORD_CREDITS = 1, + ATH10K_HTC_RECORD_LOOKAHEAD = 2, + ATH10K_HTC_RECORD_LOOKAHEAD_BUNDLE = 3, }; struct ath10k_ath10k_htc_record_hdr { @@ -192,10 +196,28 @@ struct ath10k_htc_credit_report { u8 pad1; } __packed; +struct ath10k_htc_lookahead_report { + u8 pre_valid; + u8 pad0; + u8 pad1; + u8 pad2; + u8 lk_ahd[4]; + u8 post_valid; + u8 pad3; + u8 pad4; + u8 pad5; +} __packed; + +struct ath10k_htc_lookahead_report_bundle { + u8 lk_ahd[4]; +} __packed; + struct ath10k_htc_record { struct ath10k_ath10k_htc_record_hdr hdr; union { struct ath10k_htc_credit_report credit_report[0]; + struct ath10k_htc_lookahead_report lkahd_report[0]; + struct ath10k_htc_lookahead_report_bundle lkahd_bundle[0]; u8 pauload[0]; }; } __packed __aligned(4); @@ -359,6 +381,8 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep, int ath10k_htc_process_trailer(struct ath10k_htc *htc, u8 *buffer, int length, - enum ath10k_htc_ep_id src_eid); + enum ath10k_htc_ep_id src_eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len); #endif -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: Erik Stromdahl <erik.stromdahl@gmail.com> To: kvalo@qca.qualcomm.com, linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Cc: Erik Stromdahl <erik.stromdahl@gmail.com> Subject: [RFC 02/12] ath10k: htc: rx trailer lookahead support Date: Mon, 14 Nov 2016 17:33:32 +0100 [thread overview] Message-ID: <1479141222-8493-3-git-send-email-erik.stromdahl@gmail.com> (raw) In-Reply-To: <1479141222-8493-1-git-send-email-erik.stromdahl@gmail.com> The RX trailer parsing is now capable of parsing lookahead reports. This is needed by SDIO/mbox. Signed-off-by: Erik Stromdahl <erik.stromdahl@gmail.com> --- drivers/net/wireless/ath/ath10k/htc.c | 91 ++++++++++++++++++++++++++++++++- drivers/net/wireless/ath/ath10k/htc.h | 30 +++++++++-- 2 files changed, 116 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c index 26b1e15..e3f7bf4 100644 --- a/drivers/net/wireless/ath/ath10k/htc.c +++ b/drivers/net/wireless/ath/ath10k/htc.c @@ -228,10 +228,74 @@ void ath10k_htc_tx_completion_handler(struct ath10k *ar, struct sk_buff *skb) spin_unlock_bh(&htc->tx_lock); } +static int +ath10k_htc_process_lookahead(struct ath10k_htc *htc, + const struct ath10k_htc_lookahead_report *report, + int len, + enum ath10k_htc_ep_id eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len) +{ + struct ath10k *ar = htc->ar; + + if (report->pre_valid != ((~report->post_valid) & 0xFF)) + /* Invalid lookahead flags are actually transmitted by + * the target in the HTC control message. + * Since this will happen at every boot we silently ignore + * the lookahead in this case + */ + return 0; + + if (next_lk_ahds && next_lk_ahds_len) { + ath10k_dbg(ar, ATH10K_DBG_HTC, + "htc rx lk_ahd found pre_valid 0x%x post_valid 0x%x\n", + report->pre_valid, report->post_valid); + + /* look ahead bytes are valid, copy them over */ + memcpy((u8 *)&next_lk_ahds[0], report->lk_ahd, 4); + + *next_lk_ahds_len = 1; + } + + return 0; +} + +static int +ath10k_htc_process_lookahead_bundle(struct ath10k_htc *htc, + const struct ath10k_htc_lookahead_report_bundle *report, + int len, + enum ath10k_htc_ep_id eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len) +{ + int bundle_cnt = len / sizeof(*report); + + if (!bundle_cnt || (bundle_cnt > HTC_HOST_MAX_MSG_PER_BUNDLE)) { + WARN_ON(1); + return -EINVAL; + } + + if (next_lk_ahds && next_lk_ahds_len) { + int i; + + for (i = 0; i < bundle_cnt; i++) { + memcpy((u8 *)&next_lk_ahds[i], report->lk_ahd, + sizeof(u32)); + report++; + } + + *next_lk_ahds_len = bundle_cnt; + } + + return 0; +} + int ath10k_htc_process_trailer(struct ath10k_htc *htc, u8 *buffer, int length, - enum ath10k_htc_ep_id src_eid) + enum ath10k_htc_ep_id src_eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len) { struct ath10k *ar = htc->ar; int status = 0; @@ -272,6 +336,28 @@ int ath10k_htc_process_trailer(struct ath10k_htc *htc, record->hdr.len, src_eid); break; + case ATH10K_HTC_RECORD_LOOKAHEAD: + len = sizeof(struct ath10k_htc_lookahead_report); + if (record->hdr.len < len) { + ath10k_warn(ar, "Lookahead report too long\n"); + status = -EINVAL; + break; + } + status = ath10k_htc_process_lookahead(htc, + record->lkahd_report, + record->hdr.len, + src_eid, + next_lk_ahds, + next_lk_ahds_len); + break; + case ATH10K_HTC_RECORD_LOOKAHEAD_BUNDLE: + status = ath10k_htc_process_lookahead_bundle(htc, + record->lkahd_bundle, + record->hdr.len, + src_eid, + next_lk_ahds, + next_lk_ahds_len); + break; default: ath10k_warn(ar, "Unhandled record: id:%d length:%d\n", record->hdr.id, record->hdr.len); @@ -359,7 +445,8 @@ void ath10k_htc_rx_completion_handler(struct ath10k *ar, struct sk_buff *skb) trailer += payload_len; trailer -= trailer_len; status = ath10k_htc_process_trailer(htc, trailer, - trailer_len, hdr->eid); + trailer_len, hdr->eid, + NULL, NULL); if (status) goto out; diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h index 858e19f..589800a 100644 --- a/drivers/net/wireless/ath/ath10k/htc.h +++ b/drivers/net/wireless/ath/ath10k/htc.h @@ -50,6 +50,8 @@ * 4-byte aligned. */ +#define HTC_HOST_MAX_MSG_PER_BUNDLE 8 + enum ath10k_htc_tx_flags { ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01, ATH10K_HTC_FLAG_SEND_BUNDLE = 0x02 @@ -174,8 +176,10 @@ struct ath10k_htc_msg { } __packed __aligned(4); enum ath10k_ath10k_htc_record_id { - ATH10K_HTC_RECORD_NULL = 0, - ATH10K_HTC_RECORD_CREDITS = 1 + ATH10K_HTC_RECORD_NULL = 0, + ATH10K_HTC_RECORD_CREDITS = 1, + ATH10K_HTC_RECORD_LOOKAHEAD = 2, + ATH10K_HTC_RECORD_LOOKAHEAD_BUNDLE = 3, }; struct ath10k_ath10k_htc_record_hdr { @@ -192,10 +196,28 @@ struct ath10k_htc_credit_report { u8 pad1; } __packed; +struct ath10k_htc_lookahead_report { + u8 pre_valid; + u8 pad0; + u8 pad1; + u8 pad2; + u8 lk_ahd[4]; + u8 post_valid; + u8 pad3; + u8 pad4; + u8 pad5; +} __packed; + +struct ath10k_htc_lookahead_report_bundle { + u8 lk_ahd[4]; +} __packed; + struct ath10k_htc_record { struct ath10k_ath10k_htc_record_hdr hdr; union { struct ath10k_htc_credit_report credit_report[0]; + struct ath10k_htc_lookahead_report lkahd_report[0]; + struct ath10k_htc_lookahead_report_bundle lkahd_bundle[0]; u8 pauload[0]; }; } __packed __aligned(4); @@ -359,6 +381,8 @@ void ath10k_htc_notify_tx_completion(struct ath10k_htc_ep *ep, int ath10k_htc_process_trailer(struct ath10k_htc *htc, u8 *buffer, int length, - enum ath10k_htc_ep_id src_eid); + enum ath10k_htc_ep_id src_eid, + u32 *next_lk_ahds, + int *next_lk_ahds_len); #endif -- 1.7.9.5 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2016-11-14 16:35 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-11-14 16:33 [RFC 00/12] ath10k sdio support Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-14 16:33 ` [RFC 01/12] ath10k: htc: made static function public Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl [this message] 2016-11-14 16:33 ` [RFC 02/12] ath10k: htc: rx trailer lookahead support Erik Stromdahl 2016-11-15 9:57 ` Michal Kazior 2016-11-15 9:57 ` Michal Kazior 2016-11-15 17:31 ` Erik Stromdahl 2016-11-15 17:31 ` Erik Stromdahl 2016-11-16 13:53 ` Valo, Kalle 2016-11-16 13:53 ` Valo, Kalle 2016-11-14 16:33 ` [RFC 03/12] ath10k: htc: Changed order of wait target and ep connect Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-15 10:13 ` Michal Kazior 2016-11-15 10:13 ` Michal Kazior 2016-11-15 17:07 ` Erik Stromdahl 2016-11-15 17:07 ` Erik Stromdahl 2016-11-16 14:29 ` Michal Kazior 2016-11-16 14:29 ` Michal Kazior 2016-11-14 16:33 ` [RFC 04/12] ath10k: htc: refactorization Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-15 10:19 ` Michal Kazior 2016-11-15 10:19 ` Michal Kazior 2016-11-17 16:32 ` Erik Stromdahl 2016-11-17 16:32 ` Erik Stromdahl 2016-11-18 14:49 ` Michal Kazior 2016-11-18 14:49 ` Michal Kazior 2016-11-14 16:33 ` [RFC 05/12] ath10k: htc: Added ATH10K_HTC_FLAG_BUNDLE_LSB Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-15 10:25 ` Michal Kazior 2016-11-15 10:25 ` Michal Kazior 2016-11-15 10:46 ` Valo, Kalle 2016-11-15 10:46 ` Valo, Kalle 2016-11-14 16:33 ` [RFC 06/12] ath10k: bmi: Added SOC reg read/write functions Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-15 10:28 ` Michal Kazior 2016-11-15 10:28 ` Michal Kazior 2016-11-15 17:11 ` Erik Stromdahl 2016-11-15 17:11 ` Erik Stromdahl 2016-11-14 16:33 ` [RFC 07/12] ath10k: Added SDIO dbg masks Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-14 16:33 ` [RFC 08/12] ath10k: Added ATH10K_BUS_SDIO enum Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-14 16:33 ` [RFC 09/12] ath10k: Mailbox address definitions Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-15 10:31 ` Michal Kazior 2016-11-15 10:31 ` Michal Kazior 2016-11-15 10:48 ` Valo, Kalle 2016-11-15 10:48 ` Valo, Kalle 2016-11-14 16:33 ` [RFC 10/12] ath10k: Added QCA65XX hw definition Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-15 10:34 ` Michal Kazior 2016-11-15 10:34 ` Michal Kazior 2016-11-15 10:54 ` Valo, Kalle 2016-11-15 10:54 ` Valo, Kalle 2016-11-15 18:34 ` Erik Stromdahl 2016-11-15 18:34 ` Erik Stromdahl 2016-11-14 16:33 ` [RFC 11/12] ath10k: Added more host_interest members Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl 2016-11-14 16:33 ` [RFC 12/12] ath10k: Added sdio support Erik Stromdahl 2016-11-14 16:33 ` Erik Stromdahl
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1479141222-8493-3-git-send-email-erik.stromdahl@gmail.com \ --to=erik.stromdahl@gmail.com \ --cc=ath10k@lists.infradead.org \ --cc=kvalo@qca.qualcomm.com \ --cc=linux-wireless@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.