discover: Add debug flag to config

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 1e7c8284eed3b5e1c2d0a431022b76d43b3fab15..98dc045b2c656cf85f0130b42d237dcbbf639d01 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -3,11 +3,13 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits.h>
+#include <errno.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 
+#include <file/file.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
@@ -33,6 +35,8 @@ static const char *known_params[] = {
        "auto-boot?",
        "petitboot,network",
        "petitboot,timeout",
+       "petitboot,bootdev",
+       "petitboot,debug?",
        NULL,
 };
 
@@ -343,8 +347,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 +358,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 +374,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 +423,13 @@ static void populate_config(struct platform_powerpc *platform,
        }
 
        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)
@@ -480,6 +517,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 +556,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 +579,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,
 };
@@ -565,6 +620,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];
@@ -573,6 +629,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;
@@ -589,10 +685,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:
@@ -609,6 +707,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;
        }
 }
 
@@ -643,13 +745,30 @@ static int save_config(struct platform *p, struct config *config)
        return rc;
 }
 
+static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
+{
+       struct platform_powerpc *platform = p->platform_data;
+       int len, rc;
+       char *buf;
+
+       rc = read_file(platform, "/proc/device_tree/model", &buf, &len);
+       if (rc == 0)
+               sysinfo->type = talloc_steal(sysinfo, buf);
+
+       rc = read_file(platform, "/proc/device_tree/system-id", &buf, &len);
+       if (rc == 0)
+               sysinfo->identifier = talloc_steal(sysinfo, buf);
+
+       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;
@@ -657,10 +776,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);
 
@@ -668,12 +783,14 @@ 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,
+       .get_sysinfo    = get_sysinfo,
 };
 
 register_platform(platform_powerpc);