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

[device/Accton] Fix i2c fault from ir3570a on 3 models #3245

Merged
merged 4 commits into from
Jul 31, 2019
Merged

[device/Accton] Fix i2c fault from ir3570a on 3 models #3245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3cbc9c5
Add force_deselect_on_exit=1 to force closing channel after access.
roylee123 Jun 3, 2019
d99099d
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
roylee123 Jul 30, 2019
25a6bac
[as7326/as7726/as9716]Fix i2c burst error from IC ir3750a.
roylee123 Jul 31, 2019
8402d78
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
roylee123 Jul 31, 2019
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
27 changes: 27 additions & 0 deletions platform/broadcom/sonic-platform-modules-accton/as7326-56x/utils/accton_as7326_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,30 @@ def show_set_help():
print " use \""+ cmd + " sfp 1-56 {0|1}\" to set sfp# tx_disable"
sys.exit(0)

def dis_i2c_ir3570a(addr):
cmd = "i2cset -y 0 0x%x 0xE5 0x01" % addr
status, output = commands.getstatusoutput(cmd)
cmd = "i2cset -y 0 0x%x 0x12 0x02" % addr
status, output = commands.getstatusoutput(cmd)
return status

def ir3570_check():
cmd = "i2cdump -y 0 0x42 s 0x9a"
try:
status, output = commands.getstatusoutput(cmd)
lines = output.split('\n')
hn = re.findall(r'\w+', lines[-1])
version = int(hn[1], 16)
if version == 0x24: #only for ir3570a
ret = dis_i2c_ir3570a(4)
else:
ret = 0
except Exception as e:
print "Error on ir3570_check() e:" + str(e)
return -1
return ret


def show_eeprom_help():
cmd = sys.argv[0].split("/")[-1]+ " " + args[0]
print " use \""+ cmd + " 1-56 \" to dump sfp# eeprom"
Expand Down Expand Up @@ -359,6 +383,9 @@ def do_install():
return status
else:
print PROJECT_NAME.upper()+" drivers detected...."

ir3570_check()

if not device_exist():
print "No device, installing...."
status = device_install()
Expand Down
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-accton/as7716-32x/utils/accton_as7716_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,26 +221,26 @@ def show_set_help():
print " use \""+ cmd + " sfp 1-32 {0|1}\" to set sfp# tx_disable"
sys.exit(0)

def diss_i2c_ir3507a(addr):
def dis_i2c_ir3570a(addr):
cmd = "i2cset -y 0 0x%x 0xE5 0x01" % addr
status, output = commands.getstatusoutput(cmd)
cmd = "i2cset -y 0 0x%x 0x12 0x02" % addr
status, output = commands.getstatusoutput(cmd)
return status

def ir3507_check():
def ir3570_check():
cmd = "i2cdump -y 0 0x42 s 0x9a"
try:
status, output = commands.getstatusoutput(cmd)
lines = output.split('\n')
hn = re.findall(r'\w+', lines[-1])
version = int(hn[1], 16)
if version == 0x24: #only for ir3507a
ret = diss_i2c_ir3507a(4)
if version == 0x24: #only for ir3570a
ret = dis_i2c_ir3570a(4)
else:
ret = 0
except Exception as e:
print "Error on ir3507_check() e:" + str(e)
print "Error on ir3570_check() e:" + str(e)
return -1
return ret

Expand Down Expand Up @@ -410,7 +410,7 @@ def do_install():
else:
print PROJECT_NAME.upper()+" drivers detected...."

ir3507_check()
ir3570_check()

if not device_exist():
status = device_install()
Expand Down
27 changes: 27 additions & 0 deletions platform/broadcom/sonic-platform-modules-accton/as7726-32x/utils/accton_as7726_32x_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,30 @@ def show_eeprom_help():
print " use \""+ cmd + " 1-32 \" to dump sfp# eeprom"
sys.exit(0)

def dis_i2c_ir3570a(addr):
cmd = "i2cset -y 0 0x%x 0xE5 0x01" % addr
status, output = commands.getstatusoutput(cmd)
cmd = "i2cset -y 0 0x%x 0x12 0x02" % addr
status, output = commands.getstatusoutput(cmd)
return status

def ir3570_check():
cmd = "i2cdump -y 0 0x42 s 0x9a"
try:
status, output = commands.getstatusoutput(cmd)
lines = output.split('\n')
hn = re.findall(r'\w+', lines[-1])
version = int(hn[1], 16)
if version == 0x24: #only for ir3570a
ret = dis_i2c_ir3570a(4)
else:
ret = 0
except Exception as e:
print "Error on ir3570_check() e:" + str(e)
return -1
return ret


def my_log(txt):
if DEBUG == True:
print "[ACCTON DBG]: "+txt
Expand Down Expand Up @@ -355,6 +379,9 @@ def do_install():
return status
else:
print PROJECT_NAME.upper()+" drivers detected...."

ir3570_check()

if not device_exist():
status = device_install()
if status:
Expand Down
12 changes: 6 additions & 6 deletions platform/broadcom/sonic-platform-modules-accton/as7816-64x/utils/accton_as7816_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,26 +124,26 @@ def show_set_help():
print " use \""+ cmd + " sfp 1-64 {0|1}\" to set sfp# tx_disable"
sys.exit(0)

def diss_i2c_ir3507a(addr):
def dis_i2c_ir3570a(addr):
cmd = "i2cset -y 0 0x%x 0xE5 0x01" % addr
status, output = commands.getstatusoutput(cmd)
cmd = "i2cset -y 0 0x%x 0x12 0x02" % addr
status, output = commands.getstatusoutput(cmd)
return status

def ir3507_check():
def ir3570_check():
cmd = "i2cdump -y 0 0x42 s 0x9a"
try:
status, output = commands.getstatusoutput(cmd)
lines = output.split('\n')
hn = re.findall(r'\w+', lines[-1])
version = int(hn[1], 16)
if version == 0x24: #only for ir3507a
ret = diss_i2c_ir3507a(4)
if version == 0x24: #only for ir3570a
ret = dis_i2c_ir3570a(4)
else:
ret = 0
except Exception as e:
print "Error on ir3507_check() e:" + str(e)
print "Error on ir3570_check() e:" + str(e)
return -1
return ret

Expand Down Expand Up @@ -338,7 +338,7 @@ def do_install():
else:
print PROJECT_NAME.upper()+" drivers detected...."

ir3507_check()
ir3570_check()

if not device_exist():
print "No device, installing...."
Expand Down
27 changes: 27 additions & 0 deletions platform/broadcom/sonic-platform-modules-accton/as9716-32d/utils/accton_as9716_32d_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,30 @@ def show_set_help():
print " use \""+ cmd + " sfp 1-32 {0|1}\" to set sfp# tx_disable"
sys.exit(0)

def dis_i2c_ir3570a(addr):
cmd = "i2cset -y 0 0x%x 0xE5 0x01" % addr
status, output = commands.getstatusoutput(cmd)
cmd = "i2cset -y 0 0x%x 0x12 0x02" % addr
status, output = commands.getstatusoutput(cmd)
return status

def ir3570_check():
cmd = "i2cdump -y 0 0x42 s 0x9a"
try:
status, output = commands.getstatusoutput(cmd)
lines = output.split('\n')
hn = re.findall(r'\w+', lines[-1])
version = int(hn[1], 16)
if version == 0x24: #only for ir3570a
ret = dis_i2c_ir3570a(4)
else:
ret = 0
except Exception as e:
print "Error on ir3570_check() e:" + str(e)
return -1
return ret


def show_eeprom_help():
cmd = sys.argv[0].split("/")[-1]+ " " + args[0]
print " use \""+ cmd + " 1-32 \" to dump sfp# eeprom"
Expand Down Expand Up @@ -352,6 +376,9 @@ def do_install():
return status
else:
print PROJECT_NAME.upper()+" drivers detected...."

ir3570_check()

if not device_exist():
status = device_install()
if status:
Expand Down