X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=84e18ccca5c51e73edc93585cbefe1a30b822598;hp=4cc91fa2594eeac6c2b939ee50c4dc0821fe433a;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=6600e73fe891d5006c34f694e97e37eefceb921d

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 4cc91fa..84e18cc 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -2,12 +2,12 @@
 #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 <file/file.h>
 #include <talloc/talloc.h>
@@ -15,6 +15,7 @@
 #include <log/log.h>
 #include <process/process.h>
 
+#include "hostboot.h"
 #include "platform.h"
 #include "ipmi.h"
 #include "dt.h"
@@ -22,59 +23,25 @@
 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 = 500; /* 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);
 	int		(*clear_ipmi_bootdev)(
-				struct platform_powerpc *platform);
+				struct platform_powerpc *platform,
+				bool persistent);
 	int 		(*set_os_boot_sensor)(
 				struct platform_powerpc *platform);
-};
-
-static const char *known_params[] = {
-	"auto-boot?",
-	"petitboot,network",
-	"petitboot,timeout",
-	"petitboot,bootdev",
-	"petitboot,language",
-	"petitboot,debug?",
-	NULL,
+	void		(*get_platform_versions)(struct system_info *info);
 };
 
 #define to_platform_powerpc(p) \
 	(struct platform_powerpc *)(p->platform_data)
 
-/* a partition max a max size of 64k * 16bytes = 1M */
-static const int max_partition_size = 64 * 1024 * 16;
-
-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)
 {
@@ -103,7 +70,6 @@ static int parse_nvram_params(struct platform_powerpc *platform,
 
 	for (pos = buf + i; pos < buf + len; pos += paramlen + 1) {
 		unsigned int namelen;
-		struct param *param;
 		char *newline;
 
 		newline = strchr(pos, '\n');
@@ -123,16 +89,13 @@ static int parse_nvram_params(struct platform_powerpc *platform,
 		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, &param->list);
+		param_list_set(&platform->params, name, value, false);
 	}
 
 	return 0;
@@ -140,7 +103,7 @@ static int parse_nvram_params(struct platform_powerpc *platform,
 
 static int parse_nvram(struct platform_powerpc *platform)
 {
-	struct process *process;
+	struct process_stdout *stdout;
 	const char *argv[5];
 	int rc;
 
@@ -150,23 +113,17 @@ static int parse_nvram(struct platform_powerpc *platform)
 	argv[3] = partition;
 	argv[4] = NULL;
 
-	process = process_create(platform);
-	process->path = "nvram";
-	process->argv = argv;
-	process->keep_stdout = true;
+	rc = process_get_stdout_argv(NULL, &stdout, argv);
 
-	rc = process_run_sync(process);
-
-	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;
 }
 
@@ -175,7 +132,7 @@ static int write_nvram(struct platform_powerpc *platform)
 	struct process *process;
 	struct param *param;
 	const char *argv[6];
-	int rc;
+	int rc = 0;
 
 	argv[0] = "nvram";
 	argv[1] = "--update-config";
@@ -188,7 +145,7 @@ static int write_nvram(struct platform_powerpc *platform)
 	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)
@@ -214,343 +171,8 @@ static int write_nvram(struct platform_powerpc *platform)
 	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, &param->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 */
-		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);
-		}
-
-	} 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 void populate_bootdev_config(struct platform_powerpc *platform,
-		struct config *config)
-
-{
-	const char *val;
-
-	config->boot_device = NULL;
-
-	val = get_param(platform, "petitboot,bootdev");
-	if (!val || !strlen(val))
-		return;
-
-	if (!strncmp(val, "uuid:", strlen("uuid:"))) {
-		config->boot_device = talloc_strdup(config,
-						val + strlen("uuid:"));
-
-	} else if (!strncmp(val, "mac:", strlen("mac:"))) {
-		config->boot_device = talloc_strdup(config,
-						val + strlen("mac:"));
-
-	} else {
-		pb_log("bootdev config is in an unknown format "
-				"(expected uuid:... or mac:...)");
-	}
-}
-
-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");
-	}
-}
-
-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",
-				config->static_config.address,
-				config->static_config.gateway ? "," : "",
-				config->static_config.gateway ?: "");
-	}
-	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;
-
-	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, *tmp = NULL;
-
-	if (!config->boot_device)
-		val = "";
-	else
-		tmp = val = talloc_asprintf(platform,
-				"uuid:%s", config->boot_device);
-
-	update_string_config(platform, "petitboot,bootdev", val);
-	talloc_free(tmp);
-}
-
-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;
@@ -559,48 +181,50 @@ static int update_config(struct platform_powerpc *platform,
 		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);
 
-	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);
 
-	update_network_config(platform, config);
+	if (config->allow_writes == defaults->allow_writes)
+		val = "";
+	else
+		val = config->allow_writes ? "true" : "false";
+	param_list_set_non_empty(pl, "petitboot,write?", val, true);
 
-	update_bootdev_config(platform, config);
+	if (!config->manual_console) {
+		val = config->boot_console ?: "";
+		param_list_set_non_empty(pl, "petitboot,console", val, true);
+	}
 
-	return write_nvram(platform);
+	val = config->http_proxy ?: "";
+	param_list_set_non_empty(pl, "petitboot,http_proxy", val, true);
+	val = config->https_proxy ?: "";
+	param_list_set_non_empty(pl, "petitboot,https_proxy", val, true);
+
+	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;
 	config->ipmi_bootdev_persistent = persistent;
 
-	switch (bootdev) {
-	case IPMI_BOOTDEV_NONE:
-	case IPMI_BOOTDEV_DISK:
-	case IPMI_BOOTDEV_NETWORK:
-	case IPMI_BOOTDEV_CDROM:
-		break;
-	case IPMI_BOOTDEV_SETUP:
-		config->autoboot_enabled = false;
-		break;
-	case IPMI_BOOTDEV_SAFE:
-		config->autoboot_enabled = false;
+	if (bootdev == IPMI_BOOTDEV_SAFE)
 		config->safe_mode = true;
-		break;
-	}
 }
 
 static int read_bootdev_sysparam(const char *name, uint8_t *val)
@@ -609,9 +233,8 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val)
 	char path[50];
 	int fd, rc;
 
-	strcpy(path, sysparams_dir);
-	assert(strlen(name) < sizeof(path) - strlen(path));
-	strcat(path, name);
+	assert(strlen(sysparams_dir) + strlen(name) < sizeof(path));
+	snprintf(path, sizeof(path), "%s%s", sysparams_dir, name);
 
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
@@ -645,9 +268,8 @@ static int write_bootdev_sysparam(const char *name, uint8_t val)
 	char path[50];
 	int fd, rc;
 
-	strcpy(path, sysparams_dir);
-	assert(strlen(name) < sizeof(path) - strlen(path));
-	strcat(path, name);
+	assert(strlen(sysparams_dir) + strlen(name) < sizeof(path));
+	snprintf(path, sizeof(path), "%s%s", sysparams_dir, name);
 
 	fd = open(path, O_WRONLY);
 	if (fd < 0) {
@@ -681,10 +303,16 @@ static int write_bootdev_sysparam(const char *name, uint8_t val)
 }
 
 static int clear_ipmi_bootdev_sysparams(
-		struct platform_powerpc *platform __attribute__((unused)))
+		struct platform_powerpc *platform __attribute__((unused)),
+		bool persistent)
 {
-	/* invalidate next-boot-device setting */
-	write_bootdev_sysparam("next-boot-device", 0xff);
+	if (persistent) {
+		/* invalidate default-boot-device setting */
+		write_bootdev_sysparam("default-boot-device", 0xff);
+	} else {
+		/* invalidate next-boot-device setting */
+		write_bootdev_sysparam("next-boot-device", 0xff);
+	}
 	return 0;
 }
 
@@ -711,7 +339,8 @@ static int get_ipmi_bootdev_sysparams(
 	return 0;
 }
 
-static int clear_ipmi_bootdev_ipmi(struct platform_powerpc *platform)
+static int clear_ipmi_bootdev_ipmi(struct platform_powerpc *platform,
+				   bool persistent __attribute__((unused)))
 {
 	uint16_t resp_len;
 	uint8_t resp[1];
@@ -763,6 +392,11 @@ 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");
+
 	if (resp[0] != 0) {
 		pb_log("platform: non-zero completion code %d from IPMI req\n",
 				resp[0]);
@@ -787,7 +421,7 @@ static int get_ipmi_bootdev_ipmi(struct platform_powerpc *platform,
 	/* check for valid flags */
 	if (!(resp[3] & 0x80)) {
 		pb_debug("platform: boot flags are invalid, ignoring\n");
-		return 0;
+		return -1;
 	}
 
 	*persistent = resp[3] & 0x40;
@@ -802,7 +436,7 @@ static int set_ipmi_os_boot_sensor(struct platform_powerpc *platform)
 	uint8_t resp[1];
 	uint8_t req[] = {
 		0x00, /* sensor number: os boot */
-		0x10, /* operation: set assertion bits */
+		0xA9, /* operation: set everything */
 		0x00, /* sensor reading: none */
 		0x40, /* assertion mask lsb: set state 6 */
 		0x00, /* assertion mask msb: none */
@@ -832,6 +466,143 @@ static int set_ipmi_os_boot_sensor(struct platform_powerpc *platform)
 	return 0;
 }
 
+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];
+	uint32_t cookie;
+	bool persistent;
+	int i, rc;
+	uint8_t req[] = {
+		0x61, /* parameter selector: OEM section (network) */
+		0x00, /* no set selector */
+		0x00, /* no block selector */
+	};
+
+	rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_CHASSIS,
+			IPMI_CMD_CHASSIS_GET_SYSTEM_BOOT_OPTIONS,
+			req, sizeof(req),
+			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");
+	}
+
+	if (rc) {
+		pb_debug("IPMI network config option unavailable\n");
+		return;
+	}
+
+	if (resp_len < min_len) {
+		pb_debug("IPMI net response too small\n");
+		return;
+	}
+
+	if (resp[0] != 0) {
+		pb_log("platform: non-zero completion code %d from IPMI network req\n",
+		       resp[0]);
+		return;
+	}
+
+	/* Check for correct parameter version */
+	if ((resp[1] & 0xf) != 0x1) {
+		pb_log("platform: unexpected version (0x%x) in network override response\n",
+		       resp[0]);
+		return;
+	}
+
+	/* Check that the parameters are valid */
+	if (resp[2] & 0x80) {
+		pb_debug("platform: network override is invalid/locked\n");
+		return;
+	}
+
+	/* Check for valid parameters in the boot flags section */
+	if (!(resp[3] & 0x80)) {
+		pb_debug("platform: network override valid flag not set\n");
+		return;
+	}
+	/* Read the persistent flag; if it is set we need to save this config */
+	persistent = resp[3] & 0x40;
+	if (persistent)
+		pb_debug("platform: network override is persistent\n");
+
+	/* Check 4-byte cookie value */
+	i = 4;
+	memcpy(&cookie, &resp[i], sizeof(cookie));
+	cookie = __be32_to_cpu(cookie);
+	if (cookie != magic_value) {
+		pb_log_fn("Incorrect cookie %x\n", cookie);
+		return;
+	}
+	i += sizeof(cookie);
+
+	/* Check 2-byte version number */
+	memcpy(&version, &resp[i], sizeof(version));
+	version = __be16_to_cpu(version);
+	i += sizeof(version);
+	if (version != 1) {
+		pb_debug("Unexpected version: %u\n", version);
+		return;
+	}
+
+	/* Interpret the rest of the interface config */
+	rc = parse_ipmi_interface_override(config, &resp[i], resp_len - i);
+
+	if (!rc && persistent) {
+		/* Write this new config to NVRAM */
+		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 config_get_active_consoles(struct config *config)
+{
+	struct stat sbuf;
+	char *fsp_prop = NULL;
+
+	config->n_consoles = 2;
+	config->consoles = talloc_array(config, char *, config->n_consoles);
+	if (!config->consoles)
+		goto err;
+
+	config->consoles[0] = talloc_asprintf(config->consoles,
+					"/dev/hvc0 [IPMI / Serial]");
+	config->consoles[1] = talloc_asprintf(config->consoles,
+					"/dev/tty1 [VGA]");
+
+	fsp_prop = talloc_asprintf(config, "%sfsps", devtree_dir);
+	if (stat(fsp_prop, &sbuf) == 0) {
+		/* FSP based machines also have a separate serial console */
+		config->consoles = talloc_realloc(config, config->consoles,
+						char *,	config->n_consoles + 1);
+		if (!config->consoles)
+			goto err;
+		config->consoles[config->n_consoles++] = talloc_asprintf(
+						config->consoles,
+						"/dev/hvc1 [Serial]");
+	}
+
+	return;
+err:
+	config->n_consoles = 0;
+	pb_log("Failed to allocate memory for consoles\n");
+}
+
 static int load_config(struct platform *p, struct config *config)
 {
 	struct platform_powerpc *platform = to_platform_powerpc(p);
@@ -839,20 +610,26 @@ static int load_config(struct platform *p, struct config *config)
 
 	rc = parse_nvram(platform);
 	if (rc)
-		return rc;
+		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;
-		uint8_t bootdev;
+		uint8_t bootdev = IPMI_BOOTDEV_INVALID;
 		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);
+
+	config_get_active_consoles(config);
+
 	return 0;
 }
 
@@ -860,15 +637,22 @@ static int save_config(struct platform *p, struct config *config)
 {
 	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)
@@ -876,7 +660,7 @@ static void pre_boot(struct platform *p, const struct config *config)
 	struct platform_powerpc *platform = to_platform_powerpc(p);
 
 	if (!config->ipmi_bootdev_persistent && platform->clear_ipmi_bootdev)
-		platform->clear_ipmi_bootdev(platform);
+		platform->clear_ipmi_bootdev(platform, false);
 
 	if (platform->set_os_boot_sensor)
 		platform->set_os_boot_sensor(platform);
@@ -900,6 +684,16 @@ static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 		sysinfo->identifier = talloc_steal(sysinfo, buf);
 	talloc_free(filename);
 
+	sysinfo->bmc_mac = talloc_zero_size(sysinfo, HWADDR_SIZE);
+
+	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 0;
 }
 
@@ -907,6 +701,7 @@ static bool probe(struct platform *p, void *ctx)
 {
 	struct platform_powerpc *platform;
 	struct stat statbuf;
+	bool bmc_present;
 	int rc;
 
 	/* we need a device tree */
@@ -918,17 +713,18 @@ static bool probe(struct platform *p, void *ctx)
 		return false;
 
 	platform = talloc_zero(ctx, struct platform_powerpc);
-	list_init(&platform->params);
+	param_list_init(&platform->params, common_known_params());
 
 	p->platform_data = platform;
 
-	if (ipmi_present()) {
+	bmc_present = stat("/proc/device-tree/bmc", &statbuf) == 0;
+
+	if (ipmi_present() && bmc_present) {
 		pb_debug("platform: using direct IPMI for IPMI paramters\n");
 		platform->ipmi = ipmi_open(platform);
 		platform->get_ipmi_bootdev = get_ipmi_bootdev_ipmi;
 		platform->clear_ipmi_bootdev = clear_ipmi_bootdev_ipmi;
 		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");
 		platform->get_ipmi_bootdev = get_ipmi_bootdev_sysparams;
@@ -938,6 +734,9 @@ static bool probe(struct platform *p, void *ctx)
 		pb_log("platform: no IPMI parameter support\n");
 	}
 
+	if (bmc_present)
+		platform->get_platform_versions = hostboot_load_versions;
+
 	return true;
 }