Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "psusutil sysfs attribute changes for hwmon" #1297

Merged
merged 1 commit into from
Jan 11, 2018
+6 −8
Merged

Revert "psusutil sysfs attribute changes for hwmon" #1297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions device/dell/x86_64-dell_s6100_c2538-r0/plugins/psuutil.py
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,10 @@ 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 = "/sys/devices/platform/dell_s6100_lpc"
retval = 'ERR'
mb_reg_file = mailbox_dir+'/' + reg_name
if (not os.path.isfile(mb_reg_file)):
print mb_reg_file, 'not found !'
return retval

try:
@@ -53,7 +52,7 @@ def get_psu_status(self, index):
faulty
"""
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'):
psu_status = int(psu_status, 16)
# Check for PSU statuse
@@ -70,7 +69,7 @@ def get_psu_presence(self, index):
:return: Boolean, True if PSU is plugged, False if not
"""
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'):
psu_presence = int(psu_presence, 16)
# Check for PSU presence
7 changes: 3 additions & 4 deletions device/dell/x86_64-dell_z9100_c2538-r0/plugins/psuutil.py
View file
Original file line number Diff line number Diff line change
@@ -20,11 +20,10 @@ 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 = "/sys/devices/platform/dell_mailbox"
retval = 'ERR'
mb_reg_file = mailbox_dir+'/' + reg_name
if (not os.path.isfile(mb_reg_file)):
print mb_reg_file, 'not found !'
return retval

try:
@@ -53,7 +52,7 @@ def get_psu_status(self, index):
faulty
"""
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'):
psu_status = int(psu_status, 16)
# Check for PSU statuse
@@ -70,7 +69,7 @@ def get_psu_presence(self, index):
:return: Boolean, True if PSU is plugged, False if not
"""
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'):
psu_presence = int(psu_presence, 16)
# Check for PSU presence