[Edgecore][sonic-platform-modules-accton]Support kernel 6.1 and bookw…

…orm (sonic-net#16982) * [Edgecore][sonic-platform-modules-accton]Support kernel 6.1 and bookworm * Modify pddf drv code for i2c_remove_callback function fail
saiarcot895 · Nov 21, 2023 · 796ce30 · 796ce30
1 parent befd2bd
commit 796ce30
Show file tree

Hide file tree

Showing 105 changed files with 373 additions and 717 deletions.
diff --git a/platform/broadcom/rules.dep b/platform/broadcom/rules.dep
@@ -4,14 +4,13 @@ include $(PLATFORM_PATH)/sai.dep
 # TODO: re-enable once the following have been updated for bookworm:
 # * Nokia
 # * Dell
-# * Accton
 # * Juniper
 # * Ragile
 include $(PLATFORM_PATH)/platform-modules-s6000.dep
 #include $(PLATFORM_PATH)/platform-modules-dell.dep
 include $(PLATFORM_PATH)/platform-modules-arista.dep
 include $(PLATFORM_PATH)/platform-modules-ingrasys.dep
-#include $(PLATFORM_PATH)/platform-modules-accton.dep
+include $(PLATFORM_PATH)/platform-modules-accton.dep
 include $(PLATFORM_PATH)/platform-modules-alphanetworks.dep
 include $(PLATFORM_PATH)/platform-modules-inventec.dep
 include $(PLATFORM_PATH)/platform-modules-cel.dep

diff --git a/platform/broadcom/rules.mk b/platform/broadcom/rules.mk
@@ -3,15 +3,14 @@ include $(PLATFORM_PATH)/sai.mk
 # TODO: re-enable once the following have been updated for bookworm:
 # * Nokia
 # * Dell
-# * Accton
 # * Juniper
 # * Ragile
 # * Ufispace
 #include $(PLATFORM_PATH)/platform-modules-nokia.mk
 #include $(PLATFORM_PATH)/platform-modules-dell.mk
 include $(PLATFORM_PATH)/platform-modules-arista.mk
 #include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
-#include $(PLATFORM_PATH)/platform-modules-accton.mk
+include $(PLATFORM_PATH)/platform-modules-accton.mk
 include $(PLATFORM_PATH)/platform-modules-alphanetworks.mk
 #include $(PLATFORM_PATH)/platform-modules-inventec.mk
 include $(PLATFORM_PATH)/platform-modules-cel.mk

diff --git a/...oadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-cpld.c b/...oadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-cpld.c
@@ -769,7 +769,7 @@ static int as4630_54pe_cpld_probe(struct i2c_client *client,
  return ret;
 }
 
-static int as4630_54pe_cpld_remove(struct i2c_client *client)
+static void as4630_54pe_cpld_remove(struct i2c_client *client)
 {
  struct as4630_54pe_cpld_data *data = i2c_get_clientdata(client);
  const struct attribute_group *group = NULL;
@@ -794,7 +794,6 @@ static int as4630_54pe_cpld_remove(struct i2c_client *client)
 
  kfree(data);
 
- return 0;
 }
 
 static int as4630_54pe_cpld_read_internal(struct i2c_client *client, u8 reg)

diff --git a/...roadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-psu.c b/...roadcom/sonic-platform-modules-accton/as4630-54pe/modules/x86-64-accton-as4630-54pe-psu.c
@@ -186,15 +186,14 @@ static int as4630_54pe_psu_probe(struct i2c_client *client,
  return status;
 }
 
-static int as4630_54pe_psu_remove(struct i2c_client *client)
+static void as4630_54pe_psu_remove(struct i2c_client *client)
 {
  struct as4630_54pe_psu_data *data = i2c_get_clientdata(client);
 
  hwmon_device_unregister(data->hwmon_dev);
  sysfs_remove_group(&client->dev.kobj, &as4630_54pe_psu_group);
  kfree(data);
 
- return 0;
 }
 
 enum psu_index

diff --git a/...oadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-cpld.c b/...oadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-cpld.c
@@ -772,7 +772,7 @@ static int as4630_54te_cpld_probe(struct i2c_client *client,
  return ret;
 }
 
-static int as4630_54te_cpld_remove(struct i2c_client *client)
+static void as4630_54te_cpld_remove(struct i2c_client *client)
 {
  struct as4630_54te_cpld_data *data = i2c_get_clientdata(client);
  const struct attribute_group *group = NULL;
@@ -797,7 +797,6 @@ static int as4630_54te_cpld_remove(struct i2c_client *client)
 
  kfree(data);
 
- return 0;
 }
 
 static int as4630_54te_cpld_read_internal(struct i2c_client *client, u8 reg)

diff --git a/...roadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-psu.c b/...roadcom/sonic-platform-modules-accton/as4630-54te/modules/x86-64-accton-as4630-54te-psu.c
@@ -187,15 +187,14 @@ static int as4630_54te_psu_probe(struct i2c_client *client,
  return status;
 }
 
-static int as4630_54te_psu_remove(struct i2c_client *client)
+static void as4630_54te_psu_remove(struct i2c_client *client)
 {
  struct as4630_54te_psu_data *data = i2c_get_clientdata(client);
 
  hwmon_device_unregister(data->hwmon_dev);
  sysfs_remove_group(&client->dev.kobj, &as4630_54te_psu_group);
  kfree(data);
 
- return 0;
 }
 
 enum psu_index

diff --git a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/classes/fanutil.py b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/classes/fanutil.py
@@ -122,7 +122,7 @@ def _get_fan_node_val(self, fan_num, node_num):
  return None
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  logging.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -153,7 +153,7 @@ def _set_fan_node_val(self, fan_num, node_num, val):
  val_file.write(content)
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  logging.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -225,14 +225,3 @@ def get_fan_status(self, fan_num):
 
  return True
 
-#def main():
-# fan = FanUtil()
-#
-# print 'get_size_node_map : %d' % fan.get_size_node_map()
-# print 'get_size_path_map : %d' % fan.get_size_path_map()
-# for x in range(fan.get_idx_fan_start(), fan.get_num_fans()+1):
-# for y in range(fan.get_idx_node_start(), fan.get_num_nodes()+1):
-# print fan.get_fan_to_device_path(x, y)
-#
-#if __name__ == '__main__':
-# main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/classes/thermalutil.py b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/classes/thermalutil.py
@@ -80,7 +80,7 @@ def _get_thermal_node_val(self, thermal_num):
  return None
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  logging.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -109,13 +109,3 @@ def get_thermal_1_val(self):
  def get_thermal_2_val(self):
  return self._get_thermal_node_val(self.THERMAL_NUM_2_IDX)
 
-#def main():
-# thermal = ThermalUtil()
-#
-# print 'get_size_node_map : %d' % thermal.get_size_node_map()
-# print 'get_size_path_map : %d' % thermal.get_size_path_map()
-# for x in range(thermal.get_idx_thermal_start(), thermal.get_num_thermals()+1):
-# print thermal.get_thermal_to_device_path(x)
-#
-#if __name__ == '__main__':
-# main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/accton_as5712_54x_psu.c b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/accton_as5712_54x_psu.c
@@ -193,15 +193,14 @@ static int as5712_54x_psu_probe(struct i2c_client *client,
  return status;
 }
 
-static int as5712_54x_psu_remove(struct i2c_client *client)
+static void as5712_54x_psu_remove(struct i2c_client *client)
 {
  struct as5712_54x_psu_data *data = i2c_get_clientdata(client);
 
  hwmon_device_unregister(data->hwmon_dev);
  sysfs_remove_group(&client->dev.kobj, &as5712_54x_psu_group);
  kfree(data);
 
- return 0;
 }
 
 enum psu_index 

diff --git a/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/accton_as5712_54x_sfp.c b/platform/broadcom/sonic-platform-modules-accton/as5712-54x/modules/accton_as5712_54x_sfp.c
@@ -498,15 +498,14 @@ static int as5712_54x_sfp_probe(struct i2c_client *client,
  return status;
 }
 
-static int as5712_54x_sfp_remove(struct i2c_client *client)
+static void as5712_54x_sfp_remove(struct i2c_client *client)
 {
  struct as5712_54x_sfp_data *data = i2c_get_clientdata(client);
 
  hwmon_device_unregister(data->hwmon_dev);
  sysfs_remove_group(&client->dev.kobj, &as5712_54x_sfp_group);
  kfree(data);
 
- return 0;
 }
 
 enum port_numbers {

diff --git a/...roadcom/sonic-platform-modules-accton/as5712-54x/modules/i2c-mux-accton_as5712_54x_cpld.c b/...roadcom/sonic-platform-modules-accton/as5712-54x/modules/i2c-mux-accton_as5712_54x_cpld.c
@@ -1277,7 +1277,7 @@ static int as5712_54x_cpld_mux_probe(struct i2c_client *client,
  return ret;
 }
 
-static int as5712_54x_cpld_mux_remove(struct i2c_client *client)
+static void as5712_54x_cpld_mux_remove(struct i2c_client *client)
 {
  struct i2c_mux_core *muxc = i2c_get_clientdata(client);
  struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
@@ -1306,7 +1306,6 @@ static int as5712_54x_cpld_mux_remove(struct i2c_client *client)
 
  i2c_mux_del_adapters(muxc);
 
- return 0;
 }
 
 static int as5712_54x_cpld_read_internal(struct i2c_client *client, u8 reg)

diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54t/classes/fanutil.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54t/classes/fanutil.py
@@ -135,7 +135,7 @@ def _get_fan_node_val(self, fan_num, node_num):
  return None
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  self.logger.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -166,7 +166,7 @@ def _set_fan_node_val(self, fan_num, node_num, val):
  val_file.write(content)
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  self.logger.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -230,14 +230,3 @@ def get_fan_status(self, fan_num):
 
  return True
 
-#def main():
-# fan = FanUtil()
-#
-# print 'get_size_node_map : %d' % fan.get_size_node_map()
-# print 'get_size_path_map : %d' % fan.get_size_path_map()
-# for x in range(fan.get_idx_fan_start(), fan.get_num_fans()+1):
-# for y in range(fan.get_idx_node_start(), fan.get_num_nodes()+1):
-# print fan.get_fan_to_device_path(x, y)
-#
-#if __name__ == '__main__':
-# main()
diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54t/classes/thermalutil.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54t/classes/thermalutil.py
@@ -77,19 +77,21 @@ def _get_thermal_node_val(self, thermal_num):
  self.logger.error('GET. unable to open file: %s', str(e))
  return None
 
- content = val_file.readline().rstrip()
+  content = val_file.readline().rstrip()
 
- if content == '':
- self.logger.debug('GET. content is NULL. device_path:%s', device_path)
- return None
+  if content == '':
+  self.logger.debug('GET. content is NULL. device_path:%s', device_path)
+  return None
 
- try:
-  val_file.close()
- except:
- self.logger.debug('GET. unable to close file. device_path:%s', device_path)
- return None
+  try:
+  val_file.close()
+  except:
+  self.logger.debug('GET. unable to close file. device_path:%s', device_path)
+  return None
 
- return int(content)
+ return int(content)
+
+ return 0
 
 
  def get_num_thermals(self):
@@ -112,14 +114,3 @@ def get_thermal_1_val(self):
 
  def get_thermal_2_val(self):
  return self._get_thermal_node_val(self.THERMAL_NUM_2_IDX)
-
-#def main():
-# thermal = ThermalUtil()
-#
-# print 'get_size_node_map : %d' % thermal.get_size_node_map()
-# print 'get_size_path_map : %d' % thermal.get_size_path_map()
-# for x in range(thermal.get_idx_thermal_start(), thermal.get_num_thermals()+1):
-# print thermal.get_thermal_to_device_path(x)
-#
-#if __name__ == '__main__':
-# main()
diff --git a/...broadcom/sonic-platform-modules-accton/as5812-54t/modules/x86-64-accton-as5812-54t-cpld.c b/...broadcom/sonic-platform-modules-accton/as5812-54t/modules/x86-64-accton-as5812-54t-cpld.c
@@ -447,7 +447,7 @@ static int as5812_54t_cpld_probe(struct i2c_client *client,
  return status;
 }
 
-static int as5812_54t_cpld_remove(struct i2c_client *client)
+static void as5812_54t_cpld_remove(struct i2c_client *client)
 {
  struct as5812_54t_cpld_data *data = i2c_get_clientdata(client);
 
@@ -456,7 +456,6 @@ static int as5812_54t_cpld_remove(struct i2c_client *client)
  kfree(data);
  as5812_54t_cpld_remove_client(client);
 
- return 0;
 }
 
 int as5812_54t_cpld_read(unsigned short cpld_addr, u8 reg)

diff --git a/.../broadcom/sonic-platform-modules-accton/as5812-54t/modules/x86-64-accton-as5812-54t-psu.c b/.../broadcom/sonic-platform-modules-accton/as5812-54t/modules/x86-64-accton-as5812-54t-psu.c
@@ -191,15 +191,14 @@ static int as5812_54t_psu_probe(struct i2c_client *client,
  return status;
 }
 
-static int as5812_54t_psu_remove(struct i2c_client *client)
+static void as5812_54t_psu_remove(struct i2c_client *client)
 {
  struct as5812_54t_psu_data *data = i2c_get_clientdata(client);
 
  hwmon_device_unregister(data->hwmon_dev);
  sysfs_remove_group(&client->dev.kobj, &as5812_54t_psu_group);
  kfree(data);
 
- return 0;
 }
 
 enum psu_index 

diff --git a/platform/broadcom/sonic-platform-modules-accton/as5812-54x/classes/fanutil.py b/platform/broadcom/sonic-platform-modules-accton/as5812-54x/classes/fanutil.py
@@ -135,7 +135,7 @@ def _get_fan_node_val(self, fan_num, node_num):
  return None
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  self.logger.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -166,7 +166,7 @@ def _set_fan_node_val(self, fan_num, node_num, val):
  val_file.write(content)
 
  try:
-  val_file.close()
+  val_file.close()
  except:
  self.logger.debug('GET. unable to close file. device_path:%s', device_path)
  return None
@@ -230,14 +230,3 @@ def get_fan_status(self, fan_num):
 
  return True
 
-#def main():
-# fan = FanUtil()
-#
-# print 'get_size_node_map : %d' % fan.get_size_node_map()
-# print 'get_size_path_map : %d' % fan.get_size_path_map()
-# for x in range(fan.get_idx_fan_start(), fan.get_num_fans()+1):
-# for y in range(fan.get_idx_node_start(), fan.get_num_nodes()+1):
-# print fan.get_fan_to_device_path(x, y)
-#
-#if __name__ == '__main__':
-# main()