* Add initial debugging of the interrupt status entry

* Add in the TDMA debugging entries that I added a while ago

4 files changed, 181 insertions, 1 deletions

diff --git a/tools/tools/ath/athalq/Makefile b/tools/tools/ath/athalq/Makefile
index 9ad4b140..60c9bf8 100644
--- a/tools/tools/ath/athalq/Makefile
+++ b/tools/tools/ath/athalq/Makefile
@@ -3,7 +3,7 @@
 PROG=	athalq
 NOMAN=	yes
 
-SRCS=	main.c ar5210_ds.c ar5211_ds.c ar5212_ds.c ar5416_ds.c
+SRCS=	main.c ar5210_ds.c ar5211_ds.c ar5212_ds.c ar5416_ds.c tdma.c
 # SRCS+=	ar9300_ds.c
 
 .include <../Makefile.inc>
diff --git a/tools/tools/ath/athalq/main.c b/tools/tools/ath/athalq/main.c
index e8e277c..1d5447d 100644
--- a/tools/tools/ath/athalq/main.c
+++ b/tools/tools/ath/athalq/main.c
@@ -38,6 +38,8 @@ __FBSDID("$FreeBSD$");
 #include "ar5212_ds.h"
 #include "ar5416_ds.h"
 
+#include "tdma.h"
+
 #define AR5210_MAGIC    0x19980124
 #define AR5211_MAGIC    0x19570405
 #define AR5212_MAGIC    0x19541014
@@ -58,6 +60,21 @@ ath_alq_print_hdr(struct if_ath_alq_init_state *hdr)
 	    be32toh(hdr->sc_hal_magic));
 }
 
+static void
+ath_alq_print_intr_status(struct if_ath_alq_payload *a)
+{
+	struct if_ath_alq_interrupt is;
+
+	/* XXX len check! */
+	memcpy(&is, &a->payload, sizeof(is));
+
+	printf("[%u.%06u] [%llu] INTR: status=0x%08x\n",
+	    (unsigned int) be32toh(a->hdr.tstamp_sec),
+	    (unsigned int) be32toh(a->hdr.tstamp_usec),
+	    (unsigned long long) be64toh(a->hdr.threadid),
+	    be32toh(is.intr_status));
+}
+
 int
 main(int argc, const char *argv[])
 {
@@ -112,6 +129,24 @@ main(int argc, const char *argv[])
 				memcpy(&hdr, a->payload, sizeof(hdr));
 				ath_alq_print_hdr(&hdr);
 				break;
+			case ATH_ALQ_TDMA_BEACON_STATE:
+				ath_tdma_beacon_state(a);
+				break;
+			case ATH_ALQ_TDMA_TIMER_CONFIG:
+				ath_tdma_timer_config(a);
+				break;
+			case ATH_ALQ_TDMA_SLOT_CALC:
+				ath_tdma_slot_calc(a);
+				break;
+			case ATH_ALQ_TDMA_TSF_ADJUST:
+				ath_tdma_tsf_adjust(a);
+				break;
+			case ATH_ALQ_TDMA_TIMER_SET:
+				ath_tdma_timer_set(a);
+				break;
+			case ATH_ALQ_INTR_STATUS:
+				ath_alq_print_intr_status(a);
+				break;
 			default:
 				if (be32toh(hdr.sc_hal_magic) == AR5210_MAGIC)
 					ar5210_alq_payload(a);
diff --git a/tools/tools/ath/athalq/tdma.c b/tools/tools/ath/athalq/tdma.c
new file mode 100644
index 0000000..55772de
--- /dev/null
+++ b/tools/tools/ath/athalq/tdma.c
@@ -0,0 +1,117 @@
+/*
+ * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
+ * All Rights Reserved.
+ *
+ * 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+
+#include <sys/types.h>
+#include <sys/alq.h>
+#include <sys/endian.h>
+
+#include <dev/ath/if_ath_alq.h>
+
+#include "tdma.h"
+
+void
+ath_tdma_beacon_state(struct if_ath_alq_payload *a)
+{
+	struct if_ath_alq_tdma_beacon_state t;
+	static uint64_t last_beacon_tx = 0;
+
+	memcpy(&t, &a->payload, sizeof(t));
+
+	printf("[%u.%06u] [%llu] BEACON: RX TSF=%llu Beacon TSF=%llu (%d)\n",
+	    (unsigned int) be32toh(a->hdr.tstamp_sec),
+	    (unsigned int) be32toh(a->hdr.tstamp_usec),
+	    (unsigned long long) be64toh(a->hdr.threadid),
+	    (unsigned long long) be64toh(t.rx_tsf),
+	    (unsigned long long) be64toh(t.beacon_tsf),
+	    be64toh(t.beacon_tsf) - last_beacon_tx);
+
+	last_beacon_tx = be64toh(t.beacon_tsf);
+}
+
+void
+ath_tdma_timer_config(struct if_ath_alq_payload *a)
+{
+	struct if_ath_alq_tdma_timer_config t;
+
+	memcpy(&t, &a->payload, sizeof(t));
+}
+
+void
+ath_tdma_slot_calc(struct if_ath_alq_payload *a)
+{
+	struct if_ath_alq_tdma_slot_calc t;
+
+	memcpy(&t, &a->payload, sizeof(t));
+	printf("[%u.%06u] [%llu] SLOTCALC: NEXTTBTT=%llu nextslot=%llu "
+	    "tsfdelta=%d avg (%d/%d)\n",
+	    (unsigned int) be32toh(a->hdr.tstamp_sec),
+	    (unsigned int) be32toh(a->hdr.tstamp_usec),
+	    (unsigned long long) be64toh(a->hdr.threadid),
+	    (unsigned long long) be64toh(t.nexttbtt),
+	    (unsigned long long) be64toh(t.next_slot),
+	    (int) be32toh(t.tsfdelta),
+	    (int) be32toh(t.avg_plus),
+	    (int) be32toh(t.avg_minus));
+}
+
+void
+ath_tdma_tsf_adjust(struct if_ath_alq_payload *a)
+{
+	struct if_ath_alq_tdma_tsf_adjust t;
+
+	memcpy(&t, &a->payload, sizeof(t));
+	printf("[%u.%06u] [%llu] TSFADJUST: TSF64 was %llu, adj=%d, "
+	    "now %llu\n",
+	    (unsigned int) be32toh(a->hdr.tstamp_sec),
+	    (unsigned int) be32toh(a->hdr.tstamp_usec),
+	    (unsigned long long) be64toh(a->hdr.threadid),
+	    (unsigned long long) be64toh(t.tsf64_old),
+	    (int) be32toh(t.tsfdelta),
+	    (unsigned long long) be64toh(t.tsf64_new));
+}
+
+void
+ath_tdma_timer_set(struct if_ath_alq_payload *a)
+{
+	struct if_ath_alq_tdma_timer_set t;
+
+	memcpy(&t, &a->payload, sizeof(t));
+	printf("[%u.%06u] [%llu] TIMERSET: bt_intval=%d nexttbtt=%d "
+	    "nextdba=%d nextswba=%d nextatim=%d flags=0x%x tdmadbaprep=%d "
+	    "tdmaswbaprep=%d\n",
+	    (unsigned int) be32toh(a->hdr.tstamp_sec),
+	    (unsigned int) be32toh(a->hdr.tstamp_usec),
+	    (unsigned long long) be64toh(a->hdr.threadid),
+	    be32toh(t.bt_intval),
+	    be32toh(t.bt_nexttbtt),
+	    be32toh(t.bt_nextdba),
+	    be32toh(t.bt_nextswba),
+	    be32toh(t.bt_nextatim),
+	    be32toh(t.bt_flags),
+	    be32toh(t.sc_tdmadbaprep),
+	    be32toh(t.sc_tdmaswbaprep));
+}
diff --git a/tools/tools/ath/athalq/tdma.h b/tools/tools/ath/athalq/tdma.h
new file mode 100644
index 0000000..25fa7de
--- /dev/null
+++ b/tools/tools/ath/athalq/tdma.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013 Adrian Chadd <adrian@FreeBSD.org>
+ * All Rights Reserved.
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+#ifndef	__TDMA_H__
+#define	__TDMA_H__
+
+extern	void ath_tdma_beacon_state(struct if_ath_alq_payload *a);
+extern	void ath_tdma_timer_config(struct if_ath_alq_payload *a);
+extern	void ath_tdma_slot_calc(struct if_ath_alq_payload *a);
+extern	void ath_tdma_tsf_adjust(struct if_ath_alq_payload *a);
+extern	void ath_tdma_timer_set(struct if_ath_alq_payload *a);
+
+#endif	/* __TDMA_H__ */