Skip to contentSkip to conversation

ath6kl: print firmware capabilities

PATCH In review Kalle Valo 3 participants 5 messages Mar 5, 2013 Atheros ATH6KL wireless driver

lore
Share & tools
lore

Kalle Valo

author
#0 lore raw

PATCH 1/1 ath6kl: print firmware capabilities

Printin the firmware capabilities during the first firmware boot makes it easier to find out what features firmware supports.

Obligatory screenshot:

[21025.678481] ath6kl: ar6003 hw 2.1.1 sdio fw 3.2.0.144 api 3
[21025.678667] ath6kl: firmware supports: sched-scan,sta-p2pdev-duplex,rsn-cap-override
---
 drivers/net/wireless/ath/ath6kl/init.c |   68 ++++++++++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
drivers/net/wireless/ath/ath6kl/init.c +68 -0
index 072a229..fd06332 100644
@@ -1549,10 +1549,76 @@ static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type)
 	return NULL;
 }
 
+
+static const struct fw_capa_str_map {
+	int id;
+	const char *name;
+} fw_capa_map[] = {
+	{ ATH6KL_FW_CAPABILITY_HOST_P2P, "host-p2p" },
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN, "sched-scan" },
+	{ ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX, "sta-p2pdev-duplex" },
+	{ ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT, "inactivity-timeout" },
+	{ ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE, "rsn-cap-override" },
+	{ ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER, "wow-mc-filter" },
+	{ ATH6KL_FW_CAPABILITY_BMISS_ENHANCE, "bmiss-enhance" },
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST, "sscan-math-list" },
+	{ ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD, "rssi-scan-thold" },
+	{ ATH6KL_FW_CAPABILITY_CUSTOM_MAC_ADDR, "custom-mac-addr" },
+	{ ATH6KL_FW_CAPABILITY_TX_ERR_NOTIFY, "tx-err-notify" },
+	{ ATH6KL_FW_CAPABILITY_REGDOMAIN, "regdomain" },
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2, "sched-scan-v2" },
+	{ ATH6KL_FW_CAPABILITY_HEART_BEAT_POLL, "hb-poll" },
+};
+
+static const char *ath6kl_init_get_fw_capa_name(unsigned int id)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(fw_capa_map); i++) {
+		if (fw_capa_map[i].id == id)
+			return fw_capa_map[i].name;
+	}
+
+	return "<unknown>";
+}
+
+static void ath6kl_init_fw_capas(struct ath6kl *ar, char *buf, size_t buf_len)
+{
+	u8 *data = (u8 *) ar->fw_capabilities;
+	size_t len = 0;
+	int i, index, bit;
+
+	for (i = 0; i < ATH6KL_FW_CAPABILITY_MAX; i++) {
+		index = i / 8;
+		bit = i % 8;
+
+		if (index >= sizeof(ar->fw_capabilities) * 4)
+			break;
+
+		if (buf_len - len < 4) {
+			ath6kl_warn("firmware capability buffer too small!\n");
+			strncpy(buf, "<error>", buf_len);
+			return;
+		}
+
+		if (data[index] & (1 << bit)) {
+			len += scnprintf(buf + len, buf_len - len, "%s,",
+					    ath6kl_init_get_fw_capa_name(i));
+		}
+	}
+
+	/* overwrite the last comma */
+	if (len > 0)
+		len --;
+
+	buf[len] = '\0';
+}
+
 static int __ath6kl_init_hw_start(struct ath6kl *ar)
 {
 	long timeleft;
 	int ret, i;
+	char buf[200];
 
 	ath6kl_dbg(ATH6KL_DBG_BOOT, "hw start\n");
 
@@ -1615,6 +1681,8 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
 			    ar->wiphy->fw_version,
 			    ar->fw_api,
 			    test_bit(TESTMODE, &ar->flag) ? " testmode" : "");
+		ath6kl_init_fw_capas(ar, buf, sizeof(buf));
+		ath6kl_info("firmware supports: %s\n", buf);
 	}
 
 	if (ar->version.abi_ver != ATH6KL_ABI_VERSION) {
#1 lore raw
Quoted 2 lines · Kalle Valo

Printin the firmware capabilities during the first firmware boot makes it easier to find out what features firmware supports.

[]

drivers/net/wireless/ath/ath6kl/init.c

Quoted 1 line
drivers/net/wireless/ath/ath6kl/init.c +0 -0

[]

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1586

Quoted 2 lines
drivers/net/wireless/ath/ath6kl/init.c +2 -0
+static void ath6kl_init_fw_capas(struct ath6kl *ar, char *buf, size_t buf_len)
+{

[]

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1600

Quoted 3 lines
drivers/net/wireless/ath/ath6kl/init.c +3 -0
+		if (buf_len - len < 4) {
+			ath6kl_warn("firmware capability buffer too small!\n");
+			strncpy(buf, "<error>", buf_len);

4 is an odd size to use.
It seems weird to overwrite the known bits.
why not just add ...?

author
#2 lore raw
Quoted 6 lines · Joe Perches
Quoted 2 lines · Kalle Valo

Printin the firmware capabilities during the first firmware boot makes it easier to find out what features firmware supports.

[]

drivers/net/wireless/ath/ath6kl/init.c

Quoted 1 line
drivers/net/wireless/ath/ath6kl/init.c +0 -0

[]

Quoted 8 lines

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1586

Quoted 2 lines
drivers/net/wireless/ath/ath6kl/init.c +2 -0
+static void ath6kl_init_fw_capas(struct ath6kl *ar, char *buf, size_t buf_len)
+{

[]

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1600

Quoted 3 lines
drivers/net/wireless/ath/ath6kl/init.c +3 -0
+		if (buf_len - len < 4) {
+			ath6kl_warn("firmware capability buffer too small!\n");
+			strncpy(buf, "<error>", buf_len);

4 is an odd size to use.

I have to admit that I was lazy here. I think "< 2" (or "== 1") would be the correct value to use but I didn't check that and just used 4 to be on the safe side :)

Quoted 1 line

It seems weird to overwrite the known bits.

I did that just to make sure that the truncation won't be missed.

Quoted 1 line

why not just add ...?

You mean to the end of buffer? Like "first,second,th..."? Looks good, I'll do that.

Signature · 1 line
Kalle Valo
#3 lore raw
In reply to Kalle Valo

Hi Kalle,

Quoted 24 lines

Printin the firmware capabilities during the first firmware boot makes it easier to find out what features firmware supports.

Obligatory screenshot:

[21025.678481] ath6kl: ar6003 hw 2.1.1 sdio fw 3.2.0.144 api 3
[21025.678667] ath6kl: firmware supports: sched-scan,sta-p2pdev-duplex,rsn-cap-override

---
drivers/net/wireless/ath/ath6kl/init.c | 68 ++++++++++++++++++++++++++++++++

1 file changed, 68 insertions(+)
drivers/net/wireless/ath/ath6kl/init.c +3 -0
index 072a229..fd06332 100644
@@ -1549,10 +1549,76 @@ static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type)
 	return NULL;
 }
 
+
+static const struct fw_capa_str_map {
+	int id;

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1564

Quoted 10 lines
drivers/net/wireless/ath/ath6kl/init.c +10 -0
+	const char *name;
+} fw_capa_map[] = {
+	{ ATH6KL_FW_CAPABILITY_HOST_P2P, "host-p2p" },
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN, "sched-scan" },
+	{ ATH6KL_FW_CAPABILITY_STA_P2PDEV_DUPLEX, "sta-p2pdev-duplex" },
+	{ ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT, "inactivity-timeout" },
+	{ ATH6KL_FW_CAPABILITY_RSN_CAP_OVERRIDE, "rsn-cap-override" },
+	{ ATH6KL_FW_CAPABILITY_WOW_MULTICAST_FILTER, "wow-mc-filter" },
+	{ ATH6KL_FW_CAPABILITY_BMISS_ENHANCE, "bmiss-enhance" },
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST, "sscan-math-list" },

math ;)

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1571

Quoted 7 lines
drivers/net/wireless/ath/ath6kl/init.c +7 -0
+	{ ATH6KL_FW_CAPABILITY_RSSI_SCAN_THOLD, "rssi-scan-thold" },
+	{ ATH6KL_FW_CAPABILITY_CUSTOM_MAC_ADDR, "custom-mac-addr" },
+	{ ATH6KL_FW_CAPABILITY_TX_ERR_NOTIFY, "tx-err-notify" },
+	{ ATH6KL_FW_CAPABILITY_REGDOMAIN, "regdomain" },
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN_V2, "sched-scan-v2" },
+	{ ATH6KL_FW_CAPABILITY_HEART_BEAT_POLL, "hb-poll" },
+};

Regards

Marcel

author
#4 lore raw
Quoted 3 lines · Marcel Holtmann

drivers/net/wireless/ath/ath6kl/init.c static const char *ath6kl_init_get_hif_name(enum ath6kl_hif_type type) · line 1564

Quoted 1 line
drivers/net/wireless/ath/ath6kl/init.c +1 -0
+	{ ATH6KL_FW_CAPABILITY_SCHED_SCAN_MATCH_LIST, "sscan-math-list" },

math ;)

Oops, I'll fix that in v2. Thanks!

Signature · 1 line
Kalle Valo