X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=24cc521c12c98c40f57c2fbec42400ee71f6f556;hp=4eb28057c9fb6c7513a05c315cda8599c71cdc7c;hb=a5dad9c05cd72820e64e0461889e9e77eaf8202d;hpb=8cd03c27d3875beb15a489f1f05d0528408cef20 diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 4eb2805..24cc521 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -16,7 +17,7 @@ #include "platform.h" static const char *partition = "common"; -static const char *sysparams_dir = "/sys/firmware/opal/sysparams"; +static const char *sysparams_dir = "/sys/firmware/opal/sysparams/"; struct param { char *name; @@ -33,6 +34,7 @@ static const char *known_params[] = { "auto-boot?", "petitboot,network", "petitboot,timeout", + "petitboot,bootdev", NULL, }; @@ -343,8 +345,8 @@ static int parse_one_dns_config(struct config *config, static void populate_network_config(struct platform_powerpc *platform, struct config *config) { + char *val, *saveptr = NULL; const char *cval; - char *val; int i; cval = get_param(platform, "petitboot,network"); @@ -354,7 +356,7 @@ static void populate_network_config(struct platform_powerpc *platform, val = talloc_strdup(config, cval); for (i = 0; ; i++) { - char *tok, *saveptr; + char *tok; tok = strtok_r(i == 0 ? val : NULL, " ", &saveptr); if (!tok) @@ -370,6 +372,32 @@ static void populate_network_config(struct platform_powerpc *platform, 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) { @@ -393,6 +421,8 @@ static void populate_config(struct platform_powerpc *platform, } populate_network_config(platform, config); + + populate_bootdev_config(platform, config); } static char *iface_config_str(void *ctx, struct interface_config *config) @@ -480,6 +510,21 @@ static void update_network_config(struct platform_powerpc *platform, 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) { @@ -504,6 +549,8 @@ static int update_config(struct platform_powerpc *platform, update_network_config(platform, config); + update_bootdev_config(platform, config); + return write_nvram(platform); } @@ -525,6 +572,7 @@ enum ipmi_bootdev { IPMI_BOOTDEV_NONE = 0x00, IPMI_BOOTDEV_NETWORK = 0x01, IPMI_BOOTDEV_DISK = 0x2, + IPMI_BOOTDEV_SAFE = 0x3, IPMI_BOOTDEV_CDROM = 0x5, IPMI_BOOTDEV_SETUP = 0x6, }; @@ -540,16 +588,24 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val) strcat(path, name); fd = open(path, O_RDONLY); - if (fd < 0) + if (fd < 0) { + pb_debug("powerpc: can't access sysparam %s\n", + name); return -1; + } rc = read(fd, buf, sizeof(buf)); close(fd); /* bootdev definitions should only be one byte in size */ - if (rc != 1) + if (rc != 1) { + pb_debug("powerpc: sysparam %s read returned %d\n", + name, rc); return -1; + } + + pb_debug("powerpc: sysparam %s: 0x%02x\n", name, buf[0]); switch (buf[0]) { default: @@ -557,6 +613,7 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val) case IPMI_BOOTDEV_NONE: case IPMI_BOOTDEV_NETWORK: case IPMI_BOOTDEV_DISK: + case IPMI_BOOTDEV_SAFE: case IPMI_BOOTDEV_CDROM: case IPMI_BOOTDEV_SETUP: *val = buf[0]; @@ -565,6 +622,46 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val) return 0; } +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); + + fd = open(path, O_WRONLY); + if (fd < 0) { + pb_debug("powerpc: can't access sysparam %s for writing\n", + name); + return -1; + } + + for (;;) { + errno = 0; + rc = write(fd, &val, sizeof(val)); + if (rc == sizeof(val)) { + rc = 0; + break; + } + + if (rc <= 0 && errno != EINTR) { + pb_log("powerpc: error updating sysparam %s: %s", + name, strerror(errno)); + rc = -1; + break; + } + } + + close(fd); + + if (!rc) + pb_debug("powerpc: set sysparam %s: 0x%02x\n", name, val); + + return rc; +} + static void parse_opal_sysparams(struct config *config) { uint8_t next_bootdev, default_bootdev; @@ -581,10 +678,12 @@ static void parse_opal_sysparams(struct config *config) if (!next_valid && !default_valid) return; - if (!next_valid) + if (next_valid) { + /* invalidate next-boot-device setting */ + write_bootdev_sysparam("next-boot-device", 0xff); + } else { next_bootdev = default_bootdev; - - /* todo: copy default to next */ + } switch (next_bootdev) { case IPMI_BOOTDEV_NONE: @@ -601,6 +700,10 @@ static void parse_opal_sysparams(struct config *config) case IPMI_BOOTDEV_SETUP: config->autoboot_enabled = false; break; + case IPMI_BOOTDEV_SAFE: + config->autoboot_enabled = false; + config->safe_mode = true; + break; } } @@ -641,7 +744,7 @@ static bool probe(struct platform *p, void *ctx) struct stat statbuf; int rc; - /* we need a device tree and a working nvram binary */ + /* we need a device tree */ rc = stat("/proc/device-tree", &statbuf); if (rc) return false; @@ -649,10 +752,6 @@ static bool probe(struct platform *p, void *ctx) if (!S_ISDIR(statbuf.st_mode)) return false; - rc = process_run_simple(ctx, "nvram", "--print-config", NULL); - if (!WIFEXITED(rc) || WEXITSTATUS(rc) != 0) - return false; - platform = talloc(ctx, struct platform_powerpc); list_init(&platform->params);