X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=3953ee1fbd471ef553a6c845674ee9e4aa9aae24;hp=9d07a588f92a5a6c3792b67a27ee507fdf2e4d4d;hb=d531395a3ff60730238854b127925978f6eab289;hpb=32d3249e252fe201eb81155cbf3b800ce5cf88e0

diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c
index 9d07a58..3953ee1 100644
--- a/lib/pb-protocol/pb-protocol.c
+++ b/lib/pb-protocol/pb-protocol.c
@@ -225,6 +225,20 @@ int pb_protocol_system_info_len(const struct system_info *sysinfo)
 		4 + optional_strlen(sysinfo->identifier) +
 		4 + 4;
 
+	len +=	4;
+	for (i = 0; i < sysinfo->n_current; i++)
+		len += 4 + optional_strlen(sysinfo->platform_current[i]);
+	len +=	4;
+	for (i = 0; i < sysinfo->n_other; i++)
+		len += 4 + optional_strlen(sysinfo->platform_other[i]);
+
+	len +=	4;
+	for (i = 0; i < sysinfo->n_bmc_current; i++)
+		len += 4 + optional_strlen(sysinfo->bmc_current[i]);
+	len +=	4;
+	for (i = 0; i < sysinfo->n_bmc_golden; i++)
+		len += 4 + optional_strlen(sysinfo->bmc_golden[i]);
+
 	for (i = 0; i < sysinfo->n_interfaces; i++) {
 		struct interface_info *if_info = sysinfo->interfaces[i];
 		len +=	4 + if_info->hwaddr_size +
@@ -395,6 +409,26 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 	pos += pb_protocol_serialise_string(pos, sysinfo->type);
 	pos += pb_protocol_serialise_string(pos, sysinfo->identifier);
 
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_current);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_current; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_current[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_other);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_other; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->platform_other[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_bmc_current);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_bmc_current; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->bmc_current[i]);
+
+	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_bmc_golden);
+	pos += sizeof(uint32_t);
+	for (i = 0; i < sysinfo->n_bmc_golden; i++)
+		pos += pb_protocol_serialise_string(pos, sysinfo->bmc_golden[i]);
+
 	*(uint32_t *)pos = __cpu_to_be32(sysinfo->n_interfaces);
 	pos += sizeof(uint32_t);
 
@@ -424,7 +458,10 @@ int pb_protocol_serialise_system_info(const struct system_info *sysinfo,
 		pos += pb_protocol_serialise_string(pos, bd_info->mountpoint);
 	}
 
-	memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE);
+	if (sysinfo->bmc_mac)
+		memcpy(pos, sysinfo->bmc_mac, HWADDR_SIZE);
+	else
+		memset(pos, 0, HWADDR_SIZE);
 	pos += HWADDR_SIZE;
 
 	assert(pos <= buf + buf_len);
@@ -795,6 +832,7 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 	unsigned int len, i;
 	const char *pos;
 	int rc = -1;
+	char *tmp;
 
 	len = message->payload_len;
 	pos = message->payload;
@@ -806,6 +844,48 @@ int pb_protocol_deserialise_system_info(struct system_info *sysinfo,
 	if (read_string(sysinfo, &pos, &len, &sysinfo->identifier))
 		goto out;
 
+	/* Platform version strings for openpower platforms */
+	if (read_u32(&pos, &len, &sysinfo->n_current))
+		goto out;
+	sysinfo->platform_current = talloc_array(sysinfo, char *,
+						sysinfo->n_current);
+	for (i = 0; i < sysinfo->n_current; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->platform_current[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	if (read_u32(&pos, &len, &sysinfo->n_other))
+		goto out;
+	sysinfo->platform_other = talloc_array(sysinfo, char *,
+						sysinfo->n_other);
+	for (i = 0; i < sysinfo->n_other; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->platform_other[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	/* BMC version strings for openpower platforms */
+	if (read_u32(&pos, &len, &sysinfo->n_bmc_current))
+		goto out;
+	sysinfo->bmc_current = talloc_array(sysinfo, char *,
+						sysinfo->n_bmc_current);
+	for (i = 0; i < sysinfo->n_bmc_current; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->bmc_current[i] = talloc_strdup(sysinfo, tmp);
+	}
+
+	if (read_u32(&pos, &len, &sysinfo->n_bmc_golden))
+		goto out;
+	sysinfo->bmc_golden = talloc_array(sysinfo, char *,
+						sysinfo->n_bmc_golden);
+	for (i = 0; i < sysinfo->n_bmc_golden; i++) {
+		if (read_string(sysinfo, &pos, &len, &tmp))
+			goto out;
+		sysinfo->bmc_golden[i] = talloc_strdup(sysinfo, tmp);
+	}
+
 	/* number of interfaces */
 	if (read_u32(&pos, &len, &sysinfo->n_interfaces))
 		goto out;