openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

wil6210: move vring_idle_trsh definition to wil6210_priv 

vring_idle_trsh is used in the operational driver, hence
should not be defined as a debugfs variable.

Signed-off-by: Gidon Studinski <qca_gidons@qca.qualcomm.com>
Signed-off-by: Maya Erez <qca_merez@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Gidon Studinski 2017-08-08 14:16:50 +03:00 committed by Kalle Valo
parent eb4c021558
commit 38d16ab2b2
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/ath/wil6210/debugfs.c
View File

@ -20,7 +20,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/rtnetlink.h> #include <linux/rtnetlink.h>
#include <linux/power_supply.h> #include <linux/power_supply.h>
#include "wil6210.h" #include "wil6210.h"
#include "wmi.h" #include "wmi.h"
#include "txrx.h" #include "txrx.h"
@ -30,7 +29,6 @@
static u32 mem_addr; static u32 mem_addr;
static u32 dbg_txdesc_index; static u32 dbg_txdesc_index;
static u32 dbg_vring_index; /* 24+ for Rx, 0..23 for Tx */ static u32 dbg_vring_index; /* 24+ for Rx, 0..23 for Tx */
u32 vring_idle_trsh = 16; /* HW fetches up to 16 descriptors at once */
enum dbg_off_type { enum dbg_off_type {
doff_u32 = 0, doff_u32 = 0,
@ -1763,6 +1761,7 @@ static const struct dbg_off dbg_wil_off[] = {
WIL_FIELD(chip_revision, 0444, doff_u8), WIL_FIELD(chip_revision, 0444, doff_u8),
WIL_FIELD(abft_len, 0644, doff_u8), WIL_FIELD(abft_len, 0644, doff_u8),
WIL_FIELD(wakeup_trigger, 0644, doff_u8), WIL_FIELD(wakeup_trigger, 0644, doff_u8),
WIL_FIELD(vring_idle_trsh, 0644, doff_u32),
{}, {},
}; };
@ -1778,8 +1777,6 @@ static const struct dbg_off dbg_statics[] = {
{"desc_index", 0644, (ulong)&dbg_txdesc_index, doff_u32}, {"desc_index", 0644, (ulong)&dbg_txdesc_index, doff_u32},
{"vring_index", 0644, (ulong)&dbg_vring_index, doff_u32}, {"vring_index", 0644, (ulong)&dbg_vring_index, doff_u32},
{"mem_addr", 0644, (ulong)&mem_addr, doff_u32}, {"mem_addr", 0644, (ulong)&mem_addr, doff_u32},
{"vring_idle_trsh", 0644, (ulong)&vring_idle_trsh,
doff_u32},
{"led_polarity", 0644, (ulong)&led_polarity, doff_u8}, {"led_polarity", 0644, (ulong)&led_polarity, doff_u8},
{}, {},
}; };

1
drivers/net/wireless/ath/wil6210/main.c
View File

@ -581,6 +581,7 @@ int wil_priv_init(struct wil6210_priv *wil)
WMI_WAKEUP_TRIGGER_BCAST; WMI_WAKEUP_TRIGGER_BCAST;
memset(&wil->suspend_stats, 0, sizeof(wil->suspend_stats)); memset(&wil->suspend_stats, 0, sizeof(wil->suspend_stats));
wil->suspend_stats.min_suspend_time = ULONG_MAX; wil->suspend_stats.min_suspend_time = ULONG_MAX;
wil->vring_idle_trsh = 16;
return 0; return 0;

6
drivers/net/wireless/ath/wil6210/txrx.c
View File

@ -1666,7 +1666,7 @@ static int __wil_tx_vring_tso(struct wil6210_priv *wil, struct vring *vring,
/* performance monitoring */ /* performance monitoring */
used = wil_vring_used_tx(vring); used = wil_vring_used_tx(vring);
if (wil_val_in_range(vring_idle_trsh, if (wil_val_in_range(wil->vring_idle_trsh,
used, used + descs_used)) { used, used + descs_used)) {
txdata->idle += get_cycles() - txdata->last_idle; txdata->idle += get_cycles() - txdata->last_idle;
wil_dbg_txrx(wil, "Ring[%2d] not idle %d -> %d\n", wil_dbg_txrx(wil, "Ring[%2d] not idle %d -> %d\n",
@ -1813,7 +1813,7 @@ static int __wil_tx_vring(struct wil6210_priv *wil, struct vring *vring,
/* performance monitoring */ /* performance monitoring */
used = wil_vring_used_tx(vring); used = wil_vring_used_tx(vring);
if (wil_val_in_range(vring_idle_trsh, if (wil_val_in_range(wil->vring_idle_trsh,
used, used + nr_frags + 1)) { used, used + nr_frags + 1)) {
txdata->idle += get_cycles() - txdata->last_idle; txdata->idle += get_cycles() - txdata->last_idle;
wil_dbg_txrx(wil, "Ring[%2d] not idle %d -> %d\n", wil_dbg_txrx(wil, "Ring[%2d] not idle %d -> %d\n",
@ -2175,7 +2175,7 @@ int wil_tx_complete(struct wil6210_priv *wil, int ringid)
/* performance monitoring */ /* performance monitoring */
used_new = wil_vring_used_tx(vring); used_new = wil_vring_used_tx(vring);
if (wil_val_in_range(vring_idle_trsh, if (wil_val_in_range(wil->vring_idle_trsh,
used_new, used_before_complete)) { used_new, used_before_complete)) {
wil_dbg_txrx(wil, "Ring[%2d] idle %d -> %d\n", wil_dbg_txrx(wil, "Ring[%2d] idle %d -> %d\n",
ringid, used_before_complete, used_new); ringid, used_before_complete, used_new);

2
drivers/net/wireless/ath/wil6210/wil6210.h
View File

@ -30,7 +30,6 @@ extern bool no_fw_recovery;
extern unsigned int mtu_max; extern unsigned int mtu_max;
extern unsigned short rx_ring_overflow_thrsh; extern unsigned short rx_ring_overflow_thrsh;
extern int agg_wsize; extern int agg_wsize;
extern u32 vring_idle_trsh;
extern bool rx_align_2; extern bool rx_align_2;
extern bool rx_large_buf; extern bool rx_large_buf;
extern bool debug_fw; extern bool debug_fw;
@ -693,6 +692,7 @@ struct wil6210_priv {
u8 vring2cid_tid[WIL6210_MAX_TX_RINGS][2]; /* [0] - CID, [1] - TID */ u8 vring2cid_tid[WIL6210_MAX_TX_RINGS][2]; /* [0] - CID, [1] - TID */
struct wil_sta_info sta[WIL6210_MAX_CID]; struct wil_sta_info sta[WIL6210_MAX_CID];
int bcast_vring; int bcast_vring;
u32 vring_idle_trsh; /* HW fetches up to 16 descriptors at once */
bool use_extended_dma_addr; /* indicates whether we are using 48 bits */ bool use_extended_dma_addr; /* indicates whether we are using 48 bits */
/* scan */ /* scan */
struct cfg80211_scan_request *scan_request; struct cfg80211_scan_request *scan_request;