X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fplatform-powerpc.c;h=1f8d27d772d93081b72d2977f96af837690db429;hp=0e3a10b29d0de2247bb7593fb90844365bad42f1;hb=1a72ffef7837cd2aa3e6be945ec03fb6b5caa51a;hpb=11284780b9aa525dd659bd85d6374040630db008

diff --git a/discover/platform-powerpc.c b/discover/platform-powerpc.c
index 0e3a10b..1f8d27d 100644
--- a/discover/platform-powerpc.c
+++ b/discover/platform-powerpc.c
@@ -956,7 +956,7 @@ static int get_ipmi_bootdev_ipmi(struct platform_powerpc *platform,
 	/* check for valid flags */
 	if (!(resp[3] & 0x80)) {
 		pb_debug("platform: boot flags are invalid, ignoring\n");
-		return 0;
+		return -1;
 	}
 
 	*persistent = resp[3] & 0x40;
@@ -1066,7 +1066,7 @@ static void get_ipmi_bmc_versions(struct platform *p, struct system_info *info)
 		bcd += 10 * (resp[4] >> 4);
 		memcpy(&aux_version, &resp[12], sizeof(aux_version));
 		info->bmc_current[2] = talloc_asprintf(info,
-						"Firmware version: %u.%02u.%u",
+						"Firmware version: %u.%02u.%05u",
 						resp[3], bcd, aux_version);
 		bcd = resp[5] & 0x0f;
 		bcd += 10 * (resp[5] >> 4);
@@ -1121,6 +1121,7 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 	const uint32_t magic_value = 0x21706221;
 	uint8_t resp[resp_len];
 	uint32_t cookie;
+	bool persistent;
 	int i, rc;
 	uint8_t req[] = {
 		0x61, /* parameter selector: OEM section (network) */
@@ -1169,18 +1170,21 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 		return;
 	}
 
-	/* Check for valid parameters. For now ignore the persistent flag */
+	/* Check that the parameters are valid */
 	if (resp[2] & 0x80) {
 		pb_debug("platform: network override is invalid/locked\n");
 		return;
 	}
 
-	/* Check for valid parameters in the boot flags section, ignoring the
-	 * persistent bit */
+	/* Check for valid parameters in the boot flags section */
 	if (!(resp[3] & 0x80)) {
 		pb_debug("platform: network override valid flag not set\n");
 		return;
 	}
+	/* Read the persistent flag; if it is set we need to save this config */
+	persistent = resp[3] & 0x40;
+	if (persistent)
+		pb_debug("platform: network override is persistent\n");
 
 	/* Check 4-byte cookie value */
 	i = 4;
@@ -1202,7 +1206,15 @@ static void get_ipmi_network_override(struct platform_powerpc *platform,
 	}
 
 	/* Interpret the rest of the interface config */
-	parse_ipmi_interface_override(config, &resp[i], resp_len - i);
+	rc = parse_ipmi_interface_override(config, &resp[i], resp_len - i);
+
+	if (!rc && persistent) {
+		/* Write this new config to NVRAM */
+		update_network_config(platform, config);
+		rc = write_nvram(platform);
+		if (rc)
+			pb_log("platform: Failed to save persistent interface override\n");
+	}
 }
 
 static int load_config(struct platform *p, struct config *config)
@@ -1218,7 +1230,7 @@ static int load_config(struct platform *p, struct config *config)
 
 	if (platform->get_ipmi_bootdev) {
 		bool bootdev_persistent;
-		uint8_t bootdev;
+		uint8_t bootdev = IPMI_BOOTDEV_INVALID;
 		rc = platform->get_ipmi_bootdev(platform, &bootdev,
 				&bootdev_persistent);
 		if (!rc && ipmi_bootdev_is_valid(bootdev)) {