[Accton AS9737-32DB] Upgradge Linux kernel version to 6.1

- The PKG.yml and Makefile under modules, change to onl-kernel-6.1-lts-x86-64-all.
- The x86-64-accton-as9737-32db-r0.yml file under platform-config, change to kernel-6-1.
- Modify driver that uses struct i2c_driver, the return type of the remove function of struct i2c_driver is changed from int to void.
- Modify driver that uses hwmon_device_register_with_info(), the fourth parameter (hwmon_chip_info) of hwmon_device_register_with_info() can’t be NULL after changed to kernel 6.1.
- Add to check the main I2C bus ID in the __init__.py because the iSMT driver is enabled, and update the I2C bus ID of CPLD.

Author: vincentchiang-ec

packages/platforms/accton/x86-64/as9737-32db/modules/PKG.yml

@@ -1 +1 @@
-!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9737-32db ARCH=amd64 KERNELS="onl-kernel-5.4-lts-x86-64-all:amd64"
+!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9737-32db ARCH=amd64 KERNELS="onl-kernel-6.1-lts-x86-64-all:amd64"

packages/platforms/accton/x86-64/as9737-32db/modules/builds/Makefile

@@ -1,4 +1,4 @@
-KERNELS := onl-kernel-5.4-lts-x86-64-all:amd64
+KERNELS := onl-kernel-6.1-lts-x86-64-all:amd64
 KMODULES := src
 VENDOR := accton
 BASENAME := x86-64-accton-as9737-32db

packages/platforms/accton/x86-64/as9737-32db/modules/builds/src/x86-64-accton-as9737-32db-cpld.c

@@ -664,7 +664,7 @@ static int as9737_32db_cpld_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int as9737_32db_cpld_remove(struct i2c_client *client)
+static void as9737_32db_cpld_remove(struct i2c_client *client)
 {
 	struct as9737_32db_cpld_data *data = i2c_get_clientdata(client);
 	const struct attribute_group *group = NULL;
@@ -690,8 +690,6 @@ static int as9737_32db_cpld_remove(struct i2c_client *client)
 		sysfs_remove_group(&client->dev.kobj, group);
 
 	kfree(data);
-
-	return 0;
 }
 
 static int as9737_32db_cpld_read_internal(struct i2c_client *client, u8 reg)

packages/platforms/accton/x86-64/as9737-32db/modules/builds/src/x86-64-accton-as9737-32db-mux.c

@@ -175,11 +175,10 @@ static int as9737_32db_mux_probe(struct i2c_client *client,
 	return ret;
 }
 
-static int as9737_32db_mux_remove(struct i2c_client *client)
+static void as9737_32db_mux_remove(struct i2c_client *client)
 {
 	struct i2c_mux_core *muxc = i2c_get_clientdata(client);
 	as9737_32db_mux_cleanup(muxc);
-	return 0;
 }
 
 static struct i2c_driver as9737_32db_mux_driver = {

packages/platforms/accton/x86-64/as9737-32db/modules/builds/src/x86-64-accton-as9737-32db-psu.c

@@ -809,6 +809,27 @@ static ssize_t show_string(struct device *dev, struct device_attribute *da,
 	return error;
 }
 
+static umode_t as9737_32db_psu_is_visible(const void *drvdata,
+                  enum hwmon_sensor_types type,
+                  u32 attr, int channel)
+{
+	return 0;
+}
+
+static const struct hwmon_channel_info *as9737_32db_psu_info[] = {
+	HWMON_CHANNEL_INFO(power, HWMON_P_ENABLE),
+	NULL,
+};
+
+static const struct hwmon_ops as9737_32db_psu_hwmon_ops = {
+	.is_visible = as9737_32db_psu_is_visible,
+};
+
+static const struct hwmon_chip_info as9737_32db_psu_chip_info = {
+	.ops = &as9737_32db_psu_hwmon_ops,
+	.info = as9737_32db_psu_info,
+};
+
 static int as9737_32db_psu_probe(struct platform_device *pdev)
 {
 	int status = 0;
@@ -817,7 +838,7 @@ static int as9737_32db_psu_probe(struct platform_device *pdev)
 
 	for(i = 0; i < 2; i++) {
 		hwmon_dev = hwmon_device_register_with_info(&pdev->dev, DRVNAME, 
-					NULL, NULL, as9737_32db_psu_groups[i]);
+					NULL, &as9737_32db_psu_chip_info, as9737_32db_psu_groups[i]);
 
 		if (IS_ERR(hwmon_dev)) {
 			status = PTR_ERR(hwmon_dev);

packages/platforms/accton/x86-64/as9737-32db/modules/builds/src/x86-64-accton-as9737-32db-thermal.c

@@ -240,13 +240,34 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
 	return status;
 }
 
+static umode_t as9737_32db_thermal_is_visible(const void *drvdata,
+                  enum hwmon_sensor_types type,
+                  u32 attr, int channel)
+{
+	return 0;
+}
+
+static const struct hwmon_channel_info *as9737_32db_thermal_info[] = {
+	HWMON_CHANNEL_INFO(temp, HWMON_T_ENABLE),
+	NULL,
+};
+
+static const struct hwmon_ops as9737_32db_thermal_hwmon_ops = {
+	.is_visible = as9737_32db_thermal_is_visible,
+};
+
+static const struct hwmon_chip_info as9737_32db_thermal_chip_info = {
+	.ops = &as9737_32db_thermal_hwmon_ops,
+	.info = as9737_32db_thermal_info,
+};
+
 static int as9737_32db_thermal_probe(struct platform_device *pdev)
 {
 	int status = 0;
 	struct device *hwmon_dev;
 
 	hwmon_dev = hwmon_device_register_with_info(&pdev->dev, DRVNAME, 
-			NULL, NULL, as9737_32db_thermal_groups);
+			NULL, &as9737_32db_thermal_chip_info, as9737_32db_thermal_groups);
 	if (IS_ERR(data->hwmon_dev)) {
 		status = PTR_ERR(data->hwmon_dev);
 		return status;

packages/platforms/accton/x86-64/as9737-32db/onlp/builds/x86_64_accton_as9737_32db/module/src/sfpi.c

@@ -42,21 +42,21 @@
 	} while(0)
 
 #define MODULE_EEPROM_FORMAT       "/sys/bus/i2c/devices/%d-0050/eeprom"
-#define MODULE_PRESENT_CPLD2_FORMAT "/sys/bus/i2c/devices/35-0061/module_present_%d"
-#define MODULE_PRESENT_CPLD3_FORMAT "/sys/bus/i2c/devices/36-0062/module_present_%d"
-#define MODULE_RXLOS_FORMAT         "/sys/bus/i2c/devices/36-0062/module_rx_los_%d"
-#define MODULE_TXFAULT_FORMAT       "/sys/bus/i2c/devices/36-0062/module_tx_fault_%d"
-#define MODULE_TXDISABLE_FORMAT     "/sys/bus/i2c/devices/36-0062/module_tx_disable_%d"
-#define MODULE_RESET_CPLD2_FORMAT   "/sys/bus/i2c/devices/35-0061/module_reset_%d"
-#define MODULE_RESET_CPLD3_FORMAT   "/sys/bus/i2c/devices/36-0062/module_reset_%d"
-#define MODULE_LPMODE_CPLD2_FORMAT  "/sys/bus/i2c/devices/35-0061/module_lpmode_%d"
-#define MODULE_LPMODE_CPLD3_FORMAT  "/sys/bus/i2c/devices/36-0062/module_lpmode_%d"
+#define MODULE_PRESENT_CPLD2_FORMAT "/sys/bus/i2c/devices/36-0061/module_present_%d"
+#define MODULE_PRESENT_CPLD3_FORMAT "/sys/bus/i2c/devices/37-0062/module_present_%d"
+#define MODULE_RXLOS_FORMAT         "/sys/bus/i2c/devices/37-0062/module_rx_los_%d"
+#define MODULE_TXFAULT_FORMAT       "/sys/bus/i2c/devices/37-0062/module_tx_fault_%d"
+#define MODULE_TXDISABLE_FORMAT     "/sys/bus/i2c/devices/37-0062/module_tx_disable_%d"
+#define MODULE_RESET_CPLD2_FORMAT   "/sys/bus/i2c/devices/36-0061/module_reset_%d"
+#define MODULE_RESET_CPLD3_FORMAT   "/sys/bus/i2c/devices/37-0062/module_reset_%d"
+#define MODULE_LPMODE_CPLD2_FORMAT  "/sys/bus/i2c/devices/36-0061/module_lpmode_%d"
+#define MODULE_LPMODE_CPLD3_FORMAT  "/sys/bus/i2c/devices/37-0062/module_lpmode_%d"
 
 #define NUM_OF_SFP_PORT 34
 static const int port_bus_index[NUM_OF_SFP_PORT] = {
-	 1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-	33, 34 
+	 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14, 15, 16, 17,
+	18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+	34, 35
 };
 
 #define PORT_BUS_INDEX(port) (port_bus_index[port-1])

packages/platforms/accton/x86-64/as9737-32db/platform-config/r0/src/lib/x86-64-accton-as9737-32db-r0.yml

@@ -18,7 +18,7 @@ x86-64-accton-as9737-32db-r0:
       --stop=1
 
     kernel:
-      <<: *kernel-5-4
+      <<: *kernel-6-1
 
     args: >-
       console=ttyS0,115200n8

packages/platforms/accton/x86-64/as9737-32db/platform-config/r0/src/python/x86_64_accton_as9737_32db_r0/__init__.py

@@ -70,6 +70,12 @@ def init_ipmi():
     print('Failed to initialize IPMI dev interface')
     return False
 
+def get_i2c_bus_num_offset():
+    cmd = 'cat /sys/bus/i2c/devices/i2c-0/name'
+    process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = process.communicate()
+    return 1 if b'iSMT' in stdout else 0
+
 class OnlPlatform_x86_64_accton_as9737_32db_r0(OnlPlatformAccton,
                                                OnlPlatformPortConfig_32x400_1x10_1x1):
     PLATFORM='x86-64-accton-as9737-32db-r0'
@@ -91,15 +97,17 @@ def baseconfig(self):
         for m in [ 'i2c-ocores', 'fpga', 'mux', 'cpld', 'fan', 'psu', 'thermal', 'sys', 'leds' ]:
             self.insmod("x86-64-accton-as9737-32db-%s.ko" % m)
 
+        bus_offset = get_i2c_bus_num_offset()
+
         ########### initialize I2C bus 0 ###########
         self.new_i2c_devices(
             [
                 # initialize multiplexer (PCA9548)
-                ('as9737_32db_mux', 0x77, 0),
+                ('as9737_32db_mux', 0x77, 0+bus_offset),
 
                 # initialize CPLDs
-                ('as9737_32db_cpld2', 0x61, 35),
-                ('as9737_32db_cpld3', 0x62, 36),
+                ('as9737_32db_cpld2', 0x61, 36),
+                ('as9737_32db_cpld3', 0x62, 37),
 
                 # EEPROM
                 #('24c02', 0x56, 0),
@@ -108,15 +116,15 @@ def baseconfig(self):
 
         # initialize SFP devices
         for port in range(1, 17):
-            subprocess.call('echo 0 > /sys/bus/i2c/devices/35-0061/module_reset_%d' % (port), shell=True)
+            subprocess.call('echo 0 > /sys/bus/i2c/devices/36-0061/module_reset_%d' % (port), shell=True)
 
         for port in range(17, 33):
-            subprocess.call('echo 0 > /sys/bus/i2c/devices/36-0062/module_reset_%d' % (port), shell=True)
+            subprocess.call('echo 0 > /sys/bus/i2c/devices/37-0062/module_reset_%d' % (port), shell=True)
 
         sfp_bus = [
-             1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16,
-            17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
-            33, 34
+             2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17,
+            18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+            34, 35
         ]
 
         for port in range(1, len(sfp_bus)+1):