[as4224/as5114] Add CPLD sub_version in onlp_sysi_platform_info_get()

Original ONLP only contains major version of CPLD. A sub version also exists, so display it too, as it’s good to have for informational purposes. Before: - onlpdump -x CPLD Versions: 2 After: - onlpdump -x CPLD Versions: 2.8 Signed-off-by: Brandon Chuang <[email protected]>
dentproject · Feb 16, 2022 · 0c04219 · 0c04219
1 parent fa37653
commit 0c04219
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/packages/platforms/accton/arm64/as4224/src/arm64_accton_as4224/module/src/sysi.c b/packages/platforms/accton/arm64/as4224/src/arm64_accton_as4224/module/src/sysi.c
@@ -105,13 +105,19 @@ onlp_sysi_platform_info_get(onlp_platform_info_t* pi)
 {
     int ret = 0;
     int version = 0;
+    int sub_version = 0;
 
     ret = get_cpld_attr_int("version", &version);
     if (ret < 0) {
         return ret;
     }
 
-    pi->cpld_versions = aim_fstrdup("%d", version);
+    ret = get_cpld_attr_int("sub_version", &sub_version);
+    if (ret < 0) {
+        return ret;
+    }
+
+    pi->cpld_versions = aim_fstrdup("%x.%x", version, sub_version);
     return ONLP_STATUS_OK;
 }
 

diff --git a/packages/platforms/accton/arm64/as4224/src/modules-5_10/arm64-accton-as4224-cpld.c b/packages/platforms/accton/arm64/as4224/src/modules-5_10/arm64-accton-as4224-cpld.c
@@ -121,6 +121,7 @@ MODULE_DEVICE_TABLE(i2c, as4224_cpld_id);
 enum as4224_cpld_sysfs_attributes {
 	PLATFORM_ID,
 	CPLD_VERSION,
+	SUB_VERSION,
 	ACCESS,
 	I2C_ACCESS_REQUEST_7040,
 	WTD_RESET_7040,   /* Trigger GPIO to reset wtd timer */
@@ -348,6 +349,7 @@ enum as4224_cpld_sysfs_attributes {
 static SENSOR_DEVICE_ATTR(platform_id, S_IRUGO, show_platform_id, NULL,
 	PLATFORM_ID);
 static SENSOR_DEVICE_ATTR(version, S_IRUGO, show_version, NULL, CPLD_VERSION);
+static SENSOR_DEVICE_ATTR(sub_version, S_IRUGO, show_version, NULL,SUB_VERSION);
 static SENSOR_DEVICE_ATTR(access, S_IWUSR, NULL, access, ACCESS);
 static SENSOR_DEVICE_ATTR(wtd_reset_7040, S_IWUSR, NULL, reset_wtd,
 	WTD_RESET_7040);
@@ -373,6 +375,7 @@ static SENSOR_DEVICE_ATTR(i2c_access_request_7040, S_IRUGO | S_IWUSR,
 static struct attribute *cpld_attributes_common[] = {
 	&sensor_dev_attr_platform_id.dev_attr.attr,
 	&sensor_dev_attr_version.dev_attr.attr,
+	&sensor_dev_attr_sub_version.dev_attr.attr,
 	&sensor_dev_attr_access.dev_attr.attr,
 	&sensor_dev_attr_i2c_access_request_7040.dev_attr.attr,
 	&sensor_dev_attr_wtd_reset_7040.dev_attr.attr,
@@ -1286,14 +1289,19 @@ static void as4224_cpld_remove_client(struct i2c_client *client)
 	mutex_unlock(&list_lock);
 }
 
-static ssize_t show_version(struct device *dev, struct device_attribute *attr,
+static ssize_t show_version(struct device *dev, struct device_attribute *da,
 				char *buf)
 {
-	int val = 0;
+	int val = 0, reg = 0;
 	struct i2c_client *client = to_i2c_client(dev);
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
 
-	val = i2c_smbus_read_byte_data(client, 0x1);
+	if (attr->index == CPLD_VERSION)
+		reg = 0x1;
+	else /* SUB_VERSION */
+		reg = 0xFF;
 
+	val = i2c_smbus_read_byte_data(client, reg);
 	if (val < 0) {
 		dev_dbg(&client->dev, "cpld(0x%x) reg(0x1) err %d\n",
 					client->addr, val);