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

Commit 1df94a85 authored by Vasanthakumar Thiagarajan's avatar Vasanthakumar Thiagarajan Committed by Kalle Valo
Browse files

ath6kl: Fix buffer alignment for scatter-gather I/O 



For non-scatter buffers, there is already a bounce buffer which
takes care of alignment. This patch is influenced by a rough patch of
Kalle.

Signed-off-by: default avatarVasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 13e34ea1

drivers/net/wireless/ath/ath6kl/core.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ 
#define ATH6KL_MAX_ENDPOINTS   4

#define MAX_NODE_NUM           15



/* Extra bytes for htc header alignment */

#define ATH6KL_HTC_ALIGN_BYTES 3



/* MAX_HI_COOKIE_NUM are reserved for high priority traffic */

#define MAX_DEF_COOKIE_NUM                180

#define MAX_HI_COOKIE_NUM                 18	/* 10% of MAX_COOKIE_NUM */

drivers/net/wireless/ath/ath6kl/init.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct sk_buff *ath6kl_buf_alloc(int size) 


	/* Add chacheline space at front and back of buffer */

	reserved = (2 * L1_CACHE_BYTES) + ATH6KL_DATA_OFFSET +

		   sizeof(struct htc_packet);

		   sizeof(struct htc_packet) + ATH6KL_HTC_ALIGN_BYTES;

	skb = dev_alloc_skb(size + reserved);



	if (skb)

drivers/net/wireless/ath/ath6kl/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1347,7 +1347,7 @@ void init_netdev(struct net_device *dev) 
	dev->needed_headroom = ETH_HLEN;

	dev->needed_headroom += sizeof(struct ath6kl_llc_snap_hdr) +

				sizeof(struct wmi_data_hdr) + HTC_HDR_LENGTH

				+ WMI_MAX_TX_META_SZ;

				+ WMI_MAX_TX_META_SZ + ATH6KL_HTC_ALIGN_BYTES;



	return;

}

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

+15 −10
Original line number Diff line number Diff line
@@ -128,6 +128,17 @@ static int ath6kl_sdio_func0_cmd52_wr_byte(struct mmc_card *card, 
	return mmc_wait_for_cmd(card->host, &io_cmd, 0);

}



static void ath6kl_sdio_buf_align(u8 **buf, unsigned long len)

{

	u8 *align_addr;



	if (!IS_ALIGNED((unsigned long) *buf, 4)) {

		align_addr = PTR_ALIGN(*buf - 4, 4);

		memmove(align_addr, *buf, len);

		*buf = align_addr;

	}

}



static int ath6kl_sdio_io(struct sdio_func *func, u32 request, u32 addr,

			  u8 *buf, u32 len)

{
@@ -213,16 +224,10 @@ static void ath6kl_sdio_setup_scat_data(struct hif_scatter_req *scat_req, 


	/* assemble SG list */

	for (i = 0; i < scat_req->scat_entries; i++, sg++) {

		if ((unsigned long)scat_req->scat_list[i].buf & 0x3)

			/*

			 * Some scatter engines can handle unaligned

			 * buffers, print this as informational only.

			 */

			ath6kl_dbg(ATH6KL_DBG_SCATTER,

				   "(%s) scatter buffer is unaligned 0x%p\n",

				   scat_req->req & HIF_WRITE ? "WR" : "RD",

				   scat_req->scat_list[i].buf);



		/* No header is added to rx buf, so it shoule be aligned */

		if (data->flags == MMC_DATA_WRITE)

			ath6kl_sdio_buf_align(&scat_req->scat_list[i].buf,

					      scat_req->scat_list[i].len);

		ath6kl_dbg(ATH6KL_DBG_SCATTER, "%d: addr:0x%p, len:%d\n",

			   i, scat_req->scat_list[i].buf,

			   scat_req->scat_list[i].len);

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

+2 −0
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ void ath6kl_rx_refill(struct htc_target *target, enum htc_endpoint_id endpoint) 
			break;



		packet = (struct htc_packet *) skb->head;

		skb->data = PTR_ALIGN(skb->data - 4, 4);

		set_htc_rxpkt_info(packet, skb, skb->data,

				ATH6KL_BUFFER_SIZE, endpoint);

		list_add_tail(&packet->list, &queue);
@@ -709,6 +710,7 @@ void ath6kl_refill_amsdu_rxbufs(struct ath6kl *ar, int count) 
			return;



		packet = (struct htc_packet *) skb->head;

		skb->data = PTR_ALIGN(skb->data - 4, 4);

		set_htc_rxpkt_info(packet, skb, skb->data,

				   ATH6KL_AMSDU_BUFFER_SIZE, 0);

		spin_lock_bh(&ar->lock);