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

[platform] update Ingrassy platform to support stretch #2322

Merged
merged 3 commits into from
Dec 1, 2018
Merged

[platform] update Ingrassy platform to support stretch #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a918ef
remove nephos sonic-platform-modules-ingrasys module
fengkm Nov 20, 2018
d0426f5
[Ingrasys]Add platform drivers and device to support Debian Stretch
fengkm Nov 20, 2018
090d3f4
fix gpio init issue
fengkm Nov 26, 2018
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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@
[submodule "platform/p4/SAI-P4-BM"]
path = platform/p4/SAI-P4-BM
url = https://github.com/Mellanox/SAI-P4-BM.git
[submodule "platform/nephos/sonic-platform-modules-ingrasys"]
path = platform/nephos/sonic-platform-modules-ingrasys
url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys-nephos.git
[submodule "platform/barefoot/sonic-platform-modules-arista"]
path = platform/barefoot/sonic-platform-modules-arista
url = https://github.com/aristanetworks/sonic
Expand Down
28 changes: 28 additions & 0 deletions device/ingrasys/x86_64-ingrasys_s8810_32q-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Platform-specific SFP transceiver interface for SONiC
#

import os

try:
import time
from sonic_sfp.sfputilbase import SfpUtilBase
Expand All @@ -23,6 +25,7 @@ class SfpUtil(SfpUtilBase):
#INT_GPIO_BASE = 192
LP_GPIO_BASE = 160
RST_GPIO_BASE = 128
GPIO_OFFSET = 0

BASE_DIR_PATH = "/sys/class/gpio/gpio{0}/direction"
BASE_VAL_PATH = "/sys/class/gpio/gpio{0}/value"
Expand All @@ -45,7 +48,32 @@ def qsfp_ports(self):
def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def set_gpio_offset(self):
sys_gpio_dir = "/sys/class/gpio"
self.GPIO_OFFSET = 0
gpiochip_no = 0
for d in os.listdir(sys_gpio_dir):
if "gpiochip" in d:
try:
gpiochip_no = int(d[8:],10)
except ValueError as e:
print "Error: %s" % str(e)
if gpiochip_no > 255:
self.GPIO_OFFSET=256
return True
return True

def update_gpio_base(self):
self.ABS_GPIO_BASE = 224 + self.GPIO_OFFSET
self.LP_GPIO_BASE = 160 + self.GPIO_OFFSET
self.RST_GPIO_BASE = 128 + self.GPIO_OFFSET
return True

def __init__(self):
# Update abs, lpmode, and reset gpio base
self.set_gpio_offset()
self.update_gpio_base()

# Override port_to_eeprom_mapping for class initialization
eeprom_path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"

Expand Down
11 changes: 8 additions & 3 deletions ...rasys/x86_64-ingrasys_s8900_54xc-r0/INGRASYS-S8900-54XC/th-s8900-48x25G+6x100G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
#2017/05/31
#2018/03/31

os=unix

oversubscribe_mode=1
pbmp_xport_xe=0x7f00001fff4003ffffc0001fffe

lpm_scaling_enable=1
lpm_ipv6_128b_reserved=0
l3_alpm_enable=2
ipv6_lpm_128b_enable=1
l3_mem_entries=40960
l2_mem_entries=40960

l2xmsg_mode=1
mmu_lossless=0

#Parity
parity_correction=1
Expand Down
182 changes: 108 additions & 74 deletions device/ingrasys/x86_64-ingrasys_s8900_54xc-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# Platform-specific SFP transceiver interface for SONiC
#

import os

try:
import time
from sonic_sfp.sfputilbase import SfpUtilBase
Expand All @@ -17,6 +19,7 @@ class SfpUtil(SfpUtilBase):
PORT_END = 53
QSFP_PORT_START = 48
PORTS_IN_BLOCK = 54
GPIO_OFFSET = 0

BASE_DIR_PATH = "/sys/class/gpio/gpio{0}/direction"
BASE_VAL_PATH = "/sys/class/gpio/gpio{0}/value"
Expand Down Expand Up @@ -79,80 +82,9 @@ class SfpUtil(SfpUtilBase):
53: 71
}

abs_to_gpio_mapping = {
0: 192,
1: 193,
2: 194,
3: 195,
4: 196,
5: 197,
6: 198,
7: 199,
8: 200,
9: 201,
10: 202,
11: 203,
12: 204,
13: 205,
14: 206,
15: 207,
16: 176,
17: 177,
18: 178,
19: 179,
20: 180,
21: 181,
22: 182,
23: 183,
24: 184,
25: 185,
26: 186,
27: 187,
28: 188,
29: 189,
30: 190,
31: 191,
32: 160,
33: 161,
34: 162,
35: 163,
36: 164,
37: 165,
38: 166,
39: 167,
40: 168,
41: 169,
42: 170,
43: 171,
44: 172,
45: 173,
46: 174,
47: 175,
48: 240,
49: 241,
50: 242,
51: 243,
52: 244,
53: 245
}

lpmode_to_gpio_mapping = {
48: 224,
49: 225,
50: 226,
51: 227,
52: 228,
53: 229
}

reset_to_gpio_mapping = {
48: 208,
49: 209,
50: 210,
51: 211,
52: 212,
53: 213
}
abs_to_gpio_mapping = {}
lpmode_to_gpio_mapping = {}
reset_to_gpio_mapping = {}

@property
def port_start(self):
Expand All @@ -174,7 +106,109 @@ def qsfp_ports(self):
def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def set_gpio_offset(self):
sys_gpio_dir = "/sys/class/gpio"
self.GPIO_OFFSET = 0
gpiochip_no = 0
for d in os.listdir(sys_gpio_dir):
if "gpiochip" in d:
try:
gpiochip_no = int(d[8:],10)
except ValueError as e:
print "Error: %s" % str(e)
if gpiochip_no > 255:
self.GPIO_OFFSET=256
return True
return True

def init_abs_to_gpio_mapping(self):
self.abs_to_gpio_mapping = {
0: 192+self.GPIO_OFFSET,
1: 193+self.GPIO_OFFSET,
2: 194+self.GPIO_OFFSET,
3: 195+self.GPIO_OFFSET,
4: 196+self.GPIO_OFFSET,
5: 197+self.GPIO_OFFSET,
6: 198+self.GPIO_OFFSET,
7: 199+self.GPIO_OFFSET,
8: 200+self.GPIO_OFFSET,
9: 201+self.GPIO_OFFSET,
10: 202+self.GPIO_OFFSET,
11: 203+self.GPIO_OFFSET,
12: 204+self.GPIO_OFFSET,
13: 205+self.GPIO_OFFSET,
14: 206+self.GPIO_OFFSET,
15: 207+self.GPIO_OFFSET,
16: 176+self.GPIO_OFFSET,
17: 177+self.GPIO_OFFSET,
18: 178+self.GPIO_OFFSET,
19: 179+self.GPIO_OFFSET,
20: 180+self.GPIO_OFFSET,
21: 181+self.GPIO_OFFSET,
22: 182+self.GPIO_OFFSET,
23: 183+self.GPIO_OFFSET,
24: 184+self.GPIO_OFFSET,
25: 185+self.GPIO_OFFSET,
26: 186+self.GPIO_OFFSET,
27: 187+self.GPIO_OFFSET,
28: 188+self.GPIO_OFFSET,
29: 189+self.GPIO_OFFSET,
30: 190+self.GPIO_OFFSET,
31: 191+self.GPIO_OFFSET,
32: 160+self.GPIO_OFFSET,
33: 161+self.GPIO_OFFSET,
34: 162+self.GPIO_OFFSET,
35: 163+self.GPIO_OFFSET,
36: 164+self.GPIO_OFFSET,
37: 165+self.GPIO_OFFSET,
38: 166+self.GPIO_OFFSET,
39: 167+self.GPIO_OFFSET,
40: 168+self.GPIO_OFFSET,
41: 169+self.GPIO_OFFSET,
42: 170+self.GPIO_OFFSET,
43: 171+self.GPIO_OFFSET,
44: 172+self.GPIO_OFFSET,
45: 173+self.GPIO_OFFSET,
46: 174+self.GPIO_OFFSET,
47: 175+self.GPIO_OFFSET,
48: 240+self.GPIO_OFFSET,
49: 241+self.GPIO_OFFSET,
50: 242+self.GPIO_OFFSET,
51: 243+self.GPIO_OFFSET,
52: 244+self.GPIO_OFFSET,
53: 245+self.GPIO_OFFSET
}
return True

def init_lpmode_to_gpio_mapping(self):
self.lpmode_to_gpio_mapping = {
48: 224+self.GPIO_OFFSET,
49: 225+self.GPIO_OFFSET,
50: 226+self.GPIO_OFFSET,
51: 227+self.GPIO_OFFSET,
52: 228+self.GPIO_OFFSET,
53: 229+self.GPIO_OFFSET
}
return True

def init_reset_to_gpio_mapping(self):
self.reset_to_gpio_mapping = {
48: 208+self.GPIO_OFFSET,
49: 209+self.GPIO_OFFSET,
50: 210+self.GPIO_OFFSET,
51: 211+self.GPIO_OFFSET,
52: 212+self.GPIO_OFFSET,
53: 213+self.GPIO_OFFSET
}
return True

def __init__(self):
# Init abs, lpmode, and reset to gpio mapping
self.set_gpio_offset()
self.init_abs_to_gpio_mapping()
self.init_lpmode_to_gpio_mapping()
self.init_reset_to_gpio_mapping()

# Override port_to_eeprom_mapping for class initialization
eeprom_path = "/sys/class/i2c-adapter/i2c-{0}/{0}-0050/eeprom"

Expand Down
Loading