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

Commit d1d061b1 authored by Alagu Sankar's avatar Alagu Sankar Committed by Kalle Valo
Browse files

ath10k: sdio: allocate correct size for RECV_1MORE_BLOCK rx packets 



Without this, when receiving a packet that has this flag set
from firmware, we will read invalid trailer data from the packet,
which will be shown as various errors, e.g. "sdio mbox lookahead
is zero" or "invalid rx packet" or "payload length x exceeds max
htc length".

Co-Developed-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: default avatarAlagu Sankar <alagusankar@silex-india.com>
Signed-off-by: default avatarNiklas Cassel <niklas.cassel@linaro.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 679e1f07

drivers/net/wireless/ath/ath10k/htc.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ enum ath10k_htc_tx_flags { 
};



enum ath10k_htc_rx_flags {

	ATH10K_HTC_FLAGS_RECV_1MORE_BLOCK = 0x01,

	ATH10K_HTC_FLAG_TRAILER_PRESENT = 0x02,

	ATH10K_HTC_FLAG_BUNDLE_MASK     = 0xF0

};

drivers/net/wireless/ath/ath10k/sdio.c

+3 −0
Original line number Diff line number Diff line
@@ -604,6 +604,9 @@ static int ath10k_sdio_mbox_rx_alloc(struct ath10k *ar, 
		 * ATH10K_HTC_FLAG_BUNDLE_MASK flag set, all bundled

		 * packet skb's have been allocated in the previous step.

		 */

		if (htc_hdr->flags & ATH10K_HTC_FLAGS_RECV_1MORE_BLOCK)

			full_len += ATH10K_HIF_MBOX_BLOCK_SIZE;



		ret = ath10k_sdio_mbox_alloc_rx_pkt(&ar_sdio->rx_pkts[i],

						    act_len,

						    full_len,