summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2023-05-09 14:07:42 -0700
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2023-05-09 16:54:41 -0700
commit8c452c2ec1739efe581273bacd738e5294d0ca0f (patch)
tree430d01d7305406d3c17aeed7caa1d536de669ddd
parent89f8d6bae18f853ae2ab9f6de21b62469f82d84c (diff)
downloadbluez-8c452c2ec1739efe581273bacd738e5294d0ca0f.tar.gz
monitor/intel: Skip packet/error counters if 0
This skips printing TLVs related to packet/error count if they are 0 and also update the missing TLVs: > HCI Event: Vendor (0xff) plen 188 Vendor Prefix (0x8780) Intel Extended Telemetry (0x03) Extended event type (0x01): Perform Stats (0x05) ACL connection handle (0x4a): 0x0100 Rx HEC errors (0x4b): 3 Packets from host (0x4d): 375 Tx packets (0x4e): 375 Tx packets 0 retries (0x4f): 354 Tx packets 1 retries (0x50): 20 Tx packets 3 retries (0x52): 1 Tx 3DH5 packets (0x5c): 375 Rx packets (0x5d): 400 ACL link throughput (bps) (0x5e): 533419 ACL max packet latency (us) (0x5f): 36875 ACL avg packet latency (us) (0x60): 19441 ACL RX RSSI moving avg (0x61): 65329 ACL RX SNR Bad Margin Counter (0x62): 1M 59 2M 0 3M 0 ACL RX RSSI Bad Counter (0x63): 1M 1711 2M 0 3M 0 ACL TX RSSI Bad Counter (0x64): 1M 1024 2M 0 3M 0
-rw-r--r--monitor/intel.c129
1 files changed, 122 insertions, 7 deletions
diff --git a/monitor/intel.c b/monitor/intel.c
index 416f52503..c29b547f4 100644
--- a/monitor/intel.c
+++ b/monitor/intel.c
@@ -1257,11 +1257,9 @@ static void ext_evt_type(const struct intel_tlv *tlv)
str = "Disconnection Event";
break;
case 0x05:
- str = "Audio Link Quality Report Type";
- break;
- case 0x06:
- str = "Stats for BR/EDR Link Type";
+ str = "Performance Stats";
break;
+
default:
print_text(COLOR_UNKNOWN_EXT_EVENT,
"Unknown extended telemetry event type (0x%2.2x)",
@@ -1287,6 +1285,10 @@ static void ext_acl_evt_hec_errors(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Rx HEC errors (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1294,6 +1296,10 @@ static void ext_acl_evt_crc_errors(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Rx CRC errors (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1301,6 +1307,10 @@ static void ext_acl_evt_num_pkt_from_host(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Packets from host (0x%2.2x): %d",
tlv->subevent_id, num);
}
@@ -1309,6 +1319,10 @@ static void ext_acl_evt_num_tx_pkt_to_air(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Tx packets (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1317,6 +1331,10 @@ static void ext_acl_evt_num_tx_pkt_retry(const struct intel_tlv *tlv)
char *subevent_str;
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
switch (tlv->subevent_id) {
case 0x4f:
subevent_str = "Tx packets 0 retries";
@@ -1346,6 +1364,10 @@ static void ext_acl_evt_num_tx_pkt_type(const struct intel_tlv *tlv)
char *packet_type_str;
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
switch (tlv->subevent_id) {
case 0x54:
packet_type_str = "DH1";
@@ -1387,6 +1409,10 @@ static void ext_acl_evt_num_rx_pkt_from_air(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Rx packets (0x%2.2x): %d",
tlv->subevent_id, num);
}
@@ -1395,7 +1421,11 @@ static void ext_acl_evt_link_throughput(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
- print_field("ACL link throughput (KBps) (0x%2.2x): %d",
+ /* Skip if 0 */
+ if (!num)
+ return;
+
+ print_field("ACL link throughput (bps) (0x%2.2x): %d",
tlv->subevent_id, num);
}
@@ -1403,7 +1433,11 @@ static void ext_acl_evt_max_packet_latency(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
- print_field("ACL max packet latency (ms) (0x%2.2x): %d",
+ /* Skip if 0 */
+ if (!num)
+ return;
+
+ print_field("ACL max packet latency (us) (0x%2.2x): %d",
tlv->subevent_id, num);
}
@@ -1411,10 +1445,55 @@ static void ext_acl_evt_avg_packet_latency(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
- print_field("ACL avg packet latency (ms) (0x%2.2x): %d",
+ /* Skip if 0 */
+ if (!num)
+ return;
+
+ print_field("ACL avg packet latency (us) (0x%2.2x): %d",
tlv->subevent_id, num);
}
+static void ext_acl_evt_rssi_moving_avg(const struct intel_tlv *tlv)
+{
+ uint32_t num = get_le16(tlv->value);
+
+ /* Skip if 0 */
+ if (!num)
+ return;
+
+ print_field("ACL RX RSSI moving avg (0x%2.2x): %d",
+ tlv->subevent_id, num);
+}
+
+static void ext_acl_evt_bad_cnt(const char *prefix, const struct intel_tlv *tlv)
+{
+ uint32_t c_1m = get_le32(tlv->value);
+ uint32_t c_2m = get_le32(tlv->value + 4);
+ uint32_t c_3m = get_le32(tlv->value + 8);
+
+ /* Skip if all 0 */
+ if (!c_1m && !c_2m && !c_3m)
+ return;
+
+ print_field("%s (0x%2.2x): 1M %d 2M %d 3M %d",
+ prefix, tlv->subevent_id, c_1m, c_2m, c_3m);
+}
+
+static void ext_acl_evt_snr_bad_cnt(const struct intel_tlv *tlv)
+{
+ ext_acl_evt_bad_cnt("ACL RX SNR Bad Margin Counter", tlv);
+}
+
+static void ext_acl_evt_rx_rssi_bad_cnt(const struct intel_tlv *tlv)
+{
+ ext_acl_evt_bad_cnt("ACL RX RSSI Bad Counter", tlv);
+}
+
+static void ext_acl_evt_tx_rssi_bad_cnt(const struct intel_tlv *tlv)
+{
+ ext_acl_evt_bad_cnt("ACL TX RSSI Bad Counter", tlv);
+}
+
static void ext_sco_evt_conn_handle(const struct intel_tlv *tlv)
{
uint16_t conn_handle = get_le16(tlv->value);
@@ -1427,6 +1506,10 @@ static void ext_sco_evt_num_rx_pkt_from_air(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Packets from host (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1434,6 +1517,10 @@ static void ext_sco_evt_num_tx_pkt_to_air(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Tx packets (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1441,6 +1528,10 @@ static void ext_sco_evt_num_rx_payloads_lost(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Rx payload lost (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1449,6 +1540,10 @@ static void ext_sco_evt_num_tx_payloads_lost(const struct intel_tlv *tlv)
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Tx payload lost (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1508,6 +1603,10 @@ static void ext_sco_evt_samples_inserted(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Late samples inserted based on CDC (0x%2.2x): %d",
tlv->subevent_id, num);
}
@@ -1516,6 +1615,10 @@ static void ext_sco_evt_samples_dropped(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Samples dropped (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1523,6 +1626,10 @@ static void ext_sco_evt_mute_samples(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("Mute samples sent at initial connection (0x%2.2x): %d",
tlv->subevent_id, num);
}
@@ -1531,6 +1638,10 @@ static void ext_sco_evt_plc_injection_data(const struct intel_tlv *tlv)
{
uint32_t num = get_le32(tlv->value);
+ /* Skip if 0 */
+ if (!num)
+ return;
+
print_field("PLC injection data (0x%2.2x): %d", tlv->subevent_id, num);
}
@@ -1565,6 +1676,10 @@ static const struct intel_ext_subevent {
{ 0x5e, 4, ext_acl_evt_link_throughput },
{ 0x5f, 4, ext_acl_evt_max_packet_latency },
{ 0x60, 4, ext_acl_evt_avg_packet_latency },
+ { 0x61, 2, ext_acl_evt_rssi_moving_avg },
+ { 0x62, 12, ext_acl_evt_snr_bad_cnt },
+ { 0x63, 12, ext_acl_evt_rx_rssi_bad_cnt },
+ { 0x64, 12, ext_acl_evt_tx_rssi_bad_cnt },
/* SCO/eSCO audio link quality subevents */
{ 0x6a, 2, ext_sco_evt_conn_handle },