]> git.ozlabs.org Git - petitboot/blobdiff - discover/platform-powerpc.c
discover/powerpc: Switch to new param_list
[petitboot] / discover / platform-powerpc.c
index a0ddd1e106abb3f7429ec90c4ff86920e873845f..1ae96ac67f850726765db3b7babfa42f267b0585 100644 (file)
@@ -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>
 
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
+#include <param_list/param_list.h>
 #include <process/process.h>
 #include <types/types.h>
+#include <url/url.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)(
@@ -49,39 +43,9 @@ struct platform_powerpc {
        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)
 {
@@ -110,7 +74,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');
@@ -130,16 +93,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;
@@ -147,7 +107,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;
 
@@ -157,23 +117,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;
 }
 
@@ -195,7 +149,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)
@@ -221,43 +175,6 @@ 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;
@@ -283,11 +200,10 @@ static int parse_hwaddr(struct interface_config *ifconf, char *str)
        return 0;
 }
 
-static int parse_one_interface_config(struct config *config,
-               char *confstr)
+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);
 
@@ -320,18 +236,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;
@@ -350,8 +274,7 @@ out_err:
        return -1;
 }
 
-static int parse_one_dns_config(struct config *config,
-               char *confstr)
+static int parse_one_dns_config(struct config *config, char *confstr)
 {
        char *tok, *saveptr = NULL;
 
@@ -371,14 +294,11 @@ static int parse_one_dns_config(struct config *config,
        return 0;
 }
 
-static void populate_network_config(struct platform_powerpc *platform,
-               struct config *config)
+static void populate_network_config(struct config *config, const char *cval)
 {
        char *val, *saveptr = NULL;
-       const char *cval;
        int i;
 
-       cval = get_param(platform, "petitboot,network");
        if (!cval || !strlen(cval))
                return;
 
@@ -443,8 +363,8 @@ static int read_bootdev(void *ctx, char **pos, struct autoboot_option *opt)
        return rc;
 }
 
-static void populate_bootdev_config(struct platform_powerpc *platform,
-               struct config *config)
+static void populate_bootdev_config(struct config *config,
+       const struct param_list *pl)
 {
        struct autoboot_option *opt, *new = NULL;
        char *pos, *end;
@@ -452,7 +372,7 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
        const char *val;
 
        /* Check for ordered bootdevs */
-       val = get_param(platform, "petitboot,bootdevs");
+       val = param_list_get_value(pl, "petitboot,bootdevs");
        if (!val || !strlen(val)) {
                pos = end = NULL;
        } else {
@@ -492,21 +412,7 @@ static void populate_bootdev_config(struct platform_powerpc *platform,
        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)
+static void populate_config(struct config *config, const struct param_list *pl)
 {
        const char *val;
        char *end;
@@ -514,10 +420,10 @@ static void populate_config(struct platform_powerpc *platform,
 
        /* if the "auto-boot?' property is present and "false", disable auto
         * boot */
-       val = get_param(platform, "auto-boot?");
+       val = param_list_get_value(pl, "auto-boot?");
        config->autoboot_enabled = !val || strcmp(val, "false");
 
-       val = get_param(platform, "petitboot,timeout");
+       val = param_list_get_value(pl, "petitboot,timeout");
        if (val) {
                timeout = strtoul(val, &end, 10);
                if (end != val) {
@@ -527,40 +433,40 @@ static void populate_config(struct platform_powerpc *platform,
                }
        }
 
-       val = get_param(platform, "petitboot,language");
+       val = param_list_get_value(pl, "petitboot,language");
        config->lang = val ? talloc_strdup(config, val) : NULL;
 
-       populate_network_config(platform, config);
+       val = param_list_get_value(pl, "petitboot,network");
+       populate_network_config(config, val);
 
-       populate_bootdev_config(platform, config);
+       populate_bootdev_config(config, pl);
 
        if (!config->debug) {
-               val = get_param(platform, "petitboot,debug?");
+               val = param_list_get_value(pl, "petitboot,debug?");
                config->debug = val && !strcmp(val, "true");
        }
 
-       val = get_param(platform, "petitboot,write?");
+       val = param_list_get_value(pl, "petitboot,write?");
        if (val)
                config->allow_writes = !strcmp(val, "true");
 
-       val = get_param(platform, "petitboot,snapshots?");
+       val = param_list_get_value(pl, "petitboot,snapshots?");
        if (val)
                config->disable_snapshots = !strcmp(val, "false");
 
-       val = get_param(platform, "petitboot,console");
+       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 = get_param(platform, "petitboot,http_proxy");
+       val = param_list_get_value(pl, "petitboot,http_proxy");
        if (val)
                config->http_proxy = talloc_strdup(config, val);
-       val = get_param(platform, "petitboot,https_proxy");
+       val = param_list_get_value(pl, "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)
@@ -606,22 +512,8 @@ static char *dns_config_str(void *ctx, const char **dns_servers, int n)
        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)
+static void update_network_config(struct param_list *pl, const char *param_name,
+       const struct config *config)
 {
        unsigned int i;
        char *val;
@@ -635,10 +527,10 @@ static void update_network_config(struct platform_powerpc *platform,
                config->network.interfaces[0]->override)
                return;
 
-       val = talloc_strdup(platform, "");
+       val = talloc_strdup(pl, "");
 
        for (i = 0; i < config->network.n_interfaces; i++) {
-               char *iface_str = iface_config_str(platform,
+               char *iface_str = iface_config_str(pl,
                                        config->network.interfaces[i]);
                val = talloc_asprintf_append(val, "%s%s",
                                *val == '\0' ? "" : " ", iface_str);
@@ -646,7 +538,7 @@ static void update_network_config(struct platform_powerpc *platform,
        }
 
        if (config->network.n_dns_servers) {
-               char *dns_str = dns_config_str(platform,
+               char *dns_str = dns_config_str(pl,
                                                config->network.dns_servers,
                                                config->network.n_dns_servers);
                val = talloc_asprintf_append(val, "%s%s",
@@ -654,13 +546,12 @@ static void update_network_config(struct platform_powerpc *platform,
                talloc_free(dns_str);
        }
 
-       update_string_config(platform, "petitboot,network", val);
-
+       param_list_set_non_empty(pl, param_name, val, true);
        talloc_free(val);
 }
 
-static void update_bootdev_config(struct platform_powerpc *platform,
-               struct config *config)
+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;
@@ -686,14 +577,14 @@ 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);
+       param_list_set_non_empty(pl, param_name, val, true);
        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 update_config(struct param_list *pl, struct config *config,
+       const struct config *defaults)
 {
        char *tmp = NULL;
        const char *val;
@@ -702,51 +593,40 @@ 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);
 
-       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);
-
-       update_network_config(platform, config);
-
-       update_bootdev_config(platform, config);
+       param_list_set_non_empty(pl, "petitboot,https_proxy", val, true);
 
-       return write_nvram(platform);
+       update_network_config(pl, "petitboot,network", config);
+       update_bootdev_config(pl, "petitboot,bootdevs", config);
 }
 
 static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
@@ -998,119 +878,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.%02u.%05u",
-                                               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.%02u.%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)
 {
@@ -1188,7 +955,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
        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);
@@ -1207,7 +974,8 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 
        if (!rc && persistent) {
                /* Write this new config to NVRAM */
-               update_network_config(platform, config);
+               update_network_config(&platform->params, "petitboot,network",
+                       config);
                rc = write_nvram(platform);
                if (rc)
                        pb_log("platform: Failed to save persistent interface override\n");
@@ -1254,9 +1022,9 @@ static int load_config(struct platform *p, struct config *config)
 
        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);
+       populate_config(config, &platform->params);
 
        if (platform->get_ipmi_bootdev) {
                bool bootdev_persistent;
@@ -1280,15 +1048,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->params, config, defaults);
 
        talloc_free(defaults);
-       return rc;
+       return write_nvram(platform);
 }
 
 static void pre_boot(struct platform *p, const struct config *config)
@@ -1321,11 +1096,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);
@@ -1349,7 +1124,7 @@ 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;