Merge "wil6210: TX vring optimization" (0760225a) · Commits · e / devices / android_kernel_xiaomi_markw

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

+3 −3

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2012-2015 Qualcomm Atheros, Inc.		* Copyright (c) 2012-2016 Qualcomm Atheros, Inc.
	*		*
	* Permission to use, copy, modify, and/or distribute this software for any		* Permission to use, copy, modify, and/or distribute this software for any
	* purpose with or without fee is hereby granted, provided that the above		* purpose with or without fee is hereby granted, provided that the above
	@@ -68,13 +68,13 @@ static void wil_print_vring(struct seq_file s, struct wil6210_priv wil,
	seq_puts(s, "???\n");		seq_puts(s, "???\n");
	}		}

	if (vring->va && (vring->size < 1025)) {		if (vring->va && (vring->size <= (1 << WIL_RING_SIZE_ORDER_MAX))) {
	uint i;		uint i;

	for (i = 0; i < vring->size; i++) {		for (i = 0; i < vring->size; i++) {
	volatile struct vring_tx_desc *d = &vring->va[i].tx;		volatile struct vring_tx_desc *d = &vring->va[i].tx;

	if ((i % 64) == 0 && (i != 0))		if ((i % 128) == 0 && (i != 0))
	seq_puts(s, "\n");		seq_puts(s, "\n");
	seq_printf(s, "%c", (d->dma.status & BIT(0)) ?		seq_printf(s, "%c", (d->dma.status & BIT(0)) ?
	_s : (vring->ctx[i].skb ? _h : 'h'));		_s : (vring->ctx[i].skb ? _h : 'h'));

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -51,7 +51,7 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)

	#define WIL_TX_Q_LEN_DEFAULT (4000)		#define WIL_TX_Q_LEN_DEFAULT (4000)
	#define WIL_RX_RING_SIZE_ORDER_DEFAULT (10)		#define WIL_RX_RING_SIZE_ORDER_DEFAULT (10)
	#define WIL_TX_RING_SIZE_ORDER_DEFAULT (10)		#define WIL_TX_RING_SIZE_ORDER_DEFAULT (12)
	#define WIL_BCAST_RING_SIZE_ORDER_DEFAULT (7)		#define WIL_BCAST_RING_SIZE_ORDER_DEFAULT (7)
	#define WIL_BCAST_MCS0_LIMIT (1024) /* limit for MCS0 frame size */		#define WIL_BCAST_MCS0_LIMIT (1024) /* limit for MCS0 frame size */
	/* limit ring size in range [32..32k] */		/* limit ring size in range [32..32k] */