From bb3ddd63720501f451d3f2797f315c25efd3bd4a Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Mon, 10 Mar 2014 12:11:00 +0800 Subject: [PATCH] discover/powerpc: Invalidate next bootdev after reading The next-bootdev sysparam should only apply for the next boot, so invalidate it after reading. Signed-off-by: Jeremy Kerr --- discover/platform-powerpc.c | 49 ++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c index 1e7c828..d1d4191 100644 --- a/discover/platform-powerpc.c +++ b/discover/platform-powerpc.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include #include @@ -573,6 +574,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 +630,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: -- 2.39.2