X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=87ff72ef0f22ef0b21882966dce960623ec49d16;hp=98deea557b920ab4ae215366fed7398a35ac671c;hb=e4e0bfd13106a562c4ef5be1c3129ccf6bb97bd0;hpb=1e1e3417262e44531d2a5c6dd3152d5deb92fb90

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 98deea5..87ff72e 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -4,9 +4,9 @@
 #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>
 
@@ -16,6 +16,7 @@
 #include <log/log.h>
 #include <process/process.h>
 #include <types/types.h>
+#include <url/url.h>
 
 #include "hostboot.h"
 #include "platform.h"
@@ -25,7 +26,6 @@
 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;
@@ -53,21 +53,20 @@ static const char *known_params[] = {
 	"auto-boot?",
 	"petitboot,network",
 	"petitboot,timeout",
-	"petitboot,bootdev",
 	"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)
 
-/* 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;
@@ -148,7 +147,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;
 
@@ -158,23 +157,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_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;
 }
 
@@ -288,7 +281,7 @@ static int parse_one_interface_config(struct config *config,
 		char *confstr)
 {
 	struct interface_config *ifconf;
-	char *tok, *saveptr;
+	char *tok, *tok_gw, *tok_url, *saveptr;
 
 	ifconf = talloc_zero(config, struct interface_config);
 
@@ -321,18 +314,26 @@ static int parse_one_interface_config(struct config *config,
 		ifconf->static_config.address =
 			talloc_strdup(ifconf, tok);
 
-		tok = strtok_r(NULL, ",", &saveptr);
-		if (tok) {
-			ifconf->static_config.gateway =
-				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;
 		}
 
-		tok = strtok_r(NULL, ",", &saveptr);
-		if (tok) {
+		if (tok_url)
 			ifconf->static_config.url =
-				talloc_strdup(ifconf, tok);
-		}
-
+				talloc_strdup(ifconf, tok_url);
 	} else {
 		pb_log("Unknown network configuration method %s\n", tok);
 		goto out_err;
@@ -411,11 +412,9 @@ static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt)
 	if (!strncmp(*pos, "uuid:", strlen("uuid:"))) {
 		prefix = strlen("uuid:");
 		opt->boot_type = BOOT_DEVICE_UUID;
-		rc = 0;
 	} else if (!strncmp(*pos, "mac:", strlen("mac:"))) {
 		prefix = strlen("mac:");
 		opt->boot_type = BOOT_DEVICE_UUID;
-		rc = 0;
 	} else {
 		type = find_device_type(*pos);
 		if (type != DEVICE_TYPE_UNKNOWN) {
@@ -429,9 +428,12 @@ static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt)
 		if (delim)
 			len = (int)(delim - *pos) - prefix;
 		else
-			len = strlen(*pos);
+			len = strlen(*pos) - prefix;
 
-		opt->uuid = talloc_strndup(ctx, *pos + prefix, len);
+		if (len) {
+			opt->uuid = talloc_strndup(ctx, *pos + prefix, len);
+			rc = 0;
+		}
 	}
 
 	/* Always advance pointer to next option or end */
@@ -447,22 +449,9 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
 		struct config *config)
 {
 	struct autoboot_option *opt, *new = NULL;
-	char *pos, *end, *old_dev = NULL;
+	char *pos, *end;
 	unsigned int n_new = 0;
 	const char *val;
-	bool conflict;
-
-	/* Check for old-style bootdev */
-	val = get_param(platform, "petitboot,bootdev");
-	if (val && strlen(val)) {
-		pos = talloc_strdup(config, val);
-		if (!strncmp(val, "uuid:", strlen("uuid:")))
-			old_dev = talloc_strdup(config,
-						val + strlen("uuid:"));
-		else if (!strncmp(val, "mac:", strlen("mac:")))
-			old_dev = talloc_strdup(config,
-						val + strlen("mac:"));
-	}
 
 	/* Check for ordered bootdevs */
 	val = get_param(platform, "petitboot,bootdevs");
@@ -491,7 +480,7 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
 
 	}
 
-	if (!n_new && !old_dev) {
+	if (!n_new) {
 		/* If autoboot has been disabled, clear the default options */
 		if (!config->autoboot_enabled) {
 			talloc_free(config->autoboot_opts);
@@ -500,28 +489,9 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
 		return;
 	}
 
-	conflict = old_dev && (!n_new ||
-				    new[0].boot_type == BOOT_DEVICE_TYPE ||
-				    /* Canonical UUIDs are 36 characters long */
-				    strncmp(new[0].uuid, old_dev, 36));
-
-	if (!conflict) {
-		talloc_free(config->autoboot_opts);
-		config->autoboot_opts = new;
-		config->n_autoboot_opts = n_new;
-		return;
-	}
-
-	/*
-	 * Difference detected, defer to old format in case it has been updated
-	 * recently
-	 */
-	pb_debug("Old autoboot bootdev detected\n");
 	talloc_free(config->autoboot_opts);
-	config->autoboot_opts = talloc(config, struct autoboot_option);
-	config->autoboot_opts[0].boot_type = BOOT_DEVICE_UUID;
-	config->autoboot_opts[0].uuid = talloc_strdup(config, old_dev);
-	config->n_autoboot_opts = 1;
+	config->autoboot_opts = new;
+	config->n_autoboot_opts = n_new;
 }
 
 static void populate_config(struct platform_powerpc *platform,
@@ -565,6 +535,20 @@ static void populate_config(struct platform_powerpc *platform,
 	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);
 }
 
 static char *iface_config_str(void *ctx, struct interface_config *config)
@@ -625,11 +609,20 @@ static void update_string_config(struct platform_powerpc *platform,
 }
 
 static void update_network_config(struct platform_powerpc *platform,
-	struct config *config)
+	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(platform, "");
 
 	for (i = 0; i < config->network.n_interfaces; i++) {
@@ -649,26 +642,21 @@ static void update_network_config(struct platform_powerpc *platform,
 		talloc_free(dns_str);
 	}
 
-	update_string_config(platform, "petitboot,network", val);
+	update_string_config(platform, param_name, val);
 
 	talloc_free(val);
 }
 
 static void update_bootdev_config(struct platform_powerpc *platform,
-		struct config *config)
+		const char *param_name, const struct config *config)
 {
-	char *val = NULL, *boot_str = NULL, *tmp = NULL, *first = NULL;
+	char *val = NULL, *boot_str = NULL, *tmp = NULL;
 	struct autoboot_option *opt;
 	const char delim = ' ';
 	unsigned int i;
 
 	if (!config->n_autoboot_opts)
-		first = val = "";
-	else if (config->autoboot_opts[0].boot_type == BOOT_DEVICE_UUID)
-		first = talloc_asprintf(config, "uuid:%s",
-					config->autoboot_opts[0].uuid);
-	else
-		first = "";
+		val = "";
 
 	for (i = 0; i < config->n_autoboot_opts; i++) {
 		opt = &config->autoboot_opts[i];
@@ -686,14 +674,13 @@ static void update_bootdev_config(struct platform_powerpc *platform,
 			tmp = val = talloc_asprintf_append(val, "%s", boot_str);
 	}
 
-	update_string_config(platform, "petitboot,bootdevs", val);
-	update_string_config(platform, "petitboot,bootdev", first);
+	update_string_config(platform, param_name, val);
 	talloc_free(tmp);
 	if (boot_str)
 		talloc_free(boot_str);
 }
 
-static int update_config(struct platform_powerpc *platform,
+static void update_config(struct platform_powerpc *platform,
 		struct config *config, struct config *defaults)
 {
 	char *tmp = NULL;
@@ -711,14 +698,6 @@ static int update_config(struct platform_powerpc *platform,
 		val = tmp = talloc_asprintf(platform, "%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);
 	if (tmp)
 		talloc_free(tmp);
@@ -732,11 +711,19 @@ static int update_config(struct platform_powerpc *platform,
 		val = config->allow_writes ? "true" : "false";
 	update_string_config(platform, "petitboot,write?", val);
 
-	update_network_config(platform, config);
+	if (!config->manual_console) {
+		val = config->boot_console ?: "";
+		update_string_config(platform, "petitboot,console", val);
+	}
+
+	val = config->http_proxy ?: "";
+	update_string_config(platform, "petitboot,http_proxy", val);
+	val = config->https_proxy ?: "";
+	update_string_config(platform, "petitboot,https_proxy", val);
 
-	update_bootdev_config(platform, config);
+	update_network_config(platform, "petitboot,network", config);
 
-	return write_nvram(platform);
+	update_bootdev_config(platform, "petitboot,bootdevs", config);
 }
 
 static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
@@ -745,21 +732,8 @@ static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
 	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:
-	default:
-		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)
@@ -956,7 +930,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;
@@ -1001,119 +975,6 @@ static int set_ipmi_os_boot_sensor(struct platform_powerpc *platform)
 	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;
-	uint32_t aux_version;
-	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);
-		memcpy(&aux_version, &resp[12], sizeof(aux_version));
-		info->bmc_current[2] = talloc_asprintf(info,
-						"Firmware version: %u.%u.%u",
-						resp[3], bcd, aux_version);
-		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);
-		memcpy(&aux_version, &resp[12], sizeof(aux_version));
-		info->bmc_golden[2] = talloc_asprintf(info,
-						"Firmware version: %u.%u.%u",
-						resp[3], bcd, aux_version);
-		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)
 {
@@ -1121,6 +982,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 	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) */
@@ -1169,25 +1031,28 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 		return;
 	}
 
-	/* Check for valid parameters. For now ignore the persistent flag */
+	/* 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, ignoring the
-	 * persistent bit */
+	/* 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("%s: Incorrect cookie %x\n", __func__, cookie);
+		pb_log_fn("Incorrect cookie %x\n", cookie);
 		return;
 	}
 	i += sizeof(cookie);
@@ -1202,7 +1067,48 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 	}
 
 	/* Interpret the rest of the interface config */
-	parse_ipmi_interface_override(config, &resp[i], resp_len - i);
+	rc = parse_ipmi_interface_override(config, &resp[i], resp_len - i);
+
+	if (!rc && persistent) {
+		/* Write this new config to NVRAM */
+		update_network_config(platform, "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)
+{
+	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)
@@ -1212,13 +1118,13 @@ 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);
 
 	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)) {
@@ -1229,6 +1135,8 @@ static int load_config(struct platform *p, struct config *config)
 	if (platform->ipmi)
 		get_ipmi_network_override(platform, config);
 
+	get_active_consoles(config);
+
 	return 0;
 }
 
@@ -1236,15 +1144,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);
+	update_config(platform, config, defaults);
 
 	talloc_free(defaults);
-	return rc;
+	return write_nvram(platform);
 }
 
 static void pre_boot(struct platform *p, const struct config *config)
@@ -1277,11 +1192,11 @@ static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 	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);
@@ -1293,6 +1208,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 */
@@ -1308,7 +1224,9 @@ static bool probe(struct platform *p, void *ctx)
 
 	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;
@@ -1323,8 +1241,7 @@ static bool probe(struct platform *p, void *ctx)
 		pb_log("platform: no IPMI parameter support\n");
 	}
 
-	rc = stat("/proc/device-tree/bmc", &statbuf);
-	if (!rc)
+	if (bmc_present)
 		platform->get_platform_versions = hostboot_load_versions;
 
 	return true;