add minor version to info command

Add the minor version number to the info command through reading the
GAS address for firmware version info adding the resulting minor version
number to the to the HW revision section of the print device info cmd.

Author: BenReed161

cli/main.c

@@ -191,6 +191,8 @@ static int print_dev_info(struct switchtec_dev *dev)
 	char version[32];
 	enum switchtec_boot_phase phase;
 	enum switchtec_rev hw_rev;
+	char minor_str[8] = "";
+	int minor_ver;
 
 	device_id = switchtec_device_id(dev);
 
@@ -203,11 +205,24 @@ 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_minor_version(dev, &minor_ver);
+		if (ret) {
+			switchtec_perror("minor ver");
+			return ret;
+		}
+		sprintf(minor_str, ".%d", 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_str);
 	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_minor_version(struct switchtec_dev *dev, int *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/linux.c

@@ -300,6 +300,28 @@ static int linux_get_fw_version(struct switchtec_dev *dev, char *buf,
 	return 0;
 }
 
+static int linux_get_minor_version(struct switchtec_dev *dev, int *minor_ver)
+{
+	int ret;
+	int version;
+	char syspath[PATH_MAX];
+	struct switchtec_linux *ldev = to_switchtec_linux(dev);
+
+	ret = dev_to_sysfs_path(ldev, "device_version", syspath, sizeof(syspath));
+	if (ret)
+		return ret;
+
+	version = sysfs_read_int(syspath, 16);
+	if (version < 0)
+		return version;
+
+	version = (version >> 0x10) & 0xFF;
+	
+	memcpy(minor_ver, &version, sizeof(int));
+
+	return 0;
+}
+
 static int submit_cmd(struct switchtec_linux *ldev, uint32_t cmd,
 		      const void *payload, size_t payload_len)
 {
@@ -971,6 +993,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_minor_version = linux_get_minor_version,
 	.cmd = linux_cmd,
 	.get_devices = linux_get_devices,
 	.pff_to_port = linux_pff_to_port,

lib/platform/platform.c

@@ -150,6 +150,22 @@ int switchtec_get_fw_version(struct switchtec_dev *dev, char *buf,
 	return 0;
 }
 
+/**
+ * @brief Get the minor version number as a user readable int
+ * @ingroup Device
+ * @param[in] dev	Switchtec device handle
+ * @param[in] res	Int to put the version in
+ */
+int switchtec_get_minor_version(struct switchtec_dev *dev, int *res)
+{
+	int ret;
+	ret = dev->ops->get_minor_version(dev, res);
+	if (ret)
+		return ret;
+	
+	return 0;
+}
+
 /**
  * @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_minor_version)(struct switchtec_dev *dev, int *minor_ver);
 	int (*cmd)(struct switchtec_dev *dev,  uint32_t cmd,
 		   const void *payload, size_t payload_len, void *resp,
 		   size_t resp_len);