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

[mellanox]: Enable CPLD update progress bar (#4363)

Browse Source 
Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
This commit is contained in:
Nazarii Hnydyn 2020-04-14 19:55:08 +03:00 committed by GitHub
parent 530c9fc427
commit 3c4f3116a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
platform/mellanox/mlnx-platform-api/sonic_platform/component.py
View File

@ -14,7 +14,6 @@ try:
import io import io
import os import os
import re import re
import sys
except ImportError as e: except ImportError as e:
raise ImportError(str(e) + "- required module not found") raise ImportError(str(e) + "- required module not found")
@ -243,8 +242,7 @@ class ComponentCPLD(Component):
CPLD_PART_NUMBER_DEFAULT = ZERO CPLD_PART_NUMBER_DEFAULT = ZERO
CPLD_VERSION_MINOR_DEFAULT = ZERO CPLD_VERSION_MINOR_DEFAULT = ZERO
CPLD_UPDATE_COMMAND = 'cpldupdate --dev {} {}' CPLD_UPDATE_COMMAND = 'cpldupdate --dev {} --print-progress {}'
CPLD_INSTALL_SUCCESS_FLAG = 'PASS!'
MST_DEVICE_PATTERN = '/dev/mst/mt[0-9]*_pci_cr0' MST_DEVICE_PATTERN = '/dev/mst/mt[0-9]*_pci_cr0'
@ -303,7 +301,7 @@ class ComponentCPLD(Component):
Details: Details:
The command "cpldupdate" is provided to install CPLD. There are two ways to do it: The command "cpldupdate" is provided to install CPLD. There are two ways to do it:
1. To burn CPLD via gpio, which is faster but only supported on new systems, like Anaconda, ... 1. To burn CPLD via gpio, which is faster but only supported on new systems, like SN3700, ...
2. To install CPLD via firmware, which is slower but supported on older systems. 2. To install CPLD via firmware, which is slower but supported on older systems.
This also requires the mst device designated. This also requires the mst device designated.
"cpldupdate --dev <devname> <vme_file>" has the logic of testing whether to update via gpio is supported, "cpldupdate --dev <devname> <vme_file>" has the logic of testing whether to update via gpio is supported,
@ -326,37 +324,16 @@ class ComponentCPLD(Component):
return False return False
cmdline = self.CPLD_UPDATE_COMMAND.format(mst_dev_list[0], image_path) cmdline = self.CPLD_UPDATE_COMMAND.format(mst_dev_list[0], image_path)
outputline = ""
success_flag = False success_flag = False
try: try:
proc = subprocess.Popen(cmdline, stdout=subprocess.PIPE, shell=True, stderr=subprocess.STDOUT) subprocess.check_call(cmdline, stderr=subprocess.STDOUT, shell=True)
while True: success_flag = True
out = proc.stdout.read(1) except subprocess.CalledProcessError as e:
print("ERROR: Failed to upgrade CPLD: rc={}".format(e.returncode))
if out == '' and proc.poll() != None:
break
if out != '':
sys.stdout.write(out)
sys.stdout.flush()
outputline += out
if (out == '\n' or out == '\r') and len(outputline):
m = re.search(self.CPLD_INSTALL_SUCCESS_FLAG, outputline)
if m and m.group(0) == self.CPLD_INSTALL_SUCCESS_FLAG:
success_flag = True
if proc.returncode:
print("ERROR: Upgrade CPLD failed, return code {}".format(proc.returncode))
success_flag = False
except OSError as e:
raise RuntimeError("Failed to execute command {} due to {}".format(cmdline, repr(e)))
if success_flag: if success_flag:
print("INFO: Refresh or power cycle is required to finish CPLD installation") print("INFO: Refresh or power cycle is required to finish CPLD installation")
else:
print("ERROR: Failed to install CPLD")
return success_flag return success_flag