matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[devices]: Dell SMF driver hwmon number reorder fix for Dell S6100/Z9100 (#2305)

Browse Source
This commit is contained in:
paavaanan 2018-12-05 10:25:37 +05:30 committed by lguohan
parent f5e678cf84
commit bcd4e1e375
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
View File

@ -11,6 +11,8 @@ try:
except ImportError as e: except ImportError as e:
raise ImportError(str(e) + "- required module not found") 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): class PsuUtil(PsuBase):
"""Platform-specific PSUutil class""" """Platform-specific PSUutil class"""
@ -20,7 +22,7 @@ class PsuUtil(PsuBase):
# Get a mailbox register # Get a mailbox register
def get_pmc_register(self, reg_name): def get_pmc_register(self, reg_name):
mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1" mailbox_dir = HWMON_DIR + HWMON_NODE
retval = 'ERR' retval = 'ERR'
mb_reg_file = mailbox_dir+'/' + reg_name mb_reg_file = mailbox_dir+'/' + reg_name
if (not os.path.isfile(mb_reg_file)): if (not os.path.isfile(mb_reg_file)):

4
device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
View File

@ -11,6 +11,8 @@ try:
except ImportError as e: except ImportError as e:
raise ImportError(str(e) + "- required module not found") 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): class PsuUtil(PsuBase):
"""Platform-specific PSUutil class""" """Platform-specific PSUutil class"""
@ -20,7 +22,7 @@ class PsuUtil(PsuBase):
# Get a mailbox register # Get a mailbox register
def get_pmc_register(self, reg_name): def get_pmc_register(self, reg_name):
mailbox_dir = "/sys/devices/platform/SMF.512/hwmon/hwmon1" mailbox_dir = HWMON_DIR + HWMON_NODE
retval = 'ERR' retval = 'ERR'
mb_reg_file = mailbox_dir+'/' + reg_name mb_reg_file = mailbox_dir+'/' + reg_name
if (not os.path.isfile(mb_reg_file)): if (not os.path.isfile(mb_reg_file)):

4
platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_sensors.py
View File

@ -16,7 +16,9 @@ S6100_MAX_FAN_TRAYS = 4
S6100_MAX_PSUS = 2 S6100_MAX_PSUS = 2
S6100_MAX_IOMS = 4 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 = [] iom_status_list = []
# Get a mailbox register # Get a mailbox register

4
platform/broadcom/sonic-platform-modules-dell/z9100/scripts/platform_sensors.py
View File

@ -16,7 +16,9 @@ Z9100_MAX_FAN_TRAYS = 5
Z9100_MAX_PSUS = 2 Z9100_MAX_PSUS = 2
S6100_MAX_IOMS = 4 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 # Get a mailbox register