#include <assert.h>
#include <string.h>
#include <stdlib.h>
-#include <limits.h>
#include <errno.h>
+#include <fcntl.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/fcntl.h>
#include <sys/stat.h>
#include <asm/byteorder.h>
#include <list/list.h>
#include <log/log.h>
#include <process/process.h>
-#include <types/types.h>
#include "hostboot.h"
#include "platform.h"
static const char *partition = "common";
static const char *sysparams_dir = "/sys/firmware/opal/sysparams/";
static const char *devtree_dir = "/proc/device-tree/";
-static const int ipmi_timeout = 5000; /* milliseconds. */
-
-struct param {
- char *name;
- char *value;
- bool modified;
- struct list_item list;
-};
struct platform_powerpc {
- struct list params;
+ struct param_list *params;
struct ipmi *ipmi;
- bool ipmi_bootdev_persistent;
int (*get_ipmi_bootdev)(
struct platform_powerpc *platform,
uint8_t *bootdev, bool *persistent);
void (*get_platform_versions)(struct system_info *info);
};
-static const char *known_params[] = {
- "auto-boot?",
- "petitboot,network",
- "petitboot,timeout",
- "petitboot,bootdevs",
- "petitboot,language",
- "petitboot,debug?",
- "petitboot,write?",
- "petitboot,snapshots?",
- "petitboot,console",
- "petitboot,http_proxy",
- "petitboot,https_proxy",
- NULL,
-};
-
#define to_platform_powerpc(p) \
(struct platform_powerpc *)(p->platform_data)
-static bool param_is_known(const char *param, unsigned int len)
-{
- const char *known_param;
- unsigned int i;
-
- for (i = 0; known_params[i]; i++) {
- known_param = known_params[i];
- if (len == strlen(known_param) &&
- !strncmp(param, known_param, len))
- return true;
- }
-
- return false;
-}
-
static int parse_nvram_params(struct platform_powerpc *platform,
char *buf, int len)
{
for (pos = buf + i; pos < buf + len; pos += paramlen + 1) {
unsigned int namelen;
- struct param *param;
char *newline;
newline = strchr(pos, '\n');
if (namelen == 0)
continue;
- if (!param_is_known(name, namelen))
+ if (!param_list_is_known_n(platform->params, name, namelen))
continue;
+ *value = '\0';
value++;
- param = talloc(platform, struct param);
- param->modified = false;
- param->name = talloc_strndup(platform, name, namelen);
- param->value = talloc_strdup(platform, value);
- list_add(&platform->params, ¶m->list);
+ param_list_set(platform->params, name, value, false);
}
return 0;
static int parse_nvram(struct platform_powerpc *platform)
{
- struct process *process;
+ struct process_stdout *stdout;
const char *argv[5];
int rc;
argv[3] = partition;
argv[4] = NULL;
- process = process_create(platform);
- process->path = "nvram";
- process->argv = argv;
- process->keep_stdout = true;
-
- rc = process_run_sync(process);
+ rc = process_get_stdout_argv(NULL, &stdout, argv);
- if (rc || !process_exit_ok(process)) {
+ if (rc) {
fprintf(stderr, "nvram process returned "
"non-zero exit status\n");
rc = -1;
} else {
- rc = parse_nvram_params(platform, process->stdout_buf,
- process->stdout_len);
+ rc = parse_nvram_params(platform, stdout->buf, stdout->len);
}
- process_release(process);
+ talloc_free(stdout);
return rc;
}
process->path = "nvram";
process->argv = argv;
- list_for_each_entry(&platform->params, param, list) {
+ param_list_for_each(platform->params, param) {
char *paramstr;
if (!param->modified)
return rc;
}
-static const char *get_param(struct platform_powerpc *platform,
- const char *name)
-{
- struct param *param;
-
- list_for_each_entry(&platform->params, param, list)
- if (!strcmp(param->name, name))
- return param->value;
- return NULL;
-}
-
-static void set_param(struct platform_powerpc *platform, const char *name,
- const char *value)
-{
- struct param *param;
-
- list_for_each_entry(&platform->params, param, list) {
- if (strcmp(param->name, name))
- continue;
-
- if (!strcmp(param->value, value))
- return;
-
- talloc_free(param->value);
- param->value = talloc_strdup(param, value);
- param->modified = true;
- return;
- }
-
-
- param = talloc(platform, struct param);
- param->modified = true;
- param->name = talloc_strdup(platform, name);
- param->value = talloc_strdup(platform, value);
- list_add(&platform->params, ¶m->list);
-}
-
-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, *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);
-
- tok = strtok_r(NULL, ",", &saveptr);
- if (tok) {
- ifconf->static_config.gateway =
- talloc_strdup(ifconf, tok);
- }
-
- tok = strtok_r(NULL, ",", &saveptr);
- if (tok) {
- ifconf->static_config.url =
- talloc_strdup(ifconf, tok);
- }
-
- } 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 platform_powerpc *platform,
- struct config *config)
-{
- char *val, *saveptr = NULL;
- const char *cval;
- int i;
-
- cval = get_param(platform, "petitboot,network");
- 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 platform_powerpc *platform,
- struct config *config)
-{
- struct autoboot_option *opt, *new = NULL;
- char *pos, *end;
- unsigned int n_new = 0;
- const char *val;
-
- /* Check for ordered bootdevs */
- val = get_param(platform, "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 set_proxy_variables(struct config *config)
-{
- if (config->http_proxy)
- setenv("http_proxy", config->http_proxy, 1);
- else
- unsetenv("http_proxy");
-
- if (config->https_proxy)
- setenv("https_proxy", config->https_proxy, 1);
- else
- unsetenv("https_proxy");
-}
-
-static void populate_config(struct platform_powerpc *platform,
- struct config *config)
-{
- const char *val;
- char *end;
- unsigned long timeout;
-
- /* if the "auto-boot?' property is present and "false", disable auto
- * boot */
- val = get_param(platform, "auto-boot?");
- config->autoboot_enabled = !val || strcmp(val, "false");
-
- val = get_param(platform, "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 = get_param(platform, "petitboot,language");
- config->lang = val ? talloc_strdup(config, val) : NULL;
-
- populate_network_config(platform, config);
-
- populate_bootdev_config(platform, config);
-
- if (!config->debug) {
- val = get_param(platform, "petitboot,debug?");
- config->debug = val && !strcmp(val, "true");
- }
-
- val = get_param(platform, "petitboot,write?");
- if (val)
- config->allow_writes = !strcmp(val, "true");
-
- val = get_param(platform, "petitboot,snapshots?");
- if (val)
- config->disable_snapshots = !strcmp(val, "false");
-
- val = get_param(platform, "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 = get_param(platform, "petitboot,http_proxy");
- if (val)
- config->http_proxy = talloc_strdup(config, val);
- val = get_param(platform, "petitboot,https_proxy");
- if (val)
- config->https_proxy = talloc_strdup(config, val);
- set_proxy_variables(config);
-}
-
-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_string_config(struct platform_powerpc *platform,
- const char *name, const char *value)
-{
- const char *cur;
-
- cur = get_param(platform, name);
-
- /* don't set an empty parameter if it doesn't already exist */
- if (!cur && !strlen(value))
- return;
-
- set_param(platform, name, value);
-}
-
-static void update_network_config(struct platform_powerpc *platform,
- 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(platform, "");
-
- for (i = 0; i < config->network.n_interfaces; i++) {
- char *iface_str = iface_config_str(platform,
- 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(platform,
- config->network.dns_servers,
- config->network.n_dns_servers);
- val = talloc_asprintf_append(val, "%s%s",
- *val == '\0' ? "" : " ", dns_str);
- talloc_free(dns_str);
- }
-
- update_string_config(platform, "petitboot,network", val);
-
- talloc_free(val);
-}
-
-static void update_bootdev_config(struct platform_powerpc *platform,
- 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);
- }
-
- update_string_config(platform, "petitboot,bootdevs", val);
- talloc_free(tmp);
- if (boot_str)
- talloc_free(boot_str);
-}
-
-static int update_config(struct platform_powerpc *platform,
- struct config *config, 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;
val = "";
else
val = config->autoboot_enabled ? "true" : "false";
- update_string_config(platform, "auto-boot?", val);
+
+ param_list_set_non_empty(pl, "auto-boot?", val, true);
if (config->autoboot_timeout_sec == defaults->autoboot_timeout_sec)
val = "";
else
- val = tmp = talloc_asprintf(platform, "%d",
- config->autoboot_timeout_sec);
+ val = tmp = talloc_asprintf(pl, "%d",
+ config->autoboot_timeout_sec);
- if (config->ipmi_bootdev == IPMI_BOOTDEV_INVALID &&
- platform->clear_ipmi_bootdev) {
- platform->clear_ipmi_bootdev(platform,
- config->ipmi_bootdev_persistent);
- config->ipmi_bootdev = IPMI_BOOTDEV_NONE;
- config->ipmi_bootdev_persistent = false;
- }
-
- update_string_config(platform, "petitboot,timeout", val);
+ param_list_set_non_empty(pl, "petitboot,timeout", val, true);
if (tmp)
talloc_free(tmp);
val = config->lang ?: "";
- update_string_config(platform, "petitboot,language", val);
+ param_list_set_non_empty(pl, "petitboot,language", val, true);
if (config->allow_writes == defaults->allow_writes)
val = "";
else
val = config->allow_writes ? "true" : "false";
- update_string_config(platform, "petitboot,write?", val);
+ param_list_set_non_empty(pl, "petitboot,write?", val, true);
if (!config->manual_console) {
val = config->boot_console ?: "";
- update_string_config(platform, "petitboot,console", val);
+ param_list_set_non_empty(pl, "petitboot,console", val, true);
}
val = config->http_proxy ?: "";
- update_string_config(platform, "petitboot,http_proxy", val);
+ param_list_set_non_empty(pl, "petitboot,http_proxy", val, true);
val = config->https_proxy ?: "";
- update_string_config(platform, "petitboot,https_proxy", val);
- set_proxy_variables(config);
+ param_list_set_non_empty(pl, "petitboot,https_proxy", val, true);
- update_network_config(platform, config);
-
- update_bootdev_config(platform, config);
-
- return write_nvram(platform);
+ 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;
{
uint16_t resp_len;
uint8_t resp[8];
+ char *debug_buf;
int rc;
uint8_t req[] = {
0x05, /* parameter selector: boot flags */
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",
return 0;
}
-static void get_ipmi_bmc_mac(struct platform *p, uint8_t *buf)
-{
- struct platform_powerpc *platform = p->platform_data;
- uint16_t resp_len = 8;
- uint8_t resp[8];
- uint8_t req[] = { 0x1, 0x5, 0x0, 0x0 };
- int i, rc;
-
- rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_TRANSPORT,
- IPMI_CMD_TRANSPORT_GET_LAN_PARAMS,
- req, sizeof(req),
- resp, &resp_len,
- ipmi_timeout);
-
- pb_debug("BMC MAC resp [%d][%d]:\n", rc, resp_len);
-
- if (rc == 0 && resp_len > 0) {
- for (i = 2; i < resp_len; i++) {
- pb_debug(" %x", resp[i]);
- buf[i - 2] = resp[i];
- }
- pb_debug("\n");
- }
-
-}
-
-/*
- * Retrieve info from the "Get Device ID" IPMI commands.
- * See Chapter 20.1 in the IPMIv2 specification.
- */
-static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
-{
- struct platform_powerpc *platform = p->platform_data;
- uint16_t resp_len = 16;
- uint8_t resp[16], bcd;
- int i, rc;
-
- /* Retrieve info from current side */
- rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_APP,
- IPMI_CMD_APP_GET_DEVICE_ID,
- NULL, 0,
- resp, &resp_len,
- ipmi_timeout);
-
- pb_debug("BMC version resp [%d][%d]:\n", rc, resp_len);
- if (resp_len > 0) {
- for (i = 0; i < resp_len; i++) {
- pb_debug(" %x", resp[i]);
- }
- pb_debug("\n");
- }
-
- if (rc == 0 && resp_len == 16) {
- info->bmc_current = talloc_array(info, char *, 4);
- info->n_bmc_current = 4;
-
- info->bmc_current[0] = talloc_asprintf(info, "Device ID: 0x%x",
- resp[1]);
- info->bmc_current[1] = talloc_asprintf(info, "Device Rev: 0x%x",
- resp[2]);
- bcd = resp[4] & 0x0f;
- bcd += 10 * (resp[4] >> 4);
- /* rev1.rev2.aux_revision */
- info->bmc_current[2] = talloc_asprintf(info,
- "Firmware version: %u.%02u.%02x%02x%02x%02x",
- resp[3], bcd, resp[12],
- resp[13], resp[14], resp[15]);
- bcd = resp[5] & 0x0f;
- bcd += 10 * (resp[5] >> 4);
- info->bmc_current[3] = talloc_asprintf(info, "IPMI version: %u",
- bcd);
- } else
- pb_log("Failed to retrieve Device ID from IPMI\n");
-
- /* Retrieve info from golden side */
- memset(resp, 0, sizeof(resp));
- resp_len = 16;
- rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_AMI,
- IPMI_CMD_APP_GET_DEVICE_ID_GOLDEN,
- NULL, 0,
- resp, &resp_len,
- ipmi_timeout);
-
- pb_debug("BMC golden resp [%d][%d]:\n", rc, resp_len);
- if (resp_len > 0) {
- for (i = 0; i < resp_len; i++) {
- pb_debug(" %x", resp[i]);
- }
- pb_debug("\n");
- }
-
- if (rc == 0 && resp_len == 16) {
- info->bmc_golden = talloc_array(info, char *, 4);
- info->n_bmc_golden = 4;
-
- info->bmc_golden[0] = talloc_asprintf(info, "Device ID: 0x%x",
- resp[1]);
- info->bmc_golden[1] = talloc_asprintf(info, "Device Rev: 0x%x",
- resp[2]);
- bcd = resp[4] & 0x0f;
- bcd += 10 * (resp[4] >> 4);
- /* rev1.rev2.aux_revision */
- info->bmc_golden[2] = talloc_asprintf(info,
- "Firmware version: %u.%02u.%02x%02x%02x%02x",
- resp[3], bcd, resp[12],
- resp[13], resp[14], resp[15]);
- bcd = resp[5] & 0x0f;
- bcd += 10 * (resp[5] >> 4);
- info->bmc_golden[3] = talloc_asprintf(info, "IPMI version: %u",
- bcd);
- } else
- pb_log("Failed to retrieve Golden Device ID from IPMI\n");
-}
-
static void get_ipmi_network_override(struct platform_powerpc *platform,
struct config *config)
{
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;
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");
memcpy(&cookie, &resp[i], sizeof(cookie));
cookie = __be32_to_cpu(cookie);
if (cookie != magic_value) {
- pb_log("%s: Incorrect cookie %x\n", __func__, cookie);
+ pb_log_fn("Incorrect cookie %x\n", cookie);
return;
}
i += sizeof(cookie);
if (!rc && persistent) {
/* Write this new config to NVRAM */
- update_network_config(platform, 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;
rc = parse_nvram(platform);
if (rc)
- pb_log("%s: Failed to parse nvram\n", __func__);
+ pb_log_fn("Failed to parse nvram\n");
- populate_config(platform, config);
+ config_populate_all(config, platform->params);
if (platform->get_ipmi_bootdev) {
bool bootdev_persistent;
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);
return 0;
}
{
struct platform_powerpc *platform = to_platform_powerpc(p);
struct config *defaults;
- int rc;
+
+ if (config->ipmi_bootdev == IPMI_BOOTDEV_INVALID &&
+ platform->clear_ipmi_bootdev) {
+ platform->clear_ipmi_bootdev(platform,
+ config->ipmi_bootdev_persistent);
+ config->ipmi_bootdev = IPMI_BOOTDEV_NONE;
+ config->ipmi_bootdev_persistent = false;
+ }
defaults = talloc_zero(platform, struct config);
config_set_defaults(defaults);
- rc = update_config(platform, config, defaults);
+ params_update_all(platform->params, config, defaults);
talloc_free(defaults);
- return rc;
+ return write_nvram(platform);
}
static void pre_boot(struct platform *p, const struct config *config)
talloc_free(filename);
sysinfo->bmc_mac = talloc_zero_size(sysinfo, HWADDR_SIZE);
- if (platform->ipmi)
- get_ipmi_bmc_mac(p, sysinfo->bmc_mac);
- if (platform->ipmi)
- get_ipmi_bmc_versions(p, sysinfo);
+ if (platform->ipmi) {
+ ipmi_get_bmc_mac(platform->ipmi, sysinfo->bmc_mac);
+ ipmi_get_bmc_versions(platform->ipmi, sysinfo);
+ }
if (platform->get_platform_versions)
platform->get_platform_versions(sysinfo);
return false;
platform = talloc_zero(ctx, struct platform_powerpc);
- list_init(&platform->params);
+ platform->params = talloc_zero(platform, struct param_list);
+ param_list_init(platform->params, common_known_params());
p->platform_data = platform;