X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=c7432fb7061d1f2d7126ceb1f99c4e2596de5789;hp=3723ebf824df6fcee31c4571d900f5159f410165;hb=b5ab295d9cbddd1570d05471528f4d2ad7abae07;hpb=722e64564e436a0491563c9f57a49dfee5c50dd9 diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 3723ebf..c7432fb 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -4,9 +4,9 @@ #include #include #include +#include #include #include -#include #include #include @@ -16,6 +16,7 @@ #include #include #include +#include #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; @@ -147,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; @@ -157,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; } @@ -287,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); @@ -320,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; @@ -492,19 +494,6 @@ 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) { @@ -560,7 +549,6 @@ static void populate_config(struct platform_powerpc *platform, 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) @@ -692,7 +680,7 @@ static void update_bootdev_config(struct platform_powerpc *platform, 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; @@ -710,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); @@ -740,13 +720,10 @@ static int update_config(struct platform_powerpc *platform, update_string_config(platform, "petitboot,http_proxy", val); 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); - - return write_nvram(platform); } static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev, @@ -998,120 +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; - 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) { @@ -1189,7 +1052,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); @@ -1255,7 +1118,7 @@ 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); @@ -1281,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) @@ -1322,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);