discover/powerpc: Separate ipmi bootdev handling into separate functions

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 98dc045b2c656cf85f0130b42d237dcbbf639d01..6ae28f4cd59c4acb4043f5afd58f439e2ae42a33 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -16,9 +16,11 @@
 #include <process/process.h>
 
 #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;
@@ -36,6 +38,7 @@ static const char *known_params[] = {
        "petitboot,network",
        "petitboot,timeout",
        "petitboot,bootdev",
+       "petitboot,language",
        "petitboot,debug?",
        NULL,
 };
@@ -422,6 +425,9 @@ 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);
@@ -554,6 +560,9 @@ 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);
@@ -574,15 +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_SAFE = 0x3,
-       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)
 {
@@ -614,18 +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_SAFE:
-       case IPMI_BOOTDEV_CDROM:
-       case IPMI_BOOTDEV_SETUP:
-               *val = buf[0];
-       }
 
+       *val = buf[0];
        return 0;
 }
 
@@ -685,33 +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;
-       case IPMI_BOOTDEV_SAFE:
-               config->autoboot_enabled = false;
-               config->safe_mode = true;
-               break;
-       }
+       set_ipmi_bootdev(config, next_bootdev);
 }
 
 static int load_config(struct platform *p, struct config *config)
@@ -745,19 +737,29 @@ 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;
-       char *buf;
 
-       rc = read_file(platform, "/proc/device_tree/model", &buf, &len);
+       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);
 
-       rc = read_file(platform, "/proc/device_tree/system-id", &buf, &len);
+       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;
 }
@@ -785,12 +787,13 @@ static bool probe(struct platform *p, void *ctx)
 
 
 static struct platform platform_powerpc = {
-       .name           = "powerpc",
-       .dhcp_arch_id   = 0x000e,
-       .probe          = probe,
-       .load_config    = load_config,
-       .save_config    = save_config,
-       .get_sysinfo    = get_sysinfo,
+       .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);