X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=6ae28f4cd59c4acb4043f5afd58f439e2ae42a33;hp=28c081d7540332281e972609f935496141905a21;hb=f69fabee4a120cebaeff2359350e62bd960088f4;hpb=cf651e02fb7a34545211708c2a285cd228645531 diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 28c081d..6ae28f4 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -9,15 +9,18 @@ #include #include +#include #include #include #include #include #include "platform.h" +#include "ipmi.h" static const char *partition = "common"; static const char *sysparams_dir = "/sys/firmware/opal/sysparams/"; +static const char *devtree_dir = "/proc/device-tree/"; struct param { char *name; @@ -34,6 +37,9 @@ static const char *known_params[] = { "auto-boot?", "petitboot,network", "petitboot,timeout", + "petitboot,bootdev", + "petitboot,language", + "petitboot,debug?", NULL, }; @@ -371,6 +377,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,7 +425,17 @@ static void populate_config(struct platform_powerpc *platform, } } + 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) @@ -481,6 +523,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) { @@ -503,8 +560,13 @@ static int update_config(struct platform_powerpc *platform, if (tmp) talloc_free(tmp); + val = config->lang ?: ""; + update_string_config(platform, "petitboot,language", val); + update_network_config(platform, config); + update_bootdev_config(platform, config); + return write_nvram(platform); } @@ -521,14 +583,29 @@ static void set_exclusive_devtype(struct config *config, config->boot_priorities[1].priority = -1; } -/* bootdev options that we recognise */ -enum ipmi_bootdev { - IPMI_BOOTDEV_NONE = 0x00, - IPMI_BOOTDEV_NETWORK = 0x01, - IPMI_BOOTDEV_DISK = 0x2, - IPMI_BOOTDEV_CDROM = 0x5, - IPMI_BOOTDEV_SETUP = 0x6, -}; +static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev) +{ + switch (bootdev) { + case IPMI_BOOTDEV_NONE: + break; + case IPMI_BOOTDEV_DISK: + set_exclusive_devtype(config, DEVICE_TYPE_DISK); + break; + case IPMI_BOOTDEV_NETWORK: + set_exclusive_devtype(config, DEVICE_TYPE_NETWORK); + break; + case IPMI_BOOTDEV_CDROM: + set_exclusive_devtype(config, DEVICE_TYPE_OPTICAL); + break; + case IPMI_BOOTDEV_SETUP: + config->autoboot_enabled = false; + break; + case IPMI_BOOTDEV_SAFE: + config->autoboot_enabled = false; + config->safe_mode = true; + break; + } +} static int read_bootdev_sysparam(const char *name, uint8_t *val) { @@ -560,17 +637,10 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val) pb_debug("powerpc: sysparam %s: 0x%02x\n", name, buf[0]); - switch (buf[0]) { - default: + if (!ipmi_bootdev_is_valid(buf[0])) return -1; - case IPMI_BOOTDEV_NONE: - case IPMI_BOOTDEV_NETWORK: - case IPMI_BOOTDEV_DISK: - case IPMI_BOOTDEV_CDROM: - case IPMI_BOOTDEV_SETUP: - *val = buf[0]; - } + *val = buf[0]; return 0; } @@ -630,29 +700,10 @@ static void parse_opal_sysparams(struct config *config) if (!next_valid && !default_valid) return; - if (next_valid) { - /* invalidate next-boot-device setting */ - write_bootdev_sysparam("next-boot-device", 0xff); - } else { + if (!next_valid) next_bootdev = default_bootdev; - } - switch (next_bootdev) { - case IPMI_BOOTDEV_NONE: - return; - case IPMI_BOOTDEV_DISK: - set_exclusive_devtype(config, DEVICE_TYPE_DISK); - break; - case IPMI_BOOTDEV_NETWORK: - set_exclusive_devtype(config, DEVICE_TYPE_NETWORK); - break; - case IPMI_BOOTDEV_CDROM: - set_exclusive_devtype(config, DEVICE_TYPE_OPTICAL); - break; - case IPMI_BOOTDEV_SETUP: - config->autoboot_enabled = false; - break; - } + set_ipmi_bootdev(config, next_bootdev); } static int load_config(struct platform *p, struct config *config) @@ -686,13 +737,40 @@ static int save_config(struct platform *p, struct config *config) return rc; } +static void finalise_config(struct platform *platform __attribute__((unused))) +{ + /* invalidate next-boot-device setting */ + write_bootdev_sysparam("next-boot-device", 0xff); +} + +static int get_sysinfo(struct platform *p, struct system_info *sysinfo) +{ + struct platform_powerpc *platform = p->platform_data; + char *buf, *filename; + int len, rc; + + filename = talloc_asprintf(platform, "%smodel", devtree_dir); + rc = read_file(platform, filename, &buf, &len); + if (rc == 0) + sysinfo->type = talloc_steal(sysinfo, buf); + talloc_free(filename); + + filename = talloc_asprintf(platform, "%ssystem-id", devtree_dir); + rc = read_file(platform, filename, &buf, &len); + if (rc == 0) + sysinfo->identifier = talloc_steal(sysinfo, buf); + talloc_free(filename); + + return 0; +} + static bool probe(struct platform *p, void *ctx) { struct platform_powerpc *platform; 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; @@ -700,10 +778,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); @@ -711,12 +785,15 @@ static bool probe(struct platform *p, void *ctx) return true; } + static struct platform platform_powerpc = { - .name = "powerpc", - .dhcp_arch_id = 0x000e, - .probe = probe, - .load_config = load_config, - .save_config = save_config, + .name = "powerpc", + .dhcp_arch_id = 0x000e, + .probe = probe, + .load_config = load_config, + .save_config = save_config, + .finalise_config = finalise_config, + .get_sysinfo = get_sysinfo, }; register_platform(platform_powerpc);