add minor version to info command

Added the minor version number to the info command
through reading the GAS address for Firmware Version.
Add additional version info to the HW Revision section.

Author: BenReed161

cli/main.c

@@ -191,6 +191,7 @@ static int print_dev_info(struct switchtec_dev *dev)
 	char version[32];
 	enum switchtec_boot_phase phase;
 	enum switchtec_rev hw_rev;
+	char * minor_ver;
 
 	device_id = switchtec_device_id(dev);
 
@@ -203,11 +204,26 @@ static int print_dev_info(struct switchtec_dev *dev)
 		switchtec_perror("dev info");
 		return ret;
 	}
+	ret = switchtec_get_device_info(dev, &phase, NULL, &hw_rev);
+	if (ret) {
+		switchtec_perror("dev info");
+		return ret;
+	}
+	if (switchtec_is_gen5(dev)) {
+		switchtec_get_device_minor_ver(dev, &minor_ver);
+		if (ret) {
+			switchtec_perror("minor ver");
+			return ret;
+		}
+	}
+	else {
+		minor_ver = "";
+	}
 
 	printf("%s (%s):\n", switchtec_name(dev),
 	       switchtec_phase_id_str(phase));
 	printf("    Generation:  %s\n", switchtec_gen_str(dev));
-	printf("    HW Revision: %s\n", switchtec_rev_str(hw_rev));
+	printf("    HW Revision: %s%s\n", switchtec_rev_str(hw_rev), minor_ver);
 	printf("    Variant:     %s\n",
 	       device_id ? switchtec_variant_str(dev) : "N/A");
 	if (device_id)

inc/switchtec/switchtec.h

@@ -358,6 +358,7 @@ int switchtec_list(struct switchtec_device_info **devlist);
 void switchtec_list_free(struct switchtec_device_info *devlist);
 int switchtec_get_fw_version(struct switchtec_dev *dev, char *buf,
 			     size_t buflen);
+int switchtec_get_device_minor_ver(struct switchtec_dev *dev, char ** res);
 int switchtec_cmd(struct switchtec_dev *dev, uint32_t cmd,
 		  const void *payload, size_t payload_len, void *resp,
 		  size_t resp_len);

lib/platform/gasops.c

@@ -188,6 +188,32 @@ int gasop_get_fw_version(struct switchtec_dev *dev, char *buf,
 	return 0;
 }
 
+int gasop_get_device_minor_ver(struct switchtec_dev *dev, char ** res)
+{
+	void __gas * addr;
+	int offset = 0x2004;
+	gasptr_t map;
+	size_t map_size;
+	uint32_t gas_result;
+	char result[5];
+
+	uint8_t minor;
+	map = switchtec_gas_map(dev, 0, &map_size);
+	if (map == SWITCHTEC_MAP_FAILED) {
+		switchtec_perror("gas_map");
+		return -1;
+	}
+	addr = map;
+	gas_result = __gas_read32(dev, addr + offset);
+	minor = (gas_result >> 0x10) & 0xFF;
+	snprintf(result, 5, ".%d", minor);
+	*res = result;
+
+	switchtec_gas_unmap(dev, map);
+
+	return 0;
+}
+
 int gasop_pff_to_port(struct switchtec_dev *dev, int pff,
 		      int *partition, int *port)
 {

lib/platform/gasops.h

@@ -36,6 +36,7 @@ int gasop_cmd(struct switchtec_dev *dev, uint32_t cmd,
 int gasop_get_device_id(struct switchtec_dev *dev);
 int gasop_get_fw_version(struct switchtec_dev *dev, char *buf,
 			 size_t buflen);
+int gasop_get_device_minor_ver(struct switchtec_dev *dev, char ** res);
 int gasop_pff_to_port(struct switchtec_dev *dev, int pff,
 		      int *partition, int *port);
 int gasop_port_to_pff(struct switchtec_dev *dev, int partition,

lib/platform/linux-eth.c

@@ -524,6 +524,7 @@ static const struct switchtec_ops eth_ops = {
 	.cmd = eth_cmd,
 	.get_device_id = gasop_get_device_id,
 	.get_fw_version = gasop_get_fw_version,
+	.get_device_minor_ver = gasop_get_device_minor_ver,
 	.pff_to_port = gasop_pff_to_port,
 	.port_to_pff = gasop_port_to_pff,
 	.flash_part = gasop_flash_part,

lib/platform/linux-i2c.c

@@ -623,6 +623,7 @@ static const struct switchtec_ops i2c_ops = {
 	.cmd = gasop_cmd,
 	.get_device_id = gasop_get_device_id,
 	.get_fw_version = gasop_get_fw_version,
+	.get_device_minor_ver = gasop_get_device_minor_ver,
 	.pff_to_port = gasop_pff_to_port,
 	.port_to_pff = gasop_port_to_pff,
 	.flash_part = gasop_flash_part,

lib/platform/linux-uart.c

@@ -439,6 +439,7 @@ static const struct switchtec_ops uart_ops = {
 	.cmd = gasop_cmd,
 	.get_device_id = gasop_get_device_id,
 	.get_fw_version = gasop_get_fw_version,
+	.get_device_minor_ver = gasop_get_device_minor_ver,
 	.pff_to_port = gasop_pff_to_port,
 	.port_to_pff = gasop_port_to_pff,
 	.flash_part = gasop_flash_part,

lib/platform/linux.c

@@ -971,6 +971,7 @@ static const struct switchtec_ops linux_ops = {
 	.close = linux_close,
 	.get_device_id = linux_get_device_id,
 	.get_fw_version = linux_get_fw_version,
+	.get_device_minor_ver = gasop_get_device_minor_ver,
 	.cmd = linux_cmd,
 	.get_devices = linux_get_devices,
 	.pff_to_port = linux_pff_to_port,

lib/platform/platform.c

@@ -150,6 +150,12 @@ int switchtec_get_fw_version(struct switchtec_dev *dev, char *buf,
 	return 0;
 }
 
+int switchtec_get_device_minor_ver(struct switchtec_dev *dev, char ** res)
+{
+	int ret;
+	ret = dev->ops->get_device_minor_ver(dev, res);
+	return ret;
+}
 /**
  * @brief Execute an MRPC command
  * @ingroup Device

lib/switchtec_priv.h

@@ -93,6 +93,7 @@ struct switchtec_ops {
 	int (*get_device_id)(struct switchtec_dev *dev);
 	int (*get_fw_version)(struct switchtec_dev *dev, char *buf,
 			      size_t buflen);
+	int (*get_device_minor_ver)(struct switchtec_dev *dev, char ** res);
 	int (*cmd)(struct switchtec_dev *dev,  uint32_t cmd,
 		   const void *payload, size_t payload_len, void *resp,
 		   size_t resp_len);