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

Revert "[Dell S6100, Z9100] psusutil sysfs attribute changes for hwmon (#1264)" (#1297)

Browse Source 
This reverts commit 1ceb07a2c5.
This commit is contained in:
lguohan 2018-01-10 18:42:45 -08:00 committed by GitHub
parent 1ceb07a2c5
commit 9669b3477e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,11 +20,10 @@ 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 = "/sys/devices/platform/dell_s6100_lpc"
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)):
print mb_reg_file, 'not found !'
return retval return retval
try: try:
@ -53,7 +52,7 @@ class PsuUtil(PsuBase):
faulty faulty
""" """
status = 0 status = 0
psu_status = self.get_pmc_register('psu'+str(index)+'_presence') psu_status = self.get_pmc_register('psu_'+str(index)+'_status')
if (psu_status != 'ERR'): if (psu_status != 'ERR'):
psu_status = int(psu_status, 16) psu_status = int(psu_status, 16)
# Check for PSU statuse # Check for PSU statuse
@ -70,7 +69,7 @@ class PsuUtil(PsuBase):
:return: Boolean, True if PSU is plugged, False if not :return: Boolean, True if PSU is plugged, False if not
""" """
status = 0 status = 0
psu_presence = self.get_pmc_register('psu'+str(index)+'_presence') psu_presence = self.get_pmc_register('psu_'+str(index)+'_status')
if (psu_presence != 'ERR'): if (psu_presence != 'ERR'):
psu_presence = int(psu_presence, 16) psu_presence = int(psu_presence, 16)
# Check for PSU presence # Check for PSU presence

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

@ -20,11 +20,10 @@ 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 = "/sys/devices/platform/dell_mailbox"
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)):
print mb_reg_file, 'not found !'
return retval return retval
try: try:
@ -53,7 +52,7 @@ class PsuUtil(PsuBase):
faulty faulty
""" """
status = 0 status = 0
psu_status = self.get_pmc_register('psu'+str(index)+'_presence') psu_status = self.get_pmc_register('psu_'+str(index)+'_status')
if (psu_status != 'ERR'): if (psu_status != 'ERR'):
psu_status = int(psu_status, 16) psu_status = int(psu_status, 16)
# Check for PSU statuse # Check for PSU statuse
@ -70,7 +69,7 @@ class PsuUtil(PsuBase):
:return: Boolean, True if PSU is plugged, False if not :return: Boolean, True if PSU is plugged, False if not
""" """
status = 0 status = 0
psu_presence = self.get_pmc_register('psu'+str(index)+'_presence') psu_presence = self.get_pmc_register('psu_'+str(index)+'_status')
if (psu_presence != 'ERR'): if (psu_presence != 'ERR'):
psu_presence = int(psu_presence, 16) psu_presence = int(psu_presence, 16)
# Check for PSU presence # Check for PSU presence