discover: Initialise strtok_r saveptr to NULL

[petitboot] / discover / platform-powerpc.c

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 98dc045b2c656cf85f0130b42d237dcbbf639d01..a293ce9dd5506a0c03d000e0c1ba55d8d8e2ff51 100644 (file)
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -16,9 +16,12 @@
 #include <process/process.h>
 
 #include "platform.h"
 #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 *partition = "common";
 static const char *sysparams_dir = "/sys/firmware/opal/sysparams/";

+static const char *devtree_dir = "/proc/device-tree/";
+static const int ipmi_timeout = 500; /* milliseconds */

 
 struct param {
        char                    *name;
 
 struct param {
        char                    *name;


@@ -28,7 +31,14 @@ struct param {
 };
 
 struct platform_powerpc {
 };
 
 struct platform_powerpc {

-       struct list             params;
+       struct list     params;
+       struct ipmi     *ipmi;
+       bool            ipmi_bootdev_persistent;
+       int             (*get_ipmi_bootdev)(
+                               struct platform_powerpc *platform,
+                               uint8_t *bootdev, bool *persistent);
+       int             (*clear_ipmi_bootdev)(
+                               struct platform_powerpc *platform);

 };
 
 static const char *known_params[] = {
 };
 
 static const char *known_params[] = {


@@ -36,6 +46,7 @@ static const char *known_params[] = {
        "petitboot,network",
        "petitboot,timeout",
        "petitboot,bootdev",
        "petitboot,network",
        "petitboot,timeout",
        "petitboot,bootdev",

+       "petitboot,language",

        "petitboot,debug?",
        NULL,
 };
        "petitboot,debug?",
        NULL,
 };


@@ -326,7 +337,7 @@ out_err:
 static int parse_one_dns_config(struct config *config,
                char *confstr)
 {
 static int parse_one_dns_config(struct config *config,
                char *confstr)
 {

-       char *tok, *saveptr;
+       char *tok, *saveptr = NULL;

 
        for (tok = strtok_r(confstr, ",", &saveptr); tok;
                        tok = strtok_r(NULL, ",", &saveptr)) {
 
        for (tok = strtok_r(confstr, ",", &saveptr); tok;
                        tok = strtok_r(NULL, ",", &saveptr)) {


@@ -422,6 +433,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);
        populate_network_config(platform, config);
 
        populate_bootdev_config(platform, config);


@@ -554,6 +568,9 @@ static int update_config(struct platform_powerpc *platform,
        if (tmp)
                talloc_free(tmp);
 
        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);
        update_network_config(platform, config);
 
        update_bootdev_config(platform, config);


@@ -561,28 +578,27 @@ static int update_config(struct platform_powerpc *platform,
        return write_nvram(platform);
 }
 
        return write_nvram(platform);
 }
 

-static void set_exclusive_devtype(struct config *config,
-               enum device_type devtype)
+static void set_ipmi_bootdev(struct config *config, enum ipmi_bootdev bootdev,
+               bool persistent)

 {
 {

-       config->n_boot_priorities = 2;
-       config->boot_priorities = talloc_realloc(config,
-                       config->boot_priorities, struct boot_priority,
-                       config->n_boot_priorities);
-       config->boot_priorities[0].type = devtype;
-       config->boot_priorities[0].priority = 0;
-       config->boot_priorities[1].type = DEVICE_TYPE_ANY;
-       config->boot_priorities[1].priority = -1;
-}
+       config->ipmi_bootdev = bootdev;
+       config->ipmi_bootdev_persistent = persistent;

 
 

-/* 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,
-};
+       switch (bootdev) {
+       case IPMI_BOOTDEV_NONE:
+       case IPMI_BOOTDEV_DISK:
+       case IPMI_BOOTDEV_NETWORK:
+       case IPMI_BOOTDEV_CDROM:
+               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)
 {
 
 static int read_bootdev_sysparam(const char *name, uint8_t *val)
 {


@@ -614,18 +630,10 @@ static int read_bootdev_sysparam(const char *name, uint8_t *val)
 
        pb_debug("powerpc: sysparam %s: 0x%02x\n", name, buf[0]);
 
 
        pb_debug("powerpc: sysparam %s: 0x%02x\n", name, buf[0]);
 

-       switch (buf[0]) {
-       default:
+       if (!ipmi_bootdev_is_valid(buf[0]))

                return -1;
                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;
 }
 
        return 0;
 }
 


@@ -669,7 +677,17 @@ static int write_bootdev_sysparam(const char *name, uint8_t val)
        return rc;
 }
 
        return rc;
 }
 

-static void parse_opal_sysparams(struct config *config)
+static int clear_ipmi_bootdev_sysparams(
+               struct platform_powerpc *platform __attribute__((unused)))
+{
+       /* invalidate next-boot-device setting */
+       write_bootdev_sysparam("next-boot-device", 0xff);
+       return 0;
+}
+
+static int get_ipmi_bootdev_sysparams(
+               struct platform_powerpc *platform __attribute__((unused)),
+               uint8_t *bootdev, bool *persistent)

 {
        uint8_t next_bootdev, default_bootdev;
        bool next_valid, default_valid;
 {
        uint8_t next_bootdev, default_bootdev;
        bool next_valid, default_valid;


@@ -683,37 +701,98 @@ static void parse_opal_sysparams(struct config *config)
 
        /* nothing valid? no need to change the config */
        if (!next_valid && !default_valid)
 
        /* nothing valid? no need to change the config */
        if (!next_valid && !default_valid)

-               return;
+               return -1;

 
 

-       if (next_valid) {
-               /* invalidate next-boot-device setting */
-               write_bootdev_sysparam("next-boot-device", 0xff);
-       } else {
-               next_bootdev = default_bootdev;
+       *persistent = !next_valid;
+       *bootdev = next_valid ? next_bootdev : default_bootdev;
+       return 0;
+}
+
+static int clear_ipmi_bootdev_ipmi(struct platform_powerpc *platform)
+{
+       uint16_t resp_len;
+       uint8_t resp[1];
+       uint8_t req[] = {
+               0x05, /* parameter selector: boot flags */
+               0x80, /* data 1: valid */
+               0x00, /* data 2: bootdev: no override */
+               0x00, /* data 3: system defaults */
+               0x00, /* data 4: no request for shared mode, mux defaults */
+               0x00, /* data 5: no instance request */
+       };
+
+       resp_len = sizeof(resp);
+
+       ipmi_transaction(platform->ipmi, IPMI_NETFN_CHASSIS,
+                       IPMI_CMD_CHASSIS_SET_SYSTEM_BOOT_OPTIONS,
+                       req, sizeof(req),
+                       resp, &resp_len,
+                       ipmi_timeout);
+       return 0;
+}
+
+static int get_ipmi_bootdev_ipmi(struct platform_powerpc *platform,
+               uint8_t *bootdev, bool *persistent)
+{
+       uint16_t resp_len;
+       uint8_t resp[8];
+       int rc;
+       uint8_t req[] = {
+               0x05, /* parameter selector: boot flags */
+               0x00, /* no set selector */
+               0x00, /* no block selector */
+       };
+
+       resp_len = sizeof(resp);
+       rc = ipmi_transaction(platform->ipmi, IPMI_NETFN_CHASSIS,
+                       IPMI_CMD_CHASSIS_GET_SYSTEM_BOOT_OPTIONS,
+                       req, sizeof(req),
+                       resp, &resp_len,
+                       ipmi_timeout);
+       if (rc) {
+               pb_log("platform: error reading IPMI boot options\n");
+               return -1;

        }
 
        }
 

-       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;
+       if (resp_len != sizeof(resp)) {
+               pb_log("platform: unexpected length (%d) in "
+                               "boot options response\n", resp_len);
+               return -1;

        }
        }

+
+       if (resp[0] != 0) {
+               pb_log("platform: non-zero completion code %d from IPMI req\n",
+                               resp[0]);
+               return -1;
+       }
+
+       /* check for correct parameter version */
+       if ((resp[1] & 0xf) != 0x1) {
+               pb_log("platform: unexpected version (0x%x) in "
+                               "boot options response\n", resp[0]);
+               return -1;
+       }
+
+       /* check for valid paramters */
+       if (resp[2] & 0x80) {
+               pb_debug("platform: boot options are invalid/locked\n");
+               return -1;
+       }
+
+       *persistent = false;
+
+       /* check for valid flags */
+       if (!(resp[3] & 0x80)) {
+               pb_debug("platform: boot flags are invalid, ignoring\n");
+               return 0;
+       }
+
+       *persistent = resp[3] & 0x40;
+       *bootdev = (resp[4] >> 2) & 0x0f;
+       return 0;

 }
 
 }
 

+

 static int load_config(struct platform *p, struct config *config)
 {
        struct platform_powerpc *platform = to_platform_powerpc(p);
 static int load_config(struct platform *p, struct config *config)
 {
        struct platform_powerpc *platform = to_platform_powerpc(p);


@@ -725,7 +804,15 @@ static int load_config(struct platform *p, struct config *config)
 
        populate_config(platform, config);
 
 
        populate_config(platform, config);
 

-       parse_opal_sysparams(config);
+       if (platform->get_ipmi_bootdev) {
+               bool bootdev_persistent;
+               uint8_t bootdev;
+               rc = platform->get_ipmi_bootdev(platform, &bootdev,
+                               &bootdev_persistent);
+               if (!rc && ipmi_bootdev_is_valid(bootdev)) {
+                       set_ipmi_bootdev(config, bootdev, bootdev_persistent);
+               }
+       }

 
        return 0;
 }
 
        return 0;
 }


@@ -745,19 +832,31 @@ static int save_config(struct platform *p, struct config *config)
        return rc;
 }
 
        return rc;
 }
 

+static void pre_boot(struct platform *p, const struct config *config)
+{
+       struct platform_powerpc *platform = to_platform_powerpc(p);
+
+       if (!config->ipmi_bootdev_persistent && platform->clear_ipmi_bootdev)
+               platform->clear_ipmi_bootdev(platform);
+}
+

 static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 {
        struct platform_powerpc *platform = p->platform_data;
 static int get_sysinfo(struct platform *p, struct system_info *sysinfo)
 {
        struct platform_powerpc *platform = p->platform_data;

+       char *buf, *filename;

        int len, rc;
        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);
        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);
        if (rc == 0)
                sysinfo->identifier = talloc_steal(sysinfo, buf);

+       talloc_free(filename);

 
        return 0;
 }
 
        return 0;
 }


@@ -780,17 +879,34 @@ static bool probe(struct platform *p, void *ctx)
        list_init(&platform->params);
 
        p->platform_data = platform;
        list_init(&platform->params);
 
        p->platform_data = platform;

+
+       if (ipmi_present()) {
+               pb_debug("platform: using direct IPMI for IPMI paramters\n");
+               platform->ipmi = ipmi_open(platform);
+               platform->get_ipmi_bootdev = get_ipmi_bootdev_ipmi;
+               platform->clear_ipmi_bootdev = clear_ipmi_bootdev_ipmi;
+
+       } else if (!stat(sysparams_dir, &statbuf)) {
+               pb_debug("platform: using sysparams for IPMI paramters\n");
+               platform->get_ipmi_bootdev = get_ipmi_bootdev_sysparams;
+               platform->clear_ipmi_bootdev = clear_ipmi_bootdev_sysparams;
+
+       } else {
+               pb_log("platform: no IPMI parameter support\n");
+       }
+

        return true;
 }
 
 
 static struct platform platform_powerpc = {
        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,
+       .name                   = "powerpc",
+       .dhcp_arch_id           = 0x000e,
+       .probe                  = probe,
+       .load_config            = load_config,
+       .save_config            = save_config,
+       .pre_boot               = pre_boot,
+       .get_sysinfo            = get_sysinfo,

 };
 
 register_platform(platform_powerpc);
 };
 
 register_platform(platform_powerpc);