011f2c26f1
As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.4.y Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
76 lines
2.1 KiB
Diff
76 lines
2.1 KiB
Diff
From b7c9cdabb89d18689a9cd3dad75d7a4fffed4818 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Mon, 7 Mar 2016 15:05:11 +0000
|
|
Subject: [PATCH] vchiq_arm: Tweak the logging output
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
.../vc04_services/interface/vchiq_arm/vchiq_core.c | 31 +++++++++-------------
|
|
1 file changed, 13 insertions(+), 18 deletions(-)
|
|
|
|
--- a/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
|
|
+++ b/drivers/misc/vc04_services/interface/vchiq_arm/vchiq_core.c
|
|
@@ -891,16 +891,14 @@ queue_message(VCHIQ_STATE_T *state, VCHI
|
|
error_count);
|
|
return VCHIQ_ERROR;
|
|
}
|
|
- if (i == 0) {
|
|
- if (SRVTRACE_ENABLED(service,
|
|
- VCHIQ_LOG_INFO))
|
|
- vchiq_log_dump_mem("Sent", 0,
|
|
- header->data + pos,
|
|
- min(64u,
|
|
- elements[0].size));
|
|
- }
|
|
}
|
|
|
|
+ if (SRVTRACE_ENABLED(service,
|
|
+ VCHIQ_LOG_INFO))
|
|
+ vchiq_log_dump_mem("Sent", 0,
|
|
+ header->data,
|
|
+ min(16, pos));
|
|
+
|
|
spin_lock("a_spinlock);
|
|
service_quota->message_use_count++;
|
|
|
|
@@ -1039,16 +1037,13 @@ queue_message_sync(VCHIQ_STATE_T *state,
|
|
error_count);
|
|
return VCHIQ_ERROR;
|
|
}
|
|
- if (i == 0) {
|
|
- if (vchiq_sync_log_level >=
|
|
- VCHIQ_LOG_TRACE)
|
|
- vchiq_log_dump_mem("Sent Sync",
|
|
- 0, header->data + pos,
|
|
- min(64u,
|
|
- elements[0].size));
|
|
- }
|
|
}
|
|
|
|
+ if (vchiq_sync_log_level >= VCHIQ_LOG_TRACE)
|
|
+ vchiq_log_dump_mem("Sent Sync",
|
|
+ 0, header->data,
|
|
+ min(16, pos));
|
|
+
|
|
VCHIQ_SERVICE_STATS_INC(service, ctrl_tx_count);
|
|
VCHIQ_SERVICE_STATS_ADD(service, ctrl_tx_bytes, size);
|
|
} else {
|
|
@@ -1720,7 +1715,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
|
|
remoteport, localport, size);
|
|
if (size > 0)
|
|
vchiq_log_dump_mem("Rcvd", 0, header->data,
|
|
- min(64, size));
|
|
+ min(16, size));
|
|
}
|
|
|
|
if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size)
|
|
@@ -2187,7 +2182,7 @@ sync_func(void *v)
|
|
remoteport, localport, size);
|
|
if (size > 0)
|
|
vchiq_log_dump_mem("Rcvd", 0, header->data,
|
|
- min(64, size));
|
|
+ min(16, size));
|
|
}
|
|
|
|
switch (type) {
|