[devices]: Dell SMF driver hwmon number reorder fix for Dell S6100/Z9…

…100 (#2305)
sonic-net · Dec 5, 2018 · bcd4e1e · bcd4e1e
1 parent f5e678c
commit bcd4e1e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py b/device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
@@ -11,6 +11,8 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+HWMON_DIR = "/sys/devices/platform/SMF.512/hwmon/"
+HWMON_NODE = os.listdir(HWMON_DIR)[0]
 
 class PsuUtil(PsuBase):
     """Platform-specific PSUutil class"""
@@ -20,7 +22,7 @@ def __init__(self):
 
     # Get a mailbox register
     def get_pmc_register(self, reg_name):
-        mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
+        mailbox_dir = HWMON_DIR + HWMON_NODE
         retval = 'ERR'
         mb_reg_file = mailbox_dir+'/' + reg_name
         if (not os.path.isfile(mb_reg_file)):

diff --git a/device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py b/device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
@@ -11,6 +11,8 @@
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
+HWMON_DIR = "/sys/devices/platform/SMF.512/hwmon/"
+HWMON_NODE = os.listdir(HWMON_DIR)[0]
 
 class PsuUtil(PsuBase):
     """Platform-specific PSUutil class"""
@@ -20,7 +22,7 @@ def __init__(self):
 
     # Get a mailbox register
     def get_pmc_register(self, reg_name):
-        mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
+        mailbox_dir = HWMON_DIR + HWMON_NODE
         retval = 'ERR'
         mb_reg_file = mailbox_dir+'/' + reg_name
         if (not os.path.isfile(mb_reg_file)):

diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_sensors.py b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_sensors.py
@@ -16,7 +16,9 @@
 S6100_MAX_PSUS = 2
 S6100_MAX_IOMS = 4
 
-MAILBOX_DIR = "/sys/devices/platform/SMF.512/hwmon/hwmon1"
+HWMON_DIR = "/sys/devices/platform/SMF.512/hwmon/"
+HWMON_NODE = os.listdir(HWMON_DIR)[0]
+MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 iom_status_list = []
 
 # Get a mailbox register

diff --git a/platform/broadcom/sonic-platform-modules-dell/z9100/scripts/platform_sensors.py b/platform/broadcom/sonic-platform-modules-dell/z9100/scripts/platform_sensors.py
@@ -16,7 +16,9 @@
 Z9100_MAX_PSUS = 2
 S6100_MAX_IOMS = 4
 
-MAILBOX_DIR = "/sys/devices/platform/SMF.512/hwmon/hwmon0"
+HWMON_DIR = "/sys/devices/platform/SMF.512/hwmon/"
+HWMON_NODE = os.listdir(HWMON_DIR)[0]
+MAILBOX_DIR = HWMON_DIR + HWMON_NODE
 
 # Get a mailbox register