Revert "vchiq_arm: Tweak the logging output"

This reverts commit 16bb6574646104789a1ed844ffad670e2c336084.

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 160db24aeea33a8296923501009c1f02bc41e599..2c98da4307dff994a00dc246574ef0aaee05d5da 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -891,14 +891,16 @@ queue_message(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                                                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(&quota_spinlock);
                service_quota->message_use_count++;
 
@@ -1037,13 +1039,16 @@ queue_message_sync(VCHIQ_STATE_T *state, VCHIQ_SERVICE_T *service,
                                                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 {
@@ -1715,7 +1720,7 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                remoteport, localport, size);
                        if (size > 0)
                                vchiq_log_dump_mem("Rcvd", 0, header->data,
-                                       min(16, size));
+                                       min(64, size));
                }
 
                if (((unsigned int)header & VCHIQ_SLOT_MASK) + calc_stride(size)
@@ -2182,7 +2187,7 @@ sync_func(void *v)
                                remoteport, localport, size);
                        if (size > 0)
                                vchiq_log_dump_mem("Rcvd", 0, header->data,
-                                       min(16, size));
+                                       min(64, size));
                }
 
                switch (type) {