Skip to content

[DellEMC] S52xx fix reboot cause issue #9603

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

Merged
sujinmkang merged 2 commits into from
Jan 5, 2022
Merged

[DellEMC] S52xx fix reboot cause issue #9603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d30c6e
[DellEMC] S52xx fix reboot cause issue
aravindmani-1 Dec 21, 2021
485156a
Update pcisysfs.py
aravindmani-1 Dec 30, 2021
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
16 changes: 8 additions & 8 deletions platform/broadcom/sonic-platform-modules-dell/s5212f/scripts/pcisysfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@
from mmap import *

def usage():
''' This is the Usage Method '''
''' This is the Usage Method '''

print '\t\t pcisysfs.py --get --offset <offset> --res <resource>'
print '\t\t pcisysfs.py --set --val <val> --offset <offset> --res <resource>'
sys.exit(1)
print('\t\t pcisysfs.py --get --offset <offset> --res <resource>')
print('\t\t pcisysfs.py --set --val <val> --offset <offset> --res <resource>')
sys.exit(1)

def pci_mem_read(mm,offset):
mm.seek(offset)
read_data_stream=mm.read(4)
print ""
print("")
reg_val=struct.unpack('I',read_data_stream)
print "reg_val read:%x"%reg_val
print("reg_val read:%x"%reg_val)
return reg_val

def pci_mem_write(mm,offset,data):
mm.seek(offset)
print "data to write:%x"%data
print("data to write:%x"%data)
mm.write(struct.pack('I',data))

def pci_set_value(resource,val,offset):
Expand All @@ -63,7 +63,7 @@ def main(argv):
try:
opts, args = getopt.getopt(argv, "hgsv:" , \
["val=","res=","offset=","help", "get", "set"])

except getopt.GetoptError:
usage()

Expand Down
6 changes: 3 additions & 3 deletions platform/broadcom/sonic-platform-modules-dell/s5212f/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,15 @@ def get_reboot_cause(self):
return (self.REBOOT_CAUSE_NON_HARDWARE, None)

if reboot_cause & 0x1:
return (self.REBOOT_CAUSE_POWER_LOSS, None)
return (self.REBOOT_CAUSE_POWER_LOSS, "Power on reset")
elif reboot_cause & 0x2:
return (self.REBOOT_CAUSE_NON_HARDWARE, None)
elif reboot_cause & 0x4:
return (self.REBOOT_CAUSE_HARDWARE_OTHER, "PSU Shutdown")
elif reboot_cause & 0x8:
return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, "Thermal overload")
elif reboot_cause & 0x10:
return (self.REBOOT_CAUSE_WATCHDOG, None)
return (self.REBOOT_CAUSE_WATCHDOG, "Watchdog reset")
elif reboot_cause & 0x20:
return (self.REBOOT_CAUSE_HARDWARE_OTHER, "BMC Shutdown")
elif reboot_cause & 0x40:
Expand Down
10 changes: 5 additions & 5 deletions platform/broadcom/sonic-platform-modules-dell/s5224f/scripts/pcisysfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@
def usage():
''' This is the Usage Method '''

print '\t\t pcisysfs.py --get --offset <offset> --res <resource>'
print '\t\t pcisysfs.py --set --val <val> --offset <offset> --res <resource>'
print('\t\t pcisysfs.py --get --offset <offset> --res <resource>')
print('\t\t pcisysfs.py --set --val <val> --offset <offset> --res <resource>')
sys.exit(1)

def pci_mem_read(mm,offset):
mm.seek(offset)
read_data_stream=mm.read(4)
print ""
print("")
reg_val=struct.unpack('I',read_data_stream)
print "reg_val read:%x"%reg_val
print("reg_val read:%x"%reg_val)
return reg_val

def pci_mem_write(mm,offset,data):
mm.seek(offset)
print "data to write:%x"%data
print("data to write:%x"%data)
mm.write(struct.pack('I',data))

def pci_set_value(resource,val,offset):
Expand Down
7 changes: 4 additions & 3 deletions platform/broadcom/sonic-platform-modules-dell/s5224f/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ def get_num_sfps(self):
An integer represences the number of SFPs on the chassis.
"""
return self._num_sfps

def get_reboot_cause(self):
"""
Retrieves the cause of the previous reboot
Expand All @@ -279,15 +280,15 @@ def get_reboot_cause(self):
return (self.REBOOT_CAUSE_NON_HARDWARE, None)

if reboot_cause & 0x1:
return (self.REBOOT_CAUSE_POWER_LOSS, None)
return (self.REBOOT_CAUSE_POWER_LOSS, "Power on reset")
elif reboot_cause & 0x2:
return (self.REBOOT_CAUSE_NON_HARDWARE, None)
elif reboot_cause & 0x4:
return (self.REBOOT_CAUSE_HARDWARE_OTHER, "PSU Shutdown")
elif reboot_cause & 0x8:
return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, "Thermal overload")
elif reboot_cause & 0x10:
return (self.REBOOT_CAUSE_WATCHDOG, None)
return (self.REBOOT_CAUSE_WATCHDOG, "Watchdog reset")
elif reboot_cause & 0x20:
return (self.REBOOT_CAUSE_HARDWARE_OTHER, "BMC Shutdown")
elif reboot_cause & 0x40:
Expand Down
7 changes: 4 additions & 3 deletions platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/chassis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ class Chassis(ChassisBase):

oir_fd = -1
epoll = -1
REBOOT_CAUSE_PATH = "/host/reboot-cause/platform/reboot_reason"
pci_res = "/sys/bus/pci/devices/0000:04:00.0/resource0"
sysled_offset = 0x0024
SYSLED_COLOR_TO_REG = {
Expand Down Expand Up @@ -290,15 +291,15 @@ def get_reboot_cause(self):
return (self.REBOOT_CAUSE_NON_HARDWARE, None)

if reboot_cause & 0x1:
return (self.REBOOT_CAUSE_POWER_LOSS, None)
return (self.REBOOT_CAUSE_POWER_LOSS, "Power on reset")
elif reboot_cause & 0x2:
return (self.REBOOT_CAUSE_NON_HARDWARE, None)
elif reboot_cause & 0x4:
return (self.REBOOT_CAUSE_HARDWARE_OTHER, "PSU Shutdown")
elif reboot_cause & 0x8:
return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, None)
return (self.REBOOT_CAUSE_THERMAL_OVERLOAD_CPU, "Thermal overload")
elif reboot_cause & 0x10:
return (self.REBOOT_CAUSE_WATCHDOG, None)
return (self.REBOOT_CAUSE_WATCHDOG, "Watchdog reset")
elif reboot_cause & 0x20:
return (self.REBOOT_CAUSE_HARDWARE_OTHER, "BMC Shutdown")
elif reboot_cause & 0x40:
Expand Down
16 changes: 8 additions & 8 deletions platform/broadcom/sonic-platform-modules-dell/s5296f/scripts/pcisysfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@
from mmap import *

def usage():
''' This is the Usage Method '''
''' This is the Usage Method '''

print '\t\t pcisysfs.py --get --offset <offset> --res <resource>'
print '\t\t pcisysfs.py --set --val <val> --offset <offset> --res <resource>'
sys.exit(1)
print('\t\t pcisysfs.py --get --offset <offset> --res <resource>')
print('\t\t pcisysfs.py --set --val <val> --offset <offset> --res <resource>')
sys.exit(1)

def pci_mem_read(mm,offset):
mm.seek(offset)
read_data_stream=mm.read(4)
print ""
print("")
reg_val=struct.unpack('I',read_data_stream)
print "reg_val read:%x"%reg_val
print("reg_val read:%x"%reg_val)
return reg_val

def pci_mem_write(mm,offset,data):
mm.seek(offset)
print "data to write:%x"%data
print("data to write:%x"%data)
mm.write(struct.pack('I',data))

def pci_set_value(resource,val,offset):
Expand All @@ -63,7 +63,7 @@ def main(argv):
try:
opts, args = getopt.getopt(argv, "hgsv:" , \
["val=","res=","offset=","help", "get", "set"])

except getopt.GetoptError:
usage()

Expand Down