summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
authorKalle Valo2015-11-25 14:38:12 +0100
committerKalle Valo2015-11-30 15:54:54 +0100
commitf0de90bc1047affe4bb83a5724c612c6cce0e672 (patch)
tree89b19dec26d7d20ec201ec1004ca1eabdf546713 /drivers/net/wireless
parentath10k: fix otp board id error message (diff)
downloadkernel-qcow2-linux-f0de90bc1047affe4bb83a5724c612c6cce0e672.tar.gz
kernel-qcow2-linux-f0de90bc1047affe4bb83a5724c612c6cce0e672.tar.xz
kernel-qcow2-linux-f0de90bc1047affe4bb83a5724c612c6cce0e672.zip
ath10k: reorganise hardware and firmware info messages
This is to make it easier to split them later and also make room for crc32 checksums. Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/ath/ath10k/debug.c29
1 files changed, 18 insertions, 11 deletions
diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
index b502b7fb3ca2..c2b11bd50fa8 100644
--- a/drivers/net/wireless/ath/ath10k/debug.c
+++ b/drivers/net/wireless/ath/ath10k/debug.c
@@ -136,14 +136,28 @@ void ath10k_print_driver_info(struct ath10k *ar)
scnprintf(boardinfo, sizeof(boardinfo), "sub %04x:%04x",
ar->id.subsystem_vendor, ar->id.subsystem_device);
- ath10k_info(ar, "%s (0x%08x, 0x%08x %s) fw %s fwapi %d bdapi %d htt-ver %d.%d wmi-op %d htt-op %d cal %s max-sta %d raw %d hwcrypto %d features %s\n",
+ ath10k_info(ar, "%s target 0x%08x chip_id 0x%08x %s",
ar->hw_params.name,
ar->target_version,
ar->chip_id,
- boardinfo,
+ boardinfo);
+
+ ath10k_info(ar, "firmware ver %s api %d features %s\n",
ar->hw->wiphy->fw_version,
ar->fw_api,
- ar->bd_api,
+ fw_features);
+
+ ath10k_info(ar, "board_file api %d",
+ ar->bd_api);
+
+ ath10k_info(ar, "kconfig debug %d debugfs %d tracing %d dfs %d testmode %d\n",
+ config_enabled(CONFIG_ATH10K_DEBUG),
+ config_enabled(CONFIG_ATH10K_DEBUGFS),
+ config_enabled(CONFIG_ATH10K_TRACING),
+ config_enabled(CONFIG_ATH10K_DFS_CERTIFIED),
+ config_enabled(CONFIG_NL80211_TESTMODE));
+
+ ath10k_info(ar, "htt-ver %d.%d wmi-op %d htt-op %d cal %s max-sta %d raw %d hwcrypto %d\n",
ar->htt.target_version_major,
ar->htt.target_version_minor,
ar->wmi.op_version,
@@ -151,14 +165,7 @@ void ath10k_print_driver_info(struct ath10k *ar)
ath10k_cal_mode_str(ar->cal_mode),
ar->max_num_stations,
test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags),
- !test_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags),
- fw_features);
- ath10k_info(ar, "debug %d debugfs %d tracing %d dfs %d testmode %d\n",
- config_enabled(CONFIG_ATH10K_DEBUG),
- config_enabled(CONFIG_ATH10K_DEBUGFS),
- config_enabled(CONFIG_ATH10K_TRACING),
- config_enabled(CONFIG_ATH10K_DFS_CERTIFIED),
- config_enabled(CONFIG_NL80211_TESTMODE));
+ !test_bit(ATH10K_FLAG_HW_CRYPTO_DISABLED, &ar->dev_flags));
}
EXPORT_SYMBOL(ath10k_print_driver_info);