Skip to content

DellEMC: DellEMC platform bug fixes #4071

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
lguohan merged 1 commit into from
Jan 28, 2020
Merged

DellEMC: DellEMC platform bug fixes #4071

Show file tree
Hide file tree
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
12 changes: 11 additions & 1 deletion device/dell/x86_64-dellemc_s5232f_c3538-r0/plugins/eeprom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
# - specific encoder/decoder if there is special need
#############################################################################


try:
import os.path
from sonic_eeprom import eeprom_tlvinfo
except ImportError, e:
raise ImportError (str(e) + "- required module not found")
Expand All @@ -18,5 +20,13 @@
class board(eeprom_tlvinfo.TlvInfoDecoder):

def __init__(self, name, path, cpld_root, ro):
self.eeprom_path = "/sys/class/i2c-adapter/i2c-0/0-0050/eeprom"
self.eeprom_path = None
for b in (0, 1):
f = '/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom'.format(b)
if os.path.exists(f):
self.eeprom_path = f
break
if self.eeprom_path is None:
return

super(board, self).__init__(self.eeprom_path, 0, '', True)
12 changes: 11 additions & 1 deletion device/dell/x86_64-dellemc_s5248f_c3538-r0/plugins/eeprom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
# - specific encoder/decoder if there is special need
#############################################################################


try:
import os.path
from sonic_eeprom import eeprom_tlvinfo
except ImportError, e:
raise ImportError (str(e) + "- required module not found")
Expand All @@ -18,5 +20,13 @@
class board(eeprom_tlvinfo.TlvInfoDecoder):

def __init__(self, name, path, cpld_root, ro):
self.eeprom_path = "/sys/class/i2c-adapter/i2c-0/0-0050/eeprom"
self.eeprom_path = None
for b in (0, 1):
f = '/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom'.format(b)
if os.path.exists(f):
self.eeprom_path = f
break
if self.eeprom_path is None:
return

super(board, self).__init__(self.eeprom_path, 0, '', True)
2 changes: 1 addition & 1 deletion device/dell/x86_64-dellemc_s5248f_c3538-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def get_transceiver_change_event(self, timeout=0):

time.sleep(0.5)

def get_transceiver_dom_info_dict(self, port_num):
def get_transceiver_dom_info_dict(self, port_num):
transceiver_dom_info_dict = {}

dom_info_dict_keys = ['temperature', 'voltage', 'rx1power',
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-dell/s5232f/scripts/s5232f_platform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ init_devnum() {
# Attach/Detach syseeprom on CPU board
sys_eeprom() {
case $1 in
"new_device") echo 24c16 0x50 > /sys/bus/i2c/devices/i2c-0/$1
"new_device") echo 24c16 0x50 > /sys/bus/i2c/devices/i2c-${devnum}/$1
;;
"delete_device") echo 0x50 > /sys/bus/i2c/devices/i2c-0/$1
"delete_device") echo 0x50 > /sys/bus/i2c/devices/i2c-${devnum}/$1
;;
*) echo "s5232f_platform: sys_eeprom : invalid command !"
;;
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sonic-platform-modules-dell/s5248f/scripts/s5248f_platform.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ init_devnum() {
# Attach/Detach syseeprom on CPU board
sys_eeprom() {
case $1 in
"new_device") echo 24c16 0x50 > /sys/bus/i2c/devices/i2c-0/$1
"new_device") echo 24c16 0x50 > /sys/bus/i2c/devices/i2c-${devnum}/$1
;;
"delete_device") echo 0x50 > /sys/bus/i2c/devices/i2c-0/$1
"delete_device") echo 0x50 > /sys/bus/i2c/devices/i2c-${devnum}/$1
;;
*) echo "s5248f_platform: sys_eeprom : invalid command !"
;;
Expand Down