* [PATCH 01/14] wil6210: map MAC timer for packet lifetime into debugfs
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 02/14] wil6210: fix race in reset Dedy Lansky
` (12 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville
Cc: Vladimir Kondratiev, linux-wireless, wil6210, Dedy Lansky
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
expose reading RGF_MAC_MTRL_COUNTER_0 in debugfs
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/debugfs.c | 3 +++
drivers/net/wireless/ath/wil6210/wil6210.h | 3 +++
2 files changed, 6 insertions(+)
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 8f66186..dee2380 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1021,6 +1021,9 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
HOSTADDR(RGF_DMA_EP_MISC_ICR));
wil6210_debugfs_create_pseudo_ISR(wil, dbg);
wil6210_debugfs_create_ITR_CNT(wil, dbg);
+ wil_debugfs_create_iomem_x32("MAC_MTRL_COUNTER_0", S_IRUGO, dbg,
+ wil->csr +
+ HOSTADDR(RGF_MAC_MTRL_COUNTER_0));
wil_debugfs_create_iomem_x32("RGF_USER_USAGE_1", S_IRUGO, dbg,
wil->csr +
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 67e9624..077e623 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -133,6 +133,9 @@ struct RGF_ICR {
#define RGF_HP_CTRL (0x88265c)
#define RGF_PCIE_LOS_COUNTER_CTL (0x882dc4)
+/* MAC timer, usec, for packet lifetime */
+#define RGF_MAC_MTRL_COUNTER_0 (0x886aa8)
+
/* popular locations */
#define HOST_MBOX HOSTADDR(RGF_USER_USER_SCRATCH_PAD)
#define HOST_SW_INT (HOSTADDR(RGF_USER_USER_ICR) + \
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 02/14] wil6210: fix race in reset
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
2014-08-04 8:20 ` [PATCH 01/14] wil6210: map MAC timer for packet lifetime into debugfs Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 03/14] wil6210: update copyright year 2014 Dedy Lansky
` (11 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
It is important to halt USER CPU first, then MAC CPU
Otherwise, race happens in the firmware
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/main.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 3704d2a..d734283 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -327,6 +327,8 @@ static void wil_target_reset(struct wil6210_priv *wil)
/* register clear = read, AND with inverted, write */
#define C(a, v) W(a, R(a) & ~v)
+ wmb(); /* If host reorder writes here -> race in NIC */
+ W(RGF_USER_MAC_CPU_0, BIT(1)); /* mac_cpu_man_rst */
wil->hw_version = R(RGF_USER_FW_REV_ID);
rev_id = wil->hw_version & 0xff;
@@ -343,8 +345,9 @@ static void wil_target_reset(struct wil6210_priv *wil)
wmb(); /* order is important here */
}
- W(RGF_USER_MAC_CPU_0, BIT(1)); /* mac_cpu_man_rst */
W(RGF_USER_USER_CPU_0, BIT(1)); /* user_cpu_man_rst */
+ wmb(); /* If host reorder writes here -> race in NIC */
+ W(RGF_USER_MAC_CPU_0, BIT(1)); /* mac_cpu_man_rst */
wmb(); /* order is important here */
W(RGF_USER_CLKS_CTL_SW_RST_VEC_2, 0xFE000000);
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 03/14] wil6210: update copyright year 2014
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
2014-08-04 8:20 ` [PATCH 01/14] wil6210: map MAC timer for packet lifetime into debugfs Dedy Lansky
2014-08-04 8:20 ` [PATCH 02/14] wil6210: fix race in reset Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 04/14] wil6210: Optimization for Interrupt moderation threshold value Dedy Lansky
` (10 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Fix Copyright headers in all files changed in 2014, to mention 2014
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/cfg80211.c | 2 +-
drivers/net/wireless/ath/wil6210/debugfs.c | 2 +-
drivers/net/wireless/ath/wil6210/interrupt.c | 2 +-
drivers/net/wireless/ath/wil6210/main.c | 2 +-
drivers/net/wireless/ath/wil6210/netdev.c | 2 +-
drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 +-
drivers/net/wireless/ath/wil6210/rx_reorder.c | 16 ++++++++++++++++
drivers/net/wireless/ath/wil6210/txrx.c | 2 +-
drivers/net/wireless/ath/wil6210/txrx.h | 2 +-
drivers/net/wireless/ath/wil6210/wil6210.h | 2 +-
drivers/net/wireless/ath/wil6210/wmi.c | 2 +-
drivers/net/wireless/ath/wil6210/wmi.h | 2 +-
12 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index 4ac2c20..ee8a0e5 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index dee2380..fb802bd 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index 67f1002..98bfbb6 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index d734283..dc22053 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 106b6dc..8ee0862 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index d3fbfa2..a6af2bb 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/rx_reorder.c b/drivers/net/wireless/ath/wil6210/rx_reorder.c
index 180ca47..97c6a24 100644
--- a/drivers/net/wireless/ath/wil6210/rx_reorder.c
+++ b/drivers/net/wireless/ath/wil6210/rx_reorder.c
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Qualcomm Atheros, Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
#include "wil6210.h"
#include "txrx.h"
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index d346794..9fcc2e3 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/txrx.h b/drivers/net/wireless/ath/wil6210/txrx.h
index bc5706a..a1ac4f8 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.h
+++ b/drivers/net/wireless/ath/wil6210/txrx.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 077e623..0097300 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 1d1d0af..b25a62d 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 17334c8..2f51b46 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Qualcomm Atheros, Inc.
+ * Copyright (c) 2012-2014 Qualcomm Atheros, Inc.
* Copyright (c) 2006-2012 Wilocity .
*
* Permission to use, copy, modify, and/or distribute this software for any
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 04/14] wil6210: Optimization for Interrupt moderation threshold value
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (2 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 03/14] wil6210: update copyright year 2014 Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 17:38 ` Florian Fainelli
2014-08-04 8:20 ` [PATCH 05/14] wil6210: check error in wil_target_reset() Dedy Lansky
` (9 subsequent siblings)
13 siblings, 1 reply; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville
Cc: Dedy Lansky, linux-wireless, wil6210, Vladimir Kondratiev
Default value was changed to 50000 (~3 IRQs/msec) in order to reduce
significantly CPU usage without degradation in throughput.
Added module parameter named "itr_trsh" that allows the user to change
default value through insmod.
Added entry in debugfs (itr_trsh_val) for changing interrupt moderation
threshold in a single operation.
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/debugfs.c | 50 +++++++++++++++++++++++++++-
drivers/net/wireless/ath/wil6210/interrupt.c | 8 ++++-
drivers/net/wireless/ath/wil6210/wil6210.h | 2 +-
3 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index fb802bd..3990a2d 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -24,6 +24,12 @@
#include "wil6210.h"
#include "txrx.h"
+/* Max threshold supported value by wil6210 is 5sec.
+ * The interrupt moderation counter counts down every clock tick of 6nsec.
+ * Therefore max value for ITR_CNT_TRSH can be 5sec/6nsec = 833333333
+ */
+#define WIL6210_ITR_TRSH_MAX 833333333
+
/* Nasty hack. Better have per device instances */
static u32 mem_addr;
static u32 dbg_txdesc_index;
@@ -270,6 +276,48 @@ static struct dentry *wil_debugfs_create_ulong(const char *name, umode_t mode,
return debugfs_create_file(name, mode, parent, value, &wil_fops_ulong);
}
+static int wil_debugfs_itr_trsh_set(void *data, u64 val)
+{
+ struct wil6210_priv *wil = data;
+
+ /* Check value is smaller than max val limitation
+ * (covers also negative values)
+ */
+ if (val > WIL6210_ITR_TRSH_MAX)
+ return -EINVAL;
+
+ /* Perform interrupt moderation threshold update procedure */
+ iowrite32(0, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
+ wmb(); /* make sure write propagated to HW */
+
+ iowrite32((u32)val, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
+ wmb(); /* make sure write propagated to HW */
+
+ iowrite32(BIT_DMA_ITR_CNT_CRL_EN,
+ wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
+ wmb(); /* make sure write propagated to HW */
+
+ return 0;
+}
+
+static int wil_debugfs_itr_trsh_get(void *data, u64 *val)
+{
+ struct wil6210_priv *wil = data;
+ *val = ioread32(wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
+ return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(fops_itr_trsh, wil_debugfs_itr_trsh_get,
+ wil_debugfs_itr_trsh_set, "0x%08llx\n");
+
+static struct dentry *debugfs_create_itr_trsh(const char *name,
+ umode_t mode,
+ struct dentry *parent,
+ struct wil6210_priv *wil)
+{
+ return debugfs_create_file(name, mode, parent, wil, &fops_itr_trsh);
+}
+
static int wil6210_debugfs_create_ISR(struct wil6210_priv *wil,
const char *name,
struct dentry *parent, u32 off)
@@ -1024,7 +1072,7 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
wil_debugfs_create_iomem_x32("MAC_MTRL_COUNTER_0", S_IRUGO, dbg,
wil->csr +
HOSTADDR(RGF_MAC_MTRL_COUNTER_0));
-
+ debugfs_create_itr_trsh("itr_trsh_val", S_IRUGO | S_IWUSR, dbg, wil);
wil_debugfs_create_iomem_x32("RGF_USER_USAGE_1", S_IRUGO, dbg,
wil->csr +
HOSTADDR(RGF_USER_USAGE_1));
diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
index 98bfbb6..1f18e86 100644
--- a/drivers/net/wireless/ath/wil6210/interrupt.c
+++ b/drivers/net/wireless/ath/wil6210/interrupt.c
@@ -18,6 +18,12 @@
#include "wil6210.h"
#include "trace.h"
+#include <linux/moduleparam.h>
+
+static unsigned int itr_trsh = WIL6210_ITR_TRSH;
+
+module_param(itr_trsh, uint, S_IRUGO);
+MODULE_PARM_DESC(itr_trsh, " Interrupt moderation threshold value.");
/**
* Theory of operation:
@@ -163,7 +169,7 @@ void wil6210_enable_irq(struct wil6210_priv *wil)
*/
iowrite32(0, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
} else {
- iowrite32(WIL6210_ITR_TRSH,
+ iowrite32((u32)itr_trsh,
wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
iowrite32(BIT_DMA_ITR_CNT_CRL_EN,
wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 0097300..47d656a 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -47,7 +47,7 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)
#define WIL6210_MAX_TX_RINGS (24) /* HW limit */
#define WIL6210_MAX_CID (8) /* HW limit */
#define WIL6210_NAPI_BUDGET (16) /* arbitrary */
-#define WIL6210_ITR_TRSH (10000) /* arbitrary - about 15 IRQs/msec */
+#define WIL6210_ITR_TRSH (50000) /* about 3 IRQs/msec */
#define WIL6210_FW_RECOVERY_RETRIES (5) /* try to recover this many times */
#define WIL6210_FW_RECOVERY_TO msecs_to_jiffies(5000)
#define WIL6210_SCAN_TO msecs_to_jiffies(10000)
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* Re: [PATCH 04/14] wil6210: Optimization for Interrupt moderation threshold value
2014-08-04 8:20 ` [PATCH 04/14] wil6210: Optimization for Interrupt moderation threshold value Dedy Lansky
@ 2014-08-04 17:38 ` Florian Fainelli
2014-08-05 6:15 ` qca_dlansky
0 siblings, 1 reply; 17+ messages in thread
From: Florian Fainelli @ 2014-08-04 17:38 UTC (permalink / raw)
To: Dedy Lansky, John W . Linville
Cc: linux-wireless, wil6210, Vladimir Kondratiev
Hello,
On 08/04/2014 01:20 AM, Dedy Lansky wrote:
> Default value was changed to 50000 (~3 IRQs/msec) in order to reduce
> significantly CPU usage without degradation in throughput.
> Added module parameter named "itr_trsh" that allows the user to change
> default value through insmod.
> Added entry in debugfs (itr_trsh_val) for changing interrupt moderation
> threshold in a single operation.
This should be made configurable through the ethtool::set_coalesce
operations, which allows you to have separate RX and TX interrupts
coalescing parameters.
>
> Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
> ---
> drivers/net/wireless/ath/wil6210/debugfs.c | 50 +++++++++++++++++++++++++++-
> drivers/net/wireless/ath/wil6210/interrupt.c | 8 ++++-
> drivers/net/wireless/ath/wil6210/wil6210.h | 2 +-
> 3 files changed, 57 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
> index fb802bd..3990a2d 100644
> --- a/drivers/net/wireless/ath/wil6210/debugfs.c
> +++ b/drivers/net/wireless/ath/wil6210/debugfs.c
> @@ -24,6 +24,12 @@
> #include "wil6210.h"
> #include "txrx.h"
>
> +/* Max threshold supported value by wil6210 is 5sec.
> + * The interrupt moderation counter counts down every clock tick of 6nsec.
> + * Therefore max value for ITR_CNT_TRSH can be 5sec/6nsec = 833333333
> + */
> +#define WIL6210_ITR_TRSH_MAX 833333333
> +
> /* Nasty hack. Better have per device instances */
> static u32 mem_addr;
> static u32 dbg_txdesc_index;
> @@ -270,6 +276,48 @@ static struct dentry *wil_debugfs_create_ulong(const char *name, umode_t mode,
> return debugfs_create_file(name, mode, parent, value, &wil_fops_ulong);
> }
>
> +static int wil_debugfs_itr_trsh_set(void *data, u64 val)
> +{
> + struct wil6210_priv *wil = data;
> +
> + /* Check value is smaller than max val limitation
> + * (covers also negative values)
> + */
> + if (val > WIL6210_ITR_TRSH_MAX)
> + return -EINVAL;
> +
> + /* Perform interrupt moderation threshold update procedure */
> + iowrite32(0, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
> + wmb(); /* make sure write propagated to HW */
> +
> + iowrite32((u32)val, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
> + wmb(); /* make sure write propagated to HW */
> +
> + iowrite32(BIT_DMA_ITR_CNT_CRL_EN,
> + wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
> + wmb(); /* make sure write propagated to HW */
> +
> + return 0;
> +}
> +
> +static int wil_debugfs_itr_trsh_get(void *data, u64 *val)
> +{
> + struct wil6210_priv *wil = data;
> + *val = ioread32(wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
> + return 0;
> +}
> +
> +DEFINE_SIMPLE_ATTRIBUTE(fops_itr_trsh, wil_debugfs_itr_trsh_get,
> + wil_debugfs_itr_trsh_set, "0x%08llx\n");
> +
> +static struct dentry *debugfs_create_itr_trsh(const char *name,
> + umode_t mode,
> + struct dentry *parent,
> + struct wil6210_priv *wil)
> +{
> + return debugfs_create_file(name, mode, parent, wil, &fops_itr_trsh);
> +}
> +
> static int wil6210_debugfs_create_ISR(struct wil6210_priv *wil,
> const char *name,
> struct dentry *parent, u32 off)
> @@ -1024,7 +1072,7 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
> wil_debugfs_create_iomem_x32("MAC_MTRL_COUNTER_0", S_IRUGO, dbg,
> wil->csr +
> HOSTADDR(RGF_MAC_MTRL_COUNTER_0));
> -
> + debugfs_create_itr_trsh("itr_trsh_val", S_IRUGO | S_IWUSR, dbg, wil);
> wil_debugfs_create_iomem_x32("RGF_USER_USAGE_1", S_IRUGO, dbg,
> wil->csr +
> HOSTADDR(RGF_USER_USAGE_1));
> diff --git a/drivers/net/wireless/ath/wil6210/interrupt.c b/drivers/net/wireless/ath/wil6210/interrupt.c
> index 98bfbb6..1f18e86 100644
> --- a/drivers/net/wireless/ath/wil6210/interrupt.c
> +++ b/drivers/net/wireless/ath/wil6210/interrupt.c
> @@ -18,6 +18,12 @@
>
> #include "wil6210.h"
> #include "trace.h"
> +#include <linux/moduleparam.h>
> +
> +static unsigned int itr_trsh = WIL6210_ITR_TRSH;
> +
> +module_param(itr_trsh, uint, S_IRUGO);
> +MODULE_PARM_DESC(itr_trsh, " Interrupt moderation threshold value.");
>
> /**
> * Theory of operation:
> @@ -163,7 +169,7 @@ void wil6210_enable_irq(struct wil6210_priv *wil)
> */
> iowrite32(0, wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
> } else {
> - iowrite32(WIL6210_ITR_TRSH,
> + iowrite32((u32)itr_trsh,
> wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
> iowrite32(BIT_DMA_ITR_CNT_CRL_EN,
> wil->csr + HOSTADDR(RGF_DMA_ITR_CNT_CRL));
> diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
> index 0097300..47d656a 100644
> --- a/drivers/net/wireless/ath/wil6210/wil6210.h
> +++ b/drivers/net/wireless/ath/wil6210/wil6210.h
> @@ -47,7 +47,7 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1)
> #define WIL6210_MAX_TX_RINGS (24) /* HW limit */
> #define WIL6210_MAX_CID (8) /* HW limit */
> #define WIL6210_NAPI_BUDGET (16) /* arbitrary */
> -#define WIL6210_ITR_TRSH (10000) /* arbitrary - about 15 IRQs/msec */
> +#define WIL6210_ITR_TRSH (50000) /* about 3 IRQs/msec */
> #define WIL6210_FW_RECOVERY_RETRIES (5) /* try to recover this many times */
> #define WIL6210_FW_RECOVERY_TO msecs_to_jiffies(5000)
> #define WIL6210_SCAN_TO msecs_to_jiffies(10000)
>
^ permalink raw reply [flat|nested] 17+ messages in thread* RE: [PATCH 04/14] wil6210: Optimization for Interrupt moderation threshold value
2014-08-04 17:38 ` Florian Fainelli
@ 2014-08-05 6:15 ` qca_dlansky
0 siblings, 0 replies; 17+ messages in thread
From: qca_dlansky @ 2014-08-05 6:15 UTC (permalink / raw)
To: Florian Fainelli, John W . Linville; +Cc: linux-wireless, wil6210, qca_vkondrat
SGksDQoNCldlIHdpbGwgdGFrZSBhIGxvb2sgYXQgZXRodG9vbDo6c2V0X2NvYWxlc2NlIGFuZCBj
b21lIHVwIHdpdGggYXBwcm9wcmlhdGUgaW1wbGVtZW50YXRpb24gZm9yIHRoaXMgcGF0Y2guDQpJ
J20gZ29pbmcgdG8gcmUtdXBsb2FkIHRoZSByZW1haW5pbmcgMTMgcGF0Y2hlcyBzaG9ydGx5IGlm
IHRoYXQncyBPSy4NCg0KVGhhbmtzLA0KIERlZHkuDQoNCi0tLS0tT3JpZ2luYWwgTWVzc2FnZS0t
LS0tDQpGcm9tOiBsaW51eC13aXJlbGVzcy1vd25lckB2Z2VyLmtlcm5lbC5vcmcgW21haWx0bzps
aW51eC13aXJlbGVzcy1vd25lckB2Z2VyLmtlcm5lbC5vcmddIE9uIEJlaGFsZiBPZiBGbG9yaWFu
IEZhaW5lbGxpDQpTZW50OiBNb25kYXksIEF1Z3VzdCAwNCwgMjAxNCA4OjM5IFBNDQpUbzogcWNh
X2RsYW5za3k7IEpvaG4gVyAuIExpbnZpbGxlDQpDYzogbGludXgtd2lyZWxlc3NAdmdlci5rZXJu
ZWwub3JnOyB3aWw2MjEwOyBxY2FfdmtvbmRyYXQNClN1YmplY3Q6IFJlOiBbUEFUQ0ggMDQvMTRd
IHdpbDYyMTA6IE9wdGltaXphdGlvbiBmb3IgSW50ZXJydXB0IG1vZGVyYXRpb24gdGhyZXNob2xk
IHZhbHVlDQoNCkhlbGxvLA0KDQpPbiAwOC8wNC8yMDE0IDAxOjIwIEFNLCBEZWR5IExhbnNreSB3
cm90ZToNCj4gRGVmYXVsdCB2YWx1ZSB3YXMgY2hhbmdlZCB0byA1MDAwMCAofjMgSVJRcy9tc2Vj
KSBpbiBvcmRlciB0byByZWR1Y2UgDQo+IHNpZ25pZmljYW50bHkgQ1BVIHVzYWdlIHdpdGhvdXQg
ZGVncmFkYXRpb24gaW4gdGhyb3VnaHB1dC4NCj4gQWRkZWQgbW9kdWxlIHBhcmFtZXRlciBuYW1l
ZCAiaXRyX3Ryc2giIHRoYXQgYWxsb3dzIHRoZSB1c2VyIHRvIGNoYW5nZSANCj4gZGVmYXVsdCB2
YWx1ZSB0aHJvdWdoIGluc21vZC4NCj4gQWRkZWQgZW50cnkgaW4gZGVidWdmcyAoaXRyX3Ryc2hf
dmFsKSBmb3IgY2hhbmdpbmcgaW50ZXJydXB0IA0KPiBtb2RlcmF0aW9uIHRocmVzaG9sZCBpbiBh
IHNpbmdsZSBvcGVyYXRpb24uDQoNClRoaXMgc2hvdWxkIGJlIG1hZGUgY29uZmlndXJhYmxlIHRo
cm91Z2ggdGhlIGV0aHRvb2w6OnNldF9jb2FsZXNjZSBvcGVyYXRpb25zLCB3aGljaCBhbGxvd3Mg
eW91IHRvIGhhdmUgc2VwYXJhdGUgUlggYW5kIFRYIGludGVycnVwdHMgY29hbGVzY2luZyBwYXJh
bWV0ZXJzLg0KDQo+IA0KPiBTaWduZWQtb2ZmLWJ5OiBEZWR5IExhbnNreSA8cWNhX2RsYW5za3lA
cWNhLnF1YWxjb21tLmNvbT4NCj4gLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvd2ls
NjIxMC9kZWJ1Z2ZzLmMgICB8IDUwICsrKysrKysrKysrKysrKysrKysrKysrKysrKy0NCj4gIGRy
aXZlcnMvbmV0L3dpcmVsZXNzL2F0aC93aWw2MjEwL2ludGVycnVwdC5jIHwgIDggKysrKy0NCj4g
IGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC93aWw2MjEwL3dpbDYyMTAuaCAgIHwgIDIgKy0NCj4g
IDMgZmlsZXMgY2hhbmdlZCwgNTcgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkNCj4gDQo+
IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvd2lsNjIxMC9kZWJ1Z2ZzLmMg
DQo+IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL3dpbDYyMTAvZGVidWdmcy5jDQo+IGluZGV4
IGZiODAyYmQuLjM5OTBhMmQgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0
aC93aWw2MjEwL2RlYnVnZnMuYw0KPiArKysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvd2ls
NjIxMC9kZWJ1Z2ZzLmMNCj4gQEAgLTI0LDYgKzI0LDEyIEBADQo+ICAjaW5jbHVkZSAid2lsNjIx
MC5oIg0KPiAgI2luY2x1ZGUgInR4cnguaCINCj4gIA0KPiArLyogTWF4IHRocmVzaG9sZCBzdXBw
b3J0ZWQgdmFsdWUgYnkgd2lsNjIxMCBpcyA1c2VjLg0KPiArICogVGhlIGludGVycnVwdCBtb2Rl
cmF0aW9uIGNvdW50ZXIgY291bnRzIGRvd24gZXZlcnkgY2xvY2sgdGljayBvZiA2bnNlYy4NCj4g
KyAqIFRoZXJlZm9yZSBtYXggdmFsdWUgZm9yIElUUl9DTlRfVFJTSCBjYW4gYmUgNXNlYy82bnNl
YyA9IDgzMzMzMzMzMyAgDQo+ICsqLyAjZGVmaW5lIFdJTDYyMTBfSVRSX1RSU0hfTUFYIDgzMzMz
MzMzMw0KPiArDQo+ICAvKiBOYXN0eSBoYWNrLiBCZXR0ZXIgaGF2ZSBwZXIgZGV2aWNlIGluc3Rh
bmNlcyAqLyAgc3RhdGljIHUzMiANCj4gbWVtX2FkZHI7ICBzdGF0aWMgdTMyIGRiZ190eGRlc2Nf
aW5kZXg7IEBAIC0yNzAsNiArMjc2LDQ4IEBAIHN0YXRpYyANCj4gc3RydWN0IGRlbnRyeSAqd2ls
X2RlYnVnZnNfY3JlYXRlX3Vsb25nKGNvbnN0IGNoYXIgKm5hbWUsIHVtb2RlX3QgbW9kZSwNCj4g
IAlyZXR1cm4gZGVidWdmc19jcmVhdGVfZmlsZShuYW1lLCBtb2RlLCBwYXJlbnQsIHZhbHVlLCAN
Cj4gJndpbF9mb3BzX3Vsb25nKTsgIH0NCj4gIA0KPiArc3RhdGljIGludCB3aWxfZGVidWdmc19p
dHJfdHJzaF9zZXQodm9pZCAqZGF0YSwgdTY0IHZhbCkgew0KPiArCXN0cnVjdCB3aWw2MjEwX3By
aXYgKndpbCA9IGRhdGE7DQo+ICsNCj4gKwkvKiBDaGVjayB2YWx1ZSBpcyBzbWFsbGVyIHRoYW4g
bWF4IHZhbCBsaW1pdGF0aW9uDQo+ICsJICogKGNvdmVycyBhbHNvIG5lZ2F0aXZlIHZhbHVlcykN
Cj4gKwkgKi8NCj4gKwlpZiAodmFsID4gV0lMNjIxMF9JVFJfVFJTSF9NQVgpDQo+ICsJCXJldHVy
biAtRUlOVkFMOw0KPiArDQo+ICsJLyogUGVyZm9ybSBpbnRlcnJ1cHQgbW9kZXJhdGlvbiB0aHJl
c2hvbGQgdXBkYXRlIHByb2NlZHVyZSAqLw0KPiArCWlvd3JpdGUzMigwLCB3aWwtPmNzciArIEhP
U1RBRERSKFJHRl9ETUFfSVRSX0NOVF9DUkwpKTsNCj4gKwl3bWIoKTsgLyogbWFrZSBzdXJlIHdy
aXRlIHByb3BhZ2F0ZWQgdG8gSFcgKi8NCj4gKw0KPiArCWlvd3JpdGUzMigodTMyKXZhbCwgd2ls
LT5jc3IgKyBIT1NUQUREUihSR0ZfRE1BX0lUUl9DTlRfVFJTSCkpOw0KPiArCXdtYigpOyAvKiBt
YWtlIHN1cmUgd3JpdGUgcHJvcGFnYXRlZCB0byBIVyAqLw0KPiArDQo+ICsJaW93cml0ZTMyKEJJ
VF9ETUFfSVRSX0NOVF9DUkxfRU4sDQo+ICsJCSAgd2lsLT5jc3IgKyBIT1NUQUREUihSR0ZfRE1B
X0lUUl9DTlRfQ1JMKSk7DQo+ICsJd21iKCk7IC8qIG1ha2Ugc3VyZSB3cml0ZSBwcm9wYWdhdGVk
IHRvIEhXICovDQo+ICsNCj4gKwlyZXR1cm4gMDsNCj4gK30NCj4gKw0KPiArc3RhdGljIGludCB3
aWxfZGVidWdmc19pdHJfdHJzaF9nZXQodm9pZCAqZGF0YSwgdTY0ICp2YWwpIHsNCj4gKwlzdHJ1
Y3Qgd2lsNjIxMF9wcml2ICp3aWwgPSBkYXRhOw0KPiArCSp2YWwgPSBpb3JlYWQzMih3aWwtPmNz
ciArIEhPU1RBRERSKFJHRl9ETUFfSVRSX0NOVF9UUlNIKSk7DQo+ICsJcmV0dXJuIDA7DQo+ICt9
DQo+ICsNCj4gK0RFRklORV9TSU1QTEVfQVRUUklCVVRFKGZvcHNfaXRyX3Ryc2gsIHdpbF9kZWJ1
Z2ZzX2l0cl90cnNoX2dldCwNCj4gKwkJCXdpbF9kZWJ1Z2ZzX2l0cl90cnNoX3NldCwgIjB4JTA4
bGx4XG4iKTsNCj4gKw0KPiArc3RhdGljIHN0cnVjdCBkZW50cnkgKmRlYnVnZnNfY3JlYXRlX2l0
cl90cnNoKGNvbnN0IGNoYXIgKm5hbWUsDQo+ICsJCQkJCSAgICAgIHVtb2RlX3QgbW9kZSwNCj4g
KwkJCQkJICAgICAgc3RydWN0IGRlbnRyeSAqcGFyZW50LA0KPiArCQkJCQkgICAgICBzdHJ1Y3Qg
d2lsNjIxMF9wcml2ICp3aWwpDQo+ICt7DQo+ICsJcmV0dXJuIGRlYnVnZnNfY3JlYXRlX2ZpbGUo
bmFtZSwgbW9kZSwgcGFyZW50LCB3aWwsICZmb3BzX2l0cl90cnNoKTsgDQo+ICt9DQo+ICsNCj4g
IHN0YXRpYyBpbnQgd2lsNjIxMF9kZWJ1Z2ZzX2NyZWF0ZV9JU1Ioc3RydWN0IHdpbDYyMTBfcHJp
diAqd2lsLA0KPiAgCQkJCSAgICAgIGNvbnN0IGNoYXIgKm5hbWUsDQo+ICAJCQkJICAgICAgc3Ry
dWN0IGRlbnRyeSAqcGFyZW50LCB1MzIgb2ZmKSBAQCAtMTAyNCw3ICsxMDcyLDcgQEAgaW50IA0K
PiB3aWw2MjEwX2RlYnVnZnNfaW5pdChzdHJ1Y3Qgd2lsNjIxMF9wcml2ICp3aWwpDQo+ICAJd2ls
X2RlYnVnZnNfY3JlYXRlX2lvbWVtX3gzMigiTUFDX01UUkxfQ09VTlRFUl8wIiwgU19JUlVHTywg
ZGJnLA0KPiAgCQkJCSAgICAgd2lsLT5jc3IgKw0KPiAgCQkJCSAgICAgSE9TVEFERFIoUkdGX01B
Q19NVFJMX0NPVU5URVJfMCkpOw0KPiAtDQo+ICsJZGVidWdmc19jcmVhdGVfaXRyX3Ryc2goIml0
cl90cnNoX3ZhbCIsIFNfSVJVR08gfCBTX0lXVVNSLCBkYmcsIA0KPiArd2lsKTsNCj4gIAl3aWxf
ZGVidWdmc19jcmVhdGVfaW9tZW1feDMyKCJSR0ZfVVNFUl9VU0FHRV8xIiwgU19JUlVHTywgZGJn
LA0KPiAgCQkJCSAgICAgd2lsLT5jc3IgKw0KPiAgCQkJCSAgICAgSE9TVEFERFIoUkdGX1VTRVJf
VVNBR0VfMSkpOyBkaWZmIC0tZ2l0IA0KPiBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC93aWw2
MjEwL2ludGVycnVwdC5jIA0KPiBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC93aWw2MjEwL2lu
dGVycnVwdC5jDQo+IGluZGV4IDk4YmZiYjYuLjFmMThlODYgMTAwNjQ0DQo+IC0tLSBhL2RyaXZl
cnMvbmV0L3dpcmVsZXNzL2F0aC93aWw2MjEwL2ludGVycnVwdC5jDQo+ICsrKyBiL2RyaXZlcnMv
bmV0L3dpcmVsZXNzL2F0aC93aWw2MjEwL2ludGVycnVwdC5jDQo+IEBAIC0xOCw2ICsxOCwxMiBA
QA0KPiAgDQo+ICAjaW5jbHVkZSAid2lsNjIxMC5oIg0KPiAgI2luY2x1ZGUgInRyYWNlLmgiDQo+
ICsjaW5jbHVkZSA8bGludXgvbW9kdWxlcGFyYW0uaD4NCj4gKw0KPiArc3RhdGljIHVuc2lnbmVk
IGludCBpdHJfdHJzaCA9IFdJTDYyMTBfSVRSX1RSU0g7DQo+ICsNCj4gK21vZHVsZV9wYXJhbShp
dHJfdHJzaCwgdWludCwgU19JUlVHTyk7IE1PRFVMRV9QQVJNX0RFU0MoaXRyX3Ryc2gsICIgDQo+
ICtJbnRlcnJ1cHQgbW9kZXJhdGlvbiB0aHJlc2hvbGQgdmFsdWUuIik7DQo+ICANCj4gIC8qKg0K
PiAgICogVGhlb3J5IG9mIG9wZXJhdGlvbjoNCj4gQEAgLTE2Myw3ICsxNjksNyBAQCB2b2lkIHdp
bDYyMTBfZW5hYmxlX2lycShzdHJ1Y3Qgd2lsNjIxMF9wcml2ICp3aWwpDQo+ICAJCSAqLw0KPiAg
CQlpb3dyaXRlMzIoMCwgd2lsLT5jc3IgKyBIT1NUQUREUihSR0ZfRE1BX0lUUl9DTlRfQ1JMKSk7
DQo+ICAJfSBlbHNlIHsNCj4gLQkJaW93cml0ZTMyKFdJTDYyMTBfSVRSX1RSU0gsDQo+ICsJCWlv
d3JpdGUzMigodTMyKWl0cl90cnNoLA0KPiAgCQkJICB3aWwtPmNzciArIEhPU1RBRERSKFJHRl9E
TUFfSVRSX0NOVF9UUlNIKSk7DQo+ICAJCWlvd3JpdGUzMihCSVRfRE1BX0lUUl9DTlRfQ1JMX0VO
LA0KPiAgCQkJICB3aWwtPmNzciArIEhPU1RBRERSKFJHRl9ETUFfSVRSX0NOVF9DUkwpKTsgZGlm
ZiAtLWdpdCANCj4gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvd2lsNjIxMC93aWw2MjEwLmgg
DQo+IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL3dpbDYyMTAvd2lsNjIxMC5oDQo+IGluZGV4
IDAwOTczMDAuLjQ3ZDY1NmEgMTAwNjQ0DQo+IC0tLSBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2F0
aC93aWw2MjEwL3dpbDYyMTAuaA0KPiArKysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvd2ls
NjIxMC93aWw2MjEwLmgNCj4gQEAgLTQ3LDcgKzQ3LDcgQEAgc3RhdGljIGlubGluZSB1MzIgV0lM
X0dFVF9CSVRTKHUzMiB4LCBpbnQgYjAsIGludCBiMSkNCj4gICNkZWZpbmUgV0lMNjIxMF9NQVhf
VFhfUklOR1MJKDI0KSAvKiBIVyBsaW1pdCAqLw0KPiAgI2RlZmluZSBXSUw2MjEwX01BWF9DSUQJ
CSg4KSAvKiBIVyBsaW1pdCAqLw0KPiAgI2RlZmluZSBXSUw2MjEwX05BUElfQlVER0VUCSgxNikg
LyogYXJiaXRyYXJ5ICovDQo+IC0jZGVmaW5lIFdJTDYyMTBfSVRSX1RSU0gJKDEwMDAwKSAvKiBh
cmJpdHJhcnkgLSBhYm91dCAxNSBJUlFzL21zZWMgKi8NCj4gKyNkZWZpbmUgV0lMNjIxMF9JVFJf
VFJTSAkoNTAwMDApIC8qIGFib3V0IDMgSVJRcy9tc2VjICovDQo+ICAjZGVmaW5lIFdJTDYyMTBf
RldfUkVDT1ZFUllfUkVUUklFUwkoNSkgLyogdHJ5IHRvIHJlY292ZXIgdGhpcyBtYW55IHRpbWVz
ICovDQo+ICAjZGVmaW5lIFdJTDYyMTBfRldfUkVDT1ZFUllfVE8JbXNlY3NfdG9famlmZmllcyg1
MDAwKQ0KPiAgI2RlZmluZSBXSUw2MjEwX1NDQU5fVE8JCW1zZWNzX3RvX2ppZmZpZXMoMTAwMDAp
DQo+IA0KDQotLQ0KVG8gdW5zdWJzY3JpYmUgZnJvbSB0aGlzIGxpc3Q6IHNlbmQgdGhlIGxpbmUg
InVuc3Vic2NyaWJlIGxpbnV4LXdpcmVsZXNzIiBpbiB0aGUgYm9keSBvZiBhIG1lc3NhZ2UgdG8g
bWFqb3Jkb21vQHZnZXIua2VybmVsLm9yZyBNb3JlIG1ham9yZG9tbyBpbmZvIGF0ICBodHRwOi8v
dmdlci5rZXJuZWwub3JnL21ham9yZG9tby1pbmZvLmh0bWwNCg==
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 05/14] wil6210: check error in wil_target_reset()
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (3 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 04/14] wil6210: Optimization for Interrupt moderation threshold value Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 06/14] wil6210: wait longer for hardware reset completion Dedy Lansky
` (8 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
When resetting target in wil_target_reset(), error may occur.
Indicate error via error code. In case of error, don't attempt to further
interact with card, specifically don't attempt firmware download or
interrupts enabling.
Move wil_rx_fini() to be always executed to prevent memory leak.
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/main.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index dc22053..5a99342 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -309,7 +309,7 @@ void wil_priv_deinit(struct wil6210_priv *wil)
destroy_workqueue(wil->wmi_wq);
}
-static void wil_target_reset(struct wil6210_priv *wil)
+static int wil_target_reset(struct wil6210_priv *wil)
{
int delay = 0;
u32 hw_state;
@@ -395,7 +395,7 @@ static void wil_target_reset(struct wil6210_priv *wil)
if (delay++ > 100) {
wil_err(wil, "Reset not completed, hw_state 0x%08x\n",
hw_state);
- return;
+ return -ETIME;
}
} while (hw_state != HW_MACHINE_BOOT_DONE);
@@ -407,6 +407,7 @@ static void wil_target_reset(struct wil6210_priv *wil)
wmb(); /* order is important here */
wil_dbg_misc(wil, "Reset completed in %d ms\n", delay);
+ return 0;
#undef R
#undef W
@@ -471,10 +472,11 @@ int wil_reset(struct wil6210_priv *wil)
flush_workqueue(wil->wmi_wq_conn);
flush_workqueue(wil->wmi_wq);
- /* TODO: put MAC in reset */
- wil_target_reset(wil);
-
+ rc = wil_target_reset(wil);
wil_rx_fini(wil);
+ if (rc)
+ return rc;
+
/* init after reset */
wil->pending_connect_cid = -1;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 06/14] wil6210: wait longer for hardware reset completion
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (4 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 05/14] wil6210: check error in wil_target_reset() Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 07/14] wil6210: Workaround for Sparrow with bad device id Dedy Lansky
` (7 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Typical time for hardware reset, as measured, is about 200..250 msec.
Adjust sleeping to use more relaxed msleep, increase sleep interval
and increase total sleep time to be about 1sec
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/main.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/main.c b/drivers/net/wireless/ath/wil6210/main.c
index 5a99342..b69d90f 100644
--- a/drivers/net/wireless/ath/wil6210/main.c
+++ b/drivers/net/wireless/ath/wil6210/main.c
@@ -25,6 +25,9 @@ static bool no_fw_recovery;
module_param(no_fw_recovery, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(no_fw_recovery, " disable FW error recovery");
+#define RST_DELAY (20) /* msec, for loop in @wil_target_reset */
+#define RST_COUNT (1 + 1000/RST_DELAY) /* round up to be above 1 sec total */
+
/*
* Due to a hardware issue,
* one has to read/write to/from NIC in 32-bit chunks;
@@ -388,11 +391,11 @@ static int wil_target_reset(struct wil6210_priv *wil)
W(RGF_USER_CLKS_CTL_SW_RST_VEC_0, 0);
wmb(); /* order is important here */
- /* wait until device ready */
+ /* wait until device ready. typical time is 200..250 msec */
do {
- msleep(1);
+ msleep(RST_DELAY);
hw_state = R(RGF_USER_HW_MACHINE_STATE);
- if (delay++ > 100) {
+ if (delay++ > RST_COUNT) {
wil_err(wil, "Reset not completed, hw_state 0x%08x\n",
hw_state);
return -ETIME;
@@ -406,7 +409,7 @@ static int wil_target_reset(struct wil6210_priv *wil)
C(RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD);
wmb(); /* order is important here */
- wil_dbg_misc(wil, "Reset completed in %d ms\n", delay);
+ wil_dbg_misc(wil, "Reset completed in %d ms\n", delay * RST_DELAY);
return 0;
#undef R
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 07/14] wil6210: Workaround for Sparrow with bad device id
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (5 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 06/14] wil6210: wait longer for hardware reset completion Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 08/14] wil6210: convert debugfs to the table mode Dedy Lansky
` (6 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
If firmware broken on the boot time, Sparrow card enumerates as
device 0x302 instead of 0x310. Allow using this ID
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index a6af2bb..cf0b219 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -243,6 +243,8 @@ static const struct pci_device_id wil6210_pcie_ids[] = {
.driver_data = (kernel_ulong_t)&wil_board_marlon },
{ PCI_DEVICE(0x1ae9, 0x0310),
.driver_data = (kernel_ulong_t)&wil_board_sparrow },
+ { PCI_DEVICE(0x1ae9, 0x0302), /* same as above, firmware broken */
+ .driver_data = (kernel_ulong_t)&wil_board_sparrow },
{ /* end: all zeroes */ },
};
MODULE_DEVICE_TABLE(pci, wil6210_pcie_ids);
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 08/14] wil6210: convert debugfs to the table mode
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (6 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 07/14] wil6210: Workaround for Sparrow with bad device id Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 09/14] wil6210: fix beamforming data reporting Dedy Lansky
` (5 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Define tables for similar file entries, i.e.
- table for debugfs_create_file
- table for static parameters
- table for parameters that are members of "wil" structure
- table for blobs
- table for interrupt controllers
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/debugfs.c | 263 ++++++++++++++++++++---------
1 file changed, 181 insertions(+), 82 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index 3990a2d..d55018b 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -35,6 +35,21 @@ static u32 mem_addr;
static u32 dbg_txdesc_index;
static u32 dbg_vring_index; /* 24+ for Rx, 0..23 for Tx */
+enum dbg_off_type {
+ doff_u32 = 0,
+ doff_x32 = 1,
+ doff_ulong = 2,
+ doff_io32 = 3,
+};
+
+/* offset to "wil" */
+struct dbg_off {
+ const char *name;
+ umode_t mode;
+ ulong off;
+ enum dbg_off_type type;
+};
+
static void wil_print_vring(struct seq_file *s, struct wil6210_priv *wil,
const char *name, struct vring *vring,
char _s, char _h)
@@ -250,9 +265,9 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_iomem_x32, wil_debugfs_iomem_x32_get,
static struct dentry *wil_debugfs_create_iomem_x32(const char *name,
umode_t mode,
struct dentry *parent,
- void __iomem *value)
+ void *value)
{
- return debugfs_create_file(name, mode, parent, (void * __force)value,
+ return debugfs_create_file(name, mode, parent, value,
&fops_iomem_x32);
}
@@ -276,6 +291,49 @@ static struct dentry *wil_debugfs_create_ulong(const char *name, umode_t mode,
return debugfs_create_file(name, mode, parent, value, &wil_fops_ulong);
}
+/**
+ * wil6210_debugfs_init_offset - create set of debugfs files
+ * @wil - driver's context, used for printing
+ * @dbg - directory on the debugfs, where files will be created
+ * @base - base address used in address calculation
+ * @tbl - table with file descriptions. Should be terminated with empty element.
+ *
+ * Creates files accordingly to the @tbl.
+ */
+static void wil6210_debugfs_init_offset(struct wil6210_priv *wil,
+ struct dentry *dbg, void *base,
+ const struct dbg_off * const tbl)
+{
+ int i;
+
+ for (i = 0; tbl[i].name; i++) {
+ struct dentry *f = NULL;
+
+ switch (tbl[i].type) {
+ case doff_u32:
+ f = debugfs_create_u32(tbl[i].name, tbl[i].mode, dbg,
+ base + tbl[i].off);
+ break;
+ case doff_x32:
+ f = debugfs_create_x32(tbl[i].name, tbl[i].mode, dbg,
+ base + tbl[i].off);
+ break;
+ case doff_ulong:
+ f = wil_debugfs_create_ulong(tbl[i].name, tbl[i].mode,
+ dbg, base + tbl[i].off);
+ break;
+ case doff_io32:
+ f = wil_debugfs_create_iomem_x32(tbl[i].name,
+ tbl[i].mode, dbg,
+ base + tbl[i].off);
+ break;
+ }
+ if (IS_ERR_OR_NULL(f))
+ wil_err(wil, "Create file \"%s\": err %ld\n",
+ tbl[i].name, PTR_ERR(f));
+ }
+}
+
static int wil_debugfs_itr_trsh_set(void *data, u64 val)
{
struct wil6210_priv *wil = data;
@@ -310,14 +368,16 @@ static int wil_debugfs_itr_trsh_get(void *data, u64 *val)
DEFINE_SIMPLE_ATTRIBUTE(fops_itr_trsh, wil_debugfs_itr_trsh_get,
wil_debugfs_itr_trsh_set, "0x%08llx\n");
-static struct dentry *debugfs_create_itr_trsh(const char *name,
- umode_t mode,
- struct dentry *parent,
- struct wil6210_priv *wil)
-{
- return debugfs_create_file(name, mode, parent, wil, &fops_itr_trsh);
-}
-
+static const struct dbg_off isr_off[] = {
+ {"ICC", S_IRUGO | S_IWUSR, offsetof(struct RGF_ICR, ICC), doff_io32},
+ {"ICR", S_IRUGO | S_IWUSR, offsetof(struct RGF_ICR, ICR), doff_io32},
+ {"ICM", S_IRUGO | S_IWUSR, offsetof(struct RGF_ICR, ICM), doff_io32},
+ {"ICS", S_IWUSR, offsetof(struct RGF_ICR, ICS), doff_io32},
+ {"IMV", S_IRUGO | S_IWUSR, offsetof(struct RGF_ICR, IMV), doff_io32},
+ {"IMS", S_IWUSR, offsetof(struct RGF_ICR, IMS), doff_io32},
+ {"IMC", S_IWUSR, offsetof(struct RGF_ICR, IMC), doff_io32},
+ {},
+};
static int wil6210_debugfs_create_ISR(struct wil6210_priv *wil,
const char *name,
struct dentry *parent, u32 off)
@@ -327,24 +387,19 @@ static int wil6210_debugfs_create_ISR(struct wil6210_priv *wil,
if (IS_ERR_OR_NULL(d))
return -ENODEV;
- wil_debugfs_create_iomem_x32("ICC", S_IRUGO | S_IWUSR, d,
- wil->csr + off);
- wil_debugfs_create_iomem_x32("ICR", S_IRUGO | S_IWUSR, d,
- wil->csr + off + 4);
- wil_debugfs_create_iomem_x32("ICM", S_IRUGO | S_IWUSR, d,
- wil->csr + off + 8);
- wil_debugfs_create_iomem_x32("ICS", S_IWUSR, d,
- wil->csr + off + 12);
- wil_debugfs_create_iomem_x32("IMV", S_IRUGO | S_IWUSR, d,
- wil->csr + off + 16);
- wil_debugfs_create_iomem_x32("IMS", S_IWUSR, d,
- wil->csr + off + 20);
- wil_debugfs_create_iomem_x32("IMC", S_IWUSR, d,
- wil->csr + off + 24);
+ wil6210_debugfs_init_offset(wil, d, (void * __force)wil->csr + off,
+ isr_off);
return 0;
}
+static const struct dbg_off pseudo_isr_off[] = {
+ {"CAUSE", S_IRUGO, HOSTADDR(RGF_DMA_PSEUDO_CAUSE), doff_io32},
+ {"MASK_SW", S_IRUGO, HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_SW), doff_io32},
+ {"MASK_FW", S_IRUGO, HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_FW), doff_io32},
+ {},
+};
+
static int wil6210_debugfs_create_pseudo_ISR(struct wil6210_priv *wil,
struct dentry *parent)
{
@@ -353,16 +408,19 @@ static int wil6210_debugfs_create_pseudo_ISR(struct wil6210_priv *wil,
if (IS_ERR_OR_NULL(d))
return -ENODEV;
- wil_debugfs_create_iomem_x32("CAUSE", S_IRUGO, d, wil->csr +
- HOSTADDR(RGF_DMA_PSEUDO_CAUSE));
- wil_debugfs_create_iomem_x32("MASK_SW", S_IRUGO, d, wil->csr +
- HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_SW));
- wil_debugfs_create_iomem_x32("MASK_FW", S_IRUGO, d, wil->csr +
- HOSTADDR(RGF_DMA_PSEUDO_CAUSE_MASK_FW));
+ wil6210_debugfs_init_offset(wil, d, (void * __force)wil->csr,
+ pseudo_isr_off);
return 0;
}
+static const struct dbg_off itr_cnt_off[] = {
+ {"TRSH", S_IRUGO | S_IWUSR, HOSTADDR(RGF_DMA_ITR_CNT_TRSH), doff_io32},
+ {"DATA", S_IRUGO | S_IWUSR, HOSTADDR(RGF_DMA_ITR_CNT_DATA), doff_io32},
+ {"CTL", S_IRUGO | S_IWUSR, HOSTADDR(RGF_DMA_ITR_CNT_CRL), doff_io32},
+ {},
+};
+
static int wil6210_debugfs_create_ITR_CNT(struct wil6210_priv *wil,
struct dentry *parent)
{
@@ -371,12 +429,8 @@ static int wil6210_debugfs_create_ITR_CNT(struct wil6210_priv *wil,
if (IS_ERR_OR_NULL(d))
return -ENODEV;
- wil_debugfs_create_iomem_x32("TRSH", S_IRUGO | S_IWUSR, d, wil->csr +
- HOSTADDR(RGF_DMA_ITR_CNT_TRSH));
- wil_debugfs_create_iomem_x32("DATA", S_IRUGO | S_IWUSR, d, wil->csr +
- HOSTADDR(RGF_DMA_ITR_CNT_DATA));
- wil_debugfs_create_iomem_x32("CTL", S_IRUGO | S_IWUSR, d, wil->csr +
- HOSTADDR(RGF_DMA_ITR_CNT_CRL));
+ wil6210_debugfs_init_offset(wil, d, (void * __force)wil->csr,
+ itr_cnt_off);
return 0;
}
@@ -1033,6 +1087,88 @@ static void wil6210_debugfs_init_blobs(struct wil6210_priv *wil,
}
}
+/* misc files */
+static const struct {
+ const char *name;
+ umode_t mode;
+ const struct file_operations *fops;
+} dbg_files[] = {
+ {"mbox", S_IRUGO, &fops_mbox},
+ {"vrings", S_IRUGO, &fops_vring},
+ {"stations", S_IRUGO, &fops_sta},
+ {"desc", S_IRUGO, &fops_txdesc},
+ {"bf", S_IRUGO, &fops_bf},
+ {"ssid", S_IRUGO | S_IWUSR, &fops_ssid},
+ {"mem_val", S_IRUGO, &fops_memread},
+ {"reset", S_IWUSR, &fops_reset},
+ {"rxon", S_IWUSR, &fops_rxon},
+ {"tx_mgmt", S_IWUSR, &fops_txmgmt},
+ {"wmi_send", S_IWUSR, &fops_wmi},
+ {"temp", S_IRUGO, &fops_temp},
+ {"freq", S_IRUGO, &fops_freq},
+ {"link", S_IRUGO, &fops_link},
+ {"info", S_IRUGO, &fops_info},
+ {"itr_trsh_val", S_IRUGO | S_IWUSR, &fops_itr_trsh},
+};
+
+static void wil6210_debugfs_init_files(struct wil6210_priv *wil,
+ struct dentry *dbg)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(dbg_files); i++)
+ debugfs_create_file(dbg_files[i].name, dbg_files[i].mode, dbg,
+ wil, dbg_files[i].fops);
+}
+
+/* interrupt control blocks */
+static const struct {
+ const char *name;
+ u32 icr_off;
+} dbg_icr[] = {
+ {"USER_ICR", HOSTADDR(RGF_USER_USER_ICR)},
+ {"DMA_EP_TX_ICR", HOSTADDR(RGF_DMA_EP_TX_ICR)},
+ {"DMA_EP_RX_ICR", HOSTADDR(RGF_DMA_EP_RX_ICR)},
+ {"DMA_EP_MISC_ICR", HOSTADDR(RGF_DMA_EP_MISC_ICR)},
+};
+
+static void wil6210_debugfs_init_isr(struct wil6210_priv *wil,
+ struct dentry *dbg)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(dbg_icr); i++)
+ wil6210_debugfs_create_ISR(wil, dbg_icr[i].name, dbg,
+ dbg_icr[i].icr_off);
+}
+
+#define WIL_FIELD(name, mode, type) { __stringify(name), mode, \
+ offsetof(struct wil6210_priv, name), type}
+
+/* fields in struct wil6210_priv */
+static const struct dbg_off dbg_wil_off[] = {
+ WIL_FIELD(secure_pcp, S_IRUGO | S_IWUSR, doff_u32),
+ WIL_FIELD(status, S_IRUGO | S_IWUSR, doff_ulong),
+ WIL_FIELD(fw_version, S_IRUGO, doff_u32),
+ WIL_FIELD(hw_version, S_IRUGO, doff_x32),
+ {},
+};
+
+static const struct dbg_off dbg_wil_regs[] = {
+ {"RGF_MAC_MTRL_COUNTER_0", S_IRUGO, HOSTADDR(RGF_MAC_MTRL_COUNTER_0),
+ doff_io32},
+ {"RGF_USER_USAGE_1", S_IRUGO, HOSTADDR(RGF_USER_USAGE_1), doff_io32},
+ {},
+};
+
+/* static parameters */
+static const struct dbg_off dbg_statics[] = {
+ {"desc_index", S_IRUGO | S_IWUSR, (ulong)&dbg_txdesc_index, doff_u32},
+ {"vring_index", S_IRUGO | S_IWUSR, (ulong)&dbg_vring_index, doff_u32},
+ {"mem_addr", S_IRUGO | S_IWUSR, (ulong)&mem_addr, doff_u32},
+ {},
+};
+
int wil6210_debugfs_init(struct wil6210_priv *wil)
{
struct dentry *dbg = wil->debug = debugfs_create_dir(WIL_NAME,
@@ -1041,54 +1177,17 @@ int wil6210_debugfs_init(struct wil6210_priv *wil)
if (IS_ERR_OR_NULL(dbg))
return -ENODEV;
- debugfs_create_file("mbox", S_IRUGO, dbg, wil, &fops_mbox);
- debugfs_create_file("vrings", S_IRUGO, dbg, wil, &fops_vring);
- debugfs_create_file("stations", S_IRUGO, dbg, wil, &fops_sta);
- debugfs_create_file("desc", S_IRUGO, dbg, wil, &fops_txdesc);
- debugfs_create_u32("desc_index", S_IRUGO | S_IWUSR, dbg,
- &dbg_txdesc_index);
- debugfs_create_u32("vring_index", S_IRUGO | S_IWUSR, dbg,
- &dbg_vring_index);
-
- debugfs_create_file("bf", S_IRUGO, dbg, wil, &fops_bf);
- debugfs_create_file("ssid", S_IRUGO | S_IWUSR, dbg, wil, &fops_ssid);
- debugfs_create_u32("secure_pcp", S_IRUGO | S_IWUSR, dbg,
- &wil->secure_pcp);
- wil_debugfs_create_ulong("status", S_IRUGO | S_IWUSR, dbg,
- &wil->status);
- debugfs_create_u32("fw_version", S_IRUGO, dbg, &wil->fw_version);
- debugfs_create_x32("hw_version", S_IRUGO, dbg, &wil->hw_version);
-
- wil6210_debugfs_create_ISR(wil, "USER_ICR", dbg,
- HOSTADDR(RGF_USER_USER_ICR));
- wil6210_debugfs_create_ISR(wil, "DMA_EP_TX_ICR", dbg,
- HOSTADDR(RGF_DMA_EP_TX_ICR));
- wil6210_debugfs_create_ISR(wil, "DMA_EP_RX_ICR", dbg,
- HOSTADDR(RGF_DMA_EP_RX_ICR));
- wil6210_debugfs_create_ISR(wil, "DMA_EP_MISC_ICR", dbg,
- HOSTADDR(RGF_DMA_EP_MISC_ICR));
+ wil6210_debugfs_init_files(wil, dbg);
+ wil6210_debugfs_init_isr(wil, dbg);
+ wil6210_debugfs_init_blobs(wil, dbg);
+ wil6210_debugfs_init_offset(wil, dbg, wil, dbg_wil_off);
+ wil6210_debugfs_init_offset(wil, dbg, (void * __force)wil->csr,
+ dbg_wil_regs);
+ wil6210_debugfs_init_offset(wil, dbg, NULL, dbg_statics);
+
wil6210_debugfs_create_pseudo_ISR(wil, dbg);
- wil6210_debugfs_create_ITR_CNT(wil, dbg);
- wil_debugfs_create_iomem_x32("MAC_MTRL_COUNTER_0", S_IRUGO, dbg,
- wil->csr +
- HOSTADDR(RGF_MAC_MTRL_COUNTER_0));
- debugfs_create_itr_trsh("itr_trsh_val", S_IRUGO | S_IWUSR, dbg, wil);
- wil_debugfs_create_iomem_x32("RGF_USER_USAGE_1", S_IRUGO, dbg,
- wil->csr +
- HOSTADDR(RGF_USER_USAGE_1));
- debugfs_create_u32("mem_addr", S_IRUGO | S_IWUSR, dbg, &mem_addr);
- debugfs_create_file("mem_val", S_IRUGO, dbg, wil, &fops_memread);
-
- debugfs_create_file("reset", S_IWUSR, dbg, wil, &fops_reset);
- debugfs_create_file("rxon", S_IWUSR, dbg, wil, &fops_rxon);
- debugfs_create_file("tx_mgmt", S_IWUSR, dbg, wil, &fops_txmgmt);
- debugfs_create_file("wmi_send", S_IWUSR, dbg, wil, &fops_wmi);
- debugfs_create_file("temp", S_IRUGO, dbg, wil, &fops_temp);
- debugfs_create_file("freq", S_IRUGO, dbg, wil, &fops_freq);
- debugfs_create_file("link", S_IRUGO, dbg, wil, &fops_link);
- debugfs_create_file("info", S_IRUGO, dbg, wil, &fops_info);
- wil6210_debugfs_init_blobs(wil, dbg);
+ wil6210_debugfs_create_ITR_CNT(wil, dbg);
return 0;
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 09/14] wil6210: fix beamforming data reporting
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (7 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 08/14] wil6210: convert debugfs to the table mode Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 10/14] wil6210: fix false "scan timeout" Dedy Lansky
` (4 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
When reading 'bf' file on debugfs, query beam forming status from firmware.
Ignore CID's that return error or return all zeros.
Remove obsolete code that used to maintain statistics on per-device basis,
as now it is reported be per-CID and current.
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/debugfs.c | 78 +++++++++++++++++++++++++++---
drivers/net/wireless/ath/wil6210/txrx.c | 1 -
drivers/net/wireless/ath/wil6210/wil6210.h | 12 -----
drivers/net/wireless/ath/wil6210/wmi.c | 28 -----------
drivers/net/wireless/ath/wil6210/wmi.h | 2 +-
5 files changed, 72 insertions(+), 49 deletions(-)
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c
index d55018b..899c780 100644
--- a/drivers/net/wireless/ath/wil6210/debugfs.c
+++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -22,6 +22,7 @@
#include <linux/power_supply.h>
#include "wil6210.h"
+#include "wmi.h"
#include "txrx.h"
/* Max threshold supported value by wil6210 is 5sec.
@@ -768,16 +769,79 @@ static const struct file_operations fops_txdesc = {
};
/*---------beamforming------------*/
+static char *wil_bfstatus_str(u32 status)
+{
+ switch (status) {
+ case 0:
+ return "Failed";
+ case 1:
+ return "OK";
+ case 2:
+ return "Retrying";
+ default:
+ return "??";
+ }
+}
+
+static bool is_all_zeros(void * const x_, size_t sz)
+{
+ /* if reply is all-0, ignore this CID */
+ u32 *x = x_;
+ int n;
+
+ for (n = 0; n < sz / sizeof(*x); n++)
+ if (x[n])
+ return false;
+
+ return true;
+}
+
static int wil_bf_debugfs_show(struct seq_file *s, void *data)
{
+ int rc;
+ int i;
struct wil6210_priv *wil = s->private;
- seq_printf(s,
- "TSF : 0x%016llx\n"
- "TxMCS : %d\n"
- "Sectors(rx:tx) my %2d:%2d peer %2d:%2d\n",
- wil->stats.tsf, wil->stats.bf_mcs,
- wil->stats.my_rx_sector, wil->stats.my_tx_sector,
- wil->stats.peer_rx_sector, wil->stats.peer_tx_sector);
+ struct wmi_notify_req_cmd cmd = {
+ .interval_usec = 0,
+ };
+ struct {
+ struct wil6210_mbox_hdr_wmi wmi;
+ struct wmi_notify_req_done_event evt;
+ } __packed reply;
+
+ for (i = 0; i < ARRAY_SIZE(wil->sta); i++) {
+ u32 status;
+
+ cmd.cid = i;
+ rc = wmi_call(wil, WMI_NOTIFY_REQ_CMDID, &cmd, sizeof(cmd),
+ WMI_NOTIFY_REQ_DONE_EVENTID, &reply,
+ sizeof(reply), 20);
+ /* if reply is all-0, ignore this CID */
+ if (rc || is_all_zeros(&reply.evt, sizeof(reply.evt)))
+ continue;
+
+ status = le32_to_cpu(reply.evt.status);
+ seq_printf(s, "CID %d {\n"
+ " TSF = 0x%016llx\n"
+ " TxMCS = %2d TxTpt = %4d\n"
+ " SQI = %4d\n"
+ " Status = 0x%08x %s\n"
+ " Sectors(rx:tx) my %2d:%2d peer %2d:%2d\n"
+ " Goodput(rx:tx) %4d:%4d\n"
+ "}\n",
+ i,
+ le64_to_cpu(reply.evt.tsf),
+ le16_to_cpu(reply.evt.bf_mcs),
+ le32_to_cpu(reply.evt.tx_tpt),
+ reply.evt.sqi,
+ status, wil_bfstatus_str(status),
+ le16_to_cpu(reply.evt.my_rx_sector),
+ le16_to_cpu(reply.evt.my_tx_sector),
+ le16_to_cpu(reply.evt.other_rx_sector),
+ le16_to_cpu(reply.evt.other_tx_sector),
+ le32_to_cpu(reply.evt.rx_goodput),
+ le32_to_cpu(reply.evt.tx_goodput));
+ }
return 0;
}
diff --git a/drivers/net/wireless/ath/wil6210/txrx.c b/drivers/net/wireless/ath/wil6210/txrx.c
index 9fcc2e3..9bd920d 100644
--- a/drivers/net/wireless/ath/wil6210/txrx.c
+++ b/drivers/net/wireless/ath/wil6210/txrx.c
@@ -414,7 +414,6 @@ static struct sk_buff *wil_vring_reap_rx(struct wil6210_priv *wil,
cid = wil_rxdesc_cid(d);
stats = &wil->sta[cid].stats;
stats->last_mcs_rx = wil_rxdesc_mcs(d);
- wil->stats.last_mcs_rx = stats->last_mcs_rx;
/* use radiotap header only if required */
if (ndev->type == ARPHRD_IEEE80211_RADIOTAP)
diff --git a/drivers/net/wireless/ath/wil6210/wil6210.h b/drivers/net/wireless/ath/wil6210/wil6210.h
index 47d656a..902206c 100644
--- a/drivers/net/wireless/ath/wil6210/wil6210.h
+++ b/drivers/net/wireless/ath/wil6210/wil6210.h
@@ -330,17 +330,6 @@ struct wil_tid_ampdu_rx {
bool first_time; /* is it 1-st time this buffer used? */
};
-struct wil6210_stats {
- u64 tsf;
- u32 snr;
- u16 last_mcs_rx;
- u16 bf_mcs; /* last BF, used for Tx */
- u16 my_rx_sector;
- u16 my_tx_sector;
- u16 peer_rx_sector;
- u16 peer_tx_sector;
-};
-
enum wil_sta_status {
wil_sta_unused = 0,
wil_sta_conn_pending = 1,
@@ -433,7 +422,6 @@ struct wil6210_priv {
struct mutex mutex; /* for wil6210_priv access in wil_{up|down} */
/* statistics */
- struct wil6210_stats stats;
atomic_t isr_count_rx, isr_count_tx;
/* debugfs */
struct dentry *debug;
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index b25a62d..0beb129 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -482,33 +482,6 @@ static void wmi_evt_disconnect(struct wil6210_priv *wil, int id,
mutex_unlock(&wil->mutex);
}
-static void wmi_evt_notify(struct wil6210_priv *wil, int id, void *d, int len)
-{
- struct wmi_notify_req_done_event *evt = d;
-
- if (len < sizeof(*evt)) {
- wil_err(wil, "Short NOTIFY event\n");
- return;
- }
-
- wil->stats.tsf = le64_to_cpu(evt->tsf);
- wil->stats.snr = le32_to_cpu(evt->snr_val);
- wil->stats.bf_mcs = le16_to_cpu(evt->bf_mcs);
- wil->stats.my_rx_sector = le16_to_cpu(evt->my_rx_sector);
- wil->stats.my_tx_sector = le16_to_cpu(evt->my_tx_sector);
- wil->stats.peer_rx_sector = le16_to_cpu(evt->other_rx_sector);
- wil->stats.peer_tx_sector = le16_to_cpu(evt->other_tx_sector);
- wil_dbg_wmi(wil, "Link status, MCS %d TSF 0x%016llx\n"
- "BF status 0x%08x SNR 0x%08x SQI %d%%\n"
- "Tx Tpt %d goodput %d Rx goodput %d\n"
- "Sectors(rx:tx) my %d:%d peer %d:%d\n",
- wil->stats.bf_mcs, wil->stats.tsf, evt->status,
- wil->stats.snr, evt->sqi, le32_to_cpu(evt->tx_tpt),
- le32_to_cpu(evt->tx_goodput), le32_to_cpu(evt->rx_goodput),
- wil->stats.my_rx_sector, wil->stats.my_tx_sector,
- wil->stats.peer_rx_sector, wil->stats.peer_tx_sector);
-}
-
/*
* Firmware reports EAPOL frame using WME event.
* Reconstruct Ethernet frame and deliver it via normal Rx
@@ -651,7 +624,6 @@ static const struct {
{WMI_SCAN_COMPLETE_EVENTID, wmi_evt_scan_complete},
{WMI_CONNECT_EVENTID, wmi_evt_connect},
{WMI_DISCONNECT_EVENTID, wmi_evt_disconnect},
- {WMI_NOTIFY_REQ_DONE_EVENTID, wmi_evt_notify},
{WMI_EAPOL_RX_EVENTID, wmi_evt_eapol_rx},
{WMI_DATA_PORT_OPEN_EVENTID, wmi_evt_linkup},
{WMI_WBE_LINKDOWN_EVENTID, wmi_evt_linkdown},
diff --git a/drivers/net/wireless/ath/wil6210/wmi.h b/drivers/net/wireless/ath/wil6210/wmi.h
index 2f51b46..061618c 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.h
+++ b/drivers/net/wireless/ath/wil6210/wmi.h
@@ -980,7 +980,7 @@ struct wmi_ready_event {
* WMI_NOTIFY_REQ_DONE_EVENTID
*/
struct wmi_notify_req_done_event {
- __le32 status;
+ __le32 status; /* beamforming status, 0: fail; 1: OK; 2: retrying */
__le64 tsf;
__le32 snr_val;
__le32 tx_tpt;
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 10/14] wil6210: fix false "scan timeout"
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (8 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 09/14] wil6210: fix beamforming data reporting Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 11/14] wil6210: Limit max number of associated stations Dedy Lansky
` (3 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
When sending scan request, if hardware is not ready, scan timer was started
and scan timeout mis-reported.
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index ee8a0e5..a00f318 100644
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -311,8 +311,10 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
rc = wmi_send(wil, WMI_START_SCAN_CMDID, &cmd, sizeof(cmd.cmd) +
cmd.cmd.num_channels * sizeof(cmd.cmd.channel_list[0]));
- if (rc)
+ if (rc) {
+ del_timer_sync(&wil->scan_timer);
wil->scan_request = NULL;
+ }
return rc;
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 11/14] wil6210: Limit max number of associated stations
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (9 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 10/14] wil6210: fix false "scan timeout" Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 12/14] wil6210: fix free'd memory access in wil_if_free() Dedy Lansky
` (2 subsequent siblings)
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville
Cc: Dedy Lansky, linux-wireless, wil6210, Vladimir Kondratiev
Add a module parameter to support setting the maximum
number of stations that can be associated to an AP.
Signed-off-by: Dedy Lansky <qca_dlansky@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/wmi.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 0beb129..596d6c1 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -14,6 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include <linux/moduleparam.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
@@ -22,6 +23,10 @@
#include "wmi.h"
#include "trace.h"
+static uint max_assoc_sta = 1;
+module_param(max_assoc_sta, uint, S_IRUGO | S_IWUSR);
+MODULE_PARM_DESC(max_assoc_sta, " Max number of stations associated to the AP");
+
/**
* WMI event receiving - theory of operations
*
@@ -794,7 +799,7 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
.network_type = wmi_nettype,
.disable_sec_offload = 1,
.channel = chan - 1,
- .pcp_max_assoc_sta = WIL6210_MAX_CID,
+ .pcp_max_assoc_sta = max_assoc_sta,
};
struct {
struct wil6210_mbox_hdr_wmi wmi;
@@ -804,6 +809,14 @@ int wmi_pcp_start(struct wil6210_priv *wil, int bi, u8 wmi_nettype, u8 chan)
if (!wil->secure_pcp)
cmd.disable_sec = 1;
+ if ((cmd.pcp_max_assoc_sta > WIL6210_MAX_CID) ||
+ (cmd.pcp_max_assoc_sta <= 0)) {
+ wil_info(wil,
+ "Requested connection limit %u, valid values are 1 - %d. Setting to %d\n",
+ max_assoc_sta, WIL6210_MAX_CID, WIL6210_MAX_CID);
+ cmd.pcp_max_assoc_sta = WIL6210_MAX_CID;
+ }
+
/*
* Processing time may be huge, in case of secure AP it takes about
* 3500ms for FW to start AP
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 12/14] wil6210: fix free'd memory access in wil_if_free()
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (10 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 11/14] wil6210: Limit max number of associated stations Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 13/14] wil6210: cfg80211_rx_mgmt to use GFP_ATOMIC Dedy Lansky
2014-08-04 8:20 ` [PATCH 14/14] wil6210: fix access after free in wil_pcie_remove() Dedy Lansky
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
In the wil_priv_deinit(), wdev->netdev is accessed, so free_netdev()
should not be called before mentioned call.
Set wdev->netdev to NULL Make sure no more attempts to use it.
It is used for debug printk if not NULL.
This fix kernel panic on module unload and in case error on probe;
if memory allocation debugging enabled.
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/netdev.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/netdev.c b/drivers/net/wireless/ath/wil6210/netdev.c
index 8ee0862..59fd550 100644
--- a/drivers/net/wireless/ath/wil6210/netdev.c
+++ b/drivers/net/wireless/ath/wil6210/netdev.c
@@ -168,11 +168,15 @@ void *wil_if_alloc(struct device *dev, void __iomem *csr)
void wil_if_free(struct wil6210_priv *wil)
{
struct net_device *ndev = wil_to_ndev(wil);
+
if (!ndev)
return;
- free_netdev(ndev);
wil_priv_deinit(wil);
+
+ wil_to_ndev(wil) = NULL;
+ free_netdev(ndev);
+
wil_wdev_free(wil);
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 13/14] wil6210: cfg80211_rx_mgmt to use GFP_ATOMIC
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (11 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 12/14] wil6210: fix free'd memory access in wil_if_free() Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
2014-08-04 8:20 ` [PATCH 14/14] wil6210: fix access after free in wil_pcie_remove() Dedy Lansky
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Internally, cfg80211_rx_mgmt() takes lock:
spin_lock_bh(&wdev->mgmt_registrations_lock);
and therefore one can't use it with GFP_KERNEL allocation flags.
When called with GFP_KERNEL, "sleep while atomic" warning triggered:
<3>[242645.446224] BUG: sleeping function called from invalid context at kernel/mm/slub.c:926
<3>[242645.455516] in_atomic(): 1, irqs_disabled(): 0, pid: 18881, name: kworker/u16:0
<6>[242645.462868] CPU: 0 PID: 18881 Comm: kworker/u16:0 Tainted: G O 3.10.40-g619a884-00001-g357fa9c #2
<6>[242645.463044] Workqueue: wil6210_wmi wmi_event_worker [wil6210]
<6>[242645.463087] Call trace:
<6>[242645.463157] [<ffffffc000087390>] dump_backtrace+0x0/0x144
<6>[242645.463205] [<ffffffc0000874e4>] show_stack+0x10/0x1c
<6>[242645.463259] [<ffffffc0009abc04>] dump_stack+0x1c/0x28
<6>[242645.463313] [<ffffffc0000c10c0>] __might_sleep+0xe0/0xf0
<6>[242645.463365] [<ffffffc00015a514>] kmem_cache_alloc+0x48/0x1e4
<6>[242645.463414] [<ffffffc00080d468>] __alloc_skb+0x48/0x164
<6>[242645.463466] [<ffffffc00097f2c4>] nl80211_send_mgmt+0x4c/0x1dc
<6>[242645.463511] [<ffffffc000980268>] cfg80211_rx_mgmt+0x1bc/0x25c
<6>[242645.463647] [<ffffffbffc005d64>] wmi_evt_rx_mgmt+0x21c/0x23c [wil6210]
<6>[242645.463783] [<ffffffbffc0073b8>] wmi_event_worker+0x230/0x2f8 [wil6210]
<6>[242645.463838] [<ffffffc0000afffc>] process_one_work+0x258/0x3d0
<6>[242645.463887] [<ffffffc0000b0fe0>] worker_thread+0x1f0/0x310
<6>[242645.463946] [<ffffffc0000b642c>] kthread+0xac/0xb8
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/wmi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/wmi.c b/drivers/net/wireless/ath/wil6210/wmi.c
index 596d6c1..1b64823 100644
--- a/drivers/net/wireless/ath/wil6210/wmi.c
+++ b/drivers/net/wireless/ath/wil6210/wmi.c
@@ -355,7 +355,7 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len)
}
} else {
cfg80211_rx_mgmt(wil->wdev, freq, signal,
- (void *)rx_mgmt_frame, d_len, 0, GFP_KERNEL);
+ (void *)rx_mgmt_frame, d_len, 0, GFP_ATOMIC);
}
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 14/14] wil6210: fix access after free in wil_pcie_remove()
2014-08-04 8:20 [PATCH 00/14] wil6210 misc updates Dedy Lansky
` (12 preceding siblings ...)
2014-08-04 8:20 ` [PATCH 13/14] wil6210: cfg80211_rx_mgmt to use GFP_ATOMIC Dedy Lansky
@ 2014-08-04 8:20 ` Dedy Lansky
13 siblings, 0 replies; 17+ messages in thread
From: Dedy Lansky @ 2014-08-04 8:20 UTC (permalink / raw)
To: John W . Linville; +Cc: Vladimir Kondratiev, linux-wireless, wil6210
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
'wil' released in wil_if_free(); save iomapped address aside to
properly unmap it.
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
---
drivers/net/wireless/ath/wil6210/pcie_bus.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
index cf0b219..38dcbea 100644
--- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
+++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
@@ -218,12 +218,13 @@ static int wil_pcie_probe(struct pci_dev *pdev, const struct pci_device_id *id)
static void wil_pcie_remove(struct pci_dev *pdev)
{
struct wil6210_priv *wil = pci_get_drvdata(pdev);
+ void __iomem *csr = wil->csr;
wil6210_debugfs_remove(wil);
wil_if_pcie_disable(wil);
wil_if_remove(wil);
wil_if_free(wil);
- pci_iounmap(pdev, wil->csr);
+ pci_iounmap(pdev, csr);
pci_release_region(pdev, 0);
pci_disable_device(pdev);
}
--
1.8.5.2
^ permalink raw reply related [flat|nested] 17+ messages in thread