X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=5d7cc597697f683fda11a439a0e2cc278d24f493;hp=1ae96ac67f850726765db3b7babfa42f267b0585;hb=78c3a044d2302bacf27ac2d9ef179bc35824af4c;hpb=ca9ddb09f42fdc66c080afff8c113bb263f51aeb diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 1ae96ac..5d7cc59 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -2,22 +2,20 @@ #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include #include -#include #include -#include -#include +#include #include "hostboot.h" #include "platform.h" @@ -29,15 +27,20 @@ static const char *sysparams_dir = "/sys/firmware/opal/sysparams/"; static const char *devtree_dir = "/proc/device-tree/"; struct platform_powerpc { - struct param_list params; + struct param_list *params; struct ipmi *ipmi; - bool ipmi_bootdev_persistent; + char *ipmi_mailbox_original_config; int (*get_ipmi_bootdev)( struct platform_powerpc *platform, uint8_t *bootdev, bool *persistent); int (*clear_ipmi_bootdev)( struct platform_powerpc *platform, bool persistent); + int (*get_ipmi_boot_mailbox)( + struct platform_powerpc *platform, + char **buf); + int (*clear_ipmi_boot_mailbox)( + struct platform_powerpc *platform); int (*set_os_boot_sensor)( struct platform_powerpc *platform); void (*get_platform_versions)(struct system_info *info); @@ -93,13 +96,13 @@ static int parse_nvram_params(struct platform_powerpc *platform, if (namelen == 0) continue; - if (!param_list_is_known_n(&platform->params, name, namelen)) + if (!param_list_is_known_n(platform->params, name, namelen)) continue; *value = '\0'; value++; - param_list_set(&platform->params, name, value, false); + param_list_set(platform->params, name, value, false); } return 0; @@ -149,7 +152,7 @@ static int write_nvram(struct platform_powerpc *platform) process->path = "nvram"; process->argv = argv; - param_list_for_each(&platform->params, param) { + param_list_for_each(platform->params, param) { char *paramstr; if (!param->modified) @@ -175,416 +178,8 @@ static int write_nvram(struct platform_powerpc *platform) return rc; } -static int parse_hwaddr(struct interface_config *ifconf, char *str) -{ - int i; - - if (strlen(str) != strlen("00:00:00:00:00:00")) - return -1; - - for (i = 0; i < HWADDR_SIZE; i++) { - char byte[3], *endp; - unsigned long x; - - byte[0] = str[i * 3 + 0]; - byte[1] = str[i * 3 + 1]; - byte[2] = '\0'; - - x = strtoul(byte, &endp, 16); - if (endp != byte + 2) - return -1; - - ifconf->hwaddr[i] = x & 0xff; - } - - return 0; -} - -static int parse_one_interface_config(struct config *config, char *confstr) -{ - struct interface_config *ifconf; - char *tok, *tok_gw, *tok_url, *saveptr; - - ifconf = talloc_zero(config, struct interface_config); - - if (!confstr || !strlen(confstr)) - goto out_err; - - /* first token should be the mac address */ - tok = strtok_r(confstr, ",", &saveptr); - if (!tok) - goto out_err; - - if (parse_hwaddr(ifconf, tok)) - goto out_err; - - /* second token is the method */ - tok = strtok_r(NULL, ",", &saveptr); - if (!tok || !strlen(tok) || !strcmp(tok, "ignore")) { - ifconf->ignore = true; - - } else if (!strcmp(tok, "dhcp")) { - ifconf->method = CONFIG_METHOD_DHCP; - - } else if (!strcmp(tok, "static")) { - ifconf->method = CONFIG_METHOD_STATIC; - - /* ip/mask, [optional] gateway, [optional] url */ - tok = strtok_r(NULL, ",", &saveptr); - if (!tok) - goto out_err; - ifconf->static_config.address = - talloc_strdup(ifconf, tok); - - /* - * If a url is set but not a gateway, we can accidentally - * interpret the url as the gateway. To avoid changing the - * parameter format check if the "gateway" is actually a - * pb-url if it's the last token. - */ - tok_gw = strtok_r(NULL, ",", &saveptr); - tok_url = strtok_r(NULL, ",", &saveptr); - - if (tok_gw) { - if (tok_url || !is_url(tok_gw)) - ifconf->static_config.gateway = - talloc_strdup(ifconf, tok_gw); - else - tok_url = tok_gw; - } - - if (tok_url) - ifconf->static_config.url = - talloc_strdup(ifconf, tok_url); - } else { - pb_log("Unknown network configuration method %s\n", tok); - goto out_err; - } - - config->network.interfaces = talloc_realloc(config, - config->network.interfaces, - struct interface_config *, - ++config->network.n_interfaces); - - config->network.interfaces[config->network.n_interfaces - 1] = ifconf; - - return 0; -out_err: - talloc_free(ifconf); - return -1; -} - -static int parse_one_dns_config(struct config *config, char *confstr) -{ - char *tok, *saveptr = NULL; - - for (tok = strtok_r(confstr, ",", &saveptr); tok; - tok = strtok_r(NULL, ",", &saveptr)) { - - char *server = talloc_strdup(config, tok); - - config->network.dns_servers = talloc_realloc(config, - config->network.dns_servers, const char *, - ++config->network.n_dns_servers); - - config->network.dns_servers[config->network.n_dns_servers - 1] - = server; - } - - return 0; -} - -static void populate_network_config(struct config *config, const char *cval) -{ - char *val, *saveptr = NULL; - int i; - - if (!cval || !strlen(cval)) - return; - - val = talloc_strdup(config, cval); - - for (i = 0; ; i++) { - char *tok; - - tok = strtok_r(i == 0 ? val : NULL, " ", &saveptr); - if (!tok) - break; - - if (!strncasecmp(tok, "dns,", strlen("dns,"))) - parse_one_dns_config(config, tok + strlen("dns,")); - else - parse_one_interface_config(config, tok); - - } - - talloc_free(val); -} - -static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt) -{ - char *delim = strchr(*pos, ' '); - int len, prefix = 0, rc = -1; - enum device_type type; - - if (!strncmp(*pos, "uuid:", strlen("uuid:"))) { - prefix = strlen("uuid:"); - opt->boot_type = BOOT_DEVICE_UUID; - } else if (!strncmp(*pos, "mac:", strlen("mac:"))) { - prefix = strlen("mac:"); - opt->boot_type = BOOT_DEVICE_UUID; - } else { - type = find_device_type(*pos); - if (type != DEVICE_TYPE_UNKNOWN) { - opt->type = type; - opt->boot_type = BOOT_DEVICE_TYPE; - rc = 0; - } - } - - if (opt->boot_type == BOOT_DEVICE_UUID) { - if (delim) - len = (int)(delim - *pos) - prefix; - else - len = strlen(*pos) - prefix; - - if (len) { - opt->uuid = talloc_strndup(ctx, *pos + prefix, len); - rc = 0; - } - } - - /* Always advance pointer to next option or end */ - if (delim) - *pos = delim + 1; - else - *pos += strlen(*pos); - - return rc; -} - -static void populate_bootdev_config(struct config *config, - const struct param_list *pl) -{ - struct autoboot_option *opt, *new = NULL; - char *pos, *end; - unsigned int n_new = 0; - const char *val; - - /* Check for ordered bootdevs */ - val = param_list_get_value(pl, "petitboot,bootdevs"); - if (!val || !strlen(val)) { - pos = end = NULL; - } else { - pos = talloc_strdup(config, val); - end = strchr(pos, '\0'); - } - - while (pos && pos < end) { - opt = talloc(config, struct autoboot_option); - - if (read_bootdev(config, &pos, opt)) { - pb_log("bootdev config is in an unknown format " - "(expected uuid:... or mac:...)\n"); - talloc_free(opt); - continue; - } - - new = talloc_realloc(config, new, struct autoboot_option, - n_new + 1); - new[n_new] = *opt; - n_new++; - talloc_free(opt); - - } - - if (!n_new) { - /* If autoboot has been disabled, clear the default options */ - if (!config->autoboot_enabled) { - talloc_free(config->autoboot_opts); - config->n_autoboot_opts = 0; - } - return; - } - - talloc_free(config->autoboot_opts); - config->autoboot_opts = new; - config->n_autoboot_opts = n_new; -} - -static void populate_config(struct config *config, const struct param_list *pl) -{ - const char *val; - char *end; - unsigned long timeout; - - /* if the "auto-boot?' property is present and "false", disable auto - * boot */ - val = param_list_get_value(pl, "auto-boot?"); - config->autoboot_enabled = !val || strcmp(val, "false"); - - val = param_list_get_value(pl, "petitboot,timeout"); - if (val) { - timeout = strtoul(val, &end, 10); - if (end != val) { - if (timeout >= INT_MAX) - timeout = INT_MAX; - config->autoboot_timeout_sec = (int)timeout; - } - } - - val = param_list_get_value(pl, "petitboot,language"); - config->lang = val ? talloc_strdup(config, val) : NULL; - - val = param_list_get_value(pl, "petitboot,network"); - populate_network_config(config, val); - - populate_bootdev_config(config, pl); - - if (!config->debug) { - val = param_list_get_value(pl, "petitboot,debug?"); - config->debug = val && !strcmp(val, "true"); - } - - val = param_list_get_value(pl, "petitboot,write?"); - if (val) - config->allow_writes = !strcmp(val, "true"); - - val = param_list_get_value(pl, "petitboot,snapshots?"); - if (val) - config->disable_snapshots = !strcmp(val, "false"); - - val = param_list_get_value(pl, "petitboot,console"); - if (val) - config->boot_console = talloc_strdup(config, val); - /* If a full path is already set we don't want to override it */ - config->manual_console = config->boot_console && - !strchr(config->boot_console, '['); - - val = param_list_get_value(pl, "petitboot,http_proxy"); - if (val) - config->http_proxy = talloc_strdup(config, val); - val = param_list_get_value(pl, "petitboot,https_proxy"); - if (val) - config->https_proxy = talloc_strdup(config, val); -} - -static char *iface_config_str(void *ctx, struct interface_config *config) -{ - char *str; - - /* todo: HWADDR size is hardcoded as 6, but we may need to handle - * different hardware address formats */ - str = talloc_asprintf(ctx, "%02x:%02x:%02x:%02x:%02x:%02x,", - config->hwaddr[0], config->hwaddr[1], - config->hwaddr[2], config->hwaddr[3], - config->hwaddr[4], config->hwaddr[5]); - - if (config->ignore) { - str = talloc_asprintf_append(str, "ignore"); - - } else if (config->method == CONFIG_METHOD_DHCP) { - str = talloc_asprintf_append(str, "dhcp"); - - } else if (config->method == CONFIG_METHOD_STATIC) { - str = talloc_asprintf_append(str, "static,%s%s%s%s%s", - config->static_config.address, - config->static_config.gateway ? "," : "", - config->static_config.gateway ?: "", - config->static_config.url ? "," : "", - config->static_config.url ?: ""); - } - return str; -} - -static char *dns_config_str(void *ctx, const char **dns_servers, int n) -{ - char *str; - int i; - - str = talloc_strdup(ctx, "dns,"); - for (i = 0; i < n; i++) { - str = talloc_asprintf_append(str, "%s%s", - i == 0 ? "" : ",", - dns_servers[i]); - } - - return str; -} - -static void update_network_config(struct param_list *pl, const char *param_name, - const struct config *config) -{ - unsigned int i; - char *val; - - /* - * Don't store IPMI overrides to NVRAM. If this was a persistent - * override it was already stored in NVRAM by - * get_ipmi_network_override() - */ - if (config->network.n_interfaces && - config->network.interfaces[0]->override) - return; - - val = talloc_strdup(pl, ""); - - for (i = 0; i < config->network.n_interfaces; i++) { - char *iface_str = iface_config_str(pl, - config->network.interfaces[i]); - val = talloc_asprintf_append(val, "%s%s", - *val == '\0' ? "" : " ", iface_str); - talloc_free(iface_str); - } - - if (config->network.n_dns_servers) { - char *dns_str = dns_config_str(pl, - config->network.dns_servers, - config->network.n_dns_servers); - val = talloc_asprintf_append(val, "%s%s", - *val == '\0' ? "" : " ", dns_str); - talloc_free(dns_str); - } - - param_list_set_non_empty(pl, param_name, val, true); - talloc_free(val); -} - -static void update_bootdev_config(struct param_list *pl, const char *param_name, - const struct config *config) -{ - char *val = NULL, *boot_str = NULL, *tmp = NULL; - struct autoboot_option *opt; - const char delim = ' '; - unsigned int i; - - if (!config->n_autoboot_opts) - val = ""; - - for (i = 0; i < config->n_autoboot_opts; i++) { - opt = &config->autoboot_opts[i]; - switch (opt->boot_type) { - case BOOT_DEVICE_TYPE: - boot_str = talloc_asprintf(config, "%s%c", - device_type_name(opt->type), - delim); - break; - case BOOT_DEVICE_UUID: - boot_str = talloc_asprintf(config, "uuid:%s%c", - opt->uuid, delim); - break; - } - tmp = val = talloc_asprintf_append(val, "%s", boot_str); - } - - param_list_set_non_empty(pl, param_name, val, true); - talloc_free(tmp); - if (boot_str) - talloc_free(boot_str); -} - -static void update_config(struct param_list *pl, struct config *config, - const struct config *defaults) +static void params_update_all(struct param_list *pl, + const struct config *config, const struct config *defaults) { char *tmp = NULL; const char *val; @@ -625,11 +220,11 @@ static void update_config(struct param_list *pl, struct config *config, val = config->https_proxy ?: ""; param_list_set_non_empty(pl, "petitboot,https_proxy", val, true); - update_network_config(pl, "petitboot,network", config); - update_bootdev_config(pl, "petitboot,bootdevs", config); + params_update_network_values(pl, "petitboot,network", config); + params_update_bootdev_values(pl, "petitboot,bootdevs", config); } -static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev, +static void config_set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev, bool persistent) { config->ipmi_bootdev = bootdev; @@ -780,6 +375,7 @@ static int get_ipmi_bootdev_ipmi(struct platform_powerpc *platform, { uint16_t resp_len; uint8_t resp[8]; + char *debug_buf; int rc; uint8_t req[] = { 0x05, /* parameter selector: boot flags */ @@ -804,10 +400,9 @@ static int get_ipmi_bootdev_ipmi(struct platform_powerpc *platform, return -1; } - pb_debug("IPMI get_bootdev response:\n"); - for (int i = 0; i < resp_len; i++) - pb_debug("%x ", resp[i]); - pb_debug("\n"); + debug_buf = format_buffer(platform, resp, resp_len); + pb_debug_fn("IPMI get_bootdev response:\n%s\n", debug_buf); + talloc_free(debug_buf); if (resp[0] != 0) { pb_log("platform: non-zero completion code %d from IPMI req\n", @@ -841,6 +436,211 @@ static int get_ipmi_bootdev_ipmi(struct platform_powerpc *platform, return 0; } +static int get_ipmi_boot_mailbox_block(struct platform_powerpc *platform, + char *buf, uint8_t block) +{ + size_t blocksize = 16; + uint8_t resp[3 + 16]; + uint16_t resp_len; + char *debug_buf; + int rc; + uint8_t req[] = { + 0x07, /* parameter selector: boot initiator mailbox */ + block, /* set selector */ + 0x00, /* no block selector */ + }; + + resp_len = sizeof(resp); + rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_CHASSIS, + IPMI_CMD_CHASSIS_GET_SYSTEM_BOOT_OPTIONS, + req, sizeof(req), + resp, &resp_len, + ipmi_timeout); + if (rc) { + pb_log("platform: error reading IPMI boot options\n"); + return -1; + } + + if (resp_len < sizeof(resp)) { + if (resp_len < 3) { + pb_log("platform: unexpected length (%d) in " + "boot options mailbox response\n", + resp_len); + return -1; + } + + if (resp_len == 4) { + pb_debug_fn("block %hu empty\n", block); + return 0; + } + + blocksize = sizeof(resp) - 3; + pb_debug_fn("Mailbox block %hu returns only %zu bytes in block\n", + block, blocksize); + } + + debug_buf = format_buffer(platform, resp, resp_len); + pb_debug_fn("IPMI bootdev mailbox block %hu:\n%s\n", block, debug_buf); + talloc_free(debug_buf); + + if (resp[0] != 0) { + pb_log("platform: non-zero completion code %d from IPMI req\n", + resp[0]); + return -1; + } + + /* check for correct parameter version */ + if ((resp[1] & 0xf) != 0x1) { + pb_log("platform: unexpected version (0x%x) in " + "boot mailbox response\n", resp[0]); + return -1; + } + + /* check for valid paramters */ + if (resp[2] & 0x80) { + pb_debug("platform: boot mailbox parameters are invalid/locked\n"); + return -1; + } + + memcpy(buf, &resp[3], blocksize); + + return blocksize; +} + +static int get_ipmi_boot_mailbox(struct platform_powerpc *platform, + char **buf) +{ + char *mailbox_buffer, *prefix; + const size_t blocksize = 16; + char block_buffer[blocksize]; + size_t mailbox_size; + int content_size; + uint8_t i; + int rc; + + mailbox_buffer = NULL; + mailbox_size = 0; + + /* + * The BMC may hold up to 255 blocks of data but more likely the number + * will be closer to the minimum of 5 set by the specification and error + * on higher numbers. + */ + for (i = 0; i < UCHAR_MAX; i++) { + rc = get_ipmi_boot_mailbox_block(platform, block_buffer, i); + if (rc < 3 && i == 0) { + /* + * Immediate failure, no blocks read or missing IANA + * number. + */ + return -1; + } + if (rc < 1) { + /* Error or no bytes read */ + break; + } + + if (i == 0) { + /* + * The first three bytes of block zero are an IANA + * Enterprise ID number. Check it matches the IBM + * number, '2'. + */ + if (block_buffer[0] != 0x02 || + block_buffer[1] != 0x00 || + block_buffer[2] != 0x00) { + pb_log_fn("IANA number unrecognised: 0x%x:0x%x:0x%x\n", + block_buffer[0], + block_buffer[1], + block_buffer[2]); + return -1; + } + } + + mailbox_buffer = talloc_realloc(platform, mailbox_buffer, + char, mailbox_size + rc); + if (!mailbox_buffer) { + pb_log_fn("Failed to allocate mailbox buffer\n"); + return -1; + } + memcpy(mailbox_buffer + mailbox_size, block_buffer, rc); + mailbox_size += rc; + } + + if (i < 5) + pb_log_fn("Only %hu blocks read, spec requires at least 5.\n" + "Send a bug report to your preferred BMC vendor!\n", + i); + else + pb_debug_fn("%hu blocks read (%zu bytes)\n", i, mailbox_size); + + if (mailbox_size < 3 + strlen("petitboot,bootdevs=")) + return -1; + + prefix = talloc_strndup(mailbox_buffer, mailbox_buffer + 3, + strlen("petitboot,bootdevs=")); + if (!prefix) { + pb_log_fn("Couldn't check prefix\n"); + talloc_free(mailbox_buffer); + return -1; + } + + if (strncmp(prefix, "petitboot,bootdevs=", + strlen("petitboot,bootdevs=")) != 0 ) { + /* Empty or garbage */ + pb_debug_fn("Buffer looks unconfigured\n"); + talloc_free(mailbox_buffer); + *buf = NULL; + return 0; + } + + /* Don't include IANA number in buffer */ + content_size = mailbox_size - 3 - strlen("petitboot,bootdevs="); + *buf = talloc_memdup(platform, + mailbox_buffer + 3 + strlen("petitboot,bootdevs="), + content_size + 1); + (*buf)[content_size] = '\0'; + + talloc_free(mailbox_buffer); + return 0; +} + +static int clear_ipmi_boot_mailbox(struct platform_powerpc *platform) +{ + uint8_t req[18] = {0}; /* req (2) + blocksize (16) */ + uint16_t resp_len; + uint8_t resp[1]; + uint8_t i; + int rc; + + req[0] = 0x07; /* parameter selector: boot initiator mailbox */ + + resp_len = sizeof(resp); + + for (i = 0; i < UCHAR_MAX; i++) { + req[1] = i; /* set selector */ + rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_CHASSIS, + IPMI_CMD_CHASSIS_SET_SYSTEM_BOOT_OPTIONS, + req, sizeof(req), + resp, &resp_len, + ipmi_timeout); + + if (rc || resp[0]) { + if (i == 0) { + pb_log_fn("error clearing IPMI boot mailbox, " + "rc %d resp[0] %hu\n", + rc, resp[0]); + return -1; + } + break; + } + } + + pb_debug_fn("Cleared %hu blocks\n", i); + + return 0; +} + static int set_ipmi_os_boot_sensor(struct platform_powerpc *platform) { int sensor_number; @@ -884,6 +684,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform, uint16_t min_len = 12, resp_len = 53, version; const uint32_t magic_value = 0x21706221; uint8_t resp[resp_len]; + char *debug_buf; uint32_t cookie; bool persistent; int i, rc; @@ -899,17 +700,9 @@ static void get_ipmi_network_override(struct platform_powerpc *platform, resp, &resp_len, ipmi_timeout); - pb_debug("IPMI net override resp [%d][%d]:\n", rc, resp_len); - if (resp_len > 0) { - for (i = 0; i < resp_len; i++) { - pb_debug(" %02x", resp[i]); - if (i && (i + 1) % 16 == 0 && i != resp_len - 1) - pb_debug("\n"); - else if (i && (i + 1) % 8 == 0) - pb_debug(" "); - } - pb_debug("\n"); - } + debug_buf = format_buffer(platform, resp, resp_len); + pb_debug_fn("IPMI net override response:\n%s\n", debug_buf); + talloc_free(debug_buf); if (rc) { pb_debug("IPMI network config option unavailable\n"); @@ -974,15 +767,15 @@ static void get_ipmi_network_override(struct platform_powerpc *platform, if (!rc && persistent) { /* Write this new config to NVRAM */ - update_network_config(&platform->params, "petitboot,network", - config); + params_update_network_values(platform->params, + "petitboot,network", config); rc = write_nvram(platform); if (rc) pb_log("platform: Failed to save persistent interface override\n"); } } -static void get_active_consoles(struct config *config) +static void config_get_active_consoles(struct config *config) { struct stat sbuf; char *fsp_prop = NULL; @@ -1018,13 +811,39 @@ err: static int load_config(struct platform *p, struct config *config) { struct platform_powerpc *platform = to_platform_powerpc(p); + const char *hash; int rc; rc = parse_nvram(platform); if (rc) pb_log_fn("Failed to parse nvram\n"); - populate_config(config, &platform->params); + /* + * If we have an IPMI mailbox configuration available use it instead of + * the boot order found in NVRAM. + */ + if (platform->get_ipmi_boot_mailbox) { + char *mailbox; + struct param *param; + rc = platform->get_ipmi_boot_mailbox(platform, &mailbox); + if (!rc && mailbox) { + platform->ipmi_mailbox_original_config = + talloc_strdup( + platform, + param_list_get_value( + platform->params, "petitboot,bootdevs")); + param_list_set(platform->params, "petitboot,bootdevs", + mailbox, false); + param = param_list_get_param(platform->params, + "petitboot,bootdevs"); + /* Avoid writing this to NVRAM */ + param->modified = false; + config->ipmi_bootdev_mailbox = true; + talloc_free(mailbox); + } + } + + config_populate_all(config, platform->params); if (platform->get_ipmi_bootdev) { bool bootdev_persistent; @@ -1032,14 +851,23 @@ static int load_config(struct platform *p, struct config *config) rc = platform->get_ipmi_bootdev(platform, &bootdev, &bootdev_persistent); if (!rc && ipmi_bootdev_is_valid(bootdev)) { - set_ipmi_bootdev(config, bootdev, bootdev_persistent); + config_set_ipmi_bootdev(config, bootdev, + bootdev_persistent); } } if (platform->ipmi) get_ipmi_network_override(platform, config); - get_active_consoles(config); + config_get_active_consoles(config); + + + hash = param_list_get_value(platform->params, "petitboot,password"); + if (hash) { + rc = crypt_set_password_hash(platform, hash); + if (rc) + pb_log("Failed to set password hash\n"); + } return 0; } @@ -1048,6 +876,7 @@ static int save_config(struct platform *p, struct config *config) { struct platform_powerpc *platform = to_platform_powerpc(p); struct config *defaults; + struct param *param; if (config->ipmi_bootdev == IPMI_BOOTDEV_INVALID && platform->clear_ipmi_bootdev) { @@ -1057,10 +886,27 @@ static int save_config(struct platform *p, struct config *config) config->ipmi_bootdev_persistent = false; } + if (!config->ipmi_bootdev_mailbox && + platform->ipmi_mailbox_original_config) { + param = param_list_get_param(platform->params, + "petitboot,bootdevs"); + /* Restore old boot order if unmodified */ + if (!param->modified) { + param_list_set(platform->params, "petitboot,bootdevs", + platform->ipmi_mailbox_original_config, + false); + param->modified = false; + config_populate_bootdev(config, platform->params); + } + platform->clear_ipmi_boot_mailbox(platform); + talloc_free(platform->ipmi_mailbox_original_config); + platform->ipmi_mailbox_original_config = NULL; + } + defaults = talloc_zero(platform, struct config); config_set_defaults(defaults); - update_config(&platform->params, config, defaults); + params_update_all(platform->params, config, defaults); talloc_free(defaults); return write_nvram(platform); @@ -1108,6 +954,23 @@ static int get_sysinfo(struct platform *p, struct system_info *sysinfo) return 0; } +static bool restrict_clients(struct platform *p) +{ + struct platform_powerpc *platform = to_platform_powerpc(p); + + return param_list_get_value(platform->params, "petitboot,password") != NULL; +} + +static int set_password(struct platform *p, const char *hash) +{ + struct platform_powerpc *platform = to_platform_powerpc(p); + + param_list_set(platform->params, "petitboot,password", hash, true); + write_nvram(platform); + + return 0; +} + static bool probe(struct platform *p, void *ctx) { struct platform_powerpc *platform; @@ -1124,7 +987,8 @@ static bool probe(struct platform *p, void *ctx) return false; platform = talloc_zero(ctx, struct platform_powerpc); - param_list_init(&platform->params, common_known_params()); + platform->params = talloc_zero(platform, struct param_list); + param_list_init(platform->params, common_known_params()); p->platform_data = platform; @@ -1135,6 +999,8 @@ static bool probe(struct platform *p, void *ctx) platform->ipmi = ipmi_open(platform); platform->get_ipmi_bootdev = get_ipmi_bootdev_ipmi; platform->clear_ipmi_bootdev = clear_ipmi_bootdev_ipmi; + platform->get_ipmi_boot_mailbox = get_ipmi_boot_mailbox; + platform->clear_ipmi_boot_mailbox = clear_ipmi_boot_mailbox; platform->set_os_boot_sensor = set_ipmi_os_boot_sensor; } else if (!stat(sysparams_dir, &statbuf)) { pb_debug("platform: using sysparams for IPMI paramters\n"); @@ -1160,6 +1026,8 @@ static struct platform platform_powerpc = { .save_config = save_config, .pre_boot = pre_boot, .get_sysinfo = get_sysinfo, + .restrict_clients = restrict_clients, + .set_password = set_password, }; register_platform(platform_powerpc);