X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fipmi.c;h=840fdee5d6dada2e2bc959aaec340fefaa891040;hp=e52070ffe4c8a78930a519b3e7f1664923eecfa3;hb=fed2c4da36c2708f2a5a7a09eba61d014b9339d6;hpb=1e1e3417262e44531d2a5c6dd3152d5deb92fb90

diff --git a/discover/ipmi.c b/discover/ipmi.c
index e52070f..840fdee 100644
--- a/discover/ipmi.c
+++ b/discover/ipmi.c
@@ -201,7 +201,7 @@ struct ipmi *ipmi_open(void *ctx)
 	struct ipmi *ipmi;
 	int fd;
 
-	fd = open(ipmi_devnode, O_RDWR);
+	fd = open(ipmi_devnode, O_RDWR | O_CLOEXEC);
 	if (fd < 0) {
 		pb_log("IPMI: can't open IPMI device %s: %m\n", ipmi_devnode);
 		return NULL;
@@ -223,7 +223,7 @@ bool ipmi_present(void)
 
 /* Reads and applies an IPMI interface config override, which closely follows
  * the format of an interface config struct as described in lib/types */
-void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
+int parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 				uint16_t len)
 {
 	struct interface_config *ifconf;
@@ -239,15 +239,15 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 	i += sizeof(ipsize);
 
 	if (!hwsize || !ipsize) {
-		pb_log("%s: Empty response\n", __func__);
-		return;
+		pb_log_fn("Empty response\n");
+		return -1;
 	}
 
 	/* At the moment only support 6-byte MAC addresses */
 	if (hwsize != sizeof(ifconf->hwaddr)) {
 		pb_log("Unsupported HW address size in network override: %u\n",
 		       hwsize);
-		return;
+		return -1;
 	}
 
 	/* Sanity check the IP address size */
@@ -259,14 +259,14 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 		addr_len = INET6_ADDRSTRLEN;
 	} else {
 		pb_log("Unsupported IP address size: %u\n", ipsize);
-		return;
+		return -1;
 	}
 
 	/* Everything past here is the interface config */
 	ifconf = talloc_zero(config, struct interface_config);
 	if (!ifconf) {
 		pb_log("Failed to allocate network override\n");
-		return;
+		return -1;
 	}
 
 	/* Hardware Address */
@@ -281,7 +281,7 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 		if (ipsize + ipsize  + 1 > len - i) {
 			pb_log("Expected data greater than buffer size\n");
 			talloc_free(ifconf);
-			return;
+			return -1;
 		}
 
 		/* IP address */
@@ -289,7 +289,7 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 		if (!inet_ntop(addr_type, &buf[i], ipstr, addr_len)) {
 			pb_log("Failed to convert ipaddr: %m\n");
 			talloc_free(ifconf);
-			return;
+			return -1;
 		}
 		i += ipsize;
 
@@ -303,17 +303,143 @@ void parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 		if (!inet_ntop(addr_type, &buf[i], gatewaystr, addr_len)) {
 			pb_log("Failed to convert gateway: %m\n");
 			talloc_free(ifconf);
-			return;
+			return -1;
 		}
 		ifconf->static_config.gateway = gatewaystr;
 		i += ipsize;
 	}
 
-	pb_log("Applying IPMI network config\n");
+	ifconf->override = true;
+	pb_log("Applying IPMI network interface override\n");
 
 	/* Replace any existing interface config */
 	talloc_free(config->network.interfaces);
 	config->network.n_interfaces = 1;
 	config->network.interfaces = talloc(config, struct interface_config *);
 	config->network.interfaces[0] = ifconf;
+
+	return 0;
+}
+
+void ipmi_get_bmc_mac(struct ipmi *ipmi, uint8_t *buf)
+{
+	uint16_t resp_len = 8;
+	uint8_t resp[8];
+	uint8_t req[] = { 0x1, 0x5, 0x0, 0x0 };
+	int i, rc;
+
+	rc = ipmi_transaction(ipmi, IPMI_NETFN_TRANSPORT,
+			IPMI_CMD_TRANSPORT_GET_LAN_PARAMS,
+			req, sizeof(req),
+			resp, &resp_len,
+			ipmi_timeout);
+
+	pb_debug_fn("BMC MAC resp [%d][%d]:\n", rc, resp_len);
+
+	if (rc == 0 && resp_len > 0) {
+		for (i = 2; i < resp_len; i++) {
+		        pb_debug(" %x", resp[i]);
+			buf[i - 2] = resp[i];
+		}
+		pb_debug("\n");
+	}
+
 }
+
+/*
+ * Retrieve info from the "Get Device ID" IPMI commands.
+ * See Chapter 20.1 in the IPMIv2 specification.
+ */
+void ipmi_get_bmc_versions(struct ipmi *ipmi, struct system_info *info)
+{
+	uint16_t resp_len = 16;
+	uint8_t resp[16], bcd;
+	int i, rc;
+
+	/* Retrieve info from current side */
+	rc = ipmi_transaction(ipmi, IPMI_NETFN_APP,
+			IPMI_CMD_APP_GET_DEVICE_ID,
+			NULL, 0,
+			resp, &resp_len,
+			ipmi_timeout);
+
+	pb_debug_fn("BMC version resp [%d][%d]:\n", rc, resp_len);
+	if (resp_len > 0) {
+		for (i = 0; i < resp_len; i++) {
+		        pb_debug(" %x", resp[i]);
+		}
+		pb_debug("\n");
+	}
+
+	if (rc == 0 && (resp_len == 12 || resp_len == 16)) {
+		info->bmc_current = talloc_array(info, char *, 4);
+		info->n_bmc_current = 4;
+
+		info->bmc_current[0] = talloc_asprintf(info, "Device ID: 0x%x",
+						resp[1]);
+		info->bmc_current[1] = talloc_asprintf(info, "Device Rev: 0x%x",
+						resp[2]);
+		bcd = resp[4] & 0x0f;
+		bcd += 10 * (resp[4] >> 4);
+		/* rev1.rev2.aux_revision */
+		info->bmc_current[2] = talloc_asprintf(info,
+				"Firmware version: %u.%02u",
+				resp[3], bcd);
+		if (resp_len == 16) {
+			info->bmc_current[2] = talloc_asprintf_append(
+					info->bmc_current[2],
+					".%02x%02x%02x%02x",
+					resp[12], resp[13], resp[14], resp[15]);
+		}
+		bcd = resp[5] & 0x0f;
+		bcd += 10 * (resp[5] >> 4);
+		info->bmc_current[3] = talloc_asprintf(info, "IPMI version: %u",
+						bcd);
+	} else
+		pb_debug_fn("Failed to retrieve Device ID from IPMI\n");
+
+	/* Retrieve info from golden side */
+	memset(resp, 0, sizeof(resp));
+	resp_len = 16;
+	rc = ipmi_transaction(ipmi, IPMI_NETFN_AMI,
+			IPMI_CMD_APP_GET_DEVICE_ID_GOLDEN,
+			NULL, 0,
+			resp, &resp_len,
+			ipmi_timeout);
+
+	pb_debug_fn("BMC golden resp [%d][%d]:\n", rc, resp_len);
+	if (resp_len > 0) {
+		for (i = 0; i < resp_len; i++) {
+		        pb_debug(" %x", resp[i]);
+		}
+		pb_debug("\n");
+	}
+
+	if (rc == 0 && (resp_len == 12 || resp_len == 16)) {
+		info->bmc_golden = talloc_array(info, char *, 4);
+		info->n_bmc_golden = 4;
+
+		info->bmc_golden[0] = talloc_asprintf(info, "Device ID: 0x%x",
+						resp[1]);
+		info->bmc_golden[1] = talloc_asprintf(info, "Device Rev: 0x%x",
+						resp[2]);
+		bcd = resp[4] & 0x0f;
+		bcd += 10 * (resp[4] >> 4);
+		/* rev1.rev2.aux_revision */
+		info->bmc_golden[2] = talloc_asprintf(info,
+				"Firmware version: %u.%02u",
+				resp[3], bcd);
+		if (resp_len == 16) {
+			info->bmc_golden[2] = talloc_asprintf_append(
+					info->bmc_golden[2],
+					".%02x%02x%02x%02x",
+					resp[12], resp[13], resp[14], resp[15]);
+		}
+		bcd = resp[5] & 0x0f;
+		bcd += 10 * (resp[5] >> 4);
+		info->bmc_golden[3] = talloc_asprintf(info, "IPMI version: %u",
+						bcd);
+	} else
+		pb_debug_fn("Failed to retrieve Golden Device ID from IPMI\n");
+}
+