[Pdbg] [PATCH 08/17] libsbefifo: Refactor protocol marshalling for array chip-ops
Amitay Isaacs
amitay at ozlabs.org
Thu Oct 31 17:34:19 AEDT 2019
Signed-off-by: Amitay Isaacs <amitay at ozlabs.org>
---
libsbefifo/cmd_array.c | 119 ++++++++++++++++++++++++++++------------
libsbefifo/libsbefifo.h | 6 ++
2 files changed, 91 insertions(+), 34 deletions(-)
diff --git a/libsbefifo/cmd_array.c b/libsbefifo/cmd_array.c
index 75e294a..fa5742e 100644
--- a/libsbefifo/cmd_array.c
+++ b/libsbefifo/cmd_array.c
@@ -23,78 +23,129 @@
#include "libsbefifo.h"
#include "sbefifo_private.h"
-int sbefifo_control_fast_array(struct sbefifo_context *sctx, uint16_t target_type, uint8_t chiplet_id, uint8_t mode, uint64_t clock_cycle)
+int sbefifo_control_fast_array_push(uint16_t target_type, uint8_t chiplet_id, uint8_t mode, uint64_t clock_cycle, uint8_t **buf, uint32_t *buflen)
{
- uint8_t *out;
- uint32_t msg[3];
- uint32_t cmd, out_len;
+ uint32_t *msg;
+ uint32_t nwords, cmd;
uint32_t target;
- int rc;
+
+ nwords = 5;
+ *buflen = nwords * sizeof(uint32_t);
+ msg = malloc(*buflen);
+ if (!msg)
+ return ENOMEM;
cmd = SBEFIFO_CMD_CLASS_ARRAY | SBEFIFO_CMD_FAST_ARRAY;
+
target = ((uint32_t)target_type << 16) |
((uint32_t)chiplet_id << 8) |
((uint32_t)(mode & 0x3));
- msg[0] = htobe32(3); // number of words
+ msg[0] = htobe32(nwords);
msg[1] = htobe32(cmd);
msg[2] = htobe32(target);
+ msg[3] = htobe32(clock_cycle >> 32);
+ msg[4] = htobe32(clock_cycle & 0xffffffff);
+
+ *buf = (uint8_t *)msg;
+ return 0;
+}
+
+int sbefifo_control_fast_array_pull(uint8_t *buf, uint32_t buflen)
+{
+ if (buflen != 0)
+ return EPROTO;
+
+ return 0;
+}
+
+int sbefifo_control_fast_array(struct sbefifo_context *sctx, uint16_t target_type, uint8_t chiplet_id, uint8_t mode, uint64_t clock_cycle)
+{
+ uint8_t *msg, *out;
+ uint32_t msg_len, out_len;
+ int rc;
+
+ rc = sbefifo_control_fast_array_push(target_type, chiplet_id, mode, clock_cycle, &msg, &msg_len);
+ if (rc)
+ return rc;
out_len = 0;
- rc = sbefifo_operation(sctx, (uint8_t *)msg, 3 * 4, &out, &out_len);
+ rc = sbefifo_operation(sctx, msg, msg_len, &out, &out_len);
+ free(msg);
if (rc)
return rc;
- if (out_len != 0) {
+ rc = sbefifo_control_fast_array_pull(out, out_len);
+ if (out)
free(out);
- return EPROTO;
- }
- return 0;
+ return rc;
}
-int sbefifo_control_trace_array(struct sbefifo_context *sctx, uint16_t target_type, uint8_t chiplet_id, uint16_t array_id, uint16_t operation, uint8_t **trace_data, uint32_t *trace_data_len)
+int sbefifo_control_trace_array_push(uint16_t target_type, uint8_t chiplet_id, uint16_t array_id, uint16_t operation, uint8_t **buf, uint32_t *buflen)
{
- uint8_t *out;
- uint32_t msg[4];
- uint32_t cmd, out_len;
+ uint32_t *msg;
+ uint32_t nwords, cmd;
uint32_t target, oper;
- int rc;
+
+ nwords = 4;
+ *buflen = nwords * sizeof(uint32_t);
+ msg = malloc(*buflen);
+ if (!msg)
+ return ENOMEM;
cmd = SBEFIFO_CMD_CLASS_ARRAY | SBEFIFO_CMD_TRACE_ARRAY;
+
target = ((uint32_t)target_type << 16) | ((uint32_t)chiplet_id);
oper = ((uint32_t)array_id << 16) | ((uint32_t)operation);
- msg[0] = htobe32(4); // number of words
+ msg[0] = htobe32(nwords);
msg[1] = htobe32(cmd);
msg[2] = htobe32(target);
msg[3] = htobe32(oper);
- out_len = 16 * 4;
- rc = sbefifo_operation(sctx, (uint8_t *)msg, 4 * 4, &out, &out_len);
- if (rc)
- return rc;
+ *buf = (uint8_t *)msg;
+ return 0;
+}
- if (out_len < 4) {
- free(out);
+int sbefifo_control_trace_array_pull(uint8_t *buf, uint32_t buflen, uint8_t **trace_data, uint32_t *trace_data_len)
+{
+ if (buflen < 4)
return EPROTO;
- }
- *trace_data_len = 4 * be32toh(*(uint32_t *) &out[out_len-4]);
+ *trace_data_len = 4 * be32toh(*(uint32_t *) &buf[buflen-4]);
- if (out_len != *trace_data_len + 4) {
- free(out);
+ if (buflen != *trace_data_len + 4)
return EPROTO;
- }
*trace_data = malloc(*trace_data_len);
- if (! *trace_data) {
- free(out);
+ if (! *trace_data)
return ENOMEM;
- }
- memcpy(*trace_data, out, *trace_data_len);
-
- free(out);
+ memcpy(*trace_data, buf, *trace_data_len);
return 0;
}
+
+int sbefifo_control_trace_array(struct sbefifo_context *sctx, uint16_t target_type, uint8_t chiplet_id, uint16_t array_id, uint16_t operation, uint8_t **trace_data, uint32_t *trace_data_len)
+{
+ uint8_t *msg, *out;
+ uint32_t msg_len, out_len;
+ int rc;
+
+ rc = sbefifo_control_trace_array_push(target_type, chiplet_id, array_id, operation, &msg, &msg_len);
+ if (rc)
+ return rc;
+
+ /* The size of returned data is just a guess */
+ out_len = 16 * sizeof(uint32_t);
+ rc = sbefifo_operation(sctx, msg, msg_len, &out, &out_len);
+ free(msg);
+ if (rc)
+ return rc;
+
+ rc = sbefifo_control_trace_array_pull(out, out_len, trace_data, trace_data_len);
+ if (out)
+ free(out);
+
+ return rc;
+}
diff --git a/libsbefifo/libsbefifo.h b/libsbefifo/libsbefifo.h
index 5dfab97..78082b0 100644
--- a/libsbefifo/libsbefifo.h
+++ b/libsbefifo/libsbefifo.h
@@ -135,6 +135,12 @@ int sbefifo_register_put_pull(uint8_t *buf, uint32_t buflen);
int sbefifo_register_get(struct sbefifo_context *sctx, uint8_t core_id, uint8_t thread_id, uint8_t reg_type, uint8_t *reg_id, uint8_t reg_count, uint64_t **value);
int sbefifo_register_put(struct sbefifo_context *sctx, uint8_t core_id, uint8_t thread_id, uint8_t reg_type, uint8_t *reg_id, uint8_t reg_count, uint64_t *value);
+int sbefifo_control_fast_array_push(uint16_t target_type, uint8_t chiplet_id, uint8_t mode, uint64_t clock_cycle, uint8_t **buf, uint32_t *buflen);
+int sbefifo_control_fast_array_pull(uint8_t *buf, uint32_t buflen);
+
+int sbefifo_control_trace_array_push(uint16_t target_type, uint8_t chiplet_id, uint16_t array_id, uint16_t operation, uint8_t **buf, uint32_t *buflen);
+int sbefifo_control_trace_array_pull(uint8_t *buf, uint32_t buflen, uint8_t **trace_data, uint32_t *trace_data_len);
+
int sbefifo_control_fast_array(struct sbefifo_context *sctx, uint16_t target_type, uint8_t chiplet_id, uint8_t mode, uint64_t clock_cycle);
int sbefifo_control_trace_array(struct sbefifo_context *sctx, uint16_t target_type, uint8_t chiplet_id, uint16_t array_id, uint16_t operation, uint8_t **trace_data, uint32_t *trace_data_len);
--
2.21.0
More information about the Pdbg
mailing list