X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=lib%2Fpb-protocol%2Fpb-protocol.c;h=0d83bde0d11fca8f7b4902755cfa13e458a6277f;hp=9d07a588f92a5a6c3792b67a27ee507fdf2e4d4d;hb=9f42e56fc5968fcb34edfad017adb73960c2bb61;hpb=32d3249e252fe201eb81155cbf3b800ce5cf88e0 diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 9d07a58..0d83bde 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -37,6 +37,7 @@ * 4-byte len, initrd_file * 4-byte len, dtb_file * 4-byte len, boot_args + * 4-byte len, args_sig_file * * action = 0x2: device remove message * payload: @@ -49,6 +50,7 @@ * 4-byte len, initrd_file * 4-byte len, dtb_file * 4-byte len, boot_args + * 4-byte len, args_sig_file * */ @@ -72,6 +74,7 @@ void pb_protocol_dump_device(const struct device *dev, const char *text, fprintf(stream, "%s\t\tinit: %s\n", text, opt->initrd_file); fprintf(stream, "%s\t\tdtb: %s\n", text, opt->dtb_file); fprintf(stream, "%s\t\targs: %s\n", text, opt->boot_args); + fprintf(stream, "%s\t\tasig: %s\n", text, opt->args_sig_file); } } @@ -197,6 +200,7 @@ int pb_protocol_boot_option_len(const struct boot_option *opt) 4 + optional_strlen(opt->initrd_file) + 4 + optional_strlen(opt->dtb_file) + 4 + optional_strlen(opt->boot_args) + + 4 + optional_strlen(opt->args_sig_file) + sizeof(opt->is_default); } @@ -206,7 +210,9 @@ int pb_protocol_boot_len(const struct boot_command *boot) 4 + optional_strlen(boot->boot_image_file) + 4 + optional_strlen(boot->initrd_file) + 4 + optional_strlen(boot->dtb_file) + - 4 + optional_strlen(boot->boot_args); + 4 + optional_strlen(boot->boot_args) + + 4 + optional_strlen(boot->args_sig_file) + + 4 + optional_strlen(boot->console); } int pb_protocol_boot_status_len(const struct boot_status *status) @@ -225,6 +231,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_primary; i++) + len += 4 + optional_strlen(sysinfo->platform_primary[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 + @@ -263,6 +283,8 @@ static int pb_protocol_interface_config_len(struct interface_config *conf) len += 4 + optional_strlen(conf->static_config.url); } + len += 4 /* conf->override */; + return len; } @@ -296,6 +318,12 @@ int pb_protocol_config_len(const struct config *config) len += 4; /* allow_writes */ + len += 4; /* n_consoles */ + for (i = 0; i < config->n_consoles; i++) + len += 4 + optional_strlen(config->consoles[i]); + + len += 4 + optional_strlen(config->boot_console); + len += 4 + optional_strlen(config->lang); return len; @@ -339,6 +367,7 @@ int pb_protocol_serialise_boot_option(const struct boot_option *opt, pos += pb_protocol_serialise_string(pos, opt->initrd_file); pos += pb_protocol_serialise_string(pos, opt->dtb_file); pos += pb_protocol_serialise_string(pos, opt->boot_args); + pos += pb_protocol_serialise_string(pos, opt->args_sig_file); *(bool *)pos = opt->is_default; pos += sizeof(bool); @@ -359,6 +388,8 @@ int pb_protocol_serialise_boot_command(const struct boot_command *boot, pos += pb_protocol_serialise_string(pos, boot->initrd_file); pos += pb_protocol_serialise_string(pos, boot->dtb_file); pos += pb_protocol_serialise_string(pos, boot->boot_args); + pos += pb_protocol_serialise_string(pos, boot->args_sig_file); + pos += pb_protocol_serialise_string(pos, boot->console); assert(pos <= buf + buf_len); (void)buf_len; @@ -395,6 +426,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_primary); + pos += sizeof(uint32_t); + for (i = 0; i < sysinfo->n_primary; i++) + pos += pb_protocol_serialise_string(pos, sysinfo->platform_primary[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 +475,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); @@ -459,6 +513,9 @@ static int pb_protocol_serialise_config_interface(char *buf, conf->static_config.url); } + *(uint32_t *)pos = conf->override; + pos += 4; + return pos - buf; } @@ -516,6 +573,13 @@ int pb_protocol_serialise_config(const struct config *config, *(uint32_t *)pos = config->allow_writes; pos += 4; + *(uint32_t *)pos = __cpu_to_be32(config->n_consoles); + pos += 4; + for (i = 0; i < config->n_consoles; i++) + pos += pb_protocol_serialise_string(pos, config->consoles[i]); + + pos += pb_protocol_serialise_string(pos, config->boot_console); + pos += pb_protocol_serialise_string(pos, config->lang); assert(pos <= buf + buf_len); @@ -698,6 +762,9 @@ int pb_protocol_deserialise_boot_option(struct boot_option *opt, if (read_string(opt, &pos, &len, &opt->boot_args)) goto out; + if (read_string(opt, &pos, &len, &opt->args_sig_file)) + goto out; + if (len < sizeof(bool)) goto out; opt->is_default = *(bool *)(pos); @@ -733,6 +800,12 @@ int pb_protocol_deserialise_boot_command(struct boot_command *cmd, if (read_string(cmd, &pos, &len, &cmd->boot_args)) goto out; + if (read_string(cmd, &pos, &len, &cmd->args_sig_file)) + goto out; + + if (read_string(cmd, &pos, &len, &cmd->console)) + goto out; + rc = 0; out: @@ -795,6 +868,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 +880,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_primary)) + goto out; + sysinfo->platform_primary = talloc_array(sysinfo, char *, + sysinfo->n_primary); + for (i = 0; i < sysinfo->n_primary; i++) { + if (read_string(sysinfo, &pos, &len, &tmp)) + goto out; + sysinfo->platform_primary[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; @@ -908,6 +1024,10 @@ static int pb_protocol_deserialise_config_interface(const char **buf, return -1; } + if (read_u32(buf, len, &tmp)) + return -1; + iface->override = !!tmp; + return 0; } @@ -989,6 +1109,21 @@ int pb_protocol_deserialise_config(struct config *config, goto out; config->allow_writes = !!tmp; + if (read_u32(&pos, &len, &config->n_consoles)) + goto out; + + config->consoles = talloc_array(config, char *, config->n_consoles); + for (i = 0; i < config->n_consoles; i++) { + if (read_string(config->consoles, &pos, &len, &str)) + goto out; + config->consoles[i] = str; + } + + if (read_string(config, &pos, &len, &str)) + goto out; + + config->boot_console = str; + if (read_string(config, &pos, &len, &str)) goto out;