[PATCH] ath6kl: implement testmode rx command

[PATCH] ath6kl: implement testmode rx command

[Kalle Valo]

Add new testmode command for retrieving rx reports from firmware.

Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
---
 drivers/staging/ath6kl/os/linux/cfg80211.c         |   94 ++++++++++++++++++++
 .../staging/ath6kl/os/linux/include/ar6000_drv.h   |   10 --
 drivers/staging/ath6kl/os/linux/include/cfg80211.h |    3 +
 drivers/staging/ath6kl/wmi/wmi.c                   |    6 +
 4 files changed, 101 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 441ae04..ce3d859 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -1472,6 +1472,7 @@ enum ar6k_testmode_attr {
 
 enum ar6k_testmode_cmd {
 	AR6K_TM_CMD_TCMD		= 0,
+	AR6K_TM_CMD_RX_REPORT		= 1,
 };
 
 #define AR6K_TM_DATA_MAX_LEN 5000
@@ -1482,11 +1483,83 @@ static const struct nla_policy ar6k_testmode_policy[AR6K_TM_ATTR_MAX + 1] = {
 				.len = AR6K_TM_DATA_MAX_LEN },
 };
 
+void ar6000_testmode_rx_report_event(struct ar6_softc *ar, void *buf,
+				     int buf_len)
+{
+	kfree(ar->tcmd_rx_report);
+
+	ar->tcmd_rx_report = kmemdup(buf, buf_len, GFP_KERNEL);
+	ar->tcmd_rx_report_len = buf_len;
+
+	wake_up(&arEvent);
+}
+
+static int ar6000_testmode_rx_report(struct ar6_softc *ar, void *buf,
+				     int buf_len, struct sk_buff *skb)
+{
+	int ret = 0;
+	long left;
+
+	if (down_interruptible(&ar->arSem))
+		return -ERESTARTSYS;
+
+	if (ar->arWmiReady == false) {
+		ret = -EIO;
+		goto out;
+	}
+
+	if (ar->bIsDestroyProgress) {
+		ret = -EBUSY;
+		goto out;
+	}
+
+	WARN_ON(ar->tcmd_rx_report != NULL);
+	WARN_ON(ar->tcmd_rx_report_len > 0);
+
+	if (wmi_test_cmd(ar->arWmi, buf, buf_len) < 0) {
+		up(&ar->arSem);
+		return -EIO;
+	}
+
+	left = wait_event_interruptible_timeout(arEvent,
+					       ar->tcmd_rx_report != NULL,
+					       wmitimeout * HZ);
+
+	if (left == 0) {
+		ret = -ETIMEDOUT;
+		goto out;
+	} else if (left < 0) {
+		ret = left;
+		goto out;
+	}
+
+	if (ar->tcmd_rx_report == NULL || ar->tcmd_rx_report_len == 0) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	NLA_PUT(skb, AR6K_TM_ATTR_DATA, ar->tcmd_rx_report_len,
+		ar->tcmd_rx_report);
+
+	kfree(ar->tcmd_rx_report);
+	ar->tcmd_rx_report = NULL;
+
+out:
+	up(&ar->arSem);
+
+	return ret;
+
+nla_put_failure:
+	ret = -ENOBUFS;
+	goto out;
+}
+
 static int ar6k_testmode_cmd(struct wiphy *wiphy, void *data, int len)
 {
 	struct ar6_softc *ar = wiphy_priv(wiphy);
 	struct nlattr *tb[AR6K_TM_ATTR_MAX + 1];
-	int err, buf_len;
+	int err, buf_len, reply_len;
+	struct sk_buff *skb;
 	void *buf;
 
 	err = nla_parse(tb, AR6K_TM_ATTR_MAX, data, len,
@@ -1510,6 +1583,25 @@ static int ar6k_testmode_cmd(struct wiphy *wiphy, void *data, int len)
 		return 0;
 
 		break;
+	case AR6K_TM_CMD_RX_REPORT:
+		if (!tb[AR6K_TM_ATTR_DATA])
+			return -EINVAL;
+
+		buf = nla_data(tb[AR6K_TM_ATTR_DATA]);
+		buf_len = nla_len(tb[AR6K_TM_ATTR_DATA]);
+
+		reply_len = nla_total_size(AR6K_TM_DATA_MAX_LEN);
+		skb = cfg80211_testmode_alloc_reply_skb(wiphy, reply_len);
+		if (!skb)
+			return -ENOMEM;
+
+		err = ar6000_testmode_rx_report(ar, buf, buf_len, skb);
+		if (err < 0) {
+			kfree_skb(skb);
+			return err;
+		}
+
+		return cfg80211_testmode_reply(skb);
 	default:
 		return -EOPNOTSUPP;
 	}
diff --git a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
index 2911ea0..05cc774 100644
--- a/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
+++ b/drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
@@ -546,15 +546,9 @@ struct ar6_softc {
     s8 arMaxRetries;
     u8 arPhyCapability;
 #ifdef CONFIG_HOST_TCMD_SUPPORT
-    u8 tcmdRxReport;
-    u32 tcmdRxTotalPkt;
-    s32 tcmdRxRssi;
-    u32 tcmdPm;
     u32 arTargetMode;
-    u32 tcmdRxcrcErrPkt;
-    u32 tcmdRxsecErrPkt;
-    u16 tcmdRateCnt[TCMD_MAX_RATES];
-    u16 tcmdRateCntShortGuard[TCMD_MAX_RATES];
+    void *tcmd_rx_report;
+    int tcmd_rx_report_len;
 #endif
     AR6000_WLAN_STATE       arWlanState;
     struct ar_node_mapping  arNodeMap[MAX_NODE_NUM];
diff --git a/drivers/staging/ath6kl/os/linux/include/cfg80211.h b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
index 1a6ae97..25a1e1d 100644
--- a/drivers/staging/ath6kl/os/linux/include/cfg80211.h
+++ b/drivers/staging/ath6kl/os/linux/include/cfg80211.h
@@ -41,6 +41,9 @@ void ar6k_cfg80211_disconnect_event(struct ar6_softc *ar, u8 reason,
 
 void ar6k_cfg80211_tkip_micerr_event(struct ar6_softc *ar, u8 keyid, bool ismcast);
 
+void ar6000_testmode_rx_report_event(struct ar6_softc *ar, void *buf,
+				     int buf_len);
+
 #endif /* _AR6K_CFG80211_H_ */
 
 
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index 4a17f99..c7b5e5c 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -41,6 +41,7 @@
 #include "a_debug.h"
 #include "dbglog_api.h"
 #include "roaming.h"
+#include "cfg80211.h"
 
 #define ATH_DEBUG_WMI ATH_DEBUG_MAKE_MODULE_MASK(0)
 
@@ -4465,10 +4466,9 @@ wmi_verify_tspec_params(WMI_CREATE_PSTREAM_CMD *pCmd, int tspecCompliance)
 static int
 wmi_tcmd_test_report_rx(struct wmi_t *wmip, u8 *datap, int len)
 {
+	ar6000_testmode_rx_report_event(wmip->wmi_devt, datap, len);
 
-   A_DPRINTF(DBG_WMI, (DBGFMT "Enter\n", DBGARG));
-
-   return 0;
+	return 0;
 }
 
 #endif /* CONFIG_HOST_TCMD_SUPPORT*/

Re: [PATCH] ath6kl: implement testmode rx command

[Dan Carpenter]

On Mon, Jun 27, 2011 at 06:36:10PM +0300, Kalle Valo wrote:
>  #define AR6K_TM_DATA_MAX_LEN 5000
> @@ -1482,11 +1483,83 @@ static const struct nla_policy ar6k_testmode_policy[AR6K_TM_ATTR_MAX + 1] = {
>  				.len = AR6K_TM_DATA_MAX_LEN },
>  };
>  
> +void ar6000_testmode_rx_report_event(struct ar6_softc *ar, void *buf,
> +				     int buf_len)
> +{
> +	kfree(ar->tcmd_rx_report);
> +
> +	ar->tcmd_rx_report = kmemdup(buf, buf_len, GFP_KERNEL);
> +	ar->tcmd_rx_report_len = buf_len;
> +

Can this race?  When we use tcmd_rx_report_len we are under lock,
but it seems like when we set it here, we're not under lock.

regards,
dan carpenter

> +	wake_up(&arEvent);
> +}
> +

Re: [PATCH] ath6kl: implement testmode rx command

[Greg KH]

On Mon, Jun 27, 2011 at 06:36:10PM +0300, Kalle Valo wrote:
> Add new testmode command for retrieving rx reports from firmware.
> 
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

This patch breaks the build.

Please test your patches before sending them out, it causes lots of
problems and annoys me when you don't.

greg k-h

Re: [PATCH] ath6kl: implement testmode rx command

[Greg KH]

On Tue, Jun 28, 2011 at 01:18:36PM -0700, Greg KH wrote:
> On Mon, Jun 27, 2011 at 06:36:10PM +0300, Kalle Valo wrote:
> > Add new testmode command for retrieving rx reports from firmware.
> > 
> > Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
> 
> This patch breaks the build.
> 
> Please test your patches before sending them out, it causes lots of
> problems and annoys me when you don't.

Oh, and the error is:

ERROR: "ar6000_testmode_rx_report_event" [drivers/staging/ath6kl/ath6kl.ko] undefined!

Re: [PATCH] ath6kl: implement testmode rx command

[Kalle Valo]

Greg KH <greg@kroah.com> writes:

> On Tue, Jun 28, 2011 at 01:18:36PM -0700, Greg KH wrote:
>> On Mon, Jun 27, 2011 at 06:36:10PM +0300, Kalle Valo wrote:
>> > Add new testmode command for retrieving rx reports from firmware.
>> > 
>> > Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
>> 
>> This patch breaks the build.
>> 
>> Please test your patches before sending them out, it causes lots of
>> problems and annoys me when you don't.
>
> Oh, and the error is:
>
> ERROR: "ar6000_testmode_rx_report_event" [drivers/staging/ath6kl/ath6kl.ko] undefined!

I did test the patch but only with CONFIG_NL80211_TESTMODE enabled but
forgot to test the case when testmode is disabled. The linking fails
in that case.

I'll send v2 which will fix this. I'm sorry for all the trouble.

-- 
Kalle Valo

Re: [PATCH] ath6kl: implement testmode rx command

[Kalle Valo]

Dan Carpenter <error27@gmail.com> writes:

> On Mon, Jun 27, 2011 at 06:36:10PM +0300, Kalle Valo wrote:
>
>> +void ar6000_testmode_rx_report_event(struct ar6_softc *ar, void *buf,
>> +				     int buf_len)
>> +{
>> +	kfree(ar->tcmd_rx_report);
>> +
>> +	ar->tcmd_rx_report = kmemdup(buf, buf_len, GFP_KERNEL);
>> +	ar->tcmd_rx_report_len = buf_len;
>> +
>
> Can this race?  When we use tcmd_rx_report_len we are under lock,
> but it seems like when we set it here, we're not under lock.

Yes, it can. I'll fix it in v2.

Thanks again for good comments.

-- 
Kalle Valo