discover/platform-powerpc: Fix incorrect device tree directory

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 6ed65221c84b1ac14d5a7491e7e948bf7256e7be..642c93c1cdf453412959c415fa878bebdc17fad6 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -9,6 +9,7 @@
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 
+#include <file/file.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
@@ -18,6 +19,7 @@
 
 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;
@@ -35,6 +37,7 @@ static const char *known_params[] = {
        "petitboot,network",
        "petitboot,timeout",
        "petitboot,bootdev",
+       "petitboot,debug?",
        NULL,
 };
 
@@ -423,6 +426,11 @@ 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)
@@ -572,6 +580,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,
 };
@@ -612,6 +621,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];
@@ -698,6 +708,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;
        }
 }
 
@@ -732,6 +746,27 @@ 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;
+       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;
@@ -753,12 +788,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);