diff --git a/build_debian.sh b/build_debian.sh
index 2b2294194d7b..b1026c7bf3c2 100755
--- a/build_debian.sh
+++ b/build_debian.sh
@@ -300,6 +300,7 @@ set /files/etc/sysctl.conf/net.ipv6.conf.eth0.forwarding 0
set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
+set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_dad 0
set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers.json.j2 b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers.json.j2
new file mode 100644
index 000000000000..2c391214fa65
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers.json.j2
@@ -0,0 +1,111 @@
+{# Default values which will be used if no actual configura available #}
+{% set default_cable = '40m' %}
+{% set default_speed = '10G' %}
+{% set default_ports_num = 54 -%}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
+{% set ports2cable = {
+ 'torrouter_server' : '5m',
+ 'leafrouter_torrouter' : '40m',
+ 'spinerouter_leafrouter' : '300m'
+ }
+%}
+
+{%- macro cable_length(port_name) -%}
+ {%- set cable_len = [] -%}
+ {%- for local_port in DEVICE_NEIGHBOR -%}
+ {%- if local_port == port_name -%}
+ {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+ {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+ {%- set neighbor_role = neighbor.type -%}
+ {%- set roles1 = switch_role + '_' + neighbor_role %}
+ {%- set roles2 = neighbor_role + '_' + switch_role -%}
+ {%- set roles1 = roles1 | lower -%}
+ {%- set roles2 = roles2 | lower -%}
+ {%- if roles1 in ports2cable -%}
+ {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
+ {%- elif roles2 in ports2cable -%}
+ {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- if cable_len -%}
+ {{ cable_len.0 }}
+ {%- else -%}
+ {{ default_cable }}
+ {%- endif -%}
+{% endmacro %}
+
+{%- if DEVICE_METADATA is defined %}
+{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
+{%- endif -%}
+
+{# Generate list of ports if not defined #}
+{% if PORT is not defined %}
+ {% set PORT = [] %}
+ {% for port_idx in range(0,default_ports_num) %}
+ {% if PORT.append("Ethernet%d" % (port_idx)) %}{% endif %}
+ {% endfor %}
+{% endif -%}
+
+{% set port_names_list = [] %}
+{% for port in PORT %}
+ {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+ "CABLE_LENGTH": {
+ "AZURE": {
+ {% for port in PORT %}
+ {% set cable = cable_length(port) -%}
+ "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+ {% endfor %}
+ }
+ },
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "20971328",
+ "type": "ingress",
+ "mode": "static"
+ },
+ "ingress_lossy_pool": {
+ "size": "20971328",
+ "type": "ingress",
+ "mode": "static"
+ },
+ "egress_lossy_pool": {
+ "size": "20971328",
+ "type": "egress",
+ "mode": "static"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "xon":"78400",
+ "xoff":"132160",
+ "size":"3584",
+ "static_th":"82880"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"3584",
+ "dynamic_th":"-1"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"3584",
+ "dynamic_th":"-4"
+ }
+ },
+ "BUFFER_PG": {
+ },
+ "BUFFER_QUEUE": {
+ }
+}
+
\ No newline at end of file
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/pg_profile_lookup.ini b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..d98b0eca6d19
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 3584 32256 59136 36736
+ 25000 5m 3584 41216 68096 45696
+ 40000 5m 3584 47488 74368 51968
+ 50000 5m 3584 52864 79744 57344
+ 100000 5m 3584 78400 132160 82880
+ 10000 40m 3584 32256 59136 36736
+ 25000 40m 3584 41216 68096 45696
+ 40000 40m 3584 47488 74368 51968
+ 50000 40m 3584 52864 79744 57344
+ 100000 40m 3584 78400 132160 82880
+ 10000 300m 3584 32256 65856 36736
+ 25000 300m 3584 41216 84672 45696
+ 40000 300m 3584 47488 101024 51968
+ 50000 300m 3584 52864 113120 57344
+ 100000 300m 3584 78400 198688 82880
\ No newline at end of file
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.ini b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.ini
new file mode 100644
index 000000000000..52c59bc9d297
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.ini
@@ -0,0 +1,55 @@
+# name lanes alias index
+Ethernet0 8 Ethernet1/1 0
+Ethernet1 9 Ethernet2/1 1
+Ethernet2 10 Ethernet3/1 2
+Ethernet3 11 Ethernet4/1 3
+Ethernet4 12 Ethernet5/1 4
+Ethernet5 13 Ethernet6/1 5
+Ethernet6 14 Ethernet7/1 6
+Ethernet7 15 Ethernet8/1 7
+Ethernet8 16 Ethernet9/1 8
+Ethernet9 17 Ethernet10/1 9
+Ethernet10 18 Ethernet11/1 10
+Ethernet11 19 Ethernet12/1 11
+Ethernet12 20 Ethernet13/1 12
+Ethernet13 21 Ethernet14/1 13
+Ethernet14 22 Ethernet15/1 14
+Ethernet15 23 Ethernet16/1 15
+Ethernet16 32 Ethernet17/1 16
+Ethernet17 33 Ethernet18/1 17
+Ethernet18 34 Ethernet19/1 18
+Ethernet19 35 Ethernet20/1 19
+Ethernet20 40 Ethernet21/1 20
+Ethernet21 41 Ethernet22/1 21
+Ethernet22 42 Ethernet23/1 22
+Ethernet23 43 Ethernet24/1 23
+Ethernet24 48 Ethernet25/1 24
+Ethernet25 49 Ethernet26/1 25
+Ethernet26 50 Ethernet27/1 26
+Ethernet27 51 Ethernet28/1 27
+Ethernet28 56 Ethernet29/1 28
+Ethernet29 57 Ethernet30/1 29
+Ethernet30 58 Ethernet31/1 30
+Ethernet31 59 Ethernet32/1 31
+Ethernet32 64 Ethernet33/1 32
+Ethernet33 65 Ethernet34/1 33
+Ethernet34 66 Ethernet35/1 34
+Ethernet35 67 Ethernet36/1 35
+Ethernet36 68 Ethernet37/1 36
+Ethernet37 69 Ethernet38/1 37
+Ethernet38 70 Ethernet39/1 38
+Ethernet39 71 Ethernet40/1 39
+Ethernet40 72 Ethernet41/1 40
+Ethernet41 73 Ethernet42/1 41
+Ethernet42 74 Ethernet43/1 42
+Ethernet43 75 Ethernet44/1 43
+Ethernet44 76 Ethernet45/1 44
+Ethernet45 77 Ethernet46/1 45
+Ethernet46 78 Ethernet47/1 46
+Ethernet47 79 Ethernet48/1 47
+Ethernet48 84,85,86,87 Ethernet49/1 48
+Ethernet49 80,81,82,83 Ethernet50/1 49
+Ethernet50 104,105,106,107 Ethernet51/1 50
+Ethernet51 108,109,110,111 Ethernet52/1 51
+Ethernet52 112,113,114,115 Ethernet53/1 52
+Ethernet53 116,117,118,119 Ethernet54/1 53
\ No newline at end of file
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps
new file mode 100644
index 000000000000..34e5a2daab80
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps
@@ -0,0 +1,358 @@
+init start stage unit=0 low-level
+init set port-map unit=0 port=0 eth-macro=2 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=1 eth-macro=2 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=2 eth-macro=2 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=3 eth-macro=2 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=4 eth-macro=3 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=5 eth-macro=3 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=6 eth-macro=3 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=7 eth-macro=3 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=8 eth-macro=4 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=9 eth-macro=4 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=10 eth-macro=4 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=11 eth-macro=4 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=12 eth-macro=5 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=13 eth-macro=5 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=14 eth-macro=5 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=15 eth-macro=5 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=16 eth-macro=8 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=17 eth-macro=8 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=18 eth-macro=8 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=19 eth-macro=8 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=20 eth-macro=10 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=21 eth-macro=10 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=22 eth-macro=10 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=23 eth-macro=10 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=24 eth-macro=12 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=25 eth-macro=12 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=26 eth-macro=12 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=27 eth-macro=12 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=28 eth-macro=14 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=29 eth-macro=14 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=30 eth-macro=14 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=31 eth-macro=14 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=32 eth-macro=16 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=33 eth-macro=16 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=34 eth-macro=16 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=35 eth-macro=16 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=36 eth-macro=17 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=37 eth-macro=17 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=38 eth-macro=17 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=39 eth-macro=17 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=40 eth-macro=18 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=41 eth-macro=18 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=42 eth-macro=18 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=43 eth-macro=18 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=44 eth-macro=19 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=45 eth-macro=19 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=46 eth-macro=19 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=47 eth-macro=19 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=48 eth-macro=21 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=49 eth-macro=20 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=50 eth-macro=26 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=51 eth-macro=27 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=52 eth-macro=28 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=53 eth-macro=29 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=129 eth-macro=0 lane=1 max-speed=10g active=true guarantee=true cpi=true
+init set port-map unit=0 port=130 eth-macro=0 lane=0 max-speed=10g active=true guarantee=true cpi=true init-done=true
+init start stage unit=0 task-rsrc
+init start stage unit=0 module
+init start stage unit=0 task
+phy set lane-swap portlist=0 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=1 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=2 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=3 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=4 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=5 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=6 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=7 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=8 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=9 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=10 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=11 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=12 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=13 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=14 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=15 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=16 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=17 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=18 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=19 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=20 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=21 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=22 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=23 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=24 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=25 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=26 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=27 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=28 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=29 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=30 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=31 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=32 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=33 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=34 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=35 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=36 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=37 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=38 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=39 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=40 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=41 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=42 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=43 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=44 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=45 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=46 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=47 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=48 lane-cnt=4 property=tx data=0x1.3.0.2
+phy set lane-swap portlist=49 lane-cnt=4 property=tx data=0x0.3.1.2
+phy set lane-swap portlist=50 lane-cnt=4 property=tx data=0x1.3.0.2
+phy set lane-swap portlist=51 lane-cnt=4 property=tx data=0x2.0.3.1
+phy set lane-swap portlist=52 lane-cnt=4 property=tx data=0x3.2.1.0
+phy set lane-swap portlist=53 lane-cnt=4 property=tx data=0x3.2.1.0
+phy set lane-swap portlist=0 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=1 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=2 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=3 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=4 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=5 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=6 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=7 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=8 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=9 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=10 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=11 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=12 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=13 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=14 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=15 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=16 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=17 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=18 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=19 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=20 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=21 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=22 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=23 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=24 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=25 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=26 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=27 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=28 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=29 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=30 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=31 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=32 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=33 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=34 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=35 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=36 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=37 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=38 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=39 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=40 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=41 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=42 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=43 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=44 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=45 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=46 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=47 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=48 lane-cnt=4 property=rx data=0x2.1.0.3
+phy set lane-swap portlist=49 lane-cnt=4 property=rx data=0x0.1.3.2
+phy set lane-swap portlist=50 lane-cnt=4 property=rx data=0x3.1.0.2
+phy set lane-swap portlist=51 lane-cnt=4 property=rx data=0x1.3.0.2
+phy set lane-swap portlist=52 lane-cnt=4 property=rx data=0x3.2.1.0
+phy set lane-swap portlist=53 lane-cnt=4 property=rx data=0x3.2.1.0
+phy set polarity-rev portlist=0 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=1 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=2 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=3 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=4 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=5 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=6 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=7 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=8 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=9 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=10 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=11 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=12 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=13 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=14 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=15 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=16 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=17 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=18 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=19 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=20 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=21 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=22 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=23 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=24 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=25 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=26 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=27 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=28 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=29 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=30 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=31 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=32 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=33 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=34 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=35 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=36 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=37 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=38 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=39 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=40 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=41 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=42 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=43 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=44 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=45 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=46 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=47 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=48 lane-cnt=4 property=tx data=0x0.0.0.1
+phy set polarity-rev portlist=49 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=50 lane-cnt=4 property=tx data=0x1.1.0.0
+phy set polarity-rev portlist=51 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=52 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=53 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=0 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=1 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=2 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=3 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=4 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=5 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=6 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=7 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=8 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=9 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=10 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=11 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=12 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=13 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=14 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=15 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=16 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=17 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=18 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=19 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=20 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=21 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=22 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=23 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=24 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=25 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=26 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=27 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=28 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=29 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=30 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=31 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=32 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=33 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=34 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=35 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=36 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=37 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=38 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=39 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=40 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=41 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=42 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=43 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=44 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=45 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=46 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=47 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=48 lane-cnt=4 property=rx data=0x0.1.0.1
+phy set polarity-rev portlist=49 lane-cnt=4 property=rx data=0x1.0.1.0
+phy set polarity-rev portlist=50 lane-cnt=4 property=rx data=0x0.0.1.0
+phy set polarity-rev portlist=51 lane-cnt=4 property=rx data=0x0.0.0.1
+phy set polarity-rev portlist=52 lane-cnt=4 property=rx data=0x0.0.0.0
+phy set polarity-rev portlist=53 lane-cnt=4 property=rx data=0x0.0.0.0
+phy set pre-emphasis portlist=0 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=0 lane-cnt=4 property=cn1 data=0x1.1.1.1
+phy set pre-emphasis portlist=0 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=0 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=4 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=4 lane-cnt=4 property=cn1 data=0x1.1.1.1
+phy set pre-emphasis portlist=4 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=4 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=8 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=8 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=8 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=8 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=12 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=12 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=12 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=12 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=16 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=16 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=16 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=16 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=20 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=20 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=20 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=20 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=24 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=24 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=24 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=24 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=28 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=28 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=28 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=28 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=32 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=32 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=32 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=32 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=36 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=36 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=36 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=36 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=40 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=40 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=40 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=40 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=44 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=44 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=44 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=44 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=48 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=48 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=48 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=48 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=49 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=49 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=49 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=49 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=50 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=50 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=50 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=50 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=51 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=51 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=51 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=51 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=52 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=52 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=52 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=52 lane-cnt=4 property=c1 data=0x8.8.8.8
+phy set pre-emphasis portlist=53 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=53 lane-cnt=4 property=cn1 data=0x1.1.1.1
+phy set pre-emphasis portlist=53 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=53 lane-cnt=4 property=c1 data=0x7.7.7.7
+port set property portlist=0-47 speed=25g
+port set property portlist=48-53 speed=100g
+port set property portlist=129-130 speed=10g
+port set property portlist=0-47 medium-type=sr
+port set property portlist=48-53 medium-type=sr4
+port set property portlist=129-130 medium-type=kr
+port set adver portlist=129-130 speed-10g-kr
+port set property portlist=129-130 an=enable
+port set property portlist=0-53,129-130 admin=enable
+
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps.AOC.R0B b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps.AOC.R0B
new file mode 100644
index 000000000000..34e5a2daab80
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps.AOC.R0B
@@ -0,0 +1,358 @@
+init start stage unit=0 low-level
+init set port-map unit=0 port=0 eth-macro=2 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=1 eth-macro=2 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=2 eth-macro=2 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=3 eth-macro=2 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=4 eth-macro=3 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=5 eth-macro=3 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=6 eth-macro=3 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=7 eth-macro=3 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=8 eth-macro=4 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=9 eth-macro=4 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=10 eth-macro=4 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=11 eth-macro=4 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=12 eth-macro=5 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=13 eth-macro=5 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=14 eth-macro=5 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=15 eth-macro=5 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=16 eth-macro=8 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=17 eth-macro=8 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=18 eth-macro=8 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=19 eth-macro=8 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=20 eth-macro=10 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=21 eth-macro=10 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=22 eth-macro=10 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=23 eth-macro=10 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=24 eth-macro=12 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=25 eth-macro=12 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=26 eth-macro=12 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=27 eth-macro=12 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=28 eth-macro=14 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=29 eth-macro=14 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=30 eth-macro=14 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=31 eth-macro=14 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=32 eth-macro=16 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=33 eth-macro=16 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=34 eth-macro=16 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=35 eth-macro=16 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=36 eth-macro=17 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=37 eth-macro=17 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=38 eth-macro=17 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=39 eth-macro=17 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=40 eth-macro=18 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=41 eth-macro=18 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=42 eth-macro=18 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=43 eth-macro=18 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=44 eth-macro=19 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=45 eth-macro=19 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=46 eth-macro=19 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=47 eth-macro=19 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=48 eth-macro=21 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=49 eth-macro=20 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=50 eth-macro=26 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=51 eth-macro=27 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=52 eth-macro=28 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=53 eth-macro=29 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=129 eth-macro=0 lane=1 max-speed=10g active=true guarantee=true cpi=true
+init set port-map unit=0 port=130 eth-macro=0 lane=0 max-speed=10g active=true guarantee=true cpi=true init-done=true
+init start stage unit=0 task-rsrc
+init start stage unit=0 module
+init start stage unit=0 task
+phy set lane-swap portlist=0 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=1 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=2 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=3 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=4 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=5 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=6 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=7 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=8 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=9 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=10 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=11 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=12 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=13 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=14 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=15 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=16 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=17 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=18 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=19 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=20 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=21 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=22 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=23 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=24 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=25 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=26 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=27 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=28 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=29 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=30 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=31 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=32 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=33 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=34 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=35 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=36 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=37 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=38 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=39 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=40 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=41 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=42 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=43 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=44 lane-cnt=1 property=tx data=0x0
+phy set lane-swap portlist=45 lane-cnt=1 property=tx data=0x1
+phy set lane-swap portlist=46 lane-cnt=1 property=tx data=0x2
+phy set lane-swap portlist=47 lane-cnt=1 property=tx data=0x3
+phy set lane-swap portlist=48 lane-cnt=4 property=tx data=0x1.3.0.2
+phy set lane-swap portlist=49 lane-cnt=4 property=tx data=0x0.3.1.2
+phy set lane-swap portlist=50 lane-cnt=4 property=tx data=0x1.3.0.2
+phy set lane-swap portlist=51 lane-cnt=4 property=tx data=0x2.0.3.1
+phy set lane-swap portlist=52 lane-cnt=4 property=tx data=0x3.2.1.0
+phy set lane-swap portlist=53 lane-cnt=4 property=tx data=0x3.2.1.0
+phy set lane-swap portlist=0 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=1 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=2 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=3 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=4 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=5 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=6 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=7 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=8 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=9 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=10 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=11 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=12 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=13 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=14 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=15 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=16 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=17 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=18 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=19 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=20 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=21 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=22 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=23 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=24 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=25 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=26 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=27 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=28 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=29 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=30 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=31 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=32 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=33 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=34 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=35 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=36 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=37 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=38 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=39 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=40 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=41 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=42 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=43 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=44 lane-cnt=1 property=rx data=0x1
+phy set lane-swap portlist=45 lane-cnt=1 property=rx data=0x2
+phy set lane-swap portlist=46 lane-cnt=1 property=rx data=0x3
+phy set lane-swap portlist=47 lane-cnt=1 property=rx data=0x0
+phy set lane-swap portlist=48 lane-cnt=4 property=rx data=0x2.1.0.3
+phy set lane-swap portlist=49 lane-cnt=4 property=rx data=0x0.1.3.2
+phy set lane-swap portlist=50 lane-cnt=4 property=rx data=0x3.1.0.2
+phy set lane-swap portlist=51 lane-cnt=4 property=rx data=0x1.3.0.2
+phy set lane-swap portlist=52 lane-cnt=4 property=rx data=0x3.2.1.0
+phy set lane-swap portlist=53 lane-cnt=4 property=rx data=0x3.2.1.0
+phy set polarity-rev portlist=0 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=1 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=2 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=3 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=4 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=5 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=6 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=7 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=8 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=9 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=10 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=11 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=12 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=13 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=14 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=15 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=16 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=17 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=18 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=19 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=20 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=21 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=22 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=23 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=24 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=25 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=26 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=27 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=28 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=29 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=30 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=31 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=32 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=33 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=34 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=35 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=36 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=37 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=38 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=39 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=40 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=41 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=42 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=43 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=44 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=45 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=46 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=47 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev portlist=48 lane-cnt=4 property=tx data=0x0.0.0.1
+phy set polarity-rev portlist=49 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=50 lane-cnt=4 property=tx data=0x1.1.0.0
+phy set polarity-rev portlist=51 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=52 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=53 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev portlist=0 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=1 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=2 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=3 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=4 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=5 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=6 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=7 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=8 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=9 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=10 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=11 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=12 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=13 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=14 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=15 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=16 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=17 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=18 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=19 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=20 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=21 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=22 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=23 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=24 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=25 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=26 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=27 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=28 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=29 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=30 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=31 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=32 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=33 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=34 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=35 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=36 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=37 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=38 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=39 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=40 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=41 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=42 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=43 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=44 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=45 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=46 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=47 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev portlist=48 lane-cnt=4 property=rx data=0x0.1.0.1
+phy set polarity-rev portlist=49 lane-cnt=4 property=rx data=0x1.0.1.0
+phy set polarity-rev portlist=50 lane-cnt=4 property=rx data=0x0.0.1.0
+phy set polarity-rev portlist=51 lane-cnt=4 property=rx data=0x0.0.0.1
+phy set polarity-rev portlist=52 lane-cnt=4 property=rx data=0x0.0.0.0
+phy set polarity-rev portlist=53 lane-cnt=4 property=rx data=0x0.0.0.0
+phy set pre-emphasis portlist=0 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=0 lane-cnt=4 property=cn1 data=0x1.1.1.1
+phy set pre-emphasis portlist=0 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=0 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=4 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=4 lane-cnt=4 property=cn1 data=0x1.1.1.1
+phy set pre-emphasis portlist=4 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=4 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=8 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=8 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=8 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=8 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=12 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=12 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=12 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=12 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=16 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=16 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=16 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=16 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=20 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=20 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=20 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=20 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=24 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=24 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=24 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=24 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=28 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=28 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=28 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=28 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=32 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=32 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=32 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=32 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=36 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=36 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=36 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=36 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=40 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=40 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=40 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=40 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=44 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=44 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=44 lane-cnt=4 property=c0 data=0x1c.1c.1c.1c
+phy set pre-emphasis portlist=44 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=48 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=48 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=48 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=48 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=49 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=49 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=49 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=49 lane-cnt=4 property=c1 data=0x6.6.6.6
+phy set pre-emphasis portlist=50 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=50 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=50 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=50 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=51 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=51 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=51 lane-cnt=4 property=c0 data=0x1b.1b.1b.1b
+phy set pre-emphasis portlist=51 lane-cnt=4 property=c1 data=0x7.7.7.7
+phy set pre-emphasis portlist=52 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=52 lane-cnt=4 property=cn1 data=0x0.0.0.0
+phy set pre-emphasis portlist=52 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=52 lane-cnt=4 property=c1 data=0x8.8.8.8
+phy set pre-emphasis portlist=53 lane-cnt=4 property=c2 data=0x2.2.2.2
+phy set pre-emphasis portlist=53 lane-cnt=4 property=cn1 data=0x1.1.1.1
+phy set pre-emphasis portlist=53 lane-cnt=4 property=c0 data=0x1a.1a.1a.1a
+phy set pre-emphasis portlist=53 lane-cnt=4 property=c1 data=0x7.7.7.7
+port set property portlist=0-47 speed=25g
+port set property portlist=48-53 speed=100g
+port set property portlist=129-130 speed=10g
+port set property portlist=0-47 medium-type=sr
+port set property portlist=48-53 medium-type=sr4
+port set property portlist=129-130 medium-type=kr
+port set adver portlist=129-130 speed-10g-kr
+port set property portlist=129-130 an=enable
+port set property portlist=0-53,129-130 admin=enable
+
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps.DAC.R0B b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps.DAC.R0B
new file mode 100644
index 000000000000..af9927ae2884
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.nps.DAC.R0B
@@ -0,0 +1,357 @@
+init start stage unit=0 low-level
+init set port-map unit=0 port=0 eth-macro=2 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=1 eth-macro=2 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=2 eth-macro=2 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=3 eth-macro=2 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=4 eth-macro=3 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=5 eth-macro=3 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=6 eth-macro=3 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=7 eth-macro=3 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=8 eth-macro=4 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=9 eth-macro=4 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=10 eth-macro=4 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=11 eth-macro=4 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=12 eth-macro=5 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=13 eth-macro=5 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=14 eth-macro=5 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=15 eth-macro=5 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=16 eth-macro=8 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=17 eth-macro=8 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=18 eth-macro=8 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=19 eth-macro=8 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=20 eth-macro=10 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=21 eth-macro=10 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=22 eth-macro=10 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=23 eth-macro=10 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=24 eth-macro=12 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=25 eth-macro=12 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=26 eth-macro=12 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=27 eth-macro=12 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=28 eth-macro=14 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=29 eth-macro=14 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=30 eth-macro=14 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=31 eth-macro=14 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=32 eth-macro=16 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=33 eth-macro=16 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=34 eth-macro=16 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=35 eth-macro=16 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=36 eth-macro=17 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=37 eth-macro=17 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=38 eth-macro=17 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=39 eth-macro=17 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=40 eth-macro=18 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=41 eth-macro=18 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=42 eth-macro=18 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=43 eth-macro=18 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=44 eth-macro=19 lane=0 max-speed=25g active=true
+init set port-map unit=0 port=45 eth-macro=19 lane=1 max-speed=25g active=true
+init set port-map unit=0 port=46 eth-macro=19 lane=2 max-speed=25g active=true
+init set port-map unit=0 port=47 eth-macro=19 lane=3 max-speed=25g active=true
+init set port-map unit=0 port=48 eth-macro=21 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=49 eth-macro=20 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=50 eth-macro=26 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=51 eth-macro=27 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=52 eth-macro=28 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=53 eth-macro=29 lane=0 max-speed=100g active=true
+init set port-map unit=0 port=129 eth-macro=0 lane=1 max-speed=10g active=true guarantee=true cpi=true
+init set port-map unit=0 port=130 eth-macro=0 lane=0 max-speed=10g active=true guarantee=true cpi=true init-done=true
+init start stage unit=0 task-rsrc
+init start stage unit=0 module
+init start stage unit=0 task
+phy set lane-swap unit=0 portlist=0 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=1 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=2 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=3 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=4 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=5 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=6 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=7 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=8 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=9 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=10 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=11 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=12 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=13 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=14 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=15 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=16 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=17 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=18 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=19 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=20 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=21 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=22 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=23 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=24 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=25 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=26 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=27 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=28 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=29 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=30 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=31 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=32 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=33 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=34 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=35 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=36 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=37 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=38 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=39 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=40 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=41 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=42 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=43 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=44 lane-cnt=1 property=tx data=0x0
+phy set lane-swap unit=0 portlist=45 lane-cnt=1 property=tx data=0x1
+phy set lane-swap unit=0 portlist=46 lane-cnt=1 property=tx data=0x2
+phy set lane-swap unit=0 portlist=47 lane-cnt=1 property=tx data=0x3
+phy set lane-swap unit=0 portlist=48 lane-cnt=4 property=tx data=0x1.3.0.2
+phy set lane-swap unit=0 portlist=49 lane-cnt=4 property=tx data=0x0.3.1.2
+phy set lane-swap unit=0 portlist=50 lane-cnt=4 property=tx data=0x1.3.0.2
+phy set lane-swap unit=0 portlist=51 lane-cnt=4 property=tx data=0x2.0.3.1
+phy set lane-swap unit=0 portlist=52 lane-cnt=4 property=tx data=0x3.2.1.0
+phy set lane-swap unit=0 portlist=53 lane-cnt=4 property=tx data=0x3.2.1.0
+phy set lane-swap unit=0 portlist=0 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=1 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=2 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=3 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=4 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=5 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=6 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=7 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=8 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=9 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=10 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=11 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=12 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=13 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=14 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=15 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=16 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=17 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=18 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=19 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=20 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=21 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=22 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=23 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=24 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=25 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=26 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=27 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=28 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=29 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=30 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=31 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=32 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=33 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=34 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=35 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=36 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=37 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=38 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=39 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=40 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=41 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=42 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=43 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=44 lane-cnt=1 property=rx data=0x1
+phy set lane-swap unit=0 portlist=45 lane-cnt=1 property=rx data=0x2
+phy set lane-swap unit=0 portlist=46 lane-cnt=1 property=rx data=0x3
+phy set lane-swap unit=0 portlist=47 lane-cnt=1 property=rx data=0x0
+phy set lane-swap unit=0 portlist=48 lane-cnt=4 property=rx data=0x2.1.0.3
+phy set lane-swap unit=0 portlist=49 lane-cnt=4 property=rx data=0x0.1.3.2
+phy set lane-swap unit=0 portlist=50 lane-cnt=4 property=rx data=0x3.1.0.2
+phy set lane-swap unit=0 portlist=51 lane-cnt=4 property=rx data=0x1.3.0.2
+phy set lane-swap unit=0 portlist=52 lane-cnt=4 property=rx data=0x3.2.1.0
+phy set lane-swap unit=0 portlist=53 lane-cnt=4 property=rx data=0x3.2.1.0
+phy set polarity-rev unit=0 portlist=0 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=1 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=2 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=3 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=4 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=5 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=6 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=7 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=8 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=9 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=10 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=11 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=12 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=13 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=14 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=15 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=16 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=17 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=18 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=19 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=20 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=21 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=22 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=23 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=24 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=25 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=26 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=27 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=28 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=29 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=30 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=31 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=32 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=33 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=34 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=35 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=36 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=37 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=38 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=39 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=40 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=41 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=42 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=43 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=44 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=45 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=46 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=47 lane-cnt=1 property=tx data=0x0
+phy set polarity-rev unit=0 portlist=48 lane-cnt=4 property=tx data=0x0.0.0.1
+phy set polarity-rev unit=0 portlist=49 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev unit=0 portlist=50 lane-cnt=4 property=tx data=0x1.1.0.0
+phy set polarity-rev unit=0 portlist=51 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev unit=0 portlist=52 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev unit=0 portlist=53 lane-cnt=4 property=tx data=0x0.0.0.0
+phy set polarity-rev unit=0 portlist=0 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=1 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=2 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=3 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=4 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=5 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=6 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=7 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=8 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=9 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=10 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=11 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=12 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=13 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=14 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=15 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=16 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=17 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=18 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=19 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=20 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=21 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=22 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=23 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=24 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=25 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=26 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=27 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=28 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=29 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=30 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=31 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=32 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=33 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=34 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=35 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=36 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=37 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=38 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=39 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=40 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=41 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=42 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=43 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=44 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=45 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=46 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=47 lane-cnt=1 property=rx data=0x0
+phy set polarity-rev unit=0 portlist=48 lane-cnt=4 property=rx data=0x0.1.0.1
+phy set polarity-rev unit=0 portlist=49 lane-cnt=4 property=rx data=0x1.0.1.0
+phy set polarity-rev unit=0 portlist=50 lane-cnt=4 property=rx data=0x0.0.1.0
+phy set polarity-rev unit=0 portlist=51 lane-cnt=4 property=rx data=0x0.0.0.1
+phy set polarity-rev unit=0 portlist=52 lane-cnt=4 property=rx data=0x0.0.0.0
+phy set polarity-rev unit=0 portlist=53 lane-cnt=4 property=rx data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=0 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=0 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=0 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=0 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=4 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=4 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=4 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=4 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=8 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=8 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=8 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=8 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=12 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=12 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=12 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=12 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=16 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=16 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=16 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=16 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=20 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=20 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=20 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=20 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=24 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=24 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=24 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=24 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=28 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=28 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=28 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=28 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=32 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=32 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=32 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=32 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=36 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=36 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=36 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=36 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=40 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=40 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=40 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=40 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=44 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=44 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=44 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=44 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=48 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=48 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=48 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=48 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=49 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=49 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=49 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=49 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=50 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=50 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=50 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=50 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=51 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=51 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=51 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=51 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=52 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=52 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=52 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=52 lane-cnt=4 property=c1 data=0x2.2.2.2
+phy set pre-emphasis unit=0 portlist=53 lane-cnt=4 property=c2 data=0x0.0.0.0
+phy set pre-emphasis unit=0 portlist=53 lane-cnt=4 property=cn1 data=0x4.4.4.4
+phy set pre-emphasis unit=0 portlist=53 lane-cnt=4 property=c0 data=0x1e.1e.1e.1e
+phy set pre-emphasis unit=0 portlist=53 lane-cnt=4 property=c1 data=0x2.2.2.2
+port set property unit=0 portlist=0-47 speed=25g
+port set property unit=0 portlist=48-53 speed=100g
+port set property unit=0 portlist=129-130 speed=10g
+port set property unit=0 portlist=0-47 medium-type=cr
+port set property unit=0 portlist=48-53 medium-type=cr4
+port set property unit=0 portlist=129-130 medium-type=kr
+port set adver unit=0 portlist=129-130 speed-10g-kr
+port set property unit=0 portlist=129-130 an=enable
+port set property unit=0 portlist=0-53,129-130 admin=enable
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2 b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2
new file mode 100644
index 000000000000..5c5fc6e4969b
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/qos.json.j2
@@ -0,0 +1,136 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "1",
+ "1": "0",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "1",
+ "1": "0",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"1",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0" : {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1" : {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2" : {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PORT_QOS_MAP": {
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY" : {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "wred_red_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"613984",
+ "red_min_threshold":"76608",
+ "yellow_max_threshold":"628320",
+ "yellow_min_threshold":"78400",
+ "green_max_threshold": "642656",
+ "green_min_threshold": "80192"
+ },
+ "AZURE_LOSSLESS" : {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "wred_red_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"613984",
+ "red_min_threshold":"76608",
+ "yellow_max_threshold":"628320",
+ "yellow_min_threshold":"78400",
+ "green_max_threshold": "642656",
+ "green_min_threshold": "80192"
+ }
+ },
+ "QUEUE": {
+ }
+}
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/sai.profile b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/sai.profile
new file mode 100644
index 000000000000..880f47910ac1
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/sai.profile
@@ -0,0 +1,2 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/platform/led_proc_init.nps
+SAI_DSH_CONFIG_FILE=/usr/share/sonic/hwsku/port_config.nps
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/installer.conf b/device/accton/x86_64-accton_as7116_54x-r0/installer.conf
new file mode 100644
index 000000000000..4eeedca86a48
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/installer.conf
@@ -0,0 +1,4 @@
+CONSOLE_PORT=0x3f8
+CONSOLE_DEV=0
+CONSOLE_SPEED=115200
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="pci=noaer"
\ No newline at end of file
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/led_proc_init.nps b/device/accton/x86_64-accton_as7116_54x-r0/led_proc_init.nps
new file mode 100644
index 000000000000..e25c78018adb
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/led_proc_init.nps
@@ -0,0 +1,10 @@
+#unit NPS_CFG_TYPE_XXX param0 param1 value
+#---- ---------------- ------ ------ -----
+0 NPS_CFG_TYPE_USE_UNIT_PORT 0 0 1
+0 NPS_CFG_TYPE_LED_CFG 0 0 5
+0 NPS_CFG_TYPE_CPI_PORT_MODE 129 0 1
+0 NPS_CFG_TYPE_CPI_PORT_MODE 130 0 1
+0 NPS_CFG_TYPE_USER_BUF_CTRL 0 0 1
+0 NPS_CFG_TYPE_HASH_L2_FDB_REGION_ENTRY_NUM 0 0 49152
+0 NPS_CFG_TYPE_HASH_L3_WITH_IPV6_PREFIX_64_REGION_ENTRY_NUM 0 0 32768
+
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/minigraph.xml b/device/accton/x86_64-accton_as7116_54x-r0/minigraph.xml
new file mode 100644
index 000000000000..91269c2f68f6
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/minigraph.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+ HostIP
+ Loopback0
+
+ 10.1.0.32/32
+
+ 10.1.0.32/32
+
+
+
+
+
+
+
+ switch1
+
+
+
+
+
+
+
+
+
+
+
+
+ switch1
+ Accton-AS7116-54X
+
+
+
+
+
+
+ switch1
+
+
+ DhcpResources
+
+
+
+
+ NtpResources
+
+ 0.debian.pool.ntp.org;1.debian.pool.ntp.org;2.debian.pool.ntp.org;3.debian.pool.ntp.org
+
+
+ SyslogResources
+
+
+
+
+
+
+
+
+ switch1
+ Accton-AS7116-54X
+
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/plugins/eeprom.py b/device/accton/x86_64-accton_as7116_54x-r0/plugins/eeprom.py
new file mode 100644
index 000000000000..1e7d1046d93d
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/plugins/eeprom.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+try:
+ import exceptions
+ import binascii
+ import time
+ import optparse
+ import warnings
+ import os
+ import sys
+ from sonic_eeprom import eeprom_base
+ from sonic_eeprom import eeprom_tlvinfo
+ import subprocess
+except ImportError, e:
+ raise ImportError (str(e) + "- required module not found")
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+ _TLV_INFO_MAX_LEN = 256
+ def __init__(self, name, path, cpld_root, ro):
+ self.eeprom_path = "/sys/bus/i2c/devices/0-0056/eeprom"
+ super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/plugins/psuutil.py b/device/accton/x86_64-accton_as7116_54x-r0/plugins/psuutil.py
new file mode 100644
index 000000000000..08fd2648f314
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/plugins/psuutil.py
@@ -0,0 +1,92 @@
+#
+# psuutil.py
+# Platform-specific PSU status interface for SONiC
+#
+
+
+import os.path
+
+try:
+ from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+ raise ImportError(str(e) + "- required module not found")
+
+
+class PsuUtil(PsuBase):
+ """Platform-specific PSUutil class"""
+
+ SYSFS_PSU_DIR = ["/sys/bus/i2c/devices/10-0050",
+ "/sys/bus/i2c/devices/11-0053"]
+
+ def __init__(self):
+ PsuBase.__init__(self)
+
+
+ # Get sysfs attribute
+ def get_attr_value(self, attr_path):
+
+ retval = 'ERR'
+ if (not os.path.isfile(attr_path)):
+ return retval
+
+ try:
+ with open(attr_path, 'r') as fd:
+ retval = fd.read()
+ except Exception as error:
+ logging.error("Unable to open ", attr_path, " file !")
+
+ retval = retval.rstrip('\r\n')
+ return retval
+
+ def get_num_psus(self):
+ """
+ Retrieves the number of PSUs available on the device
+ :return: An integer, the number of PSUs available on the device
+ """
+ MAX_PSUS = 2
+ return MAX_PSUS
+
+ def get_psu_status(self, index):
+ """
+ Retrieves the oprational status of power supply unit (PSU) defined
+ by index
+ :param index: An integer, index of the PSU of which to query status
+ :return: Boolean, True if PSU is operating properly, False if PSU is\
+ faulty
+ """
+ status = 0
+ attr_file = 'psu_power_good'
+ attr_path = self.SYSFS_PSU_DIR[index-1] +'/' + attr_file
+
+ attr_value = self.get_attr_value(attr_path)
+
+ if (attr_value != 'ERR'):
+ attr_value = int(attr_value, 16)
+ # Check for PSU status
+ if (attr_value == 1):
+ status = 1
+
+ return status
+
+ def get_psu_presence(self, index):
+ """
+ Retrieves the presence status of power supply unit (PSU) defined
+ by index
+ :param index: An integer, index of the PSU of which to query status
+ :return: Boolean, True if PSU is plugged, False if not
+ """
+ status = 0
+ psu_absent = 0
+ attr_file ='psu_present'
+ attr_path = self.SYSFS_PSU_DIR[index-1] +'/' + attr_file
+
+ attr_value = self.get_attr_value(attr_path)
+
+ if (attr_value != 'ERR'):
+ attr_value = int(attr_value, 16)
+ # Check for PSU presence
+ if (attr_value == 1):
+ status = 1
+
+ return status
+
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/plugins/sfputil.py b/device/accton/x86_64-accton_as7116_54x-r0/plugins/sfputil.py
new file mode 100644
index 000000000000..8abcd46ccb56
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/plugins/sfputil.py
@@ -0,0 +1,150 @@
+#!/usr/bin/env python
+
+try:
+ import time
+ from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError, e:
+ raise ImportError (str(e) + "- required module not found")
+
+
+class SfpUtil(SfpUtilBase):
+ """Platform specific SfpUtill class"""
+
+ _port_start = 0
+ _port_end = 53
+ _qsfp_port_start = 48
+ _ports_in_block = 54
+
+ _port_to_eeprom_mapping = {}
+ _port_to_i2c_mapping = {
+ 0 : 37,
+ 1 : 38,
+ 2 : 39,
+ 3 : 40,
+ 4 : 41,
+ 5 : 42,
+ 6 : 43,
+ 7 : 44,
+ 8 : 45,
+ 9 : 46,
+ 10 : 47,
+ 11 : 48,
+ 12 : 49,
+ 13 : 50,
+ 14 : 51,
+ 15 : 52,
+ 16 : 53,
+ 17 : 54,
+ 18 : 55,
+ 19 : 56,
+ 20 : 57,
+ 21 : 58,
+ 22 : 59,
+ 23 : 60,
+ 24 : 61,
+ 25 : 62,
+ 26 : 63,
+ 27 : 64,
+ 28 : 65,
+ 29 : 66,
+ 30 : 67,
+ 31 : 68,
+ 32 : 69,
+ 33 : 70,
+ 34 : 71,
+ 35 : 72,
+ 36 : 73,
+ 37 : 74,
+ 38 : 75,
+ 39 : 76,
+ 40 : 77,
+ 41 : 78,
+ 42 : 79,
+ 43 : 80,
+ 44 : 81,
+ 45 : 82,
+ 46 : 83,
+ 47 : 84,
+ 48 : 21,
+ 49 : 22,
+ 50 : 23,
+ 51 : 24,
+ 52 : 25,
+ 53 : 26,
+ }
+
+ _qsfp_ports = range(_qsfp_port_start, _ports_in_block + 1)
+
+ def __init__(self):
+ eeprom_path = '/sys/bus/i2c/devices/{0}-0050/sfp_eeprom'
+ for x in range(self._port_start, self._port_end + 1):
+ port_eeprom_path = eeprom_path.format(self._port_to_i2c_mapping[x])
+ self._port_to_eeprom_mapping[x] = port_eeprom_path
+
+ SfpUtilBase.__init__(self)
+
+ def reset(self, port_num):
+ # Check for invalid port_num
+ if port_num < self._port_start or port_num > self._port_end:
+ return False
+
+ path = "/sys/bus/i2c/devices/{0}-0050/sfp_port_reset"
+ port_ps = path.format(self._port_to_i2c_mapping[port_num])
+
+ try:
+ reg_file = open(port_ps, 'w')
+ except IOError as e:
+ print "Error: unable to open file: %s" % str(e)
+ return False
+
+ #toggle reset
+ reg_file.seek(0)
+ reg_file.write('1')
+ time.sleep(1)
+ reg_file.seek(0)
+ reg_file.write('0')
+ reg_file.close()
+ return True
+
+ def set_low_power_mode(self, port_nuM, lpmode):
+ raise NotImplementedError
+
+ def get_low_power_mode(self, port_num):
+ raise NotImplementedError
+
+ def get_presence(self, port_num):
+ # Check for invalid port_num
+ if port_num < self._port_start or port_num > self._port_end:
+ return False
+
+ path = "/sys/bus/i2c/devices/{0}-0050/sfp_is_present"
+ port_ps = path.format(self._port_to_i2c_mapping[port_num])
+
+
+ try:
+ reg_file = open(port_ps)
+ except IOError as e:
+ print "Error: unable to open file: %s" % str(e)
+ return False
+
+ reg_value = reg_file.readline().rstrip()
+ if reg_value == '1':
+ return True
+
+ return False
+
+ @property
+ def port_start(self):
+ return self._port_start
+
+ @property
+ def port_end(self):
+ return self._port_end
+
+ @property
+ def qsfp_ports(self):
+ return self._qsfp_ports
+
+ @property
+ def port_to_eeprom_mapping(self):
+ return self._port_to_eeprom_mapping
diff --git a/device/accton/x86_64-accton_as7116_54x-r0/sensors.conf b/device/accton/x86_64-accton_as7116_54x-r0/sensors.conf
new file mode 100644
index 000000000000..9edb51a9e72d
--- /dev/null
+++ b/device/accton/x86_64-accton_as7116_54x-r0/sensors.conf
@@ -0,0 +1,13 @@
+# libsensors configuration file
+
+chip "as7116_54x_fan-*"
+ label fan1 "front fan 1"
+ label fan2 "front fan 2"
+ label fan3 "front fan 3"
+ label fan4 "front fan 4"
+ label fan5 "front fan 5"
+ label fan6 "rear fan 1"
+ label fan7 "rear fan 2"
+ label fan8 "rear fan 3"
+ label fan9 "rear fan 4"
+ label fan10 "rear fan 5"
diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile
index 457c339c58ab..211383b00640 100644
--- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile
+++ b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-C32/sai.profile
@@ -1,2 +1,4 @@
mode=3
hwId=as7512
+netdevMode=1
+aclEntryMaxPrio=1024
diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile
index 471c4395758f..07c7ce4d6b2e 100644
--- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile
+++ b/device/accton/x86_64-accton_as7512_32x-r0/AS7512-S128/sai.profile
@@ -1,2 +1,4 @@
mode=0
hwId=as7512
+netdevMode=1
+aclEntryMaxPrio=1024
diff --git a/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile b/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile
index 017996f7d7cc..381a440f988b 100644
--- a/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile
+++ b/device/accton/x86_64-accton_as7512_32x-r0/AS7512/sai.profile
@@ -1,2 +1,4 @@
mode=1
hwId=as7512
+netdevMode=1
+aclEntryMaxPrio=1024
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/sai.profile b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/sai.profile
index 0175b59a5da3..5c613675c37f 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/sai.profile
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
SAI_NUM_ECMP_MEMBERS=32
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
new file mode 100644
index 000000000000..6d72e20b2104
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-Q16S64/td2-a7050-qx32-16x40G+32x10G+8x40G.config.bcm
@@ -0,0 +1,707 @@
+#/******************************************************************************
+# *
+# * File: config.bcm.cloverdales (7050-QX32)
+# * Name:
+# *
+# * Description: This file contains SDK properties for an Arista
+# * Cloverdales platform.
+# *
+# *-----------------------------------------------------------------------------
+# ******************************************************************************/
+####################################################################
+# BCM Config file for Cloverdale platform
+# - 16x40g + 32x10g + 8x40G Portmode
+
+# Old LPM only configuration
+# l2_mem_entries=163840
+# l3_mem_entries=90112
+# l3_alpm_enable=0
+# ipv6_lpm_128b_enable=0
+#
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=8
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+scache_filename=/tmp/scache
+schan_intr_enable=0
+stable_size=0x2000000
+tdma_timeout_usec=5000000
+
+# for GLC transceiver
+phy_an_c73=0x0
+phy_an_c37=0x3
+
+###########################
+#port_init_speed_xe=40000
+#port_init_speed_xe.0=40000
+
+#load_firmware=0x0102
+load_firmware.0=2
+
+#########################
+# All ports are in oversubscription mode
+pbmp_oversubscribe=0x1fffffffffffffffffffffffffe
+pbmp_xport_xe.0=0x1fffffffffffffffffffffffffe
+
+##########################################
+#skip_L2_USER_ENTRY=0
+phy_aux_voltage_enable=1
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay.0=0x0d
+###############################
+serdes_sgmii_m=0
+xgxs_lcpll_xtal_refclk=1
+xgxs_lcpll_xtal_refclk.0=1
+xgxs_lcpll_xtal_refclk.1=1
+xgxs_lcpll_xtal_refclk.2=1
+xgxs_lcpll_xtal_refclk.3=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+tslam_dma_enable.2=1
+tslam_dma_enable.3=1
+#dport_map_port=0
+#pci2eb_overrid=0
+#bcm_xlate_port_enable.0=0
+#xgxs_pdetect_1=0
+table_dma_enable.0=1
+table_dma_enable.1=1
+table_dma_enable.2=1
+table_dma_enable.3=1
+
+
+phy_84328_1.0=1
+phy_84328_5.0=1
+phy_84328_9.0=1
+phy_84328_13.0=1
+phy_84328_101.0=1
+phy_84328_102.0=1
+phy_84328_103.0=1
+phy_84328_104.0=1
+
+phy_an_c37_1.0=0
+phy_an_c37_5.0=0
+phy_an_c37_9.0=0
+phy_an_c37_13.0=0
+phy_an_c37_17.0=0
+phy_an_c37_21.0=0
+phy_an_c37_25.0=0
+phy_an_c37_29.0=0
+phy_an_c37_33.0=0
+phy_an_c37_37.0=0
+phy_an_c37_41.0=0
+phy_an_c37_45.0=0
+phy_an_c37_49.0=0
+phy_an_c37_53.0=0
+phy_an_c37_57.0=0
+phy_an_c37_61.0=0
+phy_an_c37_65.0=3
+phy_an_c37_66.0=3
+phy_an_c37_67.0=3
+phy_an_c37_68.0=3
+phy_an_c37_69.0=3
+phy_an_c37_70.0=3
+phy_an_c37_71.0=3
+phy_an_c37_72.0=3
+phy_an_c37_73.0=3
+phy_an_c37_74.0=3
+phy_an_c37_75.0=3
+phy_an_c37_76.0=3
+phy_an_c37_77.0=3
+phy_an_c37_78.0=3
+phy_an_c37_79.0=3
+phy_an_c37_80.0=3
+phy_an_c37_81.0=3
+phy_an_c37_82.0=3
+phy_an_c37_83.0=3
+phy_an_c37_84.0=3
+phy_an_c37_85.0=3
+phy_an_c37_86.0=3
+phy_an_c37_87.0=3
+phy_an_c37_88.0=3
+phy_an_c37_89.0=3
+phy_an_c37_90.0=3
+phy_an_c37_91.0=3
+phy_an_c37_92.0=3
+phy_an_c37_93.0=3
+phy_an_c37_94.0=3
+phy_an_c37_95.0=3
+phy_an_c37_96.0=3
+phy_an_c37_97.0=0
+phy_an_c37_98.0=0
+phy_an_c37_99.0=0
+phy_an_c37_100.0=0
+phy_an_c37_101.0=0
+phy_an_c37_102.0=0
+phy_an_c37_103.0=0
+phy_an_c37_104.0=0
+
+phy_an_c73_1.0=2
+phy_an_c73_5.0=2
+phy_an_c73_9.0=2
+phy_an_c73_13.0=2
+phy_an_c73_17.0=2
+phy_an_c73_21.0=2
+phy_an_c73_25.0=2
+phy_an_c73_29.0=2
+phy_an_c73_33.0=2
+phy_an_c73_37.0=2
+phy_an_c73_41.0=2
+phy_an_c73_45.0=2
+phy_an_c73_49.0=2
+phy_an_c73_53.0=2
+phy_an_c73_57.0=2
+phy_an_c73_61.0=2
+phy_an_c73_65.0=0
+phy_an_c73_66.0=0
+phy_an_c73_67.0=0
+phy_an_c73_68.0=0
+phy_an_c73_69.0=0
+phy_an_c73_70.0=0
+phy_an_c73_71.0=0
+phy_an_c73_72.0=0
+phy_an_c73_73.0=0
+phy_an_c73_74.0=0
+phy_an_c73_75.0=0
+phy_an_c73_76.0=0
+phy_an_c73_77.0=0
+phy_an_c73_78.0=0
+phy_an_c73_79.0=0
+phy_an_c73_80.0=0
+phy_an_c73_81.0=0
+phy_an_c73_82.0=0
+phy_an_c73_83.0=0
+phy_an_c73_84.0=0
+phy_an_c73_85.0=0
+phy_an_c73_86.0=0
+phy_an_c73_87.0=0
+phy_an_c73_88.0=0
+phy_an_c73_89.0=0
+phy_an_c73_90.0=0
+phy_an_c73_91.0=0
+phy_an_c73_92.0=0
+phy_an_c73_93.0=0
+phy_an_c73_94.0=0
+phy_an_c73_95.0=0
+phy_an_c73_96.0=0
+phy_an_c73_97.0=2
+phy_an_c73_98.0=2
+phy_an_c73_99.0=2
+phy_an_c73_100.0=2
+phy_an_c73_101.0=2
+phy_an_c73_102.0=2
+phy_an_c73_103.0=2
+phy_an_c73_104.0=2
+
+phy_aux_voltage_enable_1.0=0x1
+phy_aux_voltage_enable_5.0=0x1
+phy_aux_voltage_enable_9.0=0x1
+phy_aux_voltage_enable_13.0=0x1
+phy_aux_voltage_enable_101.0=0x1
+phy_aux_voltage_enable_102.0=0x1
+phy_aux_voltage_enable_103.0=0x1
+phy_aux_voltage_enable_104.0=0x1
+
+phy_ext_rom_boot.0=0
+
+phy_ext_rom_boot_1.0=0x0
+phy_ext_rom_boot_5.0=0x0
+phy_ext_rom_boot_9.0=0x0
+phy_ext_rom_boot_13.0=0x0
+phy_ext_rom_boot_101.0=0x0
+phy_ext_rom_boot_102.0=0x0
+phy_ext_rom_boot_103.0=0x0
+phy_ext_rom_boot_104.0=0x0
+
+
+phy_line_tx_mode_1.0=1
+phy_line_tx_mode_5.0=1
+phy_line_tx_mode_9.0=1
+phy_line_tx_mode_13.0=1
+phy_line_tx_mode_101.0=1
+phy_line_tx_mode_102.0=1
+phy_line_tx_mode_103.0=1
+phy_line_tx_mode_104.0=1
+
+
+phy_rx_polarity_flip_1.0=0x0
+phy_rx_polarity_flip_5.0=0x0
+phy_rx_polarity_flip_9.0=0x0
+phy_rx_polarity_flip_13.0=0x0
+phy_rx_polarity_flip_101.0=0x0
+phy_rx_polarity_flip_102.0=0x0
+phy_rx_polarity_flip_103.0=0x0
+phy_rx_polarity_flip_104.0=0x0
+
+phy_system_tx_mode_1.0=0
+phy_system_tx_mode_5.0=0
+phy_system_tx_mode_9.0=0
+phy_system_tx_mode_13.0=0
+phy_system_tx_mode_101.0=0
+phy_system_tx_mode_102.0=0
+phy_system_tx_mode_103.0=0
+phy_system_tx_mode_104.0=0
+
+
+phy_tx_polarity_flip_1.0=0x0
+phy_tx_polarity_flip_5.0=0x0
+phy_tx_polarity_flip_9.0=0x0
+phy_tx_polarity_flip_13.0=0x0
+phy_tx_polarity_flip_101.0=0x0
+phy_tx_polarity_flip_102.0=0x0
+phy_tx_polarity_flip_103.0=0x0
+phy_tx_polarity_flip_104.0=0x0
+
+
+phy_xaui_rx_polarity_flip_1.0=0x0
+phy_xaui_rx_polarity_flip_5.0=0x0
+phy_xaui_rx_polarity_flip_9.0=0x0
+phy_xaui_rx_polarity_flip_13.0=0x0
+phy_xaui_rx_polarity_flip_17.0=0x0
+phy_xaui_rx_polarity_flip_21.0=0x0
+phy_xaui_rx_polarity_flip_25.0=0x0
+phy_xaui_rx_polarity_flip_29.0=0x0
+phy_xaui_rx_polarity_flip_33.0=0x0
+phy_xaui_rx_polarity_flip_37.0=0x0
+phy_xaui_rx_polarity_flip_41.0=0x0
+phy_xaui_rx_polarity_flip_45.0=0x0
+phy_xaui_rx_polarity_flip_49.0=0x0
+phy_xaui_rx_polarity_flip_53.0=0x0
+phy_xaui_rx_polarity_flip_57.0=0x0
+phy_xaui_rx_polarity_flip_61.0=0x0
+phy_xaui_rx_polarity_flip_65.0=0x0
+phy_xaui_rx_polarity_flip_66.0=0x0
+phy_xaui_rx_polarity_flip_67.0=0x0
+phy_xaui_rx_polarity_flip_68.0=0x0
+phy_xaui_rx_polarity_flip_69.0=0x0
+phy_xaui_rx_polarity_flip_70.0=0x0
+phy_xaui_rx_polarity_flip_71.0=0x0
+phy_xaui_rx_polarity_flip_72.0=0x0
+phy_xaui_rx_polarity_flip_73.0=0x0
+phy_xaui_rx_polarity_flip_74.0=0x0
+phy_xaui_rx_polarity_flip_75.0=0x0
+phy_xaui_rx_polarity_flip_76.0=0x0
+phy_xaui_rx_polarity_flip_77.0=0x0
+phy_xaui_rx_polarity_flip_78.0=0x0
+phy_xaui_rx_polarity_flip_79.0=0x0
+phy_xaui_rx_polarity_flip_80.0=0x0
+phy_xaui_rx_polarity_flip_81.0=0x0
+phy_xaui_rx_polarity_flip_82.0=0x0
+phy_xaui_rx_polarity_flip_83.0=0x0
+phy_xaui_rx_polarity_flip_84.0=0x0
+phy_xaui_rx_polarity_flip_85.0=0x0
+phy_xaui_rx_polarity_flip_86.0=0x0
+phy_xaui_rx_polarity_flip_87.0=0x0
+phy_xaui_rx_polarity_flip_88.0=0x0
+phy_xaui_rx_polarity_flip_89.0=0x0
+phy_xaui_rx_polarity_flip_90.0=0x0
+phy_xaui_rx_polarity_flip_91.0=0x0
+phy_xaui_rx_polarity_flip_92.0=0x0
+phy_xaui_rx_polarity_flip_93.0=0x0
+phy_xaui_rx_polarity_flip_94.0=0x0
+phy_xaui_rx_polarity_flip_95.0=0x0
+phy_xaui_rx_polarity_flip_96.0=0x0
+phy_xaui_rx_polarity_flip_97.0=0x0
+phy_xaui_rx_polarity_flip_98.0=0x0
+phy_xaui_rx_polarity_flip_99.0=0x0
+phy_xaui_rx_polarity_flip_100.0=0x0
+phy_xaui_rx_polarity_flip_101.0=0x0
+phy_xaui_rx_polarity_flip_102.0=0x0
+phy_xaui_rx_polarity_flip_103.0=0x0
+phy_xaui_rx_polarity_flip_104.0=0x0
+
+phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_5.0=0x0
+phy_xaui_tx_polarity_flip_9.0=0x0
+phy_xaui_tx_polarity_flip_13.0=0x0
+phy_xaui_tx_polarity_flip_17.0=0x0
+phy_xaui_tx_polarity_flip_21.0=0x0
+phy_xaui_tx_polarity_flip_25.0=0x0
+phy_xaui_tx_polarity_flip_29.0=0x0
+phy_xaui_tx_polarity_flip_33.0=0x0
+phy_xaui_tx_polarity_flip_37.0=0x0
+phy_xaui_tx_polarity_flip_41.0=0x0
+phy_xaui_tx_polarity_flip_45.0=0x0
+phy_xaui_tx_polarity_flip_49.0=0x0
+phy_xaui_tx_polarity_flip_53.0=0x0
+phy_xaui_tx_polarity_flip_57.0=0x0
+phy_xaui_tx_polarity_flip_61.0=0x0
+phy_xaui_tx_polarity_flip_65.0=0x0
+phy_xaui_tx_polarity_flip_66.0=0x0
+phy_xaui_tx_polarity_flip_67.0=0x0
+phy_xaui_tx_polarity_flip_68.0=0x0
+phy_xaui_tx_polarity_flip_69.0=0x0
+phy_xaui_tx_polarity_flip_70.0=0x0
+phy_xaui_tx_polarity_flip_71.0=0x0
+phy_xaui_tx_polarity_flip_72.0=0x0
+phy_xaui_tx_polarity_flip_73.0=0x0
+phy_xaui_tx_polarity_flip_74.0=0x0
+phy_xaui_tx_polarity_flip_75.0=0x0
+phy_xaui_tx_polarity_flip_76.0=0x0
+phy_xaui_tx_polarity_flip_77.0=0x0
+phy_xaui_tx_polarity_flip_78.0=0x0
+phy_xaui_tx_polarity_flip_79.0=0x0
+phy_xaui_tx_polarity_flip_80.0=0x0
+phy_xaui_tx_polarity_flip_81.0=0x0
+phy_xaui_tx_polarity_flip_82.0=0x0
+phy_xaui_tx_polarity_flip_83.0=0x0
+phy_xaui_tx_polarity_flip_84.0=0x0
+phy_xaui_tx_polarity_flip_85.0=0x0
+phy_xaui_tx_polarity_flip_86.0=0x0
+phy_xaui_tx_polarity_flip_87.0=0x0
+phy_xaui_tx_polarity_flip_88.0=0x0
+phy_xaui_tx_polarity_flip_89.0=0x0
+phy_xaui_tx_polarity_flip_90.0=0x0
+phy_xaui_tx_polarity_flip_91.0=0x0
+phy_xaui_tx_polarity_flip_92.0=0x0
+phy_xaui_tx_polarity_flip_93.0=0x0
+phy_xaui_tx_polarity_flip_94.0=0x0
+phy_xaui_tx_polarity_flip_95.0=0x0
+phy_xaui_tx_polarity_flip_96.0=0x0
+phy_xaui_tx_polarity_flip_97.0=0x0
+phy_xaui_tx_polarity_flip_98.0=0x0
+phy_xaui_tx_polarity_flip_99.0=0x0
+phy_xaui_tx_polarity_flip_100.0=0x0
+phy_xaui_tx_polarity_flip_101.0=0x0
+phy_xaui_tx_polarity_flip_102.0=0x0
+phy_xaui_tx_polarity_flip_103.0=0x0
+phy_xaui_tx_polarity_flip_104.0=0x0
+
+port_init_autoneg_17.0=0
+port_init_autoneg_21.0=0
+port_init_autoneg_25.0=0
+port_init_autoneg_29.0=0
+port_init_autoneg_33.0=0
+port_init_autoneg_37.0=0
+port_init_autoneg_41.0=0
+port_init_autoneg_45.0=0
+port_init_autoneg_49.0=0
+port_init_autoneg_53.0=0
+port_init_autoneg_57.0=0
+port_init_autoneg_61.0=0
+port_init_autoneg_65.0=0
+port_init_autoneg_66.0=0
+port_init_autoneg_67.0=0
+port_init_autoneg_68.0=0
+port_init_autoneg_69.0=0
+port_init_autoneg_70.0=0
+port_init_autoneg_71.0=0
+port_init_autoneg_72.0=0
+port_init_autoneg_73.0=0
+port_init_autoneg_74.0=0
+port_init_autoneg_75.0=0
+port_init_autoneg_76.0=0
+port_init_autoneg_77.0=0
+port_init_autoneg_78.0=0
+port_init_autoneg_79.0=0
+port_init_autoneg_80.0=0
+port_init_autoneg_81.0=0
+port_init_autoneg_82.0=0
+port_init_autoneg_83.0=0
+port_init_autoneg_84.0=0
+port_init_autoneg_85.0=0
+port_init_autoneg_86.0=0
+port_init_autoneg_87.0=0
+port_init_autoneg_88.0=0
+port_init_autoneg_89.0=0
+port_init_autoneg_90.0=0
+port_init_autoneg_91.0=0
+port_init_autoneg_92.0=0
+port_init_autoneg_93.0=0
+port_init_autoneg_94.0=0
+port_init_autoneg_95.0=0
+port_init_autoneg_96.0=0
+port_init_autoneg_97.0=0
+port_init_autoneg_98.0=0
+port_init_autoneg_99.0=0
+port_init_autoneg_100.0=0
+
+port_init_cl72_hg.0=0x11
+
+
+portmap_1.0=125:40
+portmap_5.0=121:40
+portmap_9.0=13:40
+portmap_13.0=9:40
+portmap_17.0=17:40
+portmap_21.0=21:40
+portmap_25.0=25:40
+portmap_29.0=29:40
+portmap_33.0=37:40
+portmap_37.0=33:40
+portmap_41.0=45:40
+portmap_45.0=41:40
+portmap_49.0=53:40
+portmap_53.0=49:40
+portmap_57.0=69:40
+portmap_61.0=65:40
+portmap_65.0=77:10
+portmap_66.0=78:10
+portmap_67.0=79:10
+portmap_68.0=80:10
+portmap_69.0=73:10
+portmap_70.0=74:10
+portmap_71.0=75:10
+portmap_72.0=76:10
+portmap_73.0=93:10
+portmap_74.0=94:10
+portmap_75.0=95:10
+portmap_76.0=96:10
+portmap_77.0=89:10
+portmap_78.0=90:10
+portmap_79.0=91:10
+portmap_80.0=92:10
+portmap_81.0=101:10
+portmap_82.0=102:10
+portmap_83.0=103:10
+portmap_84.0=104:10
+portmap_85.0=97:10
+portmap_86.0=98:10
+portmap_87.0=99:10
+portmap_88.0=100:10
+portmap_89.0=109:10
+portmap_90.0=110:10
+portmap_91.0=111:10
+portmap_92.0=112:10
+portmap_93.0=105:10
+portmap_94.0=106:10
+portmap_95.0=107:10
+portmap_96.0=108:10
+portmap_97.0=61:40
+portmap_98.0=57:40
+portmap_99.0=81:40
+portmap_100.0=85:40
+portmap_101.0=117:40
+portmap_102.0=113:40
+portmap_103.0=5:40
+portmap_104.0=1:40
+
+port_phy_addr_1.0=0x4
+port_phy_addr_5.0=0x0
+port_phy_addr_9.0=0x2c
+port_phy_addr_13.0=0x28
+port_phy_addr_17.0=0x7f
+port_phy_addr_21.0=0x7f
+port_phy_addr_25.0=0x7f
+port_phy_addr_29.0=0x7f
+port_phy_addr_33.0=0x7f
+port_phy_addr_37.0=0x7f
+port_phy_addr_41.0=0x7f
+port_phy_addr_45.0=0x7f
+port_phy_addr_49.0=0x7f
+port_phy_addr_53.0=0x7f
+port_phy_addr_57.0=0x7f
+port_phy_addr_61.0=0x7f
+port_phy_addr_65.0=0x7f
+port_phy_addr_66.0=0x7f
+port_phy_addr_67.0=0x7f
+port_phy_addr_68.0=0x7f
+port_phy_addr_69.0=0x7f
+port_phy_addr_70.0=0x7f
+port_phy_addr_71.0=0x7f
+port_phy_addr_72.0=0x7f
+port_phy_addr_73.0=0x7f
+port_phy_addr_74.0=0x7f
+port_phy_addr_75.0=0x7f
+port_phy_addr_76.0=0x7f
+port_phy_addr_77.0=0x7f
+port_phy_addr_78.0=0x7f
+port_phy_addr_79.0=0x7f
+port_phy_addr_80.0=0x7f
+port_phy_addr_81.0=0x7f
+port_phy_addr_82.0=0x7f
+port_phy_addr_83.0=0x7f
+port_phy_addr_84.0=0x7f
+port_phy_addr_85.0=0x7f
+port_phy_addr_86.0=0x7f
+port_phy_addr_87.0=0x7f
+port_phy_addr_88.0=0x7f
+port_phy_addr_89.0=0x7f
+port_phy_addr_90.0=0x7f
+port_phy_addr_91.0=0x7f
+port_phy_addr_92.0=0x7f
+port_phy_addr_93.0=0x7f
+port_phy_addr_94.0=0x7f
+port_phy_addr_95.0=0x7f
+port_phy_addr_96.0=0x7f
+port_phy_addr_97.0=0x7f
+port_phy_addr_98.0=0x7f
+port_phy_addr_99.0=0x7f
+port_phy_addr_100.0=0x7f
+port_phy_addr_101.0=0x54
+port_phy_addr_102.0=0x50
+port_phy_addr_103.0=0x7c
+port_phy_addr_104.0=0x78
+
+port_phy_clause_1.0=0x2d
+port_phy_clause_5.0=0x2d
+port_phy_clause_9.0=0x2d
+port_phy_clause_13.0=0x2d
+port_phy_clause_101.0=0x2d
+port_phy_clause_102.0=0x2d
+port_phy_clause_103.0=0x2d
+port_phy_clause_104.0=0x2d
+
+port_phy_id0_1.0=0x600d
+port_phy_id0_5.0=0x600d
+port_phy_id0_9.0=0x600d
+port_phy_id0_13.0=0x600d
+port_phy_id0_101.0=0x600d
+port_phy_id0_102.0=0x600d
+port_phy_id0_103.0=0x600d
+port_phy_id0_104.0=0x600d
+
+port_phy_id1_1.0=0x8500
+port_phy_id1_5.0=0x8500
+port_phy_id1_9.0=0x8500
+port_phy_id1_13.0=0x8500
+port_phy_id1_101.0=0x8500
+port_phy_id1_102.0=0x8500
+port_phy_id1_103.0=0x8500
+port_phy_id1_104.0=0x8500
+
+xgxs_rx_lane_map_1.0=0x0123
+xgxs_rx_lane_map_5.0=0x0123
+xgxs_rx_lane_map_9.0=0x0123
+xgxs_rx_lane_map_13.0=0x0123
+xgxs_rx_lane_map_17.0=0x2031
+xgxs_rx_lane_map_21.0=0x2031
+xgxs_rx_lane_map_25.0=0x2031
+xgxs_rx_lane_map_29.0=0x2031
+xgxs_rx_lane_map_33.0=0x3120
+xgxs_rx_lane_map_37.0=0x3120
+xgxs_rx_lane_map_41.0=0x3120
+xgxs_rx_lane_map_45.0=0x3120
+xgxs_rx_lane_map_49.0=0x3120
+xgxs_rx_lane_map_53.0=0x3120
+xgxs_rx_lane_map_57.0=0x3120
+xgxs_rx_lane_map_61.0=0x3120
+xgxs_rx_lane_map_65.0=0x3120
+xgxs_rx_lane_map_69.0=0x3120
+xgxs_rx_lane_map_73.0=0x3120
+xgxs_rx_lane_map_77.0=0x3120
+xgxs_rx_lane_map_81.0=0x3120
+xgxs_rx_lane_map_85.0=0x3120
+xgxs_rx_lane_map_89.0=0x3120
+xgxs_rx_lane_map_93.0=0x3120
+xgxs_rx_lane_map_97.0=0x1302
+xgxs_rx_lane_map_98.0=0x1302
+xgxs_rx_lane_map_99.0=0x0213
+xgxs_tx_lane_map_100.0=0x0213
+xgxs_tx_lane_map_101.0=0x0123
+xgxs_tx_lane_map_102.0=0x0123
+xgxs_tx_lane_map_103.0=0x0123
+xgxs_tx_lane_map_104.0=0x0123
+
+xgxs_tx_lane_map_1.0=0x0123
+xgxs_tx_lane_map_5.0=0x0123
+xgxs_tx_lane_map_9.0=0x0123
+xgxs_tx_lane_map_13.0=0x0123
+xgxs_tx_lane_map_17.0=0x1302
+xgxs_tx_lane_map_21.0=0x1302
+xgxs_tx_lane_map_25.0=0x1302
+xgxs_tx_lane_map_29.0=0x1302
+xgxs_tx_lane_map_33.0=0x3120
+xgxs_tx_lane_map_37.0=0x3120
+xgxs_tx_lane_map_41.0=0x3120
+xgxs_tx_lane_map_45.0=0x3120
+xgxs_tx_lane_map_49.0=0x3120
+xgxs_tx_lane_map_53.0=0x3120
+xgxs_tx_lane_map_57.0=0x3120
+xgxs_tx_lane_map_61.0=0x3120
+xgxs_tx_lane_map_65.0=0x3120
+xgxs_tx_lane_map_69.0=0x3120
+xgxs_tx_lane_map_73.0=0x3120
+xgxs_tx_lane_map_77.0=0x3120
+xgxs_tx_lane_map_81.0=0x3120
+xgxs_tx_lane_map_85.0=0x3120
+xgxs_tx_lane_map_89.0=0x3120
+xgxs_tx_lane_map_93.0=0x3120
+xgxs_tx_lane_map_97.0=0x2031
+xgxs_tx_lane_map_98.0=0x2031
+xgxs_tx_lane_map_99.0=0x0213
+xgxs_rx_lane_map_100.0=0x0213
+xgxs_rx_lane_map_101.0=0x0123
+xgxs_rx_lane_map_102.0=0x0123
+xgxs_rx_lane_map_103.0=0x0123
+xgxs_rx_lane_map_104.0=0x0123
+
+serdes_firmware_mode_1.0=1
+serdes_firmware_mode_5.0=1
+serdes_firmware_mode_9.0=1
+serdes_firmware_mode_13.0=1
+serdes_firmware_mode_17.0=2
+serdes_firmware_mode_21.0=2
+serdes_firmware_mode_25.0=2
+serdes_firmware_mode_29.0=2
+serdes_firmware_mode_33.0=2
+serdes_firmware_mode_37.0=2
+serdes_firmware_mode_41.0=2
+serdes_firmware_mode_45.0=2
+serdes_firmware_mode_49.0=2
+serdes_firmware_mode_53.0=2
+serdes_firmware_mode_57.0=2
+serdes_firmware_mode_61.0=2
+serdes_firmware_mode_65.0=2
+serdes_firmware_mode_66.0=2
+serdes_firmware_mode_67.0=2
+serdes_firmware_mode_68.0=2
+serdes_firmware_mode_69.0=2
+serdes_firmware_mode_70.0=2
+serdes_firmware_mode_71.0=2
+serdes_firmware_mode_72.0=2
+serdes_firmware_mode_73.0=2
+serdes_firmware_mode_74.0=2
+serdes_firmware_mode_75.0=2
+serdes_firmware_mode_76.0=2
+serdes_firmware_mode_77.0=2
+serdes_firmware_mode_78.0=2
+serdes_firmware_mode_79.0=2
+serdes_firmware_mode_80.0=2
+serdes_firmware_mode_81.0=2
+serdes_firmware_mode_82.0=2
+serdes_firmware_mode_83.0=2
+serdes_firmware_mode_84.0=2
+serdes_firmware_mode_85.0=2
+serdes_firmware_mode_86.0=2
+serdes_firmware_mode_87.0=2
+serdes_firmware_mode_88.0=2
+serdes_firmware_mode_89.0=2
+serdes_firmware_mode_90.0=2
+serdes_firmware_mode_91.0=2
+serdes_firmware_mode_92.0=2
+serdes_firmware_mode_93.0=2
+serdes_firmware_mode_94.0=2
+serdes_firmware_mode_95.0=2
+serdes_firmware_mode_96.0=2
+serdes_firmware_mode_97.0=2
+serdes_firmware_mode_98.0=2
+serdes_firmware_mode_99.0=2
+serdes_firmware_mode_100.0=2
+serdes_firmware_mode_101.0=1
+serdes_firmware_mode_102.0=1
+serdes_firmware_mode_103.0=1
+serdes_firmware_mode_104.0=1
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2 b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
index 10f9da575a1b..551f73ca0477 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/buffers.json.j2
@@ -69,22 +69,17 @@
},
"BUFFER_POOL": {
"ingress_lossless_pool": {
- "size": "7274496",
- "type": "ingress",
- "mode": "dynamic"
- },
- "ingress_lossy_pool": {
- "size": "5491712",
+ "size": "12766208",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossless_pool": {
- "size": "7274496",
+ "size": "12766208",
"type": "egress",
"mode": "static"
},
"egress_lossy_pool": {
- "size": "5491712",
+ "size": "8072396",
"type": "egress",
"mode": "dynamic"
}
@@ -95,18 +90,18 @@
"xon":"18432",
"xoff":"40560",
"size":"41808",
- "dynamic_th":"-3",
+ "dynamic_th":"-4",
"xon_offset":"2496"
},
"ingress_lossy_profile": {
- "pool":"[BUFFER_POOL|ingress_lossy_pool]",
- "size":"1518",
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "size":"0",
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0",
- "static_th":"7274496"
+ "static_th":"12766208"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile
index 938d37180676..27d83fcc20e9 100644
--- a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/sai.profile
@@ -1,2 +1,2 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/td2-a7050-qx32-32x40G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td2-a7050-qx32-32x40G.config.bcm
SAI_NUM_ECMP_MEMBERS=32
diff --git a/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
new file mode 100644
index 000000000000..701a8480dcb3
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/Arista-7050-QX32/td2-a7050-qx32-32x40G.config.bcm
@@ -0,0 +1,873 @@
+#/******************************************************************************
+# *
+# * File: config.bcm.cloverdales (7050-QX32)
+# * Name:
+# *
+# * Description: This file contains SDK properties for an Arista
+# * Cloverdales platform.
+# *
+# *-----------------------------------------------------------------------------
+# ******************************************************************************/
+####################################################################
+# BCM Config file for Cloverdale platform
+# - 32x40g Portmode
+
+# Old LPM only configuration
+# l2_mem_entries=163840
+# l3_mem_entries=90112
+# l3_alpm_enable=0
+# ipv6_lpm_128b_enable=0
+#
+# ALPM enable
+l3_alpm_enable=2
+ipv6_lpm_128b_enable=1
+l2_mem_entries=32768
+l3_mem_entries=16384
+
+# From old config file
+os=unix
+higig2_hdr_mode=1
+
+# Parity
+parity_correction=1
+parity_enable=1
+stat_if_parity_enable=0
+
+# l2 thread related config vars
+l2xmsg_hostbuf_size=8192
+l2xmsg_mode=1
+
+bcm_num_cos=8
+bcm_stat_interval=2000000
+lls_num_l2uc=12
+max_vp_lags=0
+miim_intr_enable=0
+mmu_lossless=0
+module_64ports=0
+scache_filename=/tmp/scache
+schan_intr_enable=0
+stable_size=0x2000000
+tdma_timeout_usec=5000000
+
+# for GLC transceiver
+phy_an_c73=0x0
+phy_an_c37=0x3
+
+###########################
+#port_init_speed_xe=40000
+#port_init_speed_xe.0=40000
+
+#load_firmware=0x0102
+load_firmware.0=2
+
+#########################
+# All ports are in oversubscription mode
+pbmp_oversubscribe=0x1fffffffffffffffffffffffffe
+pbmp_xport_xe.0=0x1fffffffe
+
+phy_84328_1.0=1
+phy_84328_2.0=1
+phy_84328_29.0=1
+phy_84328_3.0=1
+phy_84328_30.0=1
+phy_84328_31.0=1
+phy_84328_32.0=1
+phy_84328_4.0=1
+phy_an_c37_1.0=3
+phy_an_c37_10.0=3
+phy_an_c37_11.0=3
+phy_an_c37_12.0=3
+phy_an_c37_13.0=3
+phy_an_c37_14.0=3
+phy_an_c37_15.0=3
+phy_an_c37_16.0=3
+phy_an_c37_17.0=3
+phy_an_c37_18.0=3
+phy_an_c37_19.0=3
+phy_an_c37_2.0=3
+phy_an_c37_20.0=3
+phy_an_c37_21.0=3
+phy_an_c37_22.0=3
+phy_an_c37_23.0=3
+phy_an_c37_24.0=3
+phy_an_c37_25.0=3
+phy_an_c37_26.0=3
+phy_an_c37_27.0=3
+phy_an_c37_28.0=3
+phy_an_c37_29.0=3
+phy_an_c37_3.0=3
+phy_an_c37_30.0=3
+phy_an_c37_31.0=3
+phy_an_c37_32.0=3
+phy_an_c37_4.0=3
+phy_an_c37_5.0=3
+phy_an_c37_6.0=3
+phy_an_c37_7.0=3
+phy_an_c37_8.0=3
+phy_an_c37_9.0=3
+phy_an_c73_1.0=1
+phy_an_c73_10.0=1
+phy_an_c73_11.0=1
+phy_an_c73_12.0=1
+phy_an_c73_13.0=1
+phy_an_c73_14.0=1
+phy_an_c73_15.0=1
+phy_an_c73_16.0=1
+phy_an_c73_17.0=1
+phy_an_c73_18.0=1
+phy_an_c73_19.0=1
+phy_an_c73_2.0=1
+phy_an_c73_20.0=1
+phy_an_c73_21.0=1
+phy_an_c73_22.0=1
+phy_an_c73_23.0=1
+phy_an_c73_24.0=1
+phy_an_c73_25.0=1
+phy_an_c73_26.0=1
+phy_an_c73_27.0=1
+phy_an_c73_28.0=1
+phy_an_c73_29.0=1
+phy_an_c73_3.0=1
+phy_an_c73_30.0=1
+phy_an_c73_31.0=1
+phy_an_c73_32.0=1
+phy_an_c73_4.0=1
+phy_an_c73_5.0=1
+phy_an_c73_6.0=1
+phy_an_c73_7.0=1
+phy_an_c73_8.0=1
+phy_an_c73_9.0=1
+phy_aux_voltage_enable_1.0=0x1
+phy_aux_voltage_enable_2.0=0x1
+phy_aux_voltage_enable_29.0=0x1
+phy_aux_voltage_enable_3.0=0x1
+phy_aux_voltage_enable_30.0=0x1
+phy_aux_voltage_enable_31.0=0x1
+phy_aux_voltage_enable_32.0=0x1
+phy_aux_voltage_enable_4.0=0x1
+phy_ext_rom_boot.0=0
+phy_ext_rom_boot_1.0=0x0
+phy_ext_rom_boot_2.0=0x0
+phy_ext_rom_boot_29.0=0x0
+phy_ext_rom_boot_3.0=0x0
+phy_ext_rom_boot_30.0=0x0
+phy_ext_rom_boot_31.0=0x0
+phy_ext_rom_boot_32.0=0x0
+phy_ext_rom_boot_4.0=0x0
+phy_line_tx_mode_1.0=1
+phy_line_tx_mode_2.0=1
+phy_line_tx_mode_29.0=1
+phy_line_tx_mode_3.0=1
+phy_line_tx_mode_30.0=1
+phy_line_tx_mode_31.0=1
+phy_line_tx_mode_32.0=1
+phy_line_tx_mode_4.0=1
+phy_rx_polarity_flip_1.0=0x0
+phy_rx_polarity_flip_2.0=0x0
+phy_rx_polarity_flip_29.0=0x0
+phy_rx_polarity_flip_3.0=0x0
+phy_rx_polarity_flip_30.0=0x0
+phy_rx_polarity_flip_31.0=0x0
+phy_rx_polarity_flip_32.0=0x0
+phy_rx_polarity_flip_4.0=0x0
+phy_system_tx_mode_1.0=0
+phy_system_tx_mode_2.0=0
+phy_system_tx_mode_29.0=0
+phy_system_tx_mode_3.0=0
+phy_system_tx_mode_30.0=0
+phy_system_tx_mode_31.0=0
+phy_system_tx_mode_32.0=0
+phy_system_tx_mode_4.0=0
+phy_tx_polarity_flip_1.0=0x0
+phy_tx_polarity_flip_2.0=0x0
+phy_tx_polarity_flip_29.0=0x0
+phy_tx_polarity_flip_3.0=0x0
+phy_tx_polarity_flip_30.0=0x0
+phy_tx_polarity_flip_31.0=0x0
+phy_tx_polarity_flip_32.0=0x0
+phy_tx_polarity_flip_4.0=0x0
+phy_xaui_rx_polarity_flip_1.0=0x0
+phy_xaui_rx_polarity_flip_10.0=0x0
+phy_xaui_rx_polarity_flip_11.0=0x0
+phy_xaui_rx_polarity_flip_12.0=0x0
+phy_xaui_rx_polarity_flip_13.0=0x0
+phy_xaui_rx_polarity_flip_14.0=0x0
+phy_xaui_rx_polarity_flip_15.0=0x0
+phy_xaui_rx_polarity_flip_16.0=0x0
+phy_xaui_rx_polarity_flip_17.0=0x0
+phy_xaui_rx_polarity_flip_18.0=0x0
+phy_xaui_rx_polarity_flip_19.0=0x0
+phy_xaui_rx_polarity_flip_2.0=0x0
+phy_xaui_rx_polarity_flip_20.0=0x0
+phy_xaui_rx_polarity_flip_21.0=0x0
+phy_xaui_rx_polarity_flip_22.0=0x0
+phy_xaui_rx_polarity_flip_23.0=0x0
+phy_xaui_rx_polarity_flip_24.0=0x0
+phy_xaui_rx_polarity_flip_25.0=0x0
+phy_xaui_rx_polarity_flip_26.0=0x0
+phy_xaui_rx_polarity_flip_27.0=0x0
+phy_xaui_rx_polarity_flip_28.0=0x0
+phy_xaui_rx_polarity_flip_29.0=0x0
+phy_xaui_rx_polarity_flip_3.0=0x0
+phy_xaui_rx_polarity_flip_30.0=0x0
+phy_xaui_rx_polarity_flip_31.0=0x0
+phy_xaui_rx_polarity_flip_32.0=0x0
+phy_xaui_rx_polarity_flip_4.0=0x0
+phy_xaui_rx_polarity_flip_5.0=0x0
+phy_xaui_rx_polarity_flip_6.0=0x0
+phy_xaui_rx_polarity_flip_7.0=0x0
+phy_xaui_rx_polarity_flip_8.0=0x0
+phy_xaui_rx_polarity_flip_9.0=0x0
+phy_xaui_tx_polarity_flip_1.0=0x0
+phy_xaui_tx_polarity_flip_10.0=0x0
+phy_xaui_tx_polarity_flip_11.0=0x0
+phy_xaui_tx_polarity_flip_12.0=0x0
+phy_xaui_tx_polarity_flip_13.0=0x0
+phy_xaui_tx_polarity_flip_14.0=0x0
+phy_xaui_tx_polarity_flip_15.0=0x0
+phy_xaui_tx_polarity_flip_16.0=0x0
+phy_xaui_tx_polarity_flip_17.0=0x0
+phy_xaui_tx_polarity_flip_18.0=0x0
+phy_xaui_tx_polarity_flip_19.0=0x0
+phy_xaui_tx_polarity_flip_2.0=0x0
+phy_xaui_tx_polarity_flip_20.0=0x0
+phy_xaui_tx_polarity_flip_21.0=0x0
+phy_xaui_tx_polarity_flip_22.0=0x0
+phy_xaui_tx_polarity_flip_23.0=0x0
+phy_xaui_tx_polarity_flip_24.0=0x0
+phy_xaui_tx_polarity_flip_25.0=0x0
+phy_xaui_tx_polarity_flip_26.0=0x0
+phy_xaui_tx_polarity_flip_27.0=0x0
+phy_xaui_tx_polarity_flip_28.0=0x0
+phy_xaui_tx_polarity_flip_29.0=0x0
+phy_xaui_tx_polarity_flip_3.0=0x0
+phy_xaui_tx_polarity_flip_30.0=0x0
+phy_xaui_tx_polarity_flip_31.0=0x0
+phy_xaui_tx_polarity_flip_32.0=0x0
+phy_xaui_tx_polarity_flip_4.0=0x0
+phy_xaui_tx_polarity_flip_5.0=0x0
+phy_xaui_tx_polarity_flip_6.0=0x0
+phy_xaui_tx_polarity_flip_7.0=0x0
+phy_xaui_tx_polarity_flip_8.0=0x0
+phy_xaui_tx_polarity_flip_9.0=0x0
+port_init_autoneg_10.0=0
+port_init_autoneg_11.0=0
+port_init_autoneg_12.0=0
+port_init_autoneg_13.0=0
+port_init_autoneg_14.0=0
+port_init_autoneg_15.0=0
+port_init_autoneg_16.0=0
+port_init_autoneg_17.0=0
+port_init_autoneg_18.0=0
+port_init_autoneg_19.0=0
+port_init_autoneg_20.0=0
+port_init_autoneg_21.0=0
+port_init_autoneg_22.0=0
+port_init_autoneg_23.0=0
+port_init_autoneg_24.0=0
+port_init_autoneg_25.0=0
+port_init_autoneg_26.0=0
+port_init_autoneg_27.0=0
+port_init_autoneg_28.0=0
+port_init_autoneg_5.0=0
+port_init_autoneg_6.0=0
+port_init_autoneg_7.0=0
+port_init_autoneg_8.0=0
+port_init_autoneg_9.0=0
+port_init_cl72_hg.0=0x11
+port_phy_addr_1.0=0x4
+port_phy_addr_10.0=0x7f
+port_phy_addr_11.0=0x7f
+port_phy_addr_12.0=0x7f
+port_phy_addr_13.0=0x7f
+port_phy_addr_14.0=0x7f
+port_phy_addr_15.0=0x7f
+port_phy_addr_16.0=0x7f
+port_phy_addr_17.0=0x7f
+port_phy_addr_18.0=0x7f
+port_phy_addr_19.0=0x7f
+port_phy_addr_2.0=0x0
+port_phy_addr_20.0=0x7f
+port_phy_addr_21.0=0x7f
+port_phy_addr_22.0=0x7f
+port_phy_addr_23.0=0x7f
+port_phy_addr_24.0=0x7f
+port_phy_addr_25.0=0x7f
+port_phy_addr_26.0=0x7f
+port_phy_addr_27.0=0x7f
+port_phy_addr_28.0=0x7f
+port_phy_addr_29.0=0x54
+port_phy_addr_3.0=0x2c
+port_phy_addr_30.0=0x50
+port_phy_addr_31.0=0x7c
+port_phy_addr_32.0=0x78
+port_phy_addr_4.0=0x28
+port_phy_addr_5.0=0x7f
+port_phy_addr_6.0=0x7f
+port_phy_addr_7.0=0x7f
+port_phy_addr_8.0=0x7f
+port_phy_addr_9.0=0x7f
+port_phy_clause_1.0=0x2d
+port_phy_clause_2.0=0x2d
+port_phy_clause_29.0=0x2d
+port_phy_clause_3.0=0x2d
+port_phy_clause_30.0=0x2d
+port_phy_clause_31.0=0x2d
+port_phy_clause_32.0=0x2d
+port_phy_clause_4.0=0x2d
+port_phy_id0_1.0=0x600d
+port_phy_id0_2.0=0x600d
+port_phy_id0_29.0=0x600d
+port_phy_id0_3.0=0x600d
+port_phy_id0_30.0=0x600d
+port_phy_id0_31.0=0x600d
+port_phy_id0_32.0=0x600d
+port_phy_id0_4.0=0x600d
+port_phy_id1_1.0=0x8500
+port_phy_id1_2.0=0x8500
+port_phy_id1_29.0=0x8500
+port_phy_id1_3.0=0x8500
+port_phy_id1_30.0=0x8500
+port_phy_id1_31.0=0x8500
+port_phy_id1_32.0=0x8500
+port_phy_id1_4.0=0x8500
+portmap_1.0=125:40
+portmap_10.0=33:40
+portmap_11.0=45:40
+portmap_12.0=41:40
+portmap_13.0=53:40
+portmap_14.0=49:40
+portmap_15.0=69:40
+portmap_16.0=65:40
+portmap_17.0=77:40
+portmap_18.0=73:40
+portmap_19.0=93:40
+portmap_2.0=121:40
+portmap_20.0=89:40
+portmap_21.0=101:40
+portmap_22.0=97:40
+portmap_23.0=109:40
+portmap_24.0=105:40
+portmap_25.0=61:40
+portmap_26.0=57:40
+portmap_27.0=81:40
+portmap_28.0=85:40
+portmap_29.0=117:40
+portmap_3.0=13:40
+portmap_30.0=113:40
+portmap_31.0=5:40
+portmap_32.0=1:40
+portmap_4.0=9:40
+portmap_5.0=17:40
+portmap_6.0=21:40
+portmap_7.0=25:40
+portmap_8.0=29:40
+portmap_9.0=37:40
+serdes_firmware_mode_1.0=1
+serdes_firmware_mode_10.0=2
+serdes_firmware_mode_11.0=2
+serdes_firmware_mode_12.0=2
+serdes_firmware_mode_13.0=2
+serdes_firmware_mode_14.0=2
+serdes_firmware_mode_15.0=2
+serdes_firmware_mode_16.0=2
+serdes_firmware_mode_17.0=2
+serdes_firmware_mode_18.0=2
+serdes_firmware_mode_19.0=2
+serdes_firmware_mode_2.0=1
+serdes_firmware_mode_20.0=2
+serdes_firmware_mode_21.0=2
+serdes_firmware_mode_22.0=2
+serdes_firmware_mode_23.0=2
+serdes_firmware_mode_24.0=2
+serdes_firmware_mode_25.0=2
+serdes_firmware_mode_26.0=2
+serdes_firmware_mode_27.0=2
+serdes_firmware_mode_28.0=2
+serdes_firmware_mode_29.0=1
+serdes_firmware_mode_3.0=1
+serdes_firmware_mode_30.0=1
+serdes_firmware_mode_31.0=1
+serdes_firmware_mode_32.0=1
+serdes_firmware_mode_4.0=1
+serdes_firmware_mode_5.0=2
+serdes_firmware_mode_6.0=2
+serdes_firmware_mode_7.0=2
+serdes_firmware_mode_8.0=2
+serdes_firmware_mode_9.0=2
+xgxs_lcpll_xtal_refclk.0=1
+xgxs_rx_lane_map_1.0=0x0123
+xgxs_rx_lane_map_10.0=0x3120
+xgxs_rx_lane_map_11.0=0x3120
+xgxs_rx_lane_map_12.0=0x3120
+xgxs_rx_lane_map_13.0=0x3120
+xgxs_rx_lane_map_14.0=0x3120
+xgxs_rx_lane_map_15.0=0x3120
+xgxs_rx_lane_map_16.0=0x3120
+xgxs_rx_lane_map_17.0=0x3120
+xgxs_rx_lane_map_18.0=0x3120
+xgxs_rx_lane_map_19.0=0x3120
+xgxs_rx_lane_map_2.0=0x0123
+xgxs_rx_lane_map_20.0=0x3120
+xgxs_rx_lane_map_21.0=0x3120
+xgxs_rx_lane_map_22.0=0x3120
+xgxs_rx_lane_map_23.0=0x3120
+xgxs_rx_lane_map_24.0=0x3120
+xgxs_rx_lane_map_25.0=0x2031
+xgxs_rx_lane_map_26.0=0x2031
+xgxs_rx_lane_map_27.0=0x0213
+xgxs_rx_lane_map_28.0=0x0213
+xgxs_rx_lane_map_29.0=0x0123
+xgxs_rx_lane_map_3.0=0x0123
+xgxs_rx_lane_map_30.0=0x0123
+xgxs_rx_lane_map_31.0=0x0123
+xgxs_rx_lane_map_32.0=0x0123
+xgxs_rx_lane_map_4.0=0x0123
+xgxs_rx_lane_map_5.0=0x2031
+xgxs_rx_lane_map_6.0=0x2031
+xgxs_rx_lane_map_7.0=0x2031
+xgxs_rx_lane_map_8.0=0x2031
+xgxs_rx_lane_map_9.0=0x3120
+xgxs_tx_lane_map_1.0=0x0123
+xgxs_tx_lane_map_10.0=0x3120
+xgxs_tx_lane_map_11.0=0x3120
+xgxs_tx_lane_map_12.0=0x3120
+xgxs_tx_lane_map_13.0=0x3120
+xgxs_tx_lane_map_14.0=0x3120
+xgxs_tx_lane_map_15.0=0x3120
+xgxs_tx_lane_map_16.0=0x3120
+xgxs_tx_lane_map_17.0=0x3120
+xgxs_tx_lane_map_18.0=0x3120
+xgxs_tx_lane_map_19.0=0x3120
+xgxs_tx_lane_map_2.0=0x0123
+xgxs_tx_lane_map_20.0=0x3120
+xgxs_tx_lane_map_21.0=0x3120
+xgxs_tx_lane_map_22.0=0x3120
+xgxs_tx_lane_map_23.0=0x3120
+xgxs_tx_lane_map_24.0=0x3120
+xgxs_tx_lane_map_25.0=0x2031
+xgxs_tx_lane_map_26.0=0x2031
+xgxs_tx_lane_map_27.0=0x0213
+xgxs_tx_lane_map_28.0=0x0213
+xgxs_tx_lane_map_29.0=0x0123
+xgxs_tx_lane_map_3.0=0x0123
+xgxs_tx_lane_map_30.0=0x0123
+xgxs_tx_lane_map_31.0=0x0123
+xgxs_tx_lane_map_32.0=0x0123
+xgxs_tx_lane_map_4.0=0x0123
+xgxs_tx_lane_map_5.0=0x1302
+xgxs_tx_lane_map_6.0=0x1302
+xgxs_tx_lane_map_7.0=0x1302
+xgxs_tx_lane_map_8.0=0x1302
+xgxs_tx_lane_map_9.0=0x3120
+
+##########################################
+#skip_L2_USER_ENTRY=0
+phy_aux_voltage_enable=1
+###############################
+serdes_fiber_pref=1
+###############################
+mdio_output_delay.0=0x0d
+###############################
+serdes_sgmii_m=0
+xgxs_lcpll_xtal_refclk=1
+xgxs_lcpll_xtal_refclk.1=1
+xgxs_lcpll_xtal_refclk.2=1
+xgxs_lcpll_xtal_refclk.3=1
+tdma_intr_enable=1
+tslam_intr_enable=1
+tslam_dma_enable.2=1
+tslam_dma_enable.3=1
+#dport_map_port=0
+#dport_map_enable=0
+#dport_map_indexed=0
+#bcm_xlate_port_enable.0=0
+#xgxs_pdetect_1=0
+table_dma_enable.0=1
+table_dma_enable.1=1
+table_dma_enable.2=1
+table_dma_enable.3=1
+serdes_driver_current_lane0_1=2
+serdes_pre_driver_current_lane0_1=2
+serdes_preemphasis_lane0_1=0x8fc0
+serdes_driver_current_lane1_1=2
+serdes_pre_driver_current_lane1_1=2
+serdes_preemphasis_lane1_1=0x8fc0
+serdes_driver_current_lane2_1=2
+serdes_pre_driver_current_lane2_1=2
+serdes_preemphasis_lane2_1=0x8fc0
+serdes_driver_current_lane3_1=2
+serdes_pre_driver_current_lane3_1=2
+serdes_preemphasis_lane3_1=0x8fc0
+serdes_driver_current_lane0_2=3
+serdes_pre_driver_current_lane0_2=2
+serdes_preemphasis_lane0_2=0x8fc0
+serdes_driver_current_lane1_2=3
+serdes_pre_driver_current_lane1_2=2
+serdes_preemphasis_lane1_2=0x8fc0
+serdes_driver_current_lane2_2=3
+serdes_pre_driver_current_lane2_2=2
+serdes_preemphasis_lane2_2=0x8fc0
+serdes_driver_current_lane3_2=3
+serdes_pre_driver_current_lane3_2=2
+serdes_preemphasis_lane3_2=0x8fc0
+serdes_driver_current_lane0_3=2
+serdes_pre_driver_current_lane0_3=2
+serdes_preemphasis_lane0_3=0x8fc0
+serdes_driver_current_lane1_3=2
+serdes_pre_driver_current_lane1_3=2
+serdes_preemphasis_lane1_3=0x8fc0
+serdes_driver_current_lane2_3=2
+serdes_pre_driver_current_lane2_3=2
+serdes_preemphasis_lane2_3=0x8fc0
+serdes_driver_current_lane3_3=2
+serdes_pre_driver_current_lane3_3=2
+serdes_preemphasis_lane3_3=0x8fc0
+serdes_driver_current_lane0_4=2
+serdes_pre_driver_current_lane0_4=2
+serdes_preemphasis_lane0_4=0x8fc0
+serdes_driver_current_lane1_4=2
+serdes_pre_driver_current_lane1_4=2
+serdes_preemphasis_lane1_4=0x8fc0
+serdes_driver_current_lane2_4=2
+serdes_pre_driver_current_lane2_4=2
+serdes_preemphasis_lane2_4=0x8fc0
+serdes_driver_current_lane3_4=2
+serdes_pre_driver_current_lane3_4=2
+serdes_preemphasis_lane3_4=0x8fc0
+serdes_driver_current_lane0_5=4
+serdes_pre_driver_current_lane0_5=4
+serdes_preemphasis_lane0_5=0xbf00
+serdes_driver_current_lane1_5=4
+serdes_pre_driver_current_lane1_5=4
+serdes_preemphasis_lane1_5=0xbf00
+serdes_driver_current_lane2_5=4
+serdes_pre_driver_current_lane2_5=4
+serdes_preemphasis_lane2_5=0xbf00
+serdes_driver_current_lane3_5=4
+serdes_pre_driver_current_lane3_5=4
+serdes_preemphasis_lane3_5=0xbf00
+serdes_driver_current_lane0_6=4
+serdes_pre_driver_current_lane0_6=4
+serdes_preemphasis_lane0_6=0xbb10
+serdes_driver_current_lane1_6=4
+serdes_pre_driver_current_lane1_6=4
+serdes_preemphasis_lane1_6=0xbb10
+serdes_driver_current_lane2_6=4
+serdes_pre_driver_current_lane2_6=4
+serdes_preemphasis_lane2_6=0xbb10
+serdes_driver_current_lane3_6=4
+serdes_pre_driver_current_lane3_6=4
+serdes_preemphasis_lane3_6=0xbb10
+serdes_driver_current_lane0_7=3
+serdes_pre_driver_current_lane0_7=3
+serdes_preemphasis_lane0_7=0xcad0
+serdes_driver_current_lane1_7=3
+serdes_pre_driver_current_lane1_7=3
+serdes_preemphasis_lane1_7=0xcad0
+serdes_driver_current_lane2_7=3
+serdes_pre_driver_current_lane2_7=3
+serdes_preemphasis_lane2_7=0xcad0
+serdes_driver_current_lane3_7=3
+serdes_pre_driver_current_lane3_7=3
+serdes_preemphasis_lane3_7=0xcad0
+serdes_driver_current_lane0_8=3
+serdes_pre_driver_current_lane0_8=3
+serdes_preemphasis_lane0_8=0xcad0
+serdes_driver_current_lane1_8=3
+serdes_pre_driver_current_lane1_8=3
+serdes_preemphasis_lane1_8=0xcad0
+serdes_driver_current_lane2_8=3
+serdes_pre_driver_current_lane2_8=3
+serdes_preemphasis_lane2_8=0xcad0
+serdes_driver_current_lane3_8=3
+serdes_pre_driver_current_lane3_8=3
+serdes_preemphasis_lane3_8=0xcad0
+serdes_driver_current_lane0_9=3
+serdes_pre_driver_current_lane0_9=3
+serdes_preemphasis_lane0_9=0xc2f0
+serdes_driver_current_lane1_9=3
+serdes_pre_driver_current_lane1_9=3
+serdes_preemphasis_lane1_9=0xc2f0
+serdes_driver_current_lane2_9=3
+serdes_pre_driver_current_lane2_9=3
+serdes_preemphasis_lane2_9=0xc2f0
+serdes_driver_current_lane3_9=3
+serdes_pre_driver_current_lane3_9=3
+serdes_preemphasis_lane3_9=0xc2f0
+serdes_driver_current_lane0_10=3
+serdes_pre_driver_current_lane0_10=3
+serdes_preemphasis_lane0_10=0xc6e0
+serdes_driver_current_lane1_10=3
+serdes_pre_driver_current_lane1_10=3
+serdes_preemphasis_lane1_10=0xc6e0
+serdes_driver_current_lane2_10=3
+serdes_pre_driver_current_lane2_10=3
+serdes_preemphasis_lane2_10=0xc6e0
+serdes_driver_current_lane3_10=3
+serdes_pre_driver_current_lane3_10=3
+serdes_preemphasis_lane3_10=0xc6e0
+serdes_driver_current_lane0_11=3
+serdes_pre_driver_current_lane0_11=3
+serdes_preemphasis_lane0_11=0xc2f0
+serdes_driver_current_lane1_11=3
+serdes_pre_driver_current_lane1_11=3
+serdes_preemphasis_lane1_11=0xc2f0
+serdes_driver_current_lane2_11=3
+serdes_pre_driver_current_lane2_11=3
+serdes_preemphasis_lane2_11=0xc2f0
+serdes_driver_current_lane3_11=3
+serdes_pre_driver_current_lane3_11=3
+serdes_preemphasis_lane3_11=0xc2f0
+serdes_driver_current_lane0_12=3
+serdes_pre_driver_current_lane0_12=3
+serdes_preemphasis_lane0_12=0xc2f0
+serdes_driver_current_lane1_12=3
+serdes_pre_driver_current_lane1_12=3
+serdes_preemphasis_lane1_12=0xc2f0
+serdes_driver_current_lane2_12=3
+serdes_pre_driver_current_lane2_12=3
+serdes_preemphasis_lane2_12=0xc2f0
+serdes_driver_current_lane3_12=3
+serdes_pre_driver_current_lane3_12=3
+serdes_preemphasis_lane3_12=0xc2f0
+serdes_driver_current_lane0_13=3
+serdes_pre_driver_current_lane0_13=3
+serdes_preemphasis_lane0_13=0xc2f0
+serdes_driver_current_lane1_13=3
+serdes_pre_driver_current_lane1_13=3
+serdes_preemphasis_lane1_13=0xc2f0
+serdes_driver_current_lane2_13=3
+serdes_pre_driver_current_lane2_13=3
+serdes_preemphasis_lane2_13=0xc2f0
+serdes_driver_current_lane3_13=3
+serdes_pre_driver_current_lane3_13=3
+serdes_preemphasis_lane3_13=0xc2f0
+serdes_driver_current_lane0_14=3
+serdes_pre_driver_current_lane0_14=3
+serdes_preemphasis_lane0_14=0xc2f0
+serdes_driver_current_lane1_14=3
+serdes_pre_driver_current_lane1_14=3
+serdes_preemphasis_lane1_14=0xc2f0
+serdes_driver_current_lane2_14=3
+serdes_pre_driver_current_lane2_14=3
+serdes_preemphasis_lane2_14=0xc2f0
+serdes_driver_current_lane3_14=3
+serdes_pre_driver_current_lane3_14=3
+serdes_preemphasis_lane3_14=0xc2f0
+serdes_driver_current_lane0_15=3
+serdes_pre_driver_current_lane0_15=3
+serdes_preemphasis_lane0_15=0xc2f0
+serdes_driver_current_lane1_15=3
+serdes_pre_driver_current_lane1_15=3
+serdes_preemphasis_lane1_15=0xc2f0
+serdes_driver_current_lane2_15=3
+serdes_pre_driver_current_lane2_15=3
+serdes_preemphasis_lane2_15=0xc2f0
+serdes_driver_current_lane3_15=3
+serdes_pre_driver_current_lane3_15=3
+serdes_preemphasis_lane3_15=0xc2f0
+serdes_driver_current_lane0_16=3
+serdes_pre_driver_current_lane0_16=3
+serdes_preemphasis_lane0_16=0xc2f0
+serdes_driver_current_lane1_16=3
+serdes_pre_driver_current_lane1_16=3
+serdes_preemphasis_lane1_16=0xc2f0
+serdes_driver_current_lane2_16=3
+serdes_pre_driver_current_lane2_16=3
+serdes_preemphasis_lane2_16=0xc2f0
+serdes_driver_current_lane3_16=3
+serdes_pre_driver_current_lane3_16=3
+serdes_preemphasis_lane3_16=0xc2f0
+serdes_driver_current_lane0_17=3
+serdes_pre_driver_current_lane0_17=3
+serdes_preemphasis_lane0_17=0xc2f0
+serdes_driver_current_lane1_17=3
+serdes_pre_driver_current_lane1_17=3
+serdes_preemphasis_lane1_17=0xc2f0
+serdes_driver_current_lane2_17=3
+serdes_pre_driver_current_lane2_17=3
+serdes_preemphasis_lane2_17=0xc2f0
+serdes_driver_current_lane3_17=3
+serdes_pre_driver_current_lane3_17=3
+serdes_preemphasis_lane3_17=0xc2f0
+serdes_driver_current_lane0_18=3
+serdes_pre_driver_current_lane0_18=3
+serdes_preemphasis_lane0_18=0xc2f0
+serdes_driver_current_lane1_18=3
+serdes_pre_driver_current_lane1_18=3
+serdes_preemphasis_lane1_18=0xc2f0
+serdes_driver_current_lane2_18=3
+serdes_pre_driver_current_lane2_18=3
+serdes_preemphasis_lane2_18=0xc2f0
+serdes_driver_current_lane3_18=3
+serdes_pre_driver_current_lane3_18=3
+serdes_preemphasis_lane3_18=0xc2f0
+serdes_driver_current_lane0_19=3
+serdes_pre_driver_current_lane0_19=3
+serdes_preemphasis_lane0_19=0xc2f0
+serdes_driver_current_lane1_19=3
+serdes_pre_driver_current_lane1_19=3
+serdes_preemphasis_lane1_19=0xc2f0
+serdes_driver_current_lane2_19=3
+serdes_pre_driver_current_lane2_19=3
+serdes_preemphasis_lane2_19=0xc2f0
+serdes_driver_current_lane3_19=3
+serdes_pre_driver_current_lane3_19=3
+serdes_preemphasis_lane3_19=0xc2f0
+serdes_driver_current_lane0_20=3
+serdes_pre_driver_current_lane0_20=3
+serdes_preemphasis_lane0_20=0xc2f0
+serdes_driver_current_lane1_20=3
+serdes_pre_driver_current_lane1_20=3
+serdes_preemphasis_lane1_20=0xc2f0
+serdes_driver_current_lane2_20=3
+serdes_pre_driver_current_lane2_20=3
+serdes_preemphasis_lane2_20=0xc2f0
+serdes_driver_current_lane3_20=3
+serdes_pre_driver_current_lane3_20=3
+serdes_preemphasis_lane3_20=0xc2f0
+serdes_driver_current_lane0_21=3
+serdes_pre_driver_current_lane0_21=3
+serdes_preemphasis_lane0_21=0xc6e0
+serdes_driver_current_lane1_21=3
+serdes_pre_driver_current_lane1_21=3
+serdes_preemphasis_lane1_21=0xc6e0
+serdes_driver_current_lane2_21=3
+serdes_pre_driver_current_lane2_21=3
+serdes_preemphasis_lane2_21=0xc6e0
+serdes_driver_current_lane3_21=3
+serdes_pre_driver_current_lane3_21=3
+serdes_preemphasis_lane3_21=0xc6e0
+serdes_driver_current_lane0_22=3
+serdes_pre_driver_current_lane0_22=3
+serdes_preemphasis_lane0_22=0xc6e0
+serdes_driver_current_lane1_22=3
+serdes_pre_driver_current_lane1_22=3
+serdes_preemphasis_lane1_22=0xc6e0
+serdes_driver_current_lane2_22=3
+serdes_pre_driver_current_lane2_22=3
+serdes_preemphasis_lane2_22=0xc6e0
+serdes_driver_current_lane3_22=3
+serdes_pre_driver_current_lane3_22=3
+serdes_preemphasis_lane3_22=0xc6e0
+serdes_driver_current_lane0_23=3
+serdes_pre_driver_current_lane0_23=3
+serdes_preemphasis_lane0_23=0xcad0
+serdes_driver_current_lane1_23=3
+serdes_pre_driver_current_lane1_23=3
+serdes_preemphasis_lane1_23=0xcad0
+serdes_driver_current_lane2_23=3
+serdes_pre_driver_current_lane2_23=3
+serdes_preemphasis_lane2_23=0xcad0
+serdes_driver_current_lane3_23=3
+serdes_pre_driver_current_lane3_23=3
+serdes_preemphasis_lane3_23=0xcad0
+serdes_driver_current_lane0_24=3
+serdes_pre_driver_current_lane0_24=3
+serdes_preemphasis_lane0_24=0xcad0
+serdes_driver_current_lane1_24=3
+serdes_pre_driver_current_lane1_24=3
+serdes_preemphasis_lane1_24=0xcad0
+serdes_driver_current_lane2_24=3
+serdes_pre_driver_current_lane2_24=3
+serdes_preemphasis_lane2_24=0xcad0
+serdes_driver_current_lane3_24=3
+serdes_pre_driver_current_lane3_24=3
+serdes_preemphasis_lane3_24=0xcad0
+serdes_driver_current_lane0_25=5
+serdes_pre_driver_current_lane0_25=5
+serdes_preemphasis_lane0_25=0xc2f0
+serdes_driver_current_lane1_25=5
+serdes_pre_driver_current_lane1_25=5
+serdes_preemphasis_lane1_25=0xc2f0
+serdes_driver_current_lane2_25=5
+serdes_pre_driver_current_lane2_25=5
+serdes_preemphasis_lane2_25=0xc2f0
+serdes_driver_current_lane3_25=5
+serdes_pre_driver_current_lane3_25=5
+serdes_preemphasis_lane3_25=0xc2f0
+serdes_driver_current_lane0_26=5
+serdes_pre_driver_current_lane0_26=5
+serdes_preemphasis_lane0_26=0xc2f0
+serdes_driver_current_lane1_26=5
+serdes_pre_driver_current_lane1_26=5
+serdes_preemphasis_lane1_26=0xc2f0
+serdes_driver_current_lane2_26=5
+serdes_pre_driver_current_lane2_26=5
+serdes_preemphasis_lane2_26=0xc2f0
+serdes_driver_current_lane3_26=5
+serdes_pre_driver_current_lane3_26=5
+serdes_preemphasis_lane3_26=0xc2f0
+serdes_driver_current_lane0_27=5
+serdes_pre_driver_current_lane0_27=5
+serdes_preemphasis_lane0_27=0xc2f0
+serdes_driver_current_lane1_27=5
+serdes_pre_driver_current_lane1_27=5
+serdes_preemphasis_lane1_27=0xc2f0
+serdes_driver_current_lane2_27=5
+serdes_pre_driver_current_lane2_27=5
+serdes_preemphasis_lane2_27=0xc2f0
+serdes_driver_current_lane3_27=5
+serdes_pre_driver_current_lane3_27=5
+serdes_preemphasis_lane3_27=0xc2f0
+serdes_driver_current_lane0_28=8
+serdes_pre_driver_current_lane0_28=6
+serdes_preemphasis_lane0_28=0xc2f0
+serdes_driver_current_lane1_28=8
+serdes_pre_driver_current_lane1_28=6
+serdes_preemphasis_lane1_28=0xc2f0
+serdes_driver_current_lane2_28=8
+serdes_pre_driver_current_lane2_28=6
+serdes_preemphasis_lane2_28=0xc2f0
+serdes_driver_current_lane3_28=8
+serdes_pre_driver_current_lane3_28=6
+serdes_preemphasis_lane3_28=0xc2f0
+serdes_driver_current_lane0_29=2
+serdes_pre_driver_current_lane0_29=2
+serdes_preemphasis_lane0_29=0x8fc0
+serdes_driver_current_lane1_29=2
+serdes_pre_driver_current_lane1_29=2
+serdes_preemphasis_lane1_29=0x8fc0
+serdes_driver_current_lane2_29=2
+serdes_pre_driver_current_lane2_29=2
+serdes_preemphasis_lane2_29=0x8fc0
+serdes_driver_current_lane3_29=2
+serdes_pre_driver_current_lane3_29=2
+serdes_preemphasis_lane3_29=0x8fc0
+serdes_driver_current_lane0_30=2
+serdes_pre_driver_current_lane0_30=2
+serdes_preemphasis_lane0_30=0x8fc0
+serdes_driver_current_lane1_30=2
+serdes_pre_driver_current_lane1_30=2
+serdes_preemphasis_lane1_30=0x8fc0
+serdes_driver_current_lane2_30=2
+serdes_pre_driver_current_lane2_30=2
+serdes_preemphasis_lane2_30=0x8fc0
+serdes_driver_current_lane3_30=2
+serdes_pre_driver_current_lane3_30=2
+serdes_preemphasis_lane3_30=0x8fc0
+serdes_driver_current_lane0_31=2
+serdes_pre_driver_current_lane0_31=2
+serdes_preemphasis_lane0_31=0x8fc0
+serdes_driver_current_lane1_31=2
+serdes_pre_driver_current_lane1_31=2
+serdes_preemphasis_lane1_31=0x8fc0
+serdes_driver_current_lane2_31=2
+serdes_pre_driver_current_lane2_31=2
+serdes_preemphasis_lane2_31=0x8fc0
+serdes_driver_current_lane3_31=2
+serdes_pre_driver_current_lane3_31=2
+serdes_preemphasis_lane3_31=0x8fc0
+serdes_driver_current_lane0_32=2
+serdes_pre_driver_current_lane0_32=2
+serdes_preemphasis_lane0_32=0x8fc0
+serdes_driver_current_lane1_32=2
+serdes_pre_driver_current_lane1_32=2
+serdes_preemphasis_lane1_32=0x8fc0
+serdes_driver_current_lane2_32=2
+serdes_pre_driver_current_lane2_32=2
+serdes_preemphasis_lane2_32=0x8fc0
+serdes_driver_current_lane3_32=2
+serdes_pre_driver_current_lane3_32=2
+serdes_preemphasis_lane3_32=0x8fc0
diff --git a/device/arista/x86_64-arista_7050_qx32/platform_reboot b/device/arista/x86_64-arista_7050_qx32/platform_reboot
new file mode 100755
index 000000000000..da438b8fe52b
--- /dev/null
+++ b/device/arista/x86_64-arista_7050_qx32/platform_reboot
@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+# Copyright (c) 2018 Arista Networks, Inc. All rights reserved.
+# Arista Networks, Inc. Confidential and Proprietary.
+
+# Reboot script for 7050QX-32
+
+from __future__ import print_function
+import sys
+import mmap, os
+import subprocess
+from struct import pack, unpack
+
+class MmapResource( object ):
+ """Resource implementation for a directly-mapped memory region."""
+
+ def __init__( self, path ):
+ try:
+ fd = os.open( path, os.O_RDWR )
+ except EnvironmentError:
+ print( "FAIL can not open scd memory-map resource file" )
+ print( "FAIL are you running on the proper platform?" )
+ sys.exit( 1 )
+ try:
+ size = os.fstat( fd ).st_size
+ except EnvironmentError:
+ print( "FAIL can not fstat scd memory-map resource file" )
+ print( "FAIL are you running on the proper platform?" )
+ sys.exit( 1 )
+ try:
+ self.mmap_ = mmap.mmap( fd, size, mmap.MAP_SHARED,
+ mmap.PROT_READ | mmap.PROT_WRITE )
+ except EnvironmentError:
+ print( "FAIL can not map scd memory-map file" )
+ print( "FAIL are you running on the proper platform?" )
+ sys.exit( 1 )
+ finally:
+ try:
+ # Note that closing the file descriptor has no effect on the memory map
+ os.close( fd )
+ except EnvironmentError:
+ print( "FAIL failed to close scd memory-map file" )
+ sys.exit( 1 )
+
+ def read32( self, addr ):
+ return unpack( '
+ :param index: An integer, index of the PSU of which to query status
+ :return: Boolean, True if PSU is operating properly, False if PSU is\
+ faulty
+ """
+ status = 0
+ psu_status = self.read_psu_statuses(self.psu[index]['power'])
+ psu_status = int(psu_status, 10)
+ # Check for PSU status
+ if (psu_status == 1):
+ status = 1
+
+ return status
+
+ def get_psu_presence(self, index):
+ """
+ Retrieves the presence status of power supply unit (PSU) defined
+ by index
+ :param index: An integer, index of the PSU of which to query status
+ :return: Boolean, True if PSU is plugged, False if not
+ """
+ status = 0
+ psu_absence = self.read_psu_statuses(self.psu[index]['abs'])
+ psu_absence = (int(psu_absence, 10))
+ # Check for PSU presence
+ if (psu_absence == 0):
+ status = 1
+
+ return status
diff --git a/device/celestica/x86_64-cel_seastone-r0/sensors.conf b/device/celestica/x86_64-cel_seastone-r0/sensors.conf
index e25717ac589f..11461a0afef9 100644
--- a/device/celestica/x86_64-cel_seastone-r0/sensors.conf
+++ b/device/celestica/x86_64-cel_seastone-r0/sensors.conf
@@ -62,3 +62,17 @@ chip "dx010_lm75b-i2c-*-4e"
label temp1 "Rear-panel temp sensor 2"
set temp1_max 43
set temp1_max_hyst 28
+
+chip "emc2305-i2c-*-2e"
+ label fan2 "fan1"
+ label fan1 "fan2"
+ label fan4 "fan3"
+ label fan5 "fan4"
+ label fan3 "fan5"
+
+chip "emc2305-i2c-*-4d"
+ label fan2 "fan1"
+ label fan4 "fan2"
+ label fan5 "fan3"
+ label fan3 "fan4"
+ label fan1 "fan5"
diff --git a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2 b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
index 10f9da575a1b..551f73ca0477 100644
--- a/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
+++ b/device/dell/x86_64-dell_s6000_s1220-r0/Force10-S6000/buffers.json.j2
@@ -69,22 +69,17 @@
},
"BUFFER_POOL": {
"ingress_lossless_pool": {
- "size": "7274496",
- "type": "ingress",
- "mode": "dynamic"
- },
- "ingress_lossy_pool": {
- "size": "5491712",
+ "size": "12766208",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossless_pool": {
- "size": "7274496",
+ "size": "12766208",
"type": "egress",
"mode": "static"
},
"egress_lossy_pool": {
- "size": "5491712",
+ "size": "8072396",
"type": "egress",
"mode": "dynamic"
}
@@ -95,18 +90,18 @@
"xon":"18432",
"xoff":"40560",
"size":"41808",
- "dynamic_th":"-3",
+ "dynamic_th":"-4",
"xon_offset":"2496"
},
"ingress_lossy_profile": {
- "pool":"[BUFFER_POOL|ingress_lossy_pool]",
- "size":"1518",
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "size":"0",
"dynamic_th":"3"
},
"egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0",
- "static_th":"7274496"
+ "static_th":"12766208"
},
"egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]",
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json
index d63cbfb8c558..99642cf8cf4c 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/qos.json
@@ -154,13 +154,13 @@
"Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|0-1" : {
"wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
},
- "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63!3-4" : {
+ "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|3-4" : {
"scheduler" : "[SCHEDULER|scheduler.0]"
},
- "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63!0" : {
+ "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|0" : {
"scheduler" : "[SCHEDULER|scheduler.1]"
},
- "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63!1" : {
+ "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53,Ethernet54,Ethernet55,Ethernet56,Ethernet57,Ethernet58,Ethernet59,Ethernet60,Ethernet61,Ethernet62,Ethernet63|1" : {
"scheduler" : "[SCHEDULER|scheduler.2]"
}
}
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2
index 92cda77668f6..265d93a5aaca 100644
--- a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/sai.profile.j2
@@ -11,3 +11,13 @@
{%- endif %}
{# Write the contents of sai_ profile_filename to sai.profile file #}
{{ sai_profile_contents }}
+{# make linkscan interval time equal to 2.0 sec to make Fast-Reboot faster #}
+{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['fast_reboot'] is defined -%}
+{%- set fast_reboot = DEVICE_METADATA['localhost']['fast_reboot'] -%}
+{%- if fast_reboot %}
+{%- set sai_profile_contents = 'SAI_BCM_LINKSCAN_INTERVAL=2000000' -%}
+{%- else %}
+{%- set sai_profile_contents = '' -%}
+{%- endif %}
+{{ sai_profile_contents }}
+{%- endif %}
\ No newline at end of file
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/led_proc_init.soc b/device/dell/x86_64-dell_s6100_c2538-r0/led_proc_init.soc
new file mode 100644
index 000000000000..a4a44f15bcf1
--- /dev/null
+++ b/device/dell/x86_64-dell_s6100_c2538-r0/led_proc_init.soc
@@ -0,0 +1,13 @@
+# LED microprocessor initialization for Dell S6100
+
+led 0 stop
+led 0 prog 02 00 60 FE 2E FE 67 2C 86 FE 67 5B 67 5B 67 5B 86 FE 2E FE 67 2C 86 FE 86 FE 06 FE D2 40 71 04 12 FF 85 05 D2 05 71 2A 52 00 3A A0 32 08 97 71 33 77 5B 32 00 32 01 B7 97 75 42 12 BC FE FE 02 0A 50 12 BC FE FE 95 75 4C 85 77 54 16 FF DA 02 71 5B 77 54 22 0E 87 22 0E 87 57 22 0F 87 22 0F 87 57 22 0F 87 22 0E 87 57
+led 0 auto on
+led 0 start
+
+led 1 stop
+led 1 prog 02 00 60 FE 2E FE 67 2C 86 FE 67 5B 67 5B 67 5B 86 FE 2E FE 67 2C 86 FE 86 FE 06 FE D2 40 71 04 12 FF 85 05 D2 05 71 2A 52 00 3A A0 32 08 97 71 33 77 5B 32 00 32 01 B7 97 75 42 12 BC FE FE 02 0A 50 12 BC FE FE 95 75 4C 85 77 54 16 FF DA 02 71 5B 77 54 22 0E 87 22 0E 87 57 22 0F 87 22 0F 87 57 22 0F 87 22 0E 87 57
+led 1 auto on
+led 1 start
+
+led 2 stop
diff --git a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/buffers.json.j2 b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/buffers.json.j2
new file mode 100644
index 000000000000..ff2adc67e149
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/buffers.json.j2
@@ -0,0 +1,111 @@
+{# Default values which will be used if no actual configura available #}
+{% set default_cable = '40m' %}
+{% set default_speed = '100G' %}
+{% set default_ports_num = 32 -%}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
+{% set ports2cable = {
+ 'torrouter_server' : '5m',
+ 'leafrouter_torrouter' : '40m',
+ 'spinerouter_leafrouter' : '300m'
+ }
+%}
+
+{%- macro cable_length(port_name) -%}
+ {%- set cable_len = [] -%}
+ {%- for local_port in DEVICE_NEIGHBOR -%}
+ {%- if local_port == port_name -%}
+ {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+ {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+ {%- set neighbor_role = neighbor.type -%}
+ {%- set roles1 = switch_role + '_' + neighbor_role %}
+ {%- set roles2 = neighbor_role + '_' + switch_role -%}
+ {%- set roles1 = roles1 | lower -%}
+ {%- set roles2 = roles2 | lower -%}
+ {%- if roles1 in ports2cable -%}
+ {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
+ {%- elif roles2 in ports2cable -%}
+ {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- if cable_len -%}
+ {{ cable_len.0 }}
+ {%- else -%}
+ {{ default_cable }}
+ {%- endif -%}
+{% endmacro %}
+
+{%- if DEVICE_METADATA is defined %}
+{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
+{%- endif -%}
+
+{# Generate list of ports if not defined #}
+{% if PORT is not defined %}
+ {% set PORT = [] %}
+ {% for port_idx in range(0,default_ports_num) %}
+ {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
+ {% endfor %}
+{% endif -%}
+
+{% set port_names_list = [] %}
+{% for port in PORT %}
+ {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+ "CABLE_LENGTH": {
+ "AZURE": {
+ {% for port in PORT %}
+ {% set cable = cable_length(port) -%}
+ "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+ {% endfor %}
+ }
+ },
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "20971328",
+ "type": "ingress",
+ "mode": "static"
+ },
+ "ingress_lossy_pool": {
+ "size": "20971328",
+ "type": "ingress",
+ "mode": "static"
+ },
+ "egress_lossy_pool": {
+ "size": "20971328",
+ "type": "egress",
+ "mode": "static"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "xon":"78400",
+ "xoff":"132160",
+ "size":"3584",
+ "static_th":"82880"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"3584",
+ "dynamic_th":"-1"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"11200",
+ "dynamic_th":"-4"
+ }
+ },
+ "BUFFER_PG": {
+ },
+ "BUFFER_QUEUE": {
+ }
+}
+
\ No newline at end of file
diff --git a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/pg_profile_lookup.ini b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..d98b0eca6d19
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 3584 32256 59136 36736
+ 25000 5m 3584 41216 68096 45696
+ 40000 5m 3584 47488 74368 51968
+ 50000 5m 3584 52864 79744 57344
+ 100000 5m 3584 78400 132160 82880
+ 10000 40m 3584 32256 59136 36736
+ 25000 40m 3584 41216 68096 45696
+ 40000 40m 3584 47488 74368 51968
+ 50000 40m 3584 52864 79744 57344
+ 100000 40m 3584 78400 132160 82880
+ 10000 300m 3584 32256 65856 36736
+ 25000 300m 3584 41216 84672 45696
+ 40000 300m 3584 47488 101024 51968
+ 50000 300m 3584 52864 113120 57344
+ 100000 300m 3584 78400 198688 82880
\ No newline at end of file
diff --git a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2 b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2
new file mode 100644
index 000000000000..42eef17c362b
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/INGRASYS-S9130-32X/qos.json.j2
@@ -0,0 +1,136 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "1",
+ "1": "0",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "1",
+ "1": "0",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"1",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0" : {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1" : {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2" : {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PORT_QOS_MAP": {
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY" : {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "wred_red_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184128",
+ "green_min_threshold": "184128"
+ },
+ "AZURE_LOSSLESS" : {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "wred_red_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184128",
+ "green_min_threshold": "184128"
+ }
+ },
+ "QUEUE": {
+ }
+}
diff --git a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/minigraph.xml b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/minigraph.xml
index 6b29a7eb83b8..949ea6641b07 100644
--- a/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/minigraph.xml
+++ b/device/ingrasys/x86_64-ingrasys_s9130_32x-r0/minigraph.xml
@@ -1,55 +1,6 @@
-
-
- OCPSCH0104001MS
- 10.10.1.26
- OCPSCH01040GGLF
- 10.10.1.25
- 1
- 10
- 3
-
-
- OCPSCH0104002MS
- 10.10.2.26
- OCPSCH01040GGLF
- 10.10.2.25
- 1
- 10
- 3
-
-
-
-
- 64536
- OCPSCH01040GGLF
-
-
- 10.10.1.26
-
-
-
-
- 10.10.2.26
-
-
-
-
-
-
-
- 64542
- OCPSCH0104001MS
-
-
-
- 64543
- OCPSCH0104002MS
-
-
-
@@ -72,18 +23,7 @@
OCPSCH01040GGLF
-
-
-
- Ethernet0
- 10.10.1.25/30
-
-
-
- Ethernet4
- 10.10.2.25/30
-
-
+
@@ -91,24 +31,7 @@
-
-
- 40000
- DeviceInterfaceLink
- OCPSCH0104001MS
- Ethernet24
- OCPSCH01040GGLF
- Ethernet0
-
-
- 40000
- DeviceInterfaceLink
- OCPSCH0104002MS
- Ethernet24
- OCPSCH01040GGLF
- Ethernet4
-
-
+
OCPSCH01040GGLF
@@ -136,11 +59,6 @@
-
- ErspanDestinationIpv4
-
- 2.2.2.2
-
diff --git a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/buffers.json.j2 b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/buffers.json.j2
new file mode 100644
index 000000000000..1f1cbe9fa0bc
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/buffers.json.j2
@@ -0,0 +1,111 @@
+{# Default values which will be used if no actual configura available #}
+{% set default_cable = '40m' %}
+{% set default_speed = '100G' %}
+{% set default_ports_num = 64 -%}
+
+{# Port configuration to cable length look-up table #}
+{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
+{# Roles described in the minigraph #}
+{% set ports2cable = {
+ 'torrouter_server' : '5m',
+ 'leafrouter_torrouter' : '40m',
+ 'spinerouter_leafrouter' : '300m'
+ }
+%}
+
+{%- macro cable_length(port_name) -%}
+ {%- set cable_len = [] -%}
+ {%- for local_port in DEVICE_NEIGHBOR -%}
+ {%- if local_port == port_name -%}
+ {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+ {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
+ {%- set neighbor_role = neighbor.type -%}
+ {%- set roles1 = switch_role + '_' + neighbor_role %}
+ {%- set roles2 = neighbor_role + '_' + switch_role -%}
+ {%- set roles1 = roles1 | lower -%}
+ {%- set roles2 = roles2 | lower -%}
+ {%- if roles1 in ports2cable -%}
+ {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
+ {%- elif roles2 in ports2cable -%}
+ {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endif -%}
+ {%- endfor -%}
+ {%- if cable_len -%}
+ {{ cable_len.0 }}
+ {%- else -%}
+ {{ default_cable }}
+ {%- endif -%}
+{% endmacro %}
+
+{%- if DEVICE_METADATA is defined %}
+{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
+{%- endif -%}
+
+{# Generate list of ports if not defined #}
+{% if PORT is not defined %}
+ {% set PORT = [] %}
+ {% for port_idx in range(0,default_ports_num) %}
+ {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
+ {% endfor %}
+{% endif -%}
+
+{% set port_names_list = [] %}
+{% for port in PORT %}
+ {%- if port_names_list.append(port) %}{% endif %}
+{% endfor %}
+{% set port_names = port_names_list | join(',') -%}
+
+{
+ "CABLE_LENGTH": {
+ "AZURE": {
+ {% for port in PORT %}
+ {% set cable = cable_length(port) -%}
+ "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
+
+ {% endfor %}
+ }
+ },
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "20971328",
+ "type": "ingress",
+ "mode": "static"
+ },
+ "ingress_lossy_pool": {
+ "size": "20971328",
+ "type": "ingress",
+ "mode": "static"
+ },
+ "egress_lossy_pool": {
+ "size": "20971328",
+ "type": "egress",
+ "mode": "static"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "xon":"78400",
+ "xoff":"132160",
+ "size":"3584",
+ "static_th":"82880"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"3584",
+ "dynamic_th":"-1"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"11200",
+ "dynamic_th":"-4"
+ }
+ },
+ "BUFFER_PG": {
+ },
+ "BUFFER_QUEUE": {
+ }
+}
+
\ No newline at end of file
diff --git a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/pg_profile_lookup.ini b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/pg_profile_lookup.ini
new file mode 100644
index 000000000000..d98b0eca6d19
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 3584 32256 59136 36736
+ 25000 5m 3584 41216 68096 45696
+ 40000 5m 3584 47488 74368 51968
+ 50000 5m 3584 52864 79744 57344
+ 100000 5m 3584 78400 132160 82880
+ 10000 40m 3584 32256 59136 36736
+ 25000 40m 3584 41216 68096 45696
+ 40000 40m 3584 47488 74368 51968
+ 50000 40m 3584 52864 79744 57344
+ 100000 40m 3584 78400 132160 82880
+ 10000 300m 3584 32256 65856 36736
+ 25000 300m 3584 41216 84672 45696
+ 40000 300m 3584 47488 101024 51968
+ 50000 300m 3584 52864 113120 57344
+ 100000 300m 3584 78400 198688 82880
\ No newline at end of file
diff --git a/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2 b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2
new file mode 100644
index 000000000000..42eef17c362b
--- /dev/null
+++ b/device/ingrasys/x86_64-ingrasys_s9230_64x-r0/INGRASYS-S9230-64X/qos.json.j2
@@ -0,0 +1,136 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "1",
+ "1": "0",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "1",
+ "1": "0",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"1",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0" : {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1" : {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2" : {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PORT_QOS_MAP": {
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY" : {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "wred_red_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184128",
+ "green_min_threshold": "184128"
+ },
+ "AZURE_LOSSLESS" : {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "wred_red_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184128",
+ "green_min_threshold": "184128"
+ }
+ },
+ "QUEUE": {
+ }
+}
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers.json.j2 b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers.json.j2
new file mode 120000
index 000000000000..add8bf8bb7c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..7bcae62336f6
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..a437d613434d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/pg_profile_lookup.ini
new file mode 100644
index 000000000000..b66b129fe43f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 34816 18432 16384 0
+ 25000 5m 34816 18432 16384 0
+ 40000 5m 34816 18432 16384 0
+ 50000 5m 34816 18432 16384 0
+ 100000 5m 36864 18432 18432 0
+ 10000 40m 36864 18432 18432 0
+ 25000 40m 39936 18432 21504 0
+ 40000 40m 41984 18432 23552 0
+ 50000 40m 41984 18432 23552 0
+ 100000 40m 54272 18432 35840 0
+ 10000 300m 49152 18432 30720 0
+ 25000 300m 71680 18432 53248 0
+ 40000 300m 94208 18432 75776 0
+ 50000 300m 94208 18432 75776 0
+ 100000 300m 184320 18432 165888 0
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/port_config.ini b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/port_config.ini
new file mode 100644
index 000000000000..816bb0e94a70
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/port_config.ini
@@ -0,0 +1,33 @@
+# name lanes
+Ethernet0 0,1,2,3
+Ethernet4 4,5,6,7
+Ethernet8 8,9,10,11
+Ethernet12 12,13,14,15
+Ethernet16 16,17,18,19
+Ethernet20 20,21,22,23
+Ethernet24 24,25,26,27
+Ethernet28 28,29,30,31
+Ethernet32 32,33,34,35
+Ethernet36 36,37,38,39
+Ethernet40 40,41,42,43
+Ethernet44 44,45,46,47
+Ethernet48 48,49,50,51
+Ethernet52 52,53,54,55
+Ethernet56 56,57,58,59
+Ethernet60 60,61,62,63
+Ethernet64 64,65,66,67
+Ethernet68 68,69,70,71
+Ethernet72 72,73,74,75
+Ethernet76 76,77,78,79
+Ethernet80 80,81,82,83
+Ethernet84 84,85,86,87
+Ethernet88 88,89,90,91
+Ethernet92 92,93,94,95
+Ethernet96 96,97,98,99
+Ethernet100 100,101,102,103
+Ethernet104 104,105,106,107
+Ethernet108 108,109,110,111
+Ethernet112 112,113,114,115
+Ethernet116 116,117,118,119
+Ethernet120 120,121,122,123
+Ethernet124 124,125,126,127
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json
new file mode 100644
index 000000000000..3e01af3f2c64
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/qos.json
@@ -0,0 +1,166 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"0",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0": {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1": {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2": {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "PORT_QOS_MAP": {
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124": {
+ "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
+ "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+ "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+ "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_enable": "3,4"
+ }
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ },
+ "AZURE_LOSSLESS": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ }
+ },
+ "QUEUE": {
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0": {
+ "scheduler" : "[SCHEDULER|scheduler.1]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|1": {
+ "scheduler" : "[SCHEDULER|scheduler.2]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0-1": {
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|3-4": {
+ "scheduler" : "[SCHEDULER|scheduler.0]",
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
+ }
+ }
+}
+
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/sai.profile b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/sai.profile
new file mode 100644
index 000000000000..9a9a38aeb068
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/LS-SN2700/sai.profile
@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sai_2700.xml
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/hw-management b/device/mellanox/x86_64-mlnx_lssn2700-r0/hw-management
new file mode 120000
index 000000000000..eb5e941daad7
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/hw-management
@@ -0,0 +1 @@
+/etc/mlnx/msn2700
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/installer.conf b/device/mellanox/x86_64-mlnx_lssn2700-r0/installer.conf
new file mode 100644
index 000000000000..c9c9493a5404
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/installer.conf
@@ -0,0 +1 @@
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="acpi_enforce_resources=lax acpi=noirq"
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/minigraph.xml b/device/mellanox/x86_64-mlnx_lssn2700-r0/minigraph.xml
new file mode 100644
index 000000000000..40eb5252610b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/minigraph.xml
@@ -0,0 +1,1079 @@
+
+
+
+
+
+ ARISTA01T0
+ 10.0.0.33
+ sonic
+ 10.0.0.32
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.0
+ ARISTA01T2
+ 10.0.0.1
+ 1
+ 180
+ 60
+
+
+ ARISTA02T0
+ 10.0.0.35
+ sonic
+ 10.0.0.34
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.2
+ ARISTA02T2
+ 10.0.0.3
+ 1
+ 180
+ 60
+
+
+ ARISTA03T0
+ 10.0.0.37
+ sonic
+ 10.0.0.36
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.4
+ ARISTA03T2
+ 10.0.0.5
+ 1
+ 180
+ 60
+
+
+ ARISTA04T0
+ 10.0.0.39
+ sonic
+ 10.0.0.38
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.6
+ ARISTA04T2
+ 10.0.0.7
+ 1
+ 180
+ 60
+
+
+ ARISTA05T0
+ 10.0.0.41
+ sonic
+ 10.0.0.40
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.8
+ ARISTA05T2
+ 10.0.0.9
+ 1
+ 180
+ 60
+
+
+ ARISTA06T0
+ 10.0.0.43
+ sonic
+ 10.0.0.42
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.10
+ ARISTA06T2
+ 10.0.0.11
+ 1
+ 180
+ 60
+
+
+ ARISTA07T0
+ 10.0.0.45
+ sonic
+ 10.0.0.44
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.12
+ ARISTA07T2
+ 10.0.0.13
+ 1
+ 180
+ 60
+
+
+ ARISTA08T0
+ 10.0.0.47
+ sonic
+ 10.0.0.46
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.14
+ ARISTA08T2
+ 10.0.0.15
+ 1
+ 180
+ 60
+
+
+ ARISTA09T0
+ 10.0.0.49
+ sonic
+ 10.0.0.48
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.16
+ ARISTA09T2
+ 10.0.0.17
+ 1
+ 180
+ 60
+
+
+ ARISTA10T0
+ 10.0.0.51
+ sonic
+ 10.0.0.50
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.18
+ ARISTA10T2
+ 10.0.0.19
+ 1
+ 180
+ 60
+
+
+ ARISTA11T0
+ 10.0.0.53
+ sonic
+ 10.0.0.52
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.20
+ ARISTA11T2
+ 10.0.0.21
+ 1
+ 180
+ 60
+
+
+ ARISTA12T0
+ 10.0.0.55
+ sonic
+ 10.0.0.54
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.22
+ ARISTA12T2
+ 10.0.0.23
+ 1
+ 180
+ 60
+
+
+ ARISTA13T0
+ 10.0.0.57
+ sonic
+ 10.0.0.56
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.24
+ ARISTA13T2
+ 10.0.0.25
+ 1
+ 180
+ 60
+
+
+ ARISTA14T0
+ 10.0.0.59
+ sonic
+ 10.0.0.58
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.26
+ ARISTA14T2
+ 10.0.0.27
+ 1
+ 180
+ 60
+
+
+ ARISTA15T0
+ 10.0.0.61
+ sonic
+ 10.0.0.60
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.28
+ ARISTA15T2
+ 10.0.0.29
+ 1
+ 180
+ 60
+
+
+ ARISTA16T0
+ 10.0.0.63
+ sonic
+ 10.0.0.62
+ 1
+ 180
+ 60
+
+
+ sonic
+ 10.0.0.30
+ ARISTA16T2
+ 10.0.0.31
+ 1
+ 180
+ 60
+
+
+
+
+ 65100
+ sonic
+
+
+ 10.0.0.33
+
+
+
+
+ 10.0.0.1
+
+
+
+
+ 10.0.0.35
+
+
+
+
+ 10.0.0.3
+
+
+
+
+ 10.0.0.37
+
+
+
+
+ 10.0.0.5
+
+
+
+
+ 10.0.0.39
+
+
+
+
+ 10.0.0.7
+
+
+
+
+ 10.0.0.41
+
+
+
+
+ 10.0.0.9
+
+
+
+
+ 10.0.0.43
+
+
+
+
+ 10.0.0.11
+
+
+
+
+ 10.0.0.45
+
+
+
+
+ 10.0.0.13
+
+
+
+
+ 10.0.0.47
+
+
+
+
+ 10.0.0.15
+
+
+
+
+ 10.0.0.49
+
+
+
+
+ 10.0.0.17
+
+
+
+
+ 10.0.0.51
+
+
+
+
+ 10.0.0.19
+
+
+
+
+ 10.0.0.53
+
+
+
+
+ 10.0.0.21
+
+
+
+
+ 10.0.0.55
+
+
+
+
+ 10.0.0.23
+
+
+
+
+ 10.0.0.57
+
+
+
+
+ 10.0.0.25
+
+
+
+
+ 10.0.0.59
+
+
+
+
+ 10.0.0.27
+
+
+
+
+ 10.0.0.61
+
+
+
+
+ 10.0.0.29
+
+
+
+
+ 10.0.0.63
+
+
+
+
+ 10.0.0.31
+
+
+
+
+
+
+
+ 64001
+ ARISTA01T0
+
+
+
+ 65200
+ ARISTA01T2
+
+
+
+ 64002
+ ARISTA02T0
+
+
+
+ 65200
+ ARISTA02T2
+
+
+
+ 64003
+ ARISTA03T0
+
+
+
+ 65200
+ ARISTA03T2
+
+
+
+ 64004
+ ARISTA04T0
+
+
+
+ 65200
+ ARISTA04T2
+
+
+
+ 64005
+ ARISTA05T0
+
+
+
+ 65200
+ ARISTA05T2
+
+
+
+ 64006
+ ARISTA06T0
+
+
+
+ 65200
+ ARISTA06T2
+
+
+
+ 64007
+ ARISTA07T0
+
+
+
+ 65200
+ ARISTA07T2
+
+
+
+ 64008
+ ARISTA08T0
+
+
+
+ 65200
+ ARISTA08T2
+
+
+
+ 64009
+ ARISTA09T0
+
+
+
+ 65200
+ ARISTA09T2
+
+
+
+ 64010
+ ARISTA10T0
+
+
+
+ 65200
+ ARISTA10T2
+
+
+
+ 64011
+ ARISTA11T0
+
+
+
+ 65200
+ ARISTA11T2
+
+
+
+ 64012
+ ARISTA12T0
+
+
+
+ 65200
+ ARISTA12T2
+
+
+
+ 64013
+ ARISTA13T0
+
+
+
+ 65200
+ ARISTA13T2
+
+
+
+ 64014
+ ARISTA14T0
+
+
+
+ 65200
+ ARISTA14T2
+
+
+
+ 64015
+ ARISTA15T0
+
+
+
+ 65200
+ ARISTA15T2
+
+
+
+ 64016
+ ARISTA16T0
+
+
+
+ 65200
+ ARISTA16T2
+
+
+
+
+
+
+
+
+
+ HostIP
+ Loopback0
+
+ 10.1.0.32/32
+
+ 10.1.0.32/32
+
+
+
+
+
+
+
+ sonic
+
+
+
+
+
+ Ethernet0
+ 10.0.0.0/31
+
+
+
+ Ethernet4
+ 10.0.0.2/31
+
+
+
+ Ethernet8
+ 10.0.0.4/31
+
+
+
+ Ethernet12
+ 10.0.0.6/31
+
+
+
+ Ethernet16
+ 10.0.0.8/31
+
+
+
+ Ethernet20
+ 10.0.0.10/31
+
+
+
+ Ethernet24
+ 10.0.0.12/31
+
+
+
+ Ethernet28
+ 10.0.0.14/31
+
+
+
+ Ethernet32
+ 10.0.0.16/31
+
+
+
+ Ethernet36
+ 10.0.0.18/31
+
+
+
+ Ethernet40
+ 10.0.0.20/31
+
+
+
+ Ethernet44
+ 10.0.0.22/31
+
+
+
+ Ethernet48
+ 10.0.0.24/31
+
+
+
+ Ethernet52
+ 10.0.0.26/31
+
+
+
+ Ethernet56
+ 10.0.0.28/31
+
+
+
+ Ethernet60
+ 10.0.0.30/31
+
+
+
+ Ethernet64
+ 10.0.0.32/31
+
+
+
+ Ethernet68
+ 10.0.0.34/31
+
+
+
+ Ethernet72
+ 10.0.0.36/31
+
+
+
+ Ethernet76
+ 10.0.0.38/31
+
+
+
+ Ethernet80
+ 10.0.0.40/31
+
+
+
+ Ethernet84
+ 10.0.0.42/31
+
+
+
+ Ethernet88
+ 10.0.0.44/31
+
+
+
+ Ethernet92
+ 10.0.0.46/31
+
+
+
+ Ethernet96
+ 10.0.0.48/31
+
+
+
+ Ethernet100
+ 10.0.0.50/31
+
+
+
+ Ethernet104
+ 10.0.0.52/31
+
+
+
+ Ethernet108
+ 10.0.0.54/31
+
+
+
+ Ethernet112
+ 10.0.0.56/31
+
+
+
+ Ethernet116
+ 10.0.0.58/31
+
+
+
+ Ethernet120
+ 10.0.0.60/31
+
+
+
+ Ethernet124
+ 10.0.0.62/31
+
+
+
+
+
+
+
+
+
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet0
+ ARISTA01T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet4
+ ARISTA02T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet8
+ ARISTA03T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet12
+ ARISTA04T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet16
+ ARISTA05T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet20
+ ARISTA06T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet24
+ ARISTA07T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet28
+ ARISTA08T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet32
+ ARISTA09T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet36
+ ARISTA10T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet40
+ ARISTA11T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet44
+ ARISTA12T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet48
+ ARISTA13T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet52
+ ARISTA14T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet56
+ ARISTA15T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet60
+ ARISTA16T2
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet64
+ ARISTA01T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet68
+ ARISTA02T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet72
+ ARISTA03T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet76
+ ARISTA04T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet80
+ ARISTA05T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet84
+ ARISTA06T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet88
+ ARISTA07T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet92
+ ARISTA08T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet96
+ ARISTA09T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet100
+ ARISTA10T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet104
+ ARISTA11T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet108
+ ARISTA12T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet112
+ ARISTA13T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet116
+ ARISTA14T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet120
+ ARISTA15T0
+ Ethernet1
+
+
+ DeviceInterfaceLink
+ sonic
+ Ethernet124
+ ARISTA16T0
+ Ethernet1
+
+
+
+
+ sonic
+ LS-SN2700
+
+
+
+
+
+
+ sonic
+
+
+ DhcpResources
+
+
+
+
+ NtpResources
+
+ 0.debian.pool.ntp.org;1.debian.pool.ntp.org;2.debian.pool.ntp.org;3.debian.pool.ntp.org
+
+
+ SyslogResources
+
+
+
+
+ ErspanDestinationIpv4
+
+ 2.2.2.2
+
+
+
+
+
+
+ sonic
+ LS-SN2700
+
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/eeprom.py
new file mode 100644
index 000000000000..3650d9c8b70b
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/eeprom.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Mellanox
+#
+# Platform and model specific eeprom subclass, inherits from the base class,
+# and provides the followings:
+# - the eeprom format definition
+# - specific encoder/decoder if there is special need
+#############################################################################
+
+try:
+ import exceptions
+ import binascii
+ import time
+ import optparse
+ import warnings
+ import os
+ import sys
+ from sonic_eeprom import eeprom_base
+ from sonic_eeprom import eeprom_tlvinfo
+ import subprocess
+except ImportError, e:
+ raise ImportError (str(e) + "- required module not found")
+
+class board(eeprom_tlvinfo.TlvInfoDecoder):
+
+ _TLV_INFO_MAX_LEN = 256
+
+ def __init__(self, name, path, cpld_root, ro):
+ self.eeprom_path = "/bsp/eeprom/sys_eeprom"
+ super(board, self).__init__(self.eeprom_path, 0, '', True)
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/psuutil.py b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/psuutil.py
new file mode 100644
index 000000000000..301569c13a94
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/psuutil.py
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Mellanox
+#
+# Module contains an implementation of SONiC PSU Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+import os.path
+
+try:
+ from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+ raise ImportError (str(e) + "- required module not found")
+
+class PsuUtil(PsuBase):
+ """Platform-specific PSUutil class"""
+
+ def __init__(self):
+ PsuBase.__init__(self)
+
+ self.psu_path = "/sys/bus/i2c/devices/2-0060/"
+ self.psu_presence = "psu{}_status"
+ self.psu_oper_status = "psu{}_pg_status"
+
+ def get_num_psus(self):
+ """
+ Retrieves the number of PSUs available on the device
+
+ :return: An integer, the number of PSUs available on the device
+ """
+ return 2
+
+ def get_psu_status(self, index):
+ """
+ Retrieves the oprational status of power supply unit (PSU) defined
+ by 1-based index
+
+ :param index: An integer, 1-based index of the PSU of which to query status
+ :return: Boolean, True if PSU is operating properly, False if PSU is faulty
+ """
+ if index is None:
+ return False
+
+ status = 0
+ try:
+ with open(self.psu_path + self.psu_oper_status.format(index), 'r') as power_status:
+ status = int(power_status.read())
+ except IOError:
+ return False
+
+ return status == 1
+
+ def get_psu_presence(self, index):
+ """
+ Retrieves the presence status of power supply unit (PSU) defined
+ by 1-based index
+
+ :param index: An integer, 1-based index of the PSU of which to query status
+ :return: Boolean, True if PSU is plugged, False if not
+ """
+ if index is None:
+ return False
+
+ status = 0
+ try:
+ with open(self.psu_path + self.psu_presence.format(index), 'r') as presence_status:
+ status = int(presence_status.read())
+ except IOError:
+ return False
+
+ return status == 1
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfplpmget.py b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfplpmget.py
new file mode 100644
index 000000000000..170766e9bce4
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfplpmget.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+import sys, errno
+import os
+from python_sdk_api.sxd_api import *
+from python_sdk_api.sx_api import *
+
+# Check if SFP port number is provided
+if len(sys.argv) < 2:
+ print "SFP module number is missed."
+ print "Usage: sfplpmget.py "
+ sys.exit(errno.EINVAL)
+
+# Init SDK API
+rc, handle = sx_api_open(None)
+if (rc != SX_STATUS_SUCCESS):
+ print "Failed to open api handle.\nPlease check that SDK is running."
+ sys.exit(errno.EACCES)
+
+pid = os.getpid()
+rc = sxd_access_reg_init(pid, None, 0)
+if (rc != 0):
+ print "Failed to initializing register access.\nPlease check that SDK is running."
+ sys.exit(errno.EACCES)
+
+# Get SFP module number
+sfp_module = int(sys.argv[1])
+
+# Get MCION
+mcion = ku_mcion_reg()
+mcion.module = sfp_module
+meta = sxd_reg_meta_t()
+meta.dev_id = 1
+meta.swid = 0
+meta.access_cmd = SXD_ACCESS_CMD_GET
+
+rc = sxd_access_reg_mcion(mcion, meta, 1, None, None)
+assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_mcion failed, rc = %d" % rc
+
+# Get low power mode status
+lpm_mask = 1 << 8
+lpm_status = (lpm_mask & mcion.module_status_bits) != 0
+print "LPM ON" if lpm_status else "LPM OFF"
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfplpmset.py b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfplpmset.py
new file mode 100644
index 000000000000..3f31af9f2944
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfplpmset.py
@@ -0,0 +1,107 @@
+#!/usr/bin/env python
+
+import sys, errno
+import time
+import os
+from python_sdk_api.sxd_api import *
+from python_sdk_api.sx_api import *
+
+def get_log_ports(handle, sfp_module):
+ port_attributes_list = new_sx_port_attributes_t_arr(64)
+ port_cnt_p = new_uint32_t_p()
+ uint32_t_p_assign(port_cnt_p, 64)
+
+ rc = sx_api_port_device_get(handle, 1 , 0, port_attributes_list, port_cnt_p)
+ assert rc == SX_STATUS_SUCCESS, "sx_api_port_device_get failed, rc = %d" % rc
+
+ port_cnt = uint32_t_p_value(port_cnt_p)
+ log_port_list = []
+ for i in range(0, port_cnt):
+ port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list, i)
+ if port_attributes.port_mapping.module_port == sfp_module:
+ log_port_list.append(port_attributes.log_port)
+
+ return log_port_list
+
+def set_sfp_admin_status(handle, meta, sfp_module, sfp_log_port_list, admin_status):
+ # Get PMAOS
+ pmaos = ku_pmaos_reg()
+ pmaos.module = sfp_module
+ meta.access_cmd = SXD_ACCESS_CMD_GET
+ rc = sxd_access_reg_pmaos(pmaos, meta, 1, None, None)
+ assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_pmaos failed, rc = %d" % rc
+
+ # Set admin status to PMAOS
+ pmaos.ase = 1
+ pmaos.ee = 1
+ pmaos.e = 2
+ pmaos.rst = 0
+ if admin_status == SX_PORT_ADMIN_STATUS_DOWN:
+ pmaos.admin_status = 2
+ else:
+ pmaos.admin_status = 1
+
+ meta.access_cmd = SXD_ACCESS_CMD_SET
+ rc = sxd_access_reg_pmaos(pmaos, meta, 1, None, None)
+ assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_pmaos failed, rc = %d" % rc
+
+# Check if SFP port number is provided
+if len(sys.argv) < 3:
+ print "SFP module number or LPM is missed."
+ print "Usage: sfplpmset.py "
+ sys.exit(errno.EINVAL)
+
+lpm_enable = None
+if sys.argv[2] == 'on':
+ lpm_enable = True
+elif sys.argv[2] == 'off':
+ lpm_enable = False
+else:
+ print "Unrecognized LPM parameter. Please use or values"
+ sys.exit(errno.EINVAL)
+
+# Init SDK API
+rc, handle = sx_api_open(None)
+if (rc != SX_STATUS_SUCCESS):
+ print "Failed to open api handle.\nPlease check that SDK is running."
+ sys.exit(errno.EACCES)
+
+pid = os.getpid()
+rc = sxd_access_reg_init(pid, None, 0)
+if (rc != 0):
+ print "Failed to initializing register access.\nPlease check that SDK is running."
+ sys.exit(errno.EACCES);
+
+# Get SFP module and log ports number and LPM status
+sfp_module = int(sys.argv[1])
+log_port_list = get_log_ports(handle, sfp_module)
+if not log_port_list:
+ print "Failed to get log ports"
+ sys.exit(errno.EACCES)
+
+# Get PMMP
+pmmp = ku_pmmp_reg()
+pmmp.module = sfp_module
+meta = sxd_reg_meta_t()
+meta.dev_id = 1
+meta.swid = 0
+meta.access_cmd = SXD_ACCESS_CMD_GET
+rc = sxd_access_reg_pmmp(pmmp, meta, 1, None, None)
+assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_pmmp failed, rc = %d" % rc
+
+# Disable admin status before LPM settings
+set_sfp_admin_status(handle, meta, sfp_module, log_port_list, SX_PORT_ADMIN_STATUS_DOWN)
+
+# Set low power mode status
+lpm_mask = 1 << 8
+if lpm_enable:
+ pmmp.eeprom_override = pmmp.eeprom_override | lpm_mask
+else:
+ pmmp.eeprom_override = pmmp.eeprom_override & (~lpm_mask)
+
+meta.access_cmd = SXD_ACCESS_CMD_SET
+rc = sxd_access_reg_pmmp(pmmp, meta, 1, None, None)
+assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_pmmp failed, rc = %d" % rc
+
+# Enable admin status after LPM settings
+set_sfp_admin_status(handle, meta, sfp_module, log_port_list, SX_PORT_ADMIN_STATUS_UP)
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfpreset.py b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfpreset.py
new file mode 100644
index 000000000000..69fa2be614c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfpreset.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+
+import sys, errno
+import os
+from python_sdk_api.sxd_api import *
+from python_sdk_api.sx_api import *
+
+# Check if SFP port number is provided
+if len(sys.argv) < 2:
+ print "SFP module number or LPM is missed."
+ print "Usage: sfpreset.py "
+ sys.exit(errno.EINVAL)
+
+# Init SDK API
+rc, handle = sx_api_open(None)
+if (rc != SX_STATUS_SUCCESS):
+ print "Failed to open api handle.\nPlease check that SDK is running."
+ sys.exit(errno.EACCES)
+
+pid = os.getpid()
+rc = sxd_access_reg_init(pid, None, 0)
+if (rc != 0):
+ print "Failed to initializing register access.\nPlease check that SDK is running."
+ sys.exit(errno.EACCES)
+
+# Get SFP module number
+sfp_module = int(sys.argv[1])
+
+# Get PMAOS
+pmaos = ku_pmaos_reg()
+pmaos.module = sfp_module
+meta = sxd_reg_meta_t()
+meta.dev_id = 1
+meta.swid = 0
+meta.access_cmd = SXD_ACCESS_CMD_GET
+
+rc = sxd_access_reg_pmaos(pmaos, meta, 1, None, None)
+assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_pmaos failed, rc = %d" % rc
+
+# Reset SFP
+pmaos.rst = 1
+meta.access_cmd = SXD_ACCESS_CMD_SET
+rc = sxd_access_reg_pmaos(pmaos, meta, 1, None, None)
+assert rc == SXD_STATUS_SUCCESS, "sxd_access_reg_pmaos failed, rc = %d" % rc
+print "Reset flag is set"
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfputil.py
new file mode 100644
index 000000000000..6aef1310d51f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/plugins/sfputil.py
@@ -0,0 +1,151 @@
+# sfputil.py
+#
+# Platform-specific SFP transceiver interface for SONiC
+#
+
+try:
+ import time
+ import subprocess
+ from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError as e:
+ raise ImportError("%s - required module not found" % str(e))
+
+
+class SfpUtil(SfpUtilBase):
+ """Platform-specific SfpUtil class"""
+
+ PORT_START = 0
+ PORT_END = 31
+ PORTS_IN_BLOCK = 32
+
+ EEPROM_OFFSET = 1
+
+ _port_to_eeprom_mapping = {}
+
+ @property
+ def port_start(self):
+ return self.PORT_START
+
+ @property
+ def port_end(self):
+ return self.PORT_END
+
+ @property
+ def qsfp_ports(self):
+ return range(0, self.PORTS_IN_BLOCK + 1)
+
+ @property
+ def port_to_eeprom_mapping(self):
+ return self._port_to_eeprom_mapping
+
+ def __init__(self):
+ eeprom_path = "/bsp/qsfp/qsfp{0}"
+
+ for x in range(0, self.port_end + 1):
+ self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
+
+ SfpUtilBase.__init__(self)
+
+ def get_presence(self, port_num):
+ # Check for invalid port_num
+ if port_num < self.port_start or port_num > self.port_end:
+ return False
+
+ try:
+ reg_file = open("/bsp/qsfp/qsfp%d_status" % (port_num+1))
+ except IOError as e:
+ print "Error: unable to open file: %s" % str(e)
+ return False
+
+ content = reg_file.readline().rstrip()
+
+ # content is a string with the qsfp status
+ if content == "good":
+ return True
+
+ return False
+
+ def get_low_power_mode(self, port_num):
+ # Check for invalid port_num
+ if port_num < self.port_start or port_num > self.port_end:
+ return False
+
+ lpm_cmd = "docker exec syncd python /usr/share/sonic/platform/plugins/sfplpmget.py {}".format(port_num)
+
+ try:
+ output = subprocess.check_output(lpm_cmd, shell=True)
+ if 'LPM ON' in output:
+ return True
+ except subprocess.CalledProcessError as e:
+ print "Error! Unable to get LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output)
+ return False
+
+ return False
+
+ def set_low_power_mode(self, port_num, lpmode):
+ # Check for invalid port_num
+ if port_num < self.port_start or port_num > self.port_end:
+ return False
+
+ curr_lpmode = self.get_low_power_mode(port_num)
+ if curr_lpmode == lpmode:
+ return True
+
+ lpm = 'on' if lpmode else 'off'
+ lpm_cmd = "docker exec syncd python /usr/share/sonic/platform/plugins/sfplpmset.py {} {}".format(port_num, lpm)
+ sfp_port_names = self.physical_to_logical[port_num]
+
+ # Get port admin status
+ try:
+ enabled_ports = subprocess.check_output("ip link show up", shell=True)
+ except subprocess.CalledProcessError as e:
+ print "Error! Unable to get ports status, err msg: {}".format(e.output)
+ return False
+
+ port_to_disable = []
+ for port in sfp_port_names:
+ if port in enabled_ports:
+ port_to_disable.append(port)
+
+ # Disable ports before LPM settings
+ for port in port_to_disable:
+ try:
+ subprocess.check_output("ifconfig {} down".format(port), shell=True)
+ except subprocess.CalledProcessError as e:
+ print "Error! Unable to set admin status to DOWN for {}, rc = {}, err msg: {}".format(port, e.returncode, e.output)
+ return False
+
+ time.sleep(3)
+
+ # Set LPM
+ try:
+ subprocess.check_output(lpm_cmd, shell=True)
+ except subprocess.CalledProcessError as e:
+ print "Error! Unable to set LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output)
+ return False
+
+ # Enable ports after LPM settings
+ for port in port_to_disable:
+ try:
+ subprocess.check_output("ifconfig {} up".format(port), shell=True)
+ except subprocess.CalledProcessError as e:
+ print "Error! Unable to set admin status to UP for {}, rc = {}, err msg: {}".format(port, e.returncode, e.output)
+ return False
+
+ return True
+
+ def reset(self, port_num):
+ # Check for invalid port_num
+ if port_num < self.port_start or port_num > self.port_end:
+ return False
+
+ lpm_cmd = "docker exec syncd python /usr/share/sonic/platform/plugins/sfpreset.py {}".format(port_num)
+
+ try:
+ subprocess.check_output(lpm_cmd, shell=True)
+ return True
+ except subprocess.CalledProcessError as e:
+ print "Error! Unable to set LPM for {}, rc = {}, err msg: {}".format(port_num, e.returncode, e.output)
+ return False
+
+ return False
diff --git a/device/mellanox/x86_64-mlnx_lssn2700-r0/sensors.conf b/device/mellanox/x86_64-mlnx_lssn2700-r0/sensors.conf
new file mode 100644
index 000000000000..a3e30391863e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_lssn2700-r0/sensors.conf
@@ -0,0 +1,21 @@
+bus "i2c-7" "i2c-1-mux (chan_id 5)"
+chip "lm75-i2c-7-4a"
+ label temp1 "Ambient Port Temp"
+
+bus "i2c-5" "i2c-1-mux (chan_id 3)"
+chip "ucd9200-i2c-5-27"
+ label in1 "UCD1 vin"
+ label in2 "ASIC 3.3 vout"
+ label in3 "ASIC 1.2 vout"
+ label temp1 "UCD1 Temp"
+ label temp2 "UCD1 Temp2"
+
+chip "ucd9200-i2c-5-41"
+ label in1 "UCD2 vin"
+ label in2 "ASIC Vcore vout"
+ label temp1 "UCD2 Temp1"
+ label temp2 "UCD2 Temp2"
+
+bus "i2c-17" "i2c-1-mux (chan_id 7)"
+chip "lm75-i2c-17-49"
+ label temp1 "Ambient Board Temp"
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers.json.j2
new file mode 120000
index 000000000000..add8bf8bb7c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..7bcae62336f6
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..a437d613434d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/pg_profile_lookup.ini
new file mode 100644
index 000000000000..b66b129fe43f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 34816 18432 16384 0
+ 25000 5m 34816 18432 16384 0
+ 40000 5m 34816 18432 16384 0
+ 50000 5m 34816 18432 16384 0
+ 100000 5m 36864 18432 18432 0
+ 10000 40m 36864 18432 18432 0
+ 25000 40m 39936 18432 21504 0
+ 40000 40m 41984 18432 23552 0
+ 50000 40m 41984 18432 23552 0
+ 100000 40m 54272 18432 35840 0
+ 10000 300m 49152 18432 30720 0
+ 25000 300m 71680 18432 53248 0
+ 40000 300m 94208 18432 75776 0
+ 50000 300m 94208 18432 75776 0
+ 100000 300m 184320 18432 165888 0
diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json
new file mode 100644
index 000000000000..74045469dbfd
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2100-r0/ACS-MSN2100/qos.json
@@ -0,0 +1,165 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"0",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0": {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1": {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2": {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "PORT_QOS_MAP": {
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60": {
+ "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
+ "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+ "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+ "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_enable": "3,4"
+ }
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ },
+ "AZURE_LOSSLESS": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ }
+ },
+ "QUEUE": {
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60|0": {
+ "scheduler" : "[SCHEDULER|scheduler.1]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60|1": {
+ "scheduler" : "[SCHEDULER|scheduler.2]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60|0-1": {
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60|3-4": {
+ "scheduler" : "[SCHEDULER|scheduler.0]",
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
+ }
+ }
+}
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers.json.j2
new file mode 120000
index 000000000000..add8bf8bb7c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..7bcae62336f6
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..a437d613434d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/pg_profile_lookup.ini
new file mode 100644
index 000000000000..b66b129fe43f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 34816 18432 16384 0
+ 25000 5m 34816 18432 16384 0
+ 40000 5m 34816 18432 16384 0
+ 50000 5m 34816 18432 16384 0
+ 100000 5m 36864 18432 18432 0
+ 10000 40m 36864 18432 18432 0
+ 25000 40m 39936 18432 21504 0
+ 40000 40m 41984 18432 23552 0
+ 50000 40m 41984 18432 23552 0
+ 100000 40m 54272 18432 35840 0
+ 10000 300m 49152 18432 30720 0
+ 25000 300m 71680 18432 53248 0
+ 40000 300m 94208 18432 75776 0
+ 50000 300m 94208 18432 75776 0
+ 100000 300m 184320 18432 165888 0
diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json
new file mode 100644
index 000000000000..95652cf96f4e
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2410-r0/ACS-MSN2410/qos.json
@@ -0,0 +1,165 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"0",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0": {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1": {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2": {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "PORT_QOS_MAP": {
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124,Ethernet128,Ethernet132,Ethernet136,Ethernet140,Ethernet144,Ethernet148,Ethernet152,Ethernet156,Ethernet160,Ethernet164,Ethernet168,Ethernet172,Ethernet176,Ethernet180,Ethernet184,Ethernet188,Ethernet192,Ethernet196,Ethernet200,Ethernet204,Ethernet208,Ethernet212,Ethernet216,Ethernet220": {
+ "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
+ "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+ "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+ "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_enable": "3,4"
+ }
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ },
+ "AZURE_LOSSLESS": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ }
+ },
+ "QUEUE": {
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124,Ethernet128,Ethernet132,Ethernet136,Ethernet140,Ethernet144,Ethernet148,Ethernet152,Ethernet156,Ethernet160,Ethernet164,Ethernet168,Ethernet172,Ethernet176,Ethernet180,Ethernet184,Ethernet188,Ethernet192,Ethernet196,Ethernet200,Ethernet204,Ethernet208,Ethernet212,Ethernet216,Ethernet220|0": {
+ "scheduler" : "[SCHEDULER|scheduler.1]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124,Ethernet128,Ethernet132,Ethernet136,Ethernet140,Ethernet144,Ethernet148,Ethernet152,Ethernet156,Ethernet160,Ethernet164,Ethernet168,Ethernet172,Ethernet176,Ethernet180,Ethernet184,Ethernet188,Ethernet192,Ethernet196,Ethernet200,Ethernet204,Ethernet208,Ethernet212,Ethernet216,Ethernet220|1": {
+ "scheduler" : "[SCHEDULER|scheduler.2]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124,Ethernet128,Ethernet132,Ethernet136,Ethernet140,Ethernet144,Ethernet148,Ethernet152,Ethernet156,Ethernet160,Ethernet164,Ethernet168,Ethernet172,Ethernet176,Ethernet180,Ethernet184,Ethernet188,Ethernet192,Ethernet196,Ethernet200,Ethernet204,Ethernet208,Ethernet212,Ethernet216,Ethernet220|0-1": {
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124,Ethernet128,Ethernet132,Ethernet136,Ethernet140,Ethernet144,Ethernet148,Ethernet152,Ethernet156,Ethernet160,Ethernet164,Ethernet168,Ethernet172,Ethernet176,Ethernet180,Ethernet184,Ethernet188,Ethernet192,Ethernet196,Ethernet200,Ethernet204,Ethernet208,Ethernet212,Ethernet216,Ethernet220|3-4": {
+ "scheduler" : "[SCHEDULER|scheduler.0]",
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
+ }
+ }
+}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
index da9c764db92b..1083a6210fc9 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
@@ -1,162 +1,2 @@
-{# Default values which will be used if no actual configura available #}
-{% set default_cable = '300m' %}
-{% set default_ports_num = 32 -%}
-
-{# Port configuration to cable length look-up table #}
-{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
-{# Roles described in the minigraph #}
-{% set ports2cable = {
- 'torrouter_server' : '5m',
- 'leafrouter_torrouter' : '40m',
- 'spinerouter_leafrouter' : '300m'
- }
-%}
-
-{%- macro cable_length(port_name) -%}
- {%- set cable_len = [] -%}
- {%- for local_port in DEVICE_NEIGHBOR -%}
- {%- if local_port == port_name -%}
- {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
- {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
- {%- set neighbor_role = neighbor.type -%}
- {%- set roles1 = switch_role + '_' + neighbor_role %}
- {%- set roles2 = neighbor_role + '_' + switch_role -%}
- {%- set roles1 = roles1 | lower -%}
- {%- set roles2 = roles2 | lower -%}
- {%- if roles1 in ports2cable -%}
- {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
- {%- elif roles2 in ports2cable -%}
- {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
- {%- endif -%}
- {%- endif -%}
- {%- endif -%}
- {%- endfor -%}
- {%- if cable_len -%}
- {{ cable_len.0 }}
- {%- else -%}
- {{ default_cable }}
- {%- endif -%}
-{% endmacro %}
-
-{%- if DEVICE_METADATA is defined %}
-{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
-{%- endif -%}
-
-{# Generate list of ports if not defined #}
-{% if PORT is not defined %}
- {% set PORT = [] %}
- {% for port_idx in range(0,default_ports_num) %}
- {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
- {% endfor %}
-{% endif -%}
-
-{% set port_names_list = [] %}
-{% for port in PORT %}
- {%- if port_names_list.append(port) %}{% endif %}
-{% endfor %}
-{% set port_names = port_names_list | join(',') -%}
-
-{
- "CABLE_LENGTH": {
- "AZURE": {
- {% for port in PORT %}
- {% set cable = cable_length(port) -%}
- "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
-
- {% endfor %}
- }
- },
-{%if switch_role == 'ToRRouter' %}
-{% set ingress_lossless_pool_size = '4194304' %}
-{% set ingress_lossy_pool_size = '7340032' %}
-{% set egress_lossless_pool_size = '16777152' %}
-{% set egress_lossy_pool_size = '7340032' %}
-{% else %}
-{% set ingress_lossless_pool_size = '2097152' %}
-{% set ingress_lossy_pool_size = '5242880' %}
-{% set egress_lossless_pool_size = '16777152' %}
-{% set egress_lossy_pool_size = '5242880' %}
-{%endif %}
- "BUFFER_POOL": {
- "ingress_lossless_pool": {
- "size": "{{ ingress_lossless_pool_size }}",
- "type": "ingress",
- "mode": "dynamic"
- },
- "ingress_lossy_pool": {
- "size": "{{ ingress_lossy_pool_size }}",
- "type": "ingress",
- "mode": "dynamic"
- },
- "egress_lossless_pool": {
- "size": "{{ egress_lossless_pool_size }}",
- "type": "egress",
- "mode": "dynamic"
- },
- "egress_lossy_pool": {
- "size": "{{ egress_lossy_pool_size }}",
- "type": "egress",
- "mode": "dynamic"
- }
- },
- "BUFFER_PROFILE": {
- "ingress_lossless_profile": {
- "pool":"[BUFFER_POOL|ingress_lossless_pool]",
- "size":"0",
- "dynamic_th":"0"
- },
- "ingress_lossy_profile": {
- "pool":"[BUFFER_POOL|ingress_lossy_pool]",
- "size":"0",
- "dynamic_th":"3"
- },
- "egress_lossless_profile": {
- "pool":"[BUFFER_POOL|egress_lossless_pool]",
- "size":"0",
- "dynamic_th":"7"
- },
- "egress_lossy_profile": {
- "pool":"[BUFFER_POOL|egress_lossy_pool]",
- "size":"4096",
- "dynamic_th":"3"
- },
- "pg_lossy_profile": {
- "pool":"[BUFFER_POOL|ingress_lossy_pool]",
- "size":"0",
- "dynamic_th":"3"
- },
- "q_lossless_profile": {
- "pool":"[BUFFER_POOL|egress_lossless_pool]",
- "size":"0",
- "dynamic_th":"7"
- },
- "q_lossy_profile": {
- "pool":"[BUFFER_POOL|egress_lossy_pool]",
- "size":"0",
- "dynamic_th":"3"
- }
- },
- "BUFFER_PORT_INGRESS_PROFILE_LIST": {
- "{{ port_names }}": {
- "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
- }
- },
- "BUFFER_PORT_EGRESS_PROFILE_LIST": {
- "{{ port_names }}": {
- "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
- }
- },
- "BUFFER_PG": {
- "{{ port_names }}|0-1": {
- "profile" : "[BUFFER_PROFILE|pg_lossy_profile]"
- }
- },
- "BUFFER_QUEUE": {
- "{{ port_names }}|3-4": {
- "profile" : "[BUFFER_PROFILE|q_lossless_profile]"
- },
- "{{ port_names }}|0-1": {
- "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
- }
- }
-}
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..475a0227143c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
@@ -0,0 +1,90 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size = '4194304' %}
+{% set ingress_lossy_pool_size = '7340032' %}
+{% set egress_lossless_pool_size = '16777152' %}
+{% set egress_lossy_pool_size = '7340032' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+ {# Generate list of ports #}
+ {%- for port_idx in range(0, 32) %}
+ {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+ {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "{{ ingress_lossless_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "ingress_lossy_pool": {
+ "size": "{{ ingress_lossy_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "egress_lossless_pool": {
+ "size": "{{ egress_lossless_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ },
+ "egress_lossy_pool": {
+ "size": "{{ egress_lossy_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"0"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ },
+ "egress_lossless_profile": {
+ "pool":"[BUFFER_POOL|egress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"7"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"4096",
+ "dynamic_th":"3"
+ },
+ "q_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ }
+ },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+ "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+ }
+ },
+ "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+ "BUFFER_QUEUE": {
+ "{{ port_names }}|3-4": {
+ "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+ },
+ "{{ port_names }}|0-1": {
+ "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..c292ecc2f21a
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
@@ -0,0 +1,90 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size = '2097152' %}
+{% set ingress_lossy_pool_size = '5242880' %}
+{% set egress_lossless_pool_size = '16777152' %}
+{% set egress_lossy_pool_size = '5242880' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+ {# Generate list of ports #}
+ {%- for port_idx in range(0, 32) %}
+ {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+ {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "{{ ingress_lossless_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "ingress_lossy_pool": {
+ "size": "{{ ingress_lossy_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "egress_lossless_pool": {
+ "size": "{{ egress_lossless_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ },
+ "egress_lossy_pool": {
+ "size": "{{ egress_lossy_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"0"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ },
+ "egress_lossless_profile": {
+ "pool":"[BUFFER_POOL|egress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"7"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"4096",
+ "dynamic_th":"3"
+ },
+ "q_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ }
+ },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+ "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+ }
+ },
+ "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+ "BUFFER_QUEUE": {
+ "{{ port_names }}|3-4": {
+ "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+ },
+ "{{ port_names }}|0-1": {
+ "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/port_config.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/port_config.ini
index 816bb0e94a70..1e1906ff0ef5 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/port_config.ini
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/port_config.ini
@@ -1,33 +1,33 @@
-# name lanes
-Ethernet0 0,1,2,3
-Ethernet4 4,5,6,7
-Ethernet8 8,9,10,11
-Ethernet12 12,13,14,15
-Ethernet16 16,17,18,19
-Ethernet20 20,21,22,23
-Ethernet24 24,25,26,27
-Ethernet28 28,29,30,31
-Ethernet32 32,33,34,35
-Ethernet36 36,37,38,39
-Ethernet40 40,41,42,43
-Ethernet44 44,45,46,47
-Ethernet48 48,49,50,51
-Ethernet52 52,53,54,55
-Ethernet56 56,57,58,59
-Ethernet60 60,61,62,63
-Ethernet64 64,65,66,67
-Ethernet68 68,69,70,71
-Ethernet72 72,73,74,75
-Ethernet76 76,77,78,79
-Ethernet80 80,81,82,83
-Ethernet84 84,85,86,87
-Ethernet88 88,89,90,91
-Ethernet92 92,93,94,95
-Ethernet96 96,97,98,99
-Ethernet100 100,101,102,103
-Ethernet104 104,105,106,107
-Ethernet108 108,109,110,111
-Ethernet112 112,113,114,115
-Ethernet116 116,117,118,119
-Ethernet120 120,121,122,123
-Ethernet124 124,125,126,127
+# name lanes alias
+Ethernet0 0,1,2,3 etp1
+Ethernet4 4,5,6,7 etp2
+Ethernet8 8,9,10,11 etp3
+Ethernet12 12,13,14,15 etp4
+Ethernet16 16,17,18,19 etp5
+Ethernet20 20,21,22,23 etp6
+Ethernet24 24,25,26,27 etp7
+Ethernet28 28,29,30,31 etp8
+Ethernet32 32,33,34,35 etp9
+Ethernet36 36,37,38,39 etp10
+Ethernet40 40,41,42,43 etp11
+Ethernet44 44,45,46,47 etp12
+Ethernet48 48,49,50,51 etp13
+Ethernet52 52,53,54,55 etp14
+Ethernet56 56,57,58,59 etp15
+Ethernet60 60,61,62,63 etp16
+Ethernet64 64,65,66,67 etp17
+Ethernet68 68,69,70,71 etp18
+Ethernet72 72,73,74,75 etp19
+Ethernet76 76,77,78,79 etp20
+Ethernet80 80,81,82,83 etp21
+Ethernet84 84,85,86,87 etp22
+Ethernet88 88,89,90,91 etp23
+Ethernet92 92,93,94,95 etp24
+Ethernet96 96,97,98,99 etp25
+Ethernet100 100,101,102,103 etp26
+Ethernet104 104,105,106,107 etp27
+Ethernet108 108,109,110,111 etp28
+Ethernet112 112,113,114,115 etp29
+Ethernet116 116,117,118,119 etp30
+Ethernet120 120,121,122,123 etp31
+Ethernet124 124,125,126,127 etp32
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers.json.j2
new file mode 100644
index 000000000000..1083a6210fc9
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers.json.j2
@@ -0,0 +1,2 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
new file mode 100644
index 000000000000..475a0227143c
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t0.j2
@@ -0,0 +1,90 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size = '4194304' %}
+{% set ingress_lossy_pool_size = '7340032' %}
+{% set egress_lossless_pool_size = '16777152' %}
+{% set egress_lossy_pool_size = '7340032' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+ {# Generate list of ports #}
+ {%- for port_idx in range(0, 32) %}
+ {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+ {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "{{ ingress_lossless_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "ingress_lossy_pool": {
+ "size": "{{ ingress_lossy_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "egress_lossless_pool": {
+ "size": "{{ egress_lossless_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ },
+ "egress_lossy_pool": {
+ "size": "{{ egress_lossy_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"0"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ },
+ "egress_lossless_profile": {
+ "pool":"[BUFFER_POOL|egress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"7"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"4096",
+ "dynamic_th":"3"
+ },
+ "q_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ }
+ },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+ "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+ }
+ },
+ "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+ "BUFFER_QUEUE": {
+ "{{ port_names }}|3-4": {
+ "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+ },
+ "{{ port_names }}|0-1": {
+ "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
new file mode 100644
index 000000000000..c292ecc2f21a
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_t1.j2
@@ -0,0 +1,90 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size = '2097152' %}
+{% set ingress_lossy_pool_size = '5242880' %}
+{% set egress_lossless_pool_size = '16777152' %}
+{% set egress_lossy_pool_size = '5242880' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+ {# Generate list of ports #}
+ {%- for port_idx in range(0, 32) %}
+ {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+ {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+ "BUFFER_POOL": {
+ "ingress_lossless_pool": {
+ "size": "{{ ingress_lossless_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "ingress_lossy_pool": {
+ "size": "{{ ingress_lossy_pool_size }}",
+ "type": "ingress",
+ "mode": "dynamic"
+ },
+ "egress_lossless_pool": {
+ "size": "{{ egress_lossless_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ },
+ "egress_lossy_pool": {
+ "size": "{{ egress_lossy_pool_size }}",
+ "type": "egress",
+ "mode": "dynamic"
+ }
+ },
+ "BUFFER_PROFILE": {
+ "ingress_lossless_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"0"
+ },
+ "ingress_lossy_profile": {
+ "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ },
+ "egress_lossless_profile": {
+ "pool":"[BUFFER_POOL|egress_lossless_pool]",
+ "size":"0",
+ "dynamic_th":"7"
+ },
+ "egress_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"4096",
+ "dynamic_th":"3"
+ },
+ "q_lossy_profile": {
+ "pool":"[BUFFER_POOL|egress_lossy_pool]",
+ "size":"0",
+ "dynamic_th":"3"
+ }
+ },
+{%- endmacro %}
+
+{%- macro generate_profile_lists(port_names) %}
+ "BUFFER_PORT_INGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+ }
+ },
+ "BUFFER_PORT_EGRESS_PROFILE_LIST": {
+ "{{ port_names }}": {
+ "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+{%- macro generate_queue_buffers(port_names) %}
+ "BUFFER_QUEUE": {
+ "{{ port_names }}|3-4": {
+ "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
+ },
+ "{{ port_names }}|0-1": {
+ "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
+ }
+ }
+{%- endmacro %}
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
new file mode 100644
index 000000000000..b66b129fe43f
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size xon xoff threshold
+ 10000 5m 34816 18432 16384 0
+ 25000 5m 34816 18432 16384 0
+ 40000 5m 34816 18432 16384 0
+ 50000 5m 34816 18432 16384 0
+ 100000 5m 36864 18432 18432 0
+ 10000 40m 36864 18432 18432 0
+ 25000 40m 39936 18432 21504 0
+ 40000 40m 41984 18432 23552 0
+ 50000 40m 41984 18432 23552 0
+ 100000 40m 54272 18432 35840 0
+ 10000 300m 49152 18432 30720 0
+ 25000 300m 71680 18432 53248 0
+ 40000 300m 94208 18432 75776 0
+ 50000 300m 94208 18432 75776 0
+ 100000 300m 184320 18432 165888 0
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/port_config.ini b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/port_config.ini
new file mode 100644
index 000000000000..ffe3fe0ce6d9
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/port_config.ini
@@ -0,0 +1,57 @@
+# name lanes speed alias
+Ethernet0 0,1 50000 etp1a
+Ethernet2 2,3 50000 etp1b
+Ethernet4 4,5 50000 etp2a
+Ethernet6 6,7 50000 etp2b
+Ethernet8 8,9 50000 etp3a
+Ethernet10 10,11 50000 etp3b
+Ethernet12 12,13 50000 etp4a
+Ethernet14 14,15 50000 etp4b
+Ethernet16 16,17 50000 etp5a
+Ethernet18 18,19 50000 etp5b
+Ethernet20 20,21 50000 etp6a
+Ethernet22 22,23 50000 etp6b
+Ethernet24 24,25,26,27 100000 etp7
+Ethernet28 28,29,30,31 100000 etp8
+Ethernet32 32,33,34,35 100000 etp9
+Ethernet36 36,37,38,39 100000 etp10
+Ethernet40 40,41 50000 etp11a
+Ethernet42 42,43 50000 etp11b
+Ethernet44 44,45 50000 etp12a
+Ethernet46 46,47 50000 etp12b
+Ethernet48 48,49 50000 etp13a
+Ethernet50 50,51 50000 etp13b
+Ethernet52 52,53 50000 etp14a
+Ethernet54 54,55 50000 etp14b
+Ethernet56 56,57 50000 etp15a
+Ethernet58 58,59 50000 etp15b
+Ethernet60 60,61 50000 etp16a
+Ethernet62 62,63 50000 etp16b
+Ethernet64 64,65 50000 etp17a
+Ethernet66 66,67 50000 etp17b
+Ethernet68 68,69 50000 etp18a
+Ethernet70 70,71 50000 etp18b
+Ethernet72 72,73 50000 etp19a
+Ethernet74 74,75 50000 etp19b
+Ethernet76 76,77 50000 etp20a
+Ethernet78 78,79 50000 etp20b
+Ethernet80 80,81 50000 etp21a
+Ethernet82 82,83 50000 etp21b
+Ethernet84 84,85 50000 etp22a
+Ethernet86 86,87 50000 etp22b
+Ethernet88 88,89,90,91 100000 etp23
+Ethernet92 92,93,94,95 100000 etp24
+Ethernet96 96,97,98,99 100000 etp25
+Ethernet100 100,101,102,103 100000 etp26
+Ethernet104 104,105 50000 etp27a
+Ethernet106 106,107 50000 etp27b
+Ethernet108 108,109 50000 etp28a
+Ethernet110 110,111 50000 etp28b
+Ethernet112 112,113 50000 etp29a
+Ethernet114 114,115 50000 etp29b
+Ethernet116 116,117 50000 etp30a
+Ethernet118 118,119 50000 etp30b
+Ethernet120 120,121 50000 etp31a
+Ethernet122 122,123 50000 etp31b
+Ethernet124 124,125 50000 etp32a
+Ethernet126 126,127 50000 etp32b
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json
new file mode 100644
index 000000000000..d35f614de635
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/qos.json
@@ -0,0 +1,166 @@
+{
+ "TC_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "MAP_PFC_PRIORITY_TO_QUEUE": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "TC_TO_QUEUE_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "DSCP_TO_TC_MAP": {
+ "AZURE": {
+ "0":"0",
+ "1":"0",
+ "2":"0",
+ "3":"3",
+ "4":"4",
+ "5":"0",
+ "6":"0",
+ "7":"0",
+ "8":"1",
+ "9":"0",
+ "10":"0",
+ "11":"0",
+ "12":"0",
+ "13":"0",
+ "14":"0",
+ "15":"0",
+ "16":"0",
+ "17":"0",
+ "18":"0",
+ "19":"0",
+ "20":"0",
+ "21":"0",
+ "22":"0",
+ "23":"0",
+ "24":"0",
+ "25":"0",
+ "26":"0",
+ "27":"0",
+ "28":"0",
+ "29":"0",
+ "30":"0",
+ "31":"0",
+ "32":"0",
+ "33":"0",
+ "34":"0",
+ "35":"0",
+ "36":"0",
+ "37":"0",
+ "38":"0",
+ "39":"0",
+ "40":"0",
+ "41":"0",
+ "42":"0",
+ "43":"0",
+ "44":"0",
+ "45":"0",
+ "46":"0",
+ "47":"0",
+ "48":"0",
+ "49":"0",
+ "50":"0",
+ "51":"0",
+ "52":"0",
+ "53":"0",
+ "54":"0",
+ "55":"0",
+ "56":"0",
+ "57":"0",
+ "58":"0",
+ "59":"0",
+ "60":"0",
+ "61":"0",
+ "62":"0",
+ "63":"0"
+ }
+ },
+ "SCHEDULER": {
+ "scheduler.0": {
+ "type":"DWRR",
+ "weight": "25"
+ },
+ "scheduler.1": {
+ "type":"DWRR",
+ "weight": "30"
+ },
+ "scheduler.2": {
+ "type":"DWRR",
+ "weight": "20"
+ }
+ },
+ "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": {
+ "AZURE": {
+ "0": "0",
+ "1": "1",
+ "3": "3",
+ "4": "4"
+ }
+ },
+ "PORT_QOS_MAP": {
+ "Ethernet8,Ethernet2,Ethernet0,Ethernet6,Ethernet4,Ethernet108,Ethernet100,Ethernet104,Ethernet106,Ethernet58,Ethernet126,Ethernet96,Ethernet124,Ethernet122,Ethernet92,Ethernet120,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet76,Ethernet74,Ethernet18,Ethernet70,Ethernet32,Ethernet72,Ethernet16,Ethernet36,Ethernet78,Ethernet60,Ethernet28,Ethernet62,Ethernet14,Ethernet88,Ethernet118,Ethernet24,Ethernet116,Ethernet82,Ethernet114,Ethernet80,Ethernet112,Ethernet86,Ethernet110,Ethernet84,Ethernet48,Ethernet10,Ethernet44,Ethernet42,Ethernet40,Ethernet64,Ethernet66,Ethernet12,Ethernet46,Ethernet20,Ethernet22,Ethernet68": {
+ "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]",
+ "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+ "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+ "pfc_to_pg_map" : "[PFC_PRIORITY_TO_PRIORITY_GROUP_MAP|AZURE]",
+ "pfc_enable": "3,4"
+ }
+ },
+ "WRED_PROFILE": {
+ "AZURE_LOSSY": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ },
+ "AZURE_LOSSLESS": {
+ "wred_green_enable":"true",
+ "wred_yellow_enable":"true",
+ "ecn":"ecn_all",
+ "red_max_threshold":"516096",
+ "red_min_threshold":"516096",
+ "yellow_max_threshold":"516096",
+ "yellow_min_threshold":"516096",
+ "green_max_threshold": "184320",
+ "green_min_threshold": "184320"
+ }
+ },
+ "QUEUE": {
+ "Ethernet8,Ethernet2,Ethernet0,Ethernet6,Ethernet4,Ethernet108,Ethernet100,Ethernet104,Ethernet106,Ethernet58,Ethernet126,Ethernet96,Ethernet124,Ethernet122,Ethernet92,Ethernet120,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet76,Ethernet74,Ethernet18,Ethernet70,Ethernet32,Ethernet72,Ethernet16,Ethernet36,Ethernet78,Ethernet60,Ethernet28,Ethernet62,Ethernet14,Ethernet88,Ethernet118,Ethernet24,Ethernet116,Ethernet82,Ethernet114,Ethernet80,Ethernet112,Ethernet86,Ethernet110,Ethernet84,Ethernet48,Ethernet10,Ethernet44,Ethernet42,Ethernet40,Ethernet64,Ethernet66,Ethernet12,Ethernet46,Ethernet20,Ethernet22,Ethernet68|0": {
+ "scheduler" : "[SCHEDULER|scheduler.1]"
+ },
+ "Ethernet8,Ethernet2,Ethernet0,Ethernet6,Ethernet4,Ethernet108,Ethernet100,Ethernet104,Ethernet106,Ethernet58,Ethernet126,Ethernet96,Ethernet124,Ethernet122,Ethernet92,Ethernet120,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet76,Ethernet74,Ethernet18,Ethernet70,Ethernet32,Ethernet72,Ethernet16,Ethernet36,Ethernet78,Ethernet60,Ethernet28,Ethernet62,Ethernet14,Ethernet88,Ethernet118,Ethernet24,Ethernet116,Ethernet82,Ethernet114,Ethernet80,Ethernet112,Ethernet86,Ethernet110,Ethernet84,Ethernet48,Ethernet10,Ethernet44,Ethernet42,Ethernet40,Ethernet64,Ethernet66,Ethernet12,Ethernet46,Ethernet20,Ethernet22,Ethernet68|1": {
+ "scheduler" : "[SCHEDULER|scheduler.2]"
+ },
+ "Ethernet0,Ethernet4,Ethernet8,Ethernet12,Ethernet16,Ethernet20,Ethernet24,Ethernet28,Ethernet32,Ethernet36,Ethernet40,Ethernet44,Ethernet48,Ethernet52,Ethernet56,Ethernet60,Ethernet64,Ethernet68,Ethernet72,Ethernet76,Ethernet80,Ethernet84,Ethernet88,Ethernet92,Ethernet96,Ethernet100,Ethernet104,Ethernet108,Ethernet112,Ethernet116,Ethernet120,Ethernet124|0-1": {
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSY]"
+ },
+ "Ethernet8,Ethernet2,Ethernet0,Ethernet6,Ethernet4,Ethernet108,Ethernet100,Ethernet104,Ethernet106,Ethernet58,Ethernet126,Ethernet96,Ethernet124,Ethernet122,Ethernet92,Ethernet120,Ethernet50,Ethernet52,Ethernet54,Ethernet56,Ethernet76,Ethernet74,Ethernet18,Ethernet70,Ethernet32,Ethernet72,Ethernet16,Ethernet36,Ethernet78,Ethernet60,Ethernet28,Ethernet62,Ethernet14,Ethernet88,Ethernet118,Ethernet24,Ethernet116,Ethernet82,Ethernet114,Ethernet80,Ethernet112,Ethernet86,Ethernet110,Ethernet84,Ethernet48,Ethernet10,Ethernet44,Ethernet42,Ethernet40,Ethernet64,Ethernet66,Ethernet12,Ethernet46,Ethernet20,Ethernet22,Ethernet68|3-4": {
+ "scheduler" : "[SCHEDULER|scheduler.0]",
+ "wred_profile" : "[WRED_PROFILE|AZURE_LOSSLESS]"
+ }
+ }
+}
+
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
new file mode 100644
index 000000000000..bfbcb1e78f47
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai.profile
@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_2700_48x50g_8x100g.xml
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
new file mode 100644
index 000000000000..bda7a3e1cc17
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/sai_2700_48x50g_8x100g.xml
@@ -0,0 +1,267 @@
+
+
+
+
+
+ 00:02:03:04:05:00
+
+
+ 32
+
+
+
+
+ 1
+ 4
+ 16
+
+
+ 3
+
+
+ 3221225472
+ 2
+
+
+ 3
+ 4
+ 17
+ 1
+ 3221225472
+ 2
+
+
+ 5
+ 4
+ 18
+ 3
+ 3221225472
+ 2
+
+
+ 7
+ 4
+ 19
+ 1
+ 3221225472
+ 2
+
+
+ 9
+ 4
+ 20
+ 3
+ 3221225472
+ 2
+
+
+ 11
+ 4
+ 21
+ 1
+ 3221225472
+ 2
+
+
+ 13
+ 4
+ 22
+ 3
+ 11534336
+
+
+ 15
+ 4
+ 23
+ 1
+ 11534336
+
+
+ 17
+ 4
+ 24
+ 3
+ 11534336
+
+
+ 19
+ 4
+ 25
+ 1
+ 11534336
+
+
+ 21
+ 4
+ 26
+ 3
+ 3221225472
+ 2
+
+
+ 23
+ 4
+ 27
+ 1
+ 3221225472
+ 2>
+
+
+ 25
+ 4
+ 28
+ 3
+ 3221225472
+ 2
+
+
+ 27
+ 4
+ 29
+ 1
+ 3221225472
+ 2
+
+
+ 29
+ 4
+ 30
+ 3
+ 3221225472
+ 2
+
+
+ 31
+ 4
+ 31
+ 1
+ 3221225472
+ 2
+
+
+ 33
+ 4
+ 14
+ 3
+ 3221225472
+ 2
+
+
+ 35
+ 4
+ 15
+ 1
+ 3221225472
+ 2
+
+
+ 37
+ 4
+ 12
+ 3
+ 3221225472
+ 2
+
+
+ 39
+ 4
+ 13
+ 1
+ 3221225472
+ 2
+
+
+ 41
+ 4
+ 10
+ 3
+ 3221225472
+ 2
+
+
+ 43
+ 4
+ 11
+ 1
+ 3221225472
+ 2
+
+
+ 45
+ 4
+ 8
+ 3
+ 11534336
+
+
+ 47
+ 4
+ 9
+ 1
+ 11534336
+
+
+ 49
+ 4
+ 6
+ 3
+ 11534336
+
+
+ 51
+ 4
+ 7
+ 1
+ 11534336
+
+
+ 53
+ 4
+ 4
+ 3
+ 3221225472
+ 2
+
+
+ 55
+ 4
+ 5
+ 1
+ 3221225472
+ 2
+
+
+ 57
+ 4
+ 2
+ 3
+ 3221225472
+ 2
+
+
+ 59
+ 4
+ 3
+ 1
+ 3221225472
+ 2
+
+
+ 61
+ 4
+ 0
+ 3
+ 3221225472
+ 2
+
+
+ 63
+ 4
+ 1
+ 1
+ 3221225472
+ 2
+
+
+
+
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers.json.j2
deleted file mode 100644
index da9c764db92b..000000000000
--- a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers.json.j2
+++ /dev/null
@@ -1,162 +0,0 @@
-{# Default values which will be used if no actual configura available #}
-{% set default_cable = '300m' %}
-{% set default_ports_num = 32 -%}
-
-{# Port configuration to cable length look-up table #}
-{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
-{# Roles described in the minigraph #}
-{% set ports2cable = {
- 'torrouter_server' : '5m',
- 'leafrouter_torrouter' : '40m',
- 'spinerouter_leafrouter' : '300m'
- }
-%}
-
-{%- macro cable_length(port_name) -%}
- {%- set cable_len = [] -%}
- {%- for local_port in DEVICE_NEIGHBOR -%}
- {%- if local_port == port_name -%}
- {%- if DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
- {%- set neighbor = DEVICE_NEIGHBOR_METADATA[DEVICE_NEIGHBOR[local_port].name] -%}
- {%- set neighbor_role = neighbor.type -%}
- {%- set roles1 = switch_role + '_' + neighbor_role %}
- {%- set roles2 = neighbor_role + '_' + switch_role -%}
- {%- set roles1 = roles1 | lower -%}
- {%- set roles2 = roles2 | lower -%}
- {%- if roles1 in ports2cable -%}
- {%- if cable_len.append(ports2cable[roles1]) -%}{%- endif -%}
- {%- elif roles2 in ports2cable -%}
- {%- if cable_len.append(ports2cable[roles2]) -%}{%- endif -%}
- {%- endif -%}
- {%- endif -%}
- {%- endif -%}
- {%- endfor -%}
- {%- if cable_len -%}
- {{ cable_len.0 }}
- {%- else -%}
- {{ default_cable }}
- {%- endif -%}
-{% endmacro %}
-
-{%- if DEVICE_METADATA is defined %}
-{%- set switch_role = DEVICE_METADATA['localhost']['type'] %}
-{%- endif -%}
-
-{# Generate list of ports if not defined #}
-{% if PORT is not defined %}
- {% set PORT = [] %}
- {% for port_idx in range(0,default_ports_num) %}
- {% if PORT.append("Ethernet%d" % (port_idx*4)) %}{% endif %}
- {% endfor %}
-{% endif -%}
-
-{% set port_names_list = [] %}
-{% for port in PORT %}
- {%- if port_names_list.append(port) %}{% endif %}
-{% endfor %}
-{% set port_names = port_names_list | join(',') -%}
-
-{
- "CABLE_LENGTH": {
- "AZURE": {
- {% for port in PORT %}
- {% set cable = cable_length(port) -%}
- "{{ port }}": "{{ cable }}"{%- if not loop.last -%},{% endif %}
-
- {% endfor %}
- }
- },
-{%if switch_role == 'ToRRouter' %}
-{% set ingress_lossless_pool_size = '4194304' %}
-{% set ingress_lossy_pool_size = '7340032' %}
-{% set egress_lossless_pool_size = '16777152' %}
-{% set egress_lossy_pool_size = '7340032' %}
-{% else %}
-{% set ingress_lossless_pool_size = '2097152' %}
-{% set ingress_lossy_pool_size = '5242880' %}
-{% set egress_lossless_pool_size = '16777152' %}
-{% set egress_lossy_pool_size = '5242880' %}
-{%endif %}
- "BUFFER_POOL": {
- "ingress_lossless_pool": {
- "size": "{{ ingress_lossless_pool_size }}",
- "type": "ingress",
- "mode": "dynamic"
- },
- "ingress_lossy_pool": {
- "size": "{{ ingress_lossy_pool_size }}",
- "type": "ingress",
- "mode": "dynamic"
- },
- "egress_lossless_pool": {
- "size": "{{ egress_lossless_pool_size }}",
- "type": "egress",
- "mode": "dynamic"
- },
- "egress_lossy_pool": {
- "size": "{{ egress_lossy_pool_size }}",
- "type": "egress",
- "mode": "dynamic"
- }
- },
- "BUFFER_PROFILE": {
- "ingress_lossless_profile": {
- "pool":"[BUFFER_POOL|ingress_lossless_pool]",
- "size":"0",
- "dynamic_th":"0"
- },
- "ingress_lossy_profile": {
- "pool":"[BUFFER_POOL|ingress_lossy_pool]",
- "size":"0",
- "dynamic_th":"3"
- },
- "egress_lossless_profile": {
- "pool":"[BUFFER_POOL|egress_lossless_pool]",
- "size":"0",
- "dynamic_th":"7"
- },
- "egress_lossy_profile": {
- "pool":"[BUFFER_POOL|egress_lossy_pool]",
- "size":"4096",
- "dynamic_th":"3"
- },
- "pg_lossy_profile": {
- "pool":"[BUFFER_POOL|ingress_lossy_pool]",
- "size":"0",
- "dynamic_th":"3"
- },
- "q_lossless_profile": {
- "pool":"[BUFFER_POOL|egress_lossless_pool]",
- "size":"0",
- "dynamic_th":"7"
- },
- "q_lossy_profile": {
- "pool":"[BUFFER_POOL|egress_lossy_pool]",
- "size":"0",
- "dynamic_th":"3"
- }
- },
- "BUFFER_PORT_INGRESS_PROFILE_LIST": {
- "{{ port_names }}": {
- "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
- }
- },
- "BUFFER_PORT_EGRESS_PROFILE_LIST": {
- "{{ port_names }}": {
- "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]"
- }
- },
- "BUFFER_PG": {
- "{{ port_names }}|0-1": {
- "profile" : "[BUFFER_PROFILE|pg_lossy_profile]"
- }
- },
- "BUFFER_QUEUE": {
- "{{ port_names }}|3-4": {
- "profile" : "[BUFFER_PROFILE|q_lossless_profile]"
- },
- "{{ port_names }}|0-1": {
- "profile" : "[BUFFER_PROFILE|q_lossy_profile]"
- }
- }
-}
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers.json.j2
new file mode 120000
index 000000000000..add8bf8bb7c2
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers.json.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_t0.j2
new file mode 120000
index 000000000000..7bcae62336f6
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_t0.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
\ No newline at end of file
diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_t1.j2
new file mode 120000
index 000000000000..a437d613434d
--- /dev/null
+++ b/device/mellanox/x86_64-mlnx_msn2740-r0/ACS-MSN2740/buffers_defaults_t1.j2
@@ -0,0 +1 @@
+../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
\ No newline at end of file
diff --git a/device/mitac/x86_64-mitac_ly1200_b32h0_c3-r0/plugins/psuutil.py b/device/mitac/x86_64-mitac_ly1200_b32h0_c3-r0/plugins/psuutil.py
new file mode 100644
index 000000000000..8fd9d3b1f349
--- /dev/null
+++ b/device/mitac/x86_64-mitac_ly1200_b32h0_c3-r0/plugins/psuutil.py
@@ -0,0 +1,72 @@
+#!/usr/bin/env python
+
+#############################################################################
+# MiTAC
+#
+# Module contains an implementation of SONiC PSU Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+import os.path
+
+try:
+ from sonic_psu.psu_base import PsuBase
+except ImportError as e:
+ raise ImportError (str(e) + "- required module not found")
+
+class PsuUtil(PsuBase):
+ """Platform-specific PSUutil class"""
+
+ def __init__(self):
+ PsuBase.__init__(self)
+
+ self.psu_nums = 2
+ self.psu_path = "/sys/bus/i2c/devices/1-0032/"
+ self.psu_presence = "ps{}_ps"
+ self.psu_oper_status = "ps{}_pg"
+
+ def get_num_psus(self):
+ """
+ Retrieves the number of PSUs available on the device
+ :return: An integer, the number of PSUs available on the device
+ """
+ return self.psu_nums
+
+ def get_psu_status(self, index):
+ """
+ Retrieves the oprational status of power supply unit (PSU) defined
+ by 1-based index
+ :param index: An integer, 1-based index of the PSU of which to query status
+ :return: Boolean, True if PSU is operating properly, False if PSU is faulty
+ """
+ if index is None:
+ return False
+
+ status = 1
+ try:
+ with open(self.psu_path + self.psu_oper_status.format(index), 'r') as power_status:
+ status = int(power_status.read(), 0)
+ except IOError:
+ return False
+
+ return status == 0
+
+ def get_psu_presence(self, index):
+ """
+ Retrieves the presence status of power supply unit (PSU) defined
+ by 1-based index
+ :param index: An integer, 1-based index of the PSU of which to query status
+ :return: Boolean, True if PSU is plugged, False if not
+ """
+ if index is None:
+ return False
+
+ status = 1
+ try:
+ with open(self.psu_path + self.psu_presence.format(index), 'r') as presence_status:
+ status = int(presence_status.read(), 0)
+ except IOError:
+ return False
+
+ return status == 0
diff --git a/dockers/docker-dhcp-relay/start.sh b/dockers/docker-dhcp-relay/start.sh
index 2ee80c4e3388..0ac5ea1a10ec 100755
--- a/dockers/docker-dhcp-relay/start.sh
+++ b/dockers/docker-dhcp-relay/start.sh
@@ -6,13 +6,16 @@ rm -f /var/run/rsyslogd.pid
# Start rsyslog
supervisorctl start rsyslogd
-# Wait for all interfaces to come up and be assigned IPv4 addresses before
-# starting the DHCP relay agent(s). If an interface the relay should listen
-# on is down, the relay agent will not start. If an interface the relay should
-# listen on is up but does not have an IP address assigned when the relay
-# agent starts, it will not listen or send on that interface for the lifetime
-# of the process.
-/usr/bin/wait_for_intf.sh
+# If our supervisor config has entries in the "isc-dhcp-relay" group...
+if [ $(supervisorctl status | grep -c "^isc-dhcp-relay:") -gt 0 ]; then
+ # Wait for all interfaces to come up and be assigned IPv4 addresses before
+ # starting the DHCP relay agent(s). If an interface the relay should listen
+ # on is down, the relay agent will not start. If an interface the relay
+ # should listen on is up but does not have an IP address assigned when the
+ # relay agent starts, it will not listen or send on that interface for the
+ # lifetime of the process.
+ /usr/bin/wait_for_intf.sh
-# Start the DHCP relay agent(s)
-supervisorctl start isc-dhcp-relay:*
+ # Start all DHCP relay agent(s)
+ supervisorctl start isc-dhcp-relay:*
+fi
diff --git a/dockers/docker-fpm-quagga/zebra.conf.j2 b/dockers/docker-fpm-quagga/zebra.conf.j2
index 8b967f98671c..e4586e72dd62 100644
--- a/dockers/docker-fpm-quagga/zebra.conf.j2
+++ b/dockers/docker-fpm-quagga/zebra.conf.j2
@@ -40,11 +40,13 @@ ip route 0.0.0.0/0 {{ MGMT_INTERFACE[(name, prefix)]['gwaddr'] }} 200
{% set lo_ipv6_addrs = [] %}
{% if LOOPBACK_INTERFACE %}
{% for (name, prefix) in LOOPBACK_INTERFACE %}
-{% if prefix | ipv6 %}
-{% if lo_ipv6_addrs.append(prefix) %}
-{% endif %}
-{% else %}
-{% if lo_ipv4_addrs.append(prefix) %}
+{% if name == 'Loopback0' %}
+{% if prefix | ipv6 %}
+{% if lo_ipv6_addrs.append(prefix) %}
+{% endif %}
+{% else %}
+{% if lo_ipv4_addrs.append(prefix) %}
+{% endif %}
{% endif %}
{% endif %}
{% endfor %}
diff --git a/dockers/docker-lldp-sv2/lldpd.conf.j2 b/dockers/docker-lldp-sv2/lldpd.conf.j2
index ea8be54b097d..94a04596699f 100644
--- a/dockers/docker-lldp-sv2/lldpd.conf.j2
+++ b/dockers/docker-lldp-sv2/lldpd.conf.j2
@@ -1,6 +1,3 @@
{% if MGMT_INTERFACE %}
configure ports eth0 lldp portidsubtype local {{ MGMT_INTERFACE.keys()[0][0] }}
{% endif %}
-{% for local_port in DEVICE_NEIGHBOR %}
-configure ports {{ local_port }} lldp portidsubtype local {{ PORT[local_port]['alias'] }} description {{ DEVICE_NEIGHBOR[local_port]['name'] }}:{{ DEVICE_NEIGHBOR[local_port]['port'] }}
-{% endfor %}
diff --git a/dockers/docker-lldp-sv2/lldpmgrd b/dockers/docker-lldp-sv2/lldpmgrd
index 1d13b1aaafd4..c572967d3e48 100755
--- a/dockers/docker-lldp-sv2/lldpmgrd
+++ b/dockers/docker-lldp-sv2/lldpmgrd
@@ -20,6 +20,7 @@ try:
import subprocess
import sys
import syslog
+ import os.path
from swsscommon import swsscommon
except ImportError as err:
raise ImportError("%s - required module not found" % str(err))
@@ -70,6 +71,19 @@ def signal_handler(sig, frame):
else:
log_warning("Caught unhandled signal '" + sig + "'")
+# ========================== Helpers ==================================
+
+def is_port_up(port_name):
+ filename = "/sys/class/net/%s/operstate" % port_name
+ if not os.path.exists(filename):
+ return False
+
+ with open(filename) as fp:
+ state = fp.read()
+ if 'up' in state:
+ return True
+ else:
+ return False
# ============================== Classes ==============================
@@ -112,7 +126,7 @@ class LldpManager(object):
TABLE_SEPARATOR = "|"
# Retrieve all entires for this port from the Port table
- port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME, TABLE_SEPARATOR)
+ port_table = swsscommon.Table(self.config_db, swsscommon.CFG_PORT_TABLE_NAME)
(status, fvp) = port_table.get(port_name)
if status:
# Convert list of tuples to a dictionary
@@ -130,7 +144,7 @@ class LldpManager(object):
lldpcli_cmd = "lldpcli configure ports {0} lldp portidsubtype local {1}".format(port_name, port_alias)
# Retrieve all entires for this port from the Device Neighbor table
- device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME, TABLE_SEPARATOR)
+ device_neighbor_table = swsscommon.Table(self.config_db, swsscommon.CFG_DEVICE_NEIGHBOR_TABLE_NAME)
(status, fvp) = device_neighbor_table.get(port_name)
if status:
# Convert list of tuples to a dictionary
@@ -161,6 +175,11 @@ class LldpManager(object):
to_delete = []
for (port_name, cmd) in self.pending_cmds.iteritems():
+ if not is_port_up(port_name):
+ # it doesn't make any sense to configure lldpd if the target port is unavailable
+ # let's postpone the command for the next iteration
+ continue
+
log_debug("Running command: '{}'".format(cmd))
proc = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -197,7 +216,7 @@ class LldpManager(object):
# Listen indefinitely for changes to the PORT table in the State DB
while True:
- (state, c, fd) = sel.select(SELECT_TIMEOUT_MS)
+ (state, c) = sel.select(SELECT_TIMEOUT_MS)
if state == swsscommon.Select.OBJECT:
(key, op, fvp) = sst.pop()
diff --git a/dockers/docker-lldp-sv2/start.sh b/dockers/docker-lldp-sv2/start.sh
index 26337fb0667d..adc322979813 100755
--- a/dockers/docker-lldp-sv2/start.sh
+++ b/dockers/docker-lldp-sv2/start.sh
@@ -6,8 +6,32 @@ mkdir -p /var/sonic
echo "# Config files managed by sonic-config-engine" > /var/sonic/config_status
rm -f /var/run/rsyslogd.pid
+rm -f /var/run/lldpd.socket
supervisorctl start rsyslogd
supervisorctl start lldpd
supervisorctl start lldp-syncd
supervisorctl start lldpmgrd
+
+# Current lldpd version has a bug.
+# When lldpd starts it is in the pause state by default
+# But then it execute 'lldpcli resume' to configure and unpause itself.
+# When lldpd execute lldpcli, it doesn't check the return code
+# Sometimes lldpcli returns failure, but lldpd doesn't catch it
+# and keeps working paused and unconfigured
+#
+# The fix below addresses the issue.
+#
+
+# wait until lldpd started
+until [[ -e /var/run/lldpd.socket ]];
+do
+ sleep 1;
+done
+
+# Manually try to resume lldpd, until it's successful
+while /bin/true;
+do
+ lldpcli -u /var/run/lldpd.socket -c /etc/lldpd.conf -c /etc/lldpd.d resume > /dev/null && break
+ sleep 1
+done
diff --git a/dockers/docker-lldp-sv2/supervisord.conf b/dockers/docker-lldp-sv2/supervisord.conf
index 60334e1b8ede..e8022a9a5fa6 100644
--- a/dockers/docker-lldp-sv2/supervisord.conf
+++ b/dockers/docker-lldp-sv2/supervisord.conf
@@ -25,7 +25,7 @@ stderr_logfile=syslog
# - `-dd` means to stay in foreground, log warnings to console
# - `-ddd` means to stay in foreground, log warnings and info to console
# - `-dddd` means to stay in foreground, log all to console
-command=/usr/sbin/lldpd -d -I Ethernet*,eth*
+command=/usr/sbin/lldpd -d -I Ethernet*,eth* -C eth0
priority=3
autostart=false
autorestart=false
diff --git a/dockers/docker-orchagent/Dockerfile.j2 b/dockers/docker-orchagent/Dockerfile.j2
index 3d6671996358..1597b436c3fe 100755
--- a/dockers/docker-orchagent/Dockerfile.j2
+++ b/dockers/docker-orchagent/Dockerfile.j2
@@ -27,6 +27,7 @@ RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
RUN rm -rf /debs
COPY ["files/arp_update", "/usr/bin"]
+COPY ["enable_counters.py", "/usr/bin"]
COPY ["start.sh", "orchagent.sh", "swssconfig.sh", "/usr/bin/"]
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
diff --git a/dockers/docker-orchagent/enable_counters.py b/dockers/docker-orchagent/enable_counters.py
new file mode 100755
index 000000000000..712d34492b47
--- /dev/null
+++ b/dockers/docker-orchagent/enable_counters.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python
+
+import swsssdk
+import time
+
+def enable_counter_group(db, name):
+ info = {}
+ info['FLEX_COUNTER_STATUS'] = 'enable'
+ db.mod_entry("FLEX_COUNTER_TABLE", name, info)
+
+def enable_counters():
+ db = swsssdk.ConfigDBConnector()
+ db.connect()
+ enable_counter_group(db, 'PORT')
+ enable_counter_group(db, 'QUEUE')
+ enable_counter_group(db, 'PFCWD')
+
+def get_uptime():
+ with open('/proc/uptime') as fp:
+ return float(fp.read().split(' ')[0])
+
+def main():
+ # If the switch was just started (uptime less than 5 minutes),
+ # wait for 3 minutes and enable counters
+ # otherwise wait for 60 seconds and enable counters
+ uptime = get_uptime()
+ if uptime < 300:
+ time.sleep(180)
+ else:
+ time.sleep(60)
+ enable_counters()
+
+if __name__ == '__main__':
+ main()
diff --git a/dockers/docker-orchagent/ipinip.json.j2 b/dockers/docker-orchagent/ipinip.json.j2
index 2554755c701d..36fccddc237a 100644
--- a/dockers/docker-orchagent/ipinip.json.j2
+++ b/dockers/docker-orchagent/ipinip.json.j2
@@ -1,7 +1,7 @@
{# only IPv4 decapsulation is supported #}
{% set ipv4_loopback_addresses = [] %}
{% for (name, prefix) in LOOPBACK_INTERFACE %}
- {%- if prefix | ipv4 %}
+ {%- if prefix | ipv4 and name == 'Loopback0' %}
{%- set ipv4_loopback_addresses = ipv4_loopback_addresses.append(prefix) %}
{%- endif %}
{% endfor %}
@@ -11,7 +11,7 @@
"tunnel_type":"IPINIP",
"src_ip":"{{ ipv4_loopback_addresses | first | ip }}",
"dst_ip":"{% for prefix in ipv4_loopback_addresses %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}",
-{% if onie_switch_asic == "mlnx" %}
+{% if "mlnx" in DEVICE_METADATA.localhost.platform %}
"dscp_mode":"uniform",
"ecn_mode":"standard",
{% else %}
diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index e26be9286aa3..0321bf8428f4 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -28,6 +28,8 @@ supervisorctl start intfmgrd
supervisorctl start buffermgrd
+supervisorctl start enable_counters
+
# Start arp_update when VLAN exists
VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
if [ "$VLAN" != "" ]; then
diff --git a/dockers/docker-orchagent/supervisord.conf b/dockers/docker-orchagent/supervisord.conf
index 84beaed440a3..2369a4c31b05 100644
--- a/dockers/docker-orchagent/supervisord.conf
+++ b/dockers/docker-orchagent/supervisord.conf
@@ -61,10 +61,10 @@ stdout_logfile=syslog
stderr_logfile=syslog
[program:arp_update]
-command=bash -c "/usr/bin/arp_update; sleep 300"
+command=/usr/bin/arp_update
priority=8
autostart=false
-autorestart=true
+autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
@@ -91,3 +91,11 @@ autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog
+
+[program:enable_counters]
+command=/usr/bin/enable_counters.py
+priority=11
+autostart=false
+autorestart=false
+stdout_logfile=syslog
+stderr_logfile=syslog
diff --git a/dockers/docker-orchagent/switch.json.j2 b/dockers/docker-orchagent/switch.json.j2
index 7a8c3522ecee..7aaada1b1e40 100644
--- a/dockers/docker-orchagent/switch.json.j2
+++ b/dockers/docker-orchagent/switch.json.j2
@@ -1,10 +1,11 @@
+{# the range of hash_seed is 0-15 #}
{# set default hash seed to 0 #}
{% set hash_seed = 0 %}
{% if DEVICE_METADATA.localhost.type %}
{% if DEVICE_METADATA.localhost.type == "ToRRouter" %}
-{% set hash_seed = 10 %}
+{% set hash_seed = 0 %}
{% elif DEVICE_METADATA.localhost.type == "LeafRouter" %}
-{% set hash_seed = 20 %}
+{% set hash_seed = 10 %}
{% endif %}
{% endif %}
[
diff --git a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf
index 08a3e0a94872..f0bb4d5b3bbd 100644
--- a/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf
+++ b/dockers/docker-router-advertiser/docker-router-advertiser.supervisord.conf
@@ -8,6 +8,7 @@ command=/usr/bin/start.sh
priority=1
autostart=true
autorestart=false
+startsecs=0
stdout_logfile=syslog
stderr_logfile=syslog
diff --git a/dockers/docker-router-advertiser/start.sh b/dockers/docker-router-advertiser/start.sh
index cbd5ec383bd6..159006a176bd 100755
--- a/dockers/docker-router-advertiser/start.sh
+++ b/dockers/docker-router-advertiser/start.sh
@@ -1,11 +1,25 @@
#!/usr/bin/env bash
-# Generate /etc/radvd.conf config file
-sonic-cfggen -d -t /usr/share/sonic/templates/radvd.conf.j2 > /etc/radvd.conf
-
rm -f /var/run/rsyslogd.pid
supervisorctl start rsyslogd
+# Router advertiser should only run on ToR (T0) devices
+DEVICE_ROLE=$(sonic-cfggen -d -v "DEVICE_METADATA.localhost.type")
+if [ "$DEVICE_ROLE" != "ToRRouter" ]; then
+ echo "Device role is not ToRRouter. Not starting router advertiser process."
+ exit 0
+fi
+
+# Generate /etc/radvd.conf config file
+sonic-cfggen -d -t /usr/share/sonic/templates/radvd.conf.j2 > /etc/radvd.conf
+
+# Enusre at least one interface is specified in radvd.conf
+NUM_IFACES=$(grep -c "^interface " /etc/radvd.conf)
+if [ $NUM_IFACES -eq 0 ]; then
+ echo "No interfaces specified in radvd.conf. Not starting router advertiser process."
+ exit 0
+fi
+
# Start the router advertiser
supervisorctl start radvd
diff --git a/dockers/docker-snmp-sv2/snmpd-config-updater b/dockers/docker-snmp-sv2/snmpd-config-updater
index 10c2a2b57ef3..19702451495c 100755
--- a/dockers/docker-snmp-sv2/snmpd-config-updater
+++ b/dockers/docker-snmp-sv2/snmpd-config-updater
@@ -11,6 +11,7 @@
import os
import re
+import signal
import subprocess
import sys
import syslog
@@ -24,6 +25,62 @@ SYSLOG_IDENTIFIER = "snmpd-config-updater"
# ============================== Classes ==============================
+class Process(object):
+ def __init__(self, pid):
+ self.pid = pid
+ self.path = '/proc/%d/status' % pid
+ self.status = None
+
+ def read_proc_status(self):
+ data = {}
+ with open(self.path) as f:
+ for line in f.readlines():
+ key, value = line.split(':', 1)
+ data[ key ] = value.strip()
+ self.status = data
+
+ def get_proc_signals(self):
+ assert self.status
+ sigBlk = int(self.status[ 'SigBlk' ], 16)
+ sigIgn = int(self.status[ 'SigIgn' ], 16)
+ sigCgt = int(self.status[ 'SigCgt' ], 16)
+ return (sigBlk, sigIgn, sigCgt)
+
+ def handle_signal(self, sig):
+ sigBlk, sigIgn, sigCgt = self.get_proc_signals()
+ mask = 1 << ( sig - 1 )
+ if mask & sigBlk:
+ return True
+ if mask & sigIgn:
+ return True
+ if mask & sigCgt:
+ return True
+ return False
+
+ def send_signal(self, sig):
+ log_info('Sending signal %s to %d' % (sig, self.pid))
+ os.kill(self.pid, sig)
+
+ def safe_send_signal(self, sig):
+ self.read_proc_status()
+ if not self.handle_signal(sig):
+ return False
+ self.send_signal(sig)
+ return True
+
+ def wait_send_signal(self, sig, interval=0.1):
+ while not self.safe_send_signal(sig):
+ log_info('Process %s has not yet registered %s' % (self.pid, sig))
+ time.sleep(interval)
+
+ @staticmethod
+ def by_name(name):
+ try:
+ pid = subprocess.check_output([ 'pidof', '-s', name ])
+ except subprocess.CalledProcessError:
+ return None
+ return Process(int(pid.rstrip()))
+
class ConfigUpdater(object):
SERVICE = "snmpd"
CONFIG_FILE_PATH = "/etc/snmp"
@@ -48,8 +105,8 @@ class ConfigUpdater(object):
if table_data["type"] != self.ACL_TABLE_TYPE_CTRLPLANE:
continue
- # Ignore non-SSH service ACLs
- if table_data["service"] != self.ACL_SERVICE_SNMP:
+ # Ignore non-SNMP service ACLs
+ if self.ACL_SERVICE_SNMP not in table_data["services"]:
continue
acl_rules = {}
@@ -125,8 +182,10 @@ class ConfigUpdater(object):
os.rename(filename_tmp, filename)
- # Force snmpd to reload its configuration
- os.system("kill -HUP $(pgrep snmpd) > /dev/null 2> /dev/null || :")
+ # Force snmpd process to reload its configuration if it is running
+ proc = Process.by_name(self.SERVICE)
+ if proc:
+ proc.wait_send_signal(signal.SIGHUP)
def notification_handler(self, key, data):
log_info("ACL configuration changed. Updating {} config accordingly...".format(self.SERVICE))
@@ -179,7 +238,7 @@ def is_platform_arista():
if proc.returncode != 0:
log_error("Failed to retrieve platform string")
- return false
+ return False
return "arista" in stdout
diff --git a/dockers/docker-snmp-sv2/snmpd.conf.j2 b/dockers/docker-snmp-sv2/snmpd.conf.j2
index b46871dfd6f8..18b7af1e925d 100644
--- a/dockers/docker-snmp-sv2/snmpd.conf.j2
+++ b/dockers/docker-snmp-sv2/snmpd.conf.j2
@@ -13,24 +13,9 @@
# AGENT BEHAVIOUR
#
-{% if MGMT_INTERFACE %}
-# Listen for connections on localhost, loopback ip and mgmt (eth0) ip
-agentAddress udp:127.0.0.1:161
-{% for (name, prefix) in MGMT_INTERFACE %}
-{% if prefix | ipv4 %}
-agentAddress udp:{{ prefix | ip }}:161
-{% endif %}
-{% endfor %}
-# TODO: only support ipv4 lo addresses, add ipv6 support later
-{% for (name, prefix) in LOOPBACK_INTERFACE %}
-{% if prefix | ipv4 %}
-agentAddress udp:{{ prefix | ip }}:161
-{% endif %}
-{% endfor %}
-{% else %}
-# Listen on all addresses as mgmt ip not specified
+# Listen for connections on all ip addresses, including eth0, ipv4 lo
agentAddress udp:161
-{% endif %}
+# TODO: only support ipv4 lo addresses, add ipv6 support later
###############################################################################
#
diff --git a/files/build_templates/buffers_config.j2 b/files/build_templates/buffers_config.j2
index 6c55b257342e..20019d20afae 100644
--- a/files/build_templates/buffers_config.j2
+++ b/files/build_templates/buffers_config.j2
@@ -4,7 +4,7 @@
{%- else %}
def
{%- endif %}
-{%- endmacro %}
+{%- endmacro -%}
{# Determine device topology and filename postfix #}
{%- if DEVICE_METADATA is defined %}
@@ -19,12 +19,12 @@ def
{%- else %}
{%- set filename_postfix = set_default_topology() %}
{%- set switch_role = '' %}
-{%- endif %}
+{%- endif -%}
{# Import default values from device HWSKU folder #}
{%- import 'buffers_defaults_%s.j2' % filename_postfix as defs %}
-{%- set default_cable = defs.default_cable %}
+{%- set default_cable = defs.default_cable -%}
{# Port configuration to cable length look-up table #}
{# Each record describes mapping of DUT (DUT port) role and neighbor role to cable length #}
@@ -106,13 +106,28 @@ def
{% endfor %}
}
},
-{% set bufs = defs.generate_buffer_pool_and_profiles() %}
-{{ bufs }}
+
+{% if defs.generate_buffer_pool_and_profiles is defined %}
+{{ defs.generate_buffer_pool_and_profiles() }}
+{% endif %}
+
+{%- if defs.generate_profile_lists is defined %}
+{{ defs.generate_profile_lists(port_names_all) }},
+{% endif %}
+
+{%- if defs.generate_pg_profils is defined %}
+{{ defs.generate_pg_profils }},
+{% else %}
"BUFFER_PG": {
"{{ port_names_all }}|0-1": {
"profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
}
},
+{% endif %}
+
+{% if defs.generate_queue_buffers is defined %}
+{{ defs.generate_queue_buffers(port_names_all) }}
+{% else %}
"BUFFER_QUEUE": {
"{{ port_names_all }}|3-4": {
"profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
@@ -121,4 +136,5 @@ def
"profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
}
}
+{% endif %}
}
diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 6592e9ed173d..1216013e63c2 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -52,7 +52,7 @@ start() {
# docker created with a different HWSKU, remove and recreate
echo "Removing obsolete {{docker_container_name}} container with HWSKU $DOCKERMOUNT"
- docker rm {{docker_container_name}}
+ docker rm -f {{docker_container_name}}
fi
{%- if docker_container_name == "database" %}
@@ -63,6 +63,13 @@ start() {
docker run -d {{docker_image_run_opt}} \
{%- if '--log-driver=json-file' in docker_image_run_opt or '--log-driver' not in docker_image_run_opt %}
--log-opt max-size=2M --log-opt max-file=5 \
+{%- endif %}
+{%- if docker_container_name == "syncd" and sonic_asic_platform == "mellanox" %}
+ -e SX_SNIFFER_ENABLE \
+ -e SX_SNIFFER_TARGET \
+ -e PRM_SNIFFER \
+ -e PRM_SNIFFER_FILE_PATH \
+ -v /var/log/mellanox/sniffer:/var/log/mellanox/sniffer:rw \
{%- endif %}
-v /var/run/redis:/var/run/redis:rw \
-v /usr/share/sonic/device/$PLATFORM:/usr/share/sonic/platform:ro \
diff --git a/files/build_templates/snmp.service.j2 b/files/build_templates/snmp.service.j2
index f0612a9cfcb6..6398477ab6a1 100644
--- a/files/build_templates/snmp.service.j2
+++ b/files/build_templates/snmp.service.j2
@@ -7,6 +7,3 @@ After=updategraph.service swss.service
ExecStartPre=/usr/bin/{{docker_container_name}}.sh start
ExecStart=/usr/bin/{{docker_container_name}}.sh attach
ExecStop=/usr/bin/{{docker_container_name}}.sh stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/files/build_templates/snmp.timer b/files/build_templates/snmp.timer
new file mode 100644
index 000000000000..464cf01459ba
--- /dev/null
+++ b/files/build_templates/snmp.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Delays snmp container until SONiC has started
+
+[Timer]
+OnBootSec=3min 30 sec
+Unit=snmp.service
+
+[Install]
+WantedBy=timers.target
diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 0849118b83a4..7e22aad82fb4 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -93,6 +93,11 @@ sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY2_WHEEL_NAME
sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/python-sonic-utilities_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+# Install customized bash version to patch memory-leak issue. This instruction shall be removed
+# once the migration to Debian-9 (Stretch) is completed.
+sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/bash_*.deb || \
+ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+
# SONiC utilities installs bash-completion as a dependency. However, it is disabled by default
# in bash.bashrc, so we copy a version of the file with it enabled here.
sudo cp -f $IMAGE_CONFIGS/bash/bash.bashrc $FILESYSTEM_ROOT/etc/
@@ -179,6 +184,7 @@ sudo cp $IMAGE_CONFIGS/asn/deployment_id_asn_map.yml $FILESYSTEM_ROOT/etc/sonic/
# Copy sudoers configuration file
sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
+sudo cp $IMAGE_CONFIGS/sudoers/sudoers.lecture $FILESYSTEM_ROOT/etc/
# Copy control plane ACL management daemon files
sudo cp $IMAGE_CONFIGS/caclmgrd/caclmgrd.service $FILESYSTEM_ROOT/etc/systemd/system/
@@ -272,6 +278,11 @@ sudo LANG=C chroot $FILESYSTEM_ROOT fuser -km /sys || true
sudo LANG=C chroot $FILESYSTEM_ROOT umount -lf /sys
{% endif %}
+# Copy systemd timer configuration
+# It implements delayed start of services
+sudo cp $BUILD_TEMPLATES/snmp.timer $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable snmp.timer
+
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get remove -y python-dev
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get clean -y
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get autoremove -y
diff --git a/files/image_config/caclmgrd/caclmgrd b/files/image_config/caclmgrd/caclmgrd
index a61c2437a5b7..0dc59766b3d5 100755
--- a/files/image_config/caclmgrd/caclmgrd
+++ b/files/image_config/caclmgrd/caclmgrd
@@ -11,6 +11,7 @@
#
try:
+ import ipaddr as ipaddress
import os
import subprocess
import sys
@@ -113,90 +114,114 @@ class ControlPlaneAclManager(object):
# Add iptables command to delete all non-default chains
iptables_cmds.append("iptables -X")
+ # Add same set of commands for ip6tables
+ iptables_cmds.append("ip6tables -P INPUT ACCEPT")
+ iptables_cmds.append("ip6tables -P FORWARD ACCEPT")
+ iptables_cmds.append("ip6tables -P OUTPUT ACCEPT")
+ iptables_cmds.append("ip6tables -F")
+ iptables_cmds.append("ip6tables -X")
+
# Get current ACL tables and rules from Config DB
self._tables_db_info = self.config_db.get_table(self.ACL_TABLE)
self._rules_db_info = self.config_db.get_table(self.ACL_RULE)
# Walk the ACL tables
for (table_name, table_data) in self._tables_db_info.iteritems():
- # Ignore non-control-plane ACL tables
- if table_data["type"] != self.ACL_TABLE_TYPE_CTRLPLANE:
- continue
- acl_service = table_data["service"]
+ table_ip_version = None
- if acl_service not in self.ACL_SERVICES:
- log_warning("Ignoring control plane ACL '{}' with unrecognized service '{}'"
- .format(table_name, acl_service))
+ # Ignore non-control-plane ACL tables
+ if table_data["type"] != self.ACL_TABLE_TYPE_CTRLPLANE:
continue
- log_info("Translating ACL rules for control plane ACL '{}' (service: '{}')"
- .format(table_name, acl_service))
-
- # Obtain default IP protocol(s) and destination port(s) for this service
- ip_protocols = self.ACL_SERVICES[acl_service]["ip_protocols"]
- dst_ports = self.ACL_SERVICES[acl_service]["dst_ports"]
-
- acl_rules = {}
+ acl_services = table_data["services"]
- for ((rule_table_name, rule_id), rule_props) in self._rules_db_info.iteritems():
- if rule_table_name == table_name:
- acl_rules[rule_props["PRIORITY"]] = rule_props
+ for acl_service in acl_services:
+ if acl_service not in self.ACL_SERVICES:
+ log_warning("Ignoring control plane ACL '{}' with unrecognized service '{}'"
+ .format(table_name, acl_service))
+ continue
- # For each ACL rule in this table (in descending order of priority)
- for priority in sorted(acl_rules.iterkeys(), reverse=True):
- rule_props = acl_rules[priority]
+ log_info("Translating ACL rules for control plane ACL '{}' (service: '{}')"
+ .format(table_name, acl_service))
- if "PACKET_ACTION" not in rule_props:
- log_error("ACL rule does not contain PACKET_ACTION property")
+ # Obtain default IP protocol(s) and destination port(s) for this service
+ ip_protocols = self.ACL_SERVICES[acl_service]["ip_protocols"]
+ dst_ports = self.ACL_SERVICES[acl_service]["dst_ports"]
+
+ acl_rules = {}
+
+ for ((rule_table_name, rule_id), rule_props) in self._rules_db_info.iteritems():
+ if rule_table_name == table_name:
+ acl_rules[rule_props["PRIORITY"]] = rule_props
+
+ # If we haven't determined the IP version for this ACL table yet,
+ # try to do it now. We determine heuristically based on whether the
+ # src IP is an IPv4 or IPv6 address.
+ if not table_ip_version and "SRC_IP" in rule_props and rule_props["SRC_IP"]:
+ ip_addr = ipaddress.IPAddress(rule_props["SRC_IP"].split("/")[0])
+ if isinstance(ip_addr, ipaddress.IPv6Address):
+ table_ip_version = 6
+ elif isinstance(ip_addr, ipaddress.IPv4Address):
+ table_ip_version = 4
+
+ # If we were unable to determine whether this ACL table contains
+ # IPv4 or IPv6 rules, log a message and skip processing this table.
+ if not table_ip_version:
+ log_warning("Unable to determine if ACL table '{}' contains IPv4 or IPv6 rules. Skipping table..."
+ .format(table_name))
continue
- # If the rule contains an IP protocol, we will use it.
- # Otherwise, we will apply the rule to the default
- # protocol(s) for this ACL service
- if "IP_PROTOCOL" in rule_props:
- ip_protocols = [rule_props["IP_PROTOCOL"]]
-
- for ip_protocol in ip_protocols:
- for dst_port in dst_ports:
- rule_cmd = "iptables -A INPUT -p {}".format(ip_protocol)
-
- if "SRC_IP" in rule_props and rule_props["SRC_IP"]:
- rule_cmd += " -s {}".format(rule_props["SRC_IP"])
-
- rule_cmd += " --dport {}".format(dst_port)
-
- # If there are TCP flags present, append them
- if "TCP_FLAGS" in rule_props and rule_props["TCP_FLAGS"]:
- tcp_flags = int(rule_props["TCP_FLAGS"], 16)
-
- if tcp_flags > 0:
- rule_cmd += " --tcp-flags "
-
- if tcp_flags & 0x01:
- rule_cmd += "FIN,"
- if tcp_flags & 0x02:
- rule_cmd += "SYN,"
- if tcp_flags & 0x04:
- rule_cmd += "RST,"
- if tcp_flags & 0x08:
- rule_cmd += "PSH,"
- if tcp_flags & 0x10:
- rule_cmd += "ACK,"
- if tcp_flags & 0x20:
- rule_cmd += "URG,"
- if tcp_flags & 0x40:
- rule_cmd += "ECE,"
- if tcp_flags & 0x80:
- rule_cmd += "CWR,"
-
- # Delete the trailing comma
- rule_cmd = rule_cmd[:-1]
-
- # Append the packet action as the jump target
- rule_cmd += " -j {}".format(rule_props["PACKET_ACTION"])
-
- iptables_cmds.append(rule_cmd)
+ # For each ACL rule in this table (in descending order of priority)
+ for priority in sorted(acl_rules.iterkeys(), reverse=True):
+ rule_props = acl_rules[priority]
+
+ if "PACKET_ACTION" not in rule_props:
+ log_error("ACL rule does not contain PACKET_ACTION property")
+ continue
+
+ # Apply the rule to the default protocol(s) for this ACL service
+ for ip_protocol in ip_protocols:
+ for dst_port in dst_ports:
+ rule_cmd = "ip6tables" if table_ip_version == 6 else "iptables"
+ rule_cmd += " -A INPUT -p {}".format(ip_protocol)
+
+ if "SRC_IP" in rule_props and rule_props["SRC_IP"]:
+ rule_cmd += " -s {}".format(rule_props["SRC_IP"])
+
+ rule_cmd += " --dport {}".format(dst_port)
+
+ # If there are TCP flags present, append them
+ if "TCP_FLAGS" in rule_props and rule_props["TCP_FLAGS"]:
+ tcp_flags = int(rule_props["TCP_FLAGS"], 16)
+
+ if tcp_flags > 0:
+ rule_cmd += " --tcp-flags "
+
+ if tcp_flags & 0x01:
+ rule_cmd += "FIN,"
+ if tcp_flags & 0x02:
+ rule_cmd += "SYN,"
+ if tcp_flags & 0x04:
+ rule_cmd += "RST,"
+ if tcp_flags & 0x08:
+ rule_cmd += "PSH,"
+ if tcp_flags & 0x10:
+ rule_cmd += "ACK,"
+ if tcp_flags & 0x20:
+ rule_cmd += "URG,"
+ if tcp_flags & 0x40:
+ rule_cmd += "ECE,"
+ if tcp_flags & 0x80:
+ rule_cmd += "CWR,"
+
+ # Delete the trailing comma
+ rule_cmd = rule_cmd[:-1]
+
+ # Append the packet action as the jump target
+ rule_cmd += " -j {}".format(rule_props["PACKET_ACTION"])
+
+ iptables_cmds.append(rule_cmd)
return iptables_cmds
diff --git a/files/image_config/cron.d/s6100-fast-reboot b/files/image_config/cron.d/s6100-fast-reboot
new file mode 100644
index 000000000000..aa3217e61fd0
--- /dev/null
+++ b/files/image_config/cron.d/s6100-fast-reboot
@@ -0,0 +1,2 @@
+# Change linkscan interval to 0.25 sec after 3 minutes after start on Dell S6100
+@reboot root sleep 180 && [ $(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.platform) = 'x86_64-dell_s6100_c2538-r0' ] && [ $(/usr/local/bin/sonic-cfggen -H -v DEVICE_METADATA.localhost.fast_reboot) = 'True' ] && /usr/bin/docker exec -i syncd bcmcmd 'linkscan i=250000' > /dev/null 2>&1
diff --git a/files/image_config/interfaces/interfaces-config.sh b/files/image_config/interfaces/interfaces-config.sh
index 06174790f04a..a702917419ca 100755
--- a/files/image_config/interfaces/interfaces-config.sh
+++ b/files/image_config/interfaces/interfaces-config.sh
@@ -1,5 +1,7 @@
#!/bin/bash
+ifdown --force eth0
+
sonic-cfggen -d -t /usr/share/sonic/templates/interfaces.j2 > /etc/network/interfaces
[ -f /var/run/dhclient.eth0.pid ] && kill `cat /var/run/dhclient.eth0.pid` && rm -f /var/run/dhclient.eth0.pid
diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
index a931efb5b469..de54d141ef7e 100755
--- a/files/image_config/platform/rc.local
+++ b/files/image_config/platform/rc.local
@@ -126,19 +126,31 @@ if [ ! -e /host/machine.conf ]; then
if [ -n "$nos_dev" ]; then
# Mount the previous NOS's partition
- mkdir -p /mnt/nos_migration
- mount $nos_dev /mnt/nos_migration
+ NOS_DIR=/mnt/nos_migration
+ MG_GZFILE=$NOS_DIR/minigraph.xml.gz.base64.txt
+ MG_FILE=$NOS_DIR/minigraph.xml
+ ACL_GZFILE=$NOS_DIR/acl.json.gz.base64.txt
+ ACL_FILE=$NOS_DIR/acl.json
+ SNMP_FILE=$NOS_DIR/snmp.yml
+ mkdir -p $NOS_DIR
+ mount $nos_dev $NOS_DIR
mkdir -p /host/fast-reboot
+ # decode & unzip minigraph.xml.gz.base64.txt
+ [ -f $MG_GZFILE ] && /usr/bin/base64 -d $MG_GZFILE | /bin/gunzip > $MG_FILE
+ [ -f $ACL_GZFILE ] && /usr/bin/base64 -d $ACL_GZFILE | /bin/gunzip > $ACL_FILE
+
# Copy relevant files
- nos_migration_import /mnt/nos_migration/mgmt_interface.cfg /host/migration
- nos_migration_import /mnt/nos_migration/minigraph.xml /host/migration
- nos_migration_import /mnt/nos_migration/arp.json /host/fast-reboot
- nos_migration_import /mnt/nos_migration/fdb.json /host/fast-reboot
- nos_migration_import /mnt/nos_migration/default_routes.json /host/fast-reboot
-
- umount /mnt/nos_migration
- rmdir /mnt/nos_migration
+ nos_migration_import $NOS_DIR/mgmt_interface.cfg /host/migration
+ nos_migration_import $MG_FILE /host/migration
+ nos_migration_import $ACL_FILE /host/migration
+ nos_migration_import $SNMP_FILE /host/migration
+ nos_migration_import $NOS_DIR/arp.json /host/fast-reboot
+ nos_migration_import $NOS_DIR/fdb.json /host/fast-reboot
+ nos_migration_import $NOS_DIR/default_routes.json /host/fast-reboot
+
+ umount $NOS_DIR
+ rmdir $NOS_DIR
fi
update_mgmt_interface_macaddr /host/migration/mgmt_interface.cfg
@@ -196,6 +208,8 @@ if [ -f /host/image-$sonic_version/platform/firsttime ]; then
elif [ -n "$migration" ] && [ -f /host/migration/minigraph.xml ]; then
mkdir -p /etc/sonic/old_config
mv /host/migration/minigraph.xml /etc/sonic/old_config/
+ [ -f /host/migration/acl.json ] && mv /host/migration/acl.json /etc/sonic/old_config/
+ [ -f /host/migration/snmp.yml ] && mv /host/migration/snmp.yml /etc/sonic/old_config/
touch /tmp/pending_config_migration
[ -f /etc/sonic/updategraph.conf ] && sed -i -e "s/enabled=false/enabled=true/g" /etc/sonic/updategraph.conf
else
diff --git a/files/image_config/ssh/sshd-config-updater b/files/image_config/ssh/sshd-config-updater
index ad1ee000febe..5f7a4ce17f98 100755
--- a/files/image_config/ssh/sshd-config-updater
+++ b/files/image_config/ssh/sshd-config-updater
@@ -49,7 +49,7 @@ class ConfigUpdater(object):
continue
# Ignore non-SSH service ACLs
- if table_data["service"] != self.ACL_SERVICE_SSH:
+ if self.ACL_SERVICE_SSH not in table_data["services"]:
continue
acl_rules = {}
diff --git a/files/image_config/sudoers/sudoers b/files/image_config/sudoers/sudoers
index 952a2313bad2..47d98b3fed41 100644
--- a/files/image_config/sudoers/sudoers
+++ b/files/image_config/sudoers/sudoers
@@ -10,6 +10,7 @@ Defaults env_reset
#Defaults mail_badpass
Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
Defaults env_keep += "VTYSH_PAGER"
+Defaults lecture_file = /etc/sudoers.lecture
# Host alias specification
@@ -37,6 +38,9 @@ Cmnd_Alias PASSWD_CMDS = /usr/bin/config tacacs passkey *, \
# User privilege specification
root ALL=(ALL:ALL) ALL
+# Allow all users to execute read only commands
+ALL ALL=NOPASSWD: READ_ONLY_CMDS
+
# Allow members of group sudo to execute any command
%sudo ALL=(ALL:ALL) NOPASSWD: ALL
diff --git a/files/image_config/sudoers/sudoers.lecture b/files/image_config/sudoers/sudoers.lecture
new file mode 100644
index 000000000000..e89340092c70
--- /dev/null
+++ b/files/image_config/sudoers/sudoers.lecture
@@ -0,0 +1,4 @@
+
+Make sure your account has RW permission to current device.
+Otherwise sudo requests will be rejected.
+
diff --git a/files/image_config/updategraph/updategraph.service b/files/image_config/updategraph/updategraph.service
index 4599f56bdc64..ec478d93a132 100644
--- a/files/image_config/updategraph/updategraph.service
+++ b/files/image_config/updategraph/updategraph.service
@@ -7,6 +7,7 @@ Requires=database.service
[Service]
Type=oneshot
ExecStart=/usr/bin/updategraph
+RemainAfterExit=yes
[Install]
WantedBy=multi-user.target
diff --git a/files/scripts/arp_update b/files/scripts/arp_update
index cfd87c1dc51f..ab44ca6a4580 100755
--- a/files/scripts/arp_update
+++ b/files/scripts/arp_update
@@ -4,14 +4,17 @@
# arp_update: Send gratuitous ARP requests to VLAN member neighbors to refresh
# the neighbors state.
-VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
-for vlan in $VLAN; do
- # generate a list of arping commands:
- # arping -q -w 0 -c 1 -i ;
- # arping -q -w 0 -c 1 -i ;
- # ...
- arpingcmd="sed -e 's/ / -i /' -e 's/^/arping -q -w 0 -c 1 /' -e 's/$/;/'"
- ipcmd="ip -4 neigh show | grep $vlan | cut -d ' ' -f 1,3 | $arpingcmd"
+while /bin/true; do
+ VLAN=`sonic-cfggen -d -v 'VLAN.keys() | join(" ") if VLAN'`
+ for vlan in $VLAN; do
+ # generate a list of arping commands:
+ # arping -q -w 0 -c 1 -i ;
+ # arping -q -w 0 -c 1 -i ;
+ # ...
+ arpingcmd="sed -e 's/ / -i /' -e 's/^/arping -q -w 0 -c 1 /' -e 's/$/;/'"
+ ipcmd="ip -4 neigh show | grep $vlan | cut -d ' ' -f 1,3 | $arpingcmd"
- eval `eval $ipcmd`
+ eval `eval $ipcmd`
+ done
+ sleep 300
done
diff --git a/installer/x86_64/install.sh b/installer/x86_64/install.sh
index 825e4636d0af..91dd57a74ba1 100755
--- a/installer/x86_64/install.sh
+++ b/installer/x86_64/install.sh
@@ -163,11 +163,21 @@ create_demo_gpt_partition()
while read -r part_index; do
if [ "$blk_dev$part_index" = "$cur_part" ]; then continue; fi
echo "deleting partition $part_index ..."
+ # if the partition is already mounted, umount first
+ df $blk_dev$part_index 2>/dev/null && {
+ umount $blk_dev$part_index || {
+ echo "Error: Unable to umount $blk_dev$part_index"
+ exit 1
+ }
+ }
sgdisk -d $part_index $blk_dev || {
echo "Error: Unable to delete partition $part_index on $blk_dev"
exit 1
}
- partprobe
+ partprobe || {
+ echo "Error: Unable to partprobe"
+ exit 1
+ }
done < $tmpfifo
fi
@@ -446,7 +456,11 @@ fi
# Decompress the file for the file system directly to the partition
unzip -o $ONIE_INSTALLER_PAYLOAD -x "$FILESYSTEM_DOCKERFS" -d $demo_mnt/$image_dir
-TAR_EXTRA_OPTION="--numeric-owner"
+if [ "$install_env" = "onie" ]; then
+ TAR_EXTRA_OPTION="--numeric-owner"
+else
+ TAR_EXTRA_OPTION="--numeric-owner --warning=no-timestamp"
+fi
mkdir -p $demo_mnt/$image_dir/$DOCKERFS_DIR
unzip -op $ONIE_INSTALLER_PAYLOAD "$FILESYSTEM_DOCKERFS" | tar xz $TAR_EXTRA_OPTION -f - -C $demo_mnt/$image_dir/$DOCKERFS_DIR
diff --git a/platform/broadcom/docker-syncd-brcm/start.sh b/platform/broadcom/docker-syncd-brcm/start.sh
index d2180bce1ed7..cc82e1ba33a8 100755
--- a/platform/broadcom/docker-syncd-brcm/start.sh
+++ b/platform/broadcom/docker-syncd-brcm/start.sh
@@ -11,7 +11,7 @@ mkdir -p /etc/sai.d/
# Create/Copy the sai.profile to /etc/sai.d/sai.profile
if [ -f $HWSKU_DIR/sai.profile.j2 ]; then
- sonic-cfggen -d -t $HWSKU_DIR/sai.profile.j2 > /etc/sai.d/sai.profile
+ sonic-cfggen -H -d -t $HWSKU_DIR/sai.profile.j2 > /etc/sai.d/sai.profile
else
if [ -f $HWSKU_DIR/sai.profile ]; then
cp $HWSKU_DIR/sai.profile /etc/sai.d/sai.profile
@@ -33,5 +33,6 @@ wait_syncd() {
# If this platform has an initialization file for the Broadcom LED microprocessor, load it
if [ -r ${PLATFORM_DIR}/led_proc_init.soc ]; then
wait_syncd
+ sleep 60 # wait until bcm sdk is ready to get a request
/usr/bin/bcmcmd -t 60 "rcload ${PLATFORM_DIR}/led_proc_init.soc"
fi
diff --git a/platform/broadcom/platform-modules-cel.mk b/platform/broadcom/platform-modules-cel.mk
index 09e8b374e861..551ff37e3b37 100644
--- a/platform/broadcom/platform-modules-cel.mk
+++ b/platform/broadcom/platform-modules-cel.mk
@@ -1,6 +1,6 @@
# Celestica DX010 Platform modules
-CEL_DX010_PLATFORM_MODULE_VERSION = 0.6
+CEL_DX010_PLATFORM_MODULE_VERSION = 0.7
export CEL_DX010_PLATFORM_MODULE_VERSION
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index 1f124e1b9232..5cda170b3391 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,9 +1,9 @@
-BRCM_SAI = libsaibcm_3.1.3.4-7_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.4-7_amd64.deb?sv=2015-04-05&sr=b&sig=elzOgHCA3G8oKKMfWcbFa%2BvQzAh727mtYJnnVOzVJtY%3D&se=2155-02-07T23%3A37%3A54Z&sp=r"
+BRCM_SAI = libsaibcm_3.1.3.4-15_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm_3.1.3.4-15_amd64.deb?sv=2015-04-05&sr=b&sig=7CIkdlBB%2BY6Xjae0vc1QBnlAVedRkreJRhWM93SyHOI%3D&se=2032-02-29T18%3A31%3A54Z&sp=r"
-BRCM_SAI_DEV = libsaibcm-dev_3.1.3.4-7_amd64.deb
+BRCM_SAI_DEV = libsaibcm-dev_3.1.3.4-15_amd64.deb
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.4-7_amd64.deb?sv=2015-04-05&sr=b&sig=rysxdbCA%2BaqBgDnxztdRA2ixiME3ypqRvzyEds8hLw4%3D&se=2155-02-07T23%3A38%3A39Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/libsaibcm-dev_3.1.3.4-15_amd64.deb?sv=2015-04-05&sr=b&sig=rBOT802o1o%2BAcogaXq%2FgqyuTAmSlFKhtPzYM%2BtXlIdM%3D&se=2032-02-29T18%3A34%3A10Z&sp=r"
SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
diff --git a/platform/broadcom/sonic-platform-modules-arista b/platform/broadcom/sonic-platform-modules-arista
index 6fe9de4dd52b..a35c7eddaf94 160000
--- a/platform/broadcom/sonic-platform-modules-arista
+++ b/platform/broadcom/sonic-platform-modules-arista
@@ -1 +1 @@
-Subproject commit 6fe9de4dd52bba4c5856567a8f5624e75e9af66d
+Subproject commit a35c7eddaf945a1ff09ea71b47f69b6ddba5e892
diff --git a/platform/broadcom/sonic-platform-modules-cel b/platform/broadcom/sonic-platform-modules-cel
index 190d0b71ac19..4c8bcd1584e5 160000
--- a/platform/broadcom/sonic-platform-modules-cel
+++ b/platform/broadcom/sonic-platform-modules-cel
@@ -1 +1 @@
-Subproject commit 190d0b71ac1902679e2d720368e100d78eb09f3e
+Subproject commit 4c8bcd1584e5afb05476a67e0ed82ca02fba6da0
diff --git a/platform/broadcom/sonic-platform-modules-mitac b/platform/broadcom/sonic-platform-modules-mitac
index ed807feb6f8e..db8e7de1b41a 160000
--- a/platform/broadcom/sonic-platform-modules-mitac
+++ b/platform/broadcom/sonic-platform-modules-mitac
@@ -1 +1 @@
-Subproject commit ed807feb6f8efc612ae57dea3123256d972506c5
+Subproject commit db8e7de1b41a407028ee2c4361177bd7b52f9431
diff --git a/platform/cavium/cavm-platform-modules.mk b/platform/cavium/cavm-platform-modules.mk
index 4ac72a4c4aab..500043d131e1 100644
--- a/platform/cavium/cavm-platform-modules.mk
+++ b/platform/cavium/cavm-platform-modules.mk
@@ -1,3 +1,4 @@
CAVM_PLATFORM_DEB = cavm_platform_modules.deb
$(CAVM_PLATFORM_DEB)_SRC_PATH = $(PLATFORM_PATH)/cavm_platform_modules
+$(CAVM_PLATFORM_DEB)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
SONIC_MAKE_DEBS += $(CAVM_PLATFORM_DEB)
diff --git a/platform/cavium/cavm-sai.mk b/platform/cavium/cavm-sai.mk
index 0008135729c5..600bb4f1de31 100644
--- a/platform/cavium/cavm-sai.mk
+++ b/platform/cavium/cavm-sai.mk
@@ -1,6 +1,6 @@
# Cavium SAI
-CAVM_SAI_GITHUB = https://github.com/XPliant/OpenXPS/raw/13a7eaf10f523e7887964ca235f19095fcc88537/SAI/cavm-sai/
+CAVM_SAI_GITHUB = https://github.com/XPliant/OpenXPS/raw/d4e8e80da546a6e53490a71dc73e26216bb40125/SAI/cavm-sai/
CAVM_LIBSAI = libsai.deb
CAVM_SAI = sai.deb
diff --git a/platform/cavium/cavm-xpnet.mk b/platform/cavium/cavm-xpnet.mk
index ed86558a36ae..a4c43cb334bd 100644
--- a/platform/cavium/cavm-xpnet.mk
+++ b/platform/cavium/cavm-xpnet.mk
@@ -1,4 +1,4 @@
-CAVM_SAI_URL = https://github.com/XPliant/OpenXPS/raw/c26aea6a7098936ab3692e148238d73fa8962585/SAI
+CAVM_SAI_URL = https://github.com/XPliant/OpenXPS/raw/d37a606cdf7d2bdc9d6ee025b758f64572f8ddbe/SAI
CAVM_XPNET_DEB = xp80-Pcie-Endpoint.deb
$(CAVM_XPNET_DEB)_URL = $(CAVM_SAI_URL)/netdev/$(CAVM_XPNET_DEB)
diff --git a/platform/marvell/rules.mk b/platform/marvell/rules.mk
index 185b7b5fd7a9..c5df6bab194e 100644
--- a/platform/marvell/rules.mk
+++ b/platform/marvell/rules.mk
@@ -12,7 +12,7 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) \
$(DOCKER_SYNCD_MRVL_RPC)
# Inject mrvl sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) #$(LIBSAITHRIFT_DEV_MRVL)
+$(LIBSAIREDIS)_DEPENDS += $(MRVL_FPA) $(MRVL_SAI) $(LIBSAITHRIFT_DEV_MRVL)
# Runtime dependency on mrvl sai is set only for syncd
$(SYNCD)_RDEPENDS += $(MRVL_SAI)
diff --git a/platform/marvell/sai.mk b/platform/marvell/sai.mk
index d2722971f1dd..5016b47f19a9 100644
--- a/platform/marvell/sai.mk
+++ b/platform/marvell/sai.mk
@@ -1,7 +1,7 @@
# Marvell SAI
-export MRVL_SAI_VERSION = 1.0.1
-export MRVL_SAI_TAG = SONiC.201712
+export MRVL_SAI_VERSION = 1.2.1
+export MRVL_SAI_TAG = SONiC.201803
export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION).deb
$(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai
diff --git a/platform/marvell/sdk.mk b/platform/marvell/sdk.mk
index 12050df5d34b..3d1ce8e04c88 100644
--- a/platform/marvell/sdk.mk
+++ b/platform/marvell/sdk.mk
@@ -1,7 +1,7 @@
# Marvell FPA
-export MRVL_FPA_VERSION = 1.0.1
-export MRVL_FPA_TAG = SONiC.201712
+export MRVL_FPA_VERSION = 1.2.1
+export MRVL_FPA_TAG = SONiC.201803
export MRVL_FPA = mrvllibfpa_$(MRVL_FPA_VERSION).deb
$(MRVL_FPA)_SRC_PATH = $(PLATFORM_PATH)/sdk
diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 0ac9dd9b7aa6..ca8e4f988bd8 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -1,6 +1,6 @@
# mellanox firmware
-MLNX_FW_VERSION = 13.1620.0208
+MLNX_FW_VERSION = 13.1620.0234
MLNX_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_FW_VERSION))-EVB.mfa
$(MLNX_FW_FILE)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_FW_FILE)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index afb080413f64..648ee3eca5b7 100644
--- a/platform/mellanox/mlnx-sai.mk
+++ b/platform/mellanox/mlnx-sai.mk
@@ -1,7 +1,7 @@
# Mellanox SAI
-MLNX_SAI_VERSION = SAIRel1.11.4-master
-MLNX_SAI_REVISION = 6367854b48b73470a6e093f6fbbd45b3341edaba
+MLNX_SAI_VERSION = SAIRel1.11.5-master
+MLNX_SAI_REVISION = 5675ef1037813992cd234d3afcee43959e1ca4f6
export MLNX_SAI_VERSION MLNX_SAI_REVISION
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 2ebb7d23f9c6..83d5dad7af8a 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,5 +1,5 @@
-MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/6367854b48b73470a6e093f6fbbd45b3341edaba/sdk
-MLNX_SDK_VERSION = 4.2.7201
+MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/5675ef1037813992cd234d3afcee43959e1ca4f6/sdk
+MLNX_SDK_VERSION = 4.2.7303
MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \
$(SXD_LIBS) $(TESTX)
diff --git a/platform/nephos/one-image.mk b/platform/nephos/one-image.mk
index 8e9406dca89c..61dcd6e30468 100644
--- a/platform/nephos/one-image.mk
+++ b/platform/nephos/one-image.mk
@@ -5,6 +5,7 @@ $(SONIC_ONE_IMAGE)_MACHINE = nephos
$(SONIC_ONE_IMAGE)_IMAGE_TYPE = onie
$(SONIC_ONE_IMAGE)_INSTALLS += $(NEPHOS_NPS_KERNEL)
$(SONIC_ONE_IMAGE)_LAZY_INSTALLS += $(INGRASYS_S9130_32X_PLATFORM_MODULE) \
- $(INGRASYS_S9230_64X_PLATFORM_MODULE)
+ $(INGRASYS_S9230_64X_PLATFORM_MODULE) \
+ $(ACCTON_AS7116_54X_PLATFORM_MODULE)
$(SONIC_ONE_IMAGE)_DOCKERS += $(SONIC_INSTALL_DOCKER_IMAGES)
SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
diff --git a/platform/nephos/platform-modules-accton.mk b/platform/nephos/platform-modules-accton.mk
new file mode 100644
index 000000000000..110d0f3a5a11
--- /dev/null
+++ b/platform/nephos/platform-modules-accton.mk
@@ -0,0 +1,11 @@
+# Accton AS7116 54X Platform modules
+
+ACCTON_AS7116_54X_PLATFORM_MODULE_VERSION = 1.0.0
+
+export ACCTON_AS7116_54X_PLATFORM_MODULE_VERSION
+
+ACCTON_AS7116_54X_PLATFORM_MODULE = sonic-platform-accton-as7116-54x_$(ACCTON_AS7116_54X_PLATFORM_MODULE_VERSION)_amd64.deb
+$(ACCTON_AS7116_54X_PLATFORM_MODULE)_SRC_PATH = $(PLATFORM_PATH)/sonic-platform-modules-accton
+$(ACCTON_AS7116_54X_PLATFORM_MODULE)_DEPENDS += $(LINUX_HEADERS) $(LINUX_HEADERS_COMMON)
+$(ACCTON_AS7116_54X_PLATFORM_MODULE)_PLATFORM = x86_64-accton_as7116_54x-r0
+SONIC_DPKG_DEBS += $(ACCTON_AS7116_54X_PLATFORM_MODULE)
diff --git a/platform/nephos/rules.mk b/platform/nephos/rules.mk
index 96f39ef8aad1..bf77ad0e6edf 100644
--- a/platform/nephos/rules.mk
+++ b/platform/nephos/rules.mk
@@ -1,6 +1,7 @@
include $(PLATFORM_PATH)/sdk.mk
include $(PLATFORM_PATH)/sai.mk
include $(PLATFORM_PATH)/platform-modules-ingrasys.mk
+include $(PLATFORM_PATH)/platform-modules-accton.mk
include $(PLATFORM_PATH)/docker-orchagent-nephos.mk
include $(PLATFORM_PATH)/docker-syncd-nephos.mk
include $(PLATFORM_PATH)/docker-syncd-nephos-rpc.mk
diff --git a/platform/nephos/sai.mk b/platform/nephos/sai.mk
index 7c898bbada6b..79f7569f1c16 100644
--- a/platform/nephos/sai.mk
+++ b/platform/nephos/sai.mk
@@ -1,9 +1,9 @@
-NEPHOS_SAI = libsainps_2.0.4_amd64.deb
-$(NEPHOS_SAI)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_2.0.4_amd64.deb"
+NEPHOS_SAI = libsainps_2.0.3_sai_1.2.4_3147dc_amd64.deb
+$(NEPHOS_SAI)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps_2.0.3_sai_1.2.4_3147dc_amd64.deb"
-NEPHOS_SAI_DEV = libsainps-dev_2.0.4_sai_1.2.4_amd64.deb
+NEPHOS_SAI_DEV = libsainps-dev_2.0.3_sai_1.2.4_3147dc_amd64.deb
$(eval $(call add_derived_package,$(NEPHOS_SAI),$(NEPHOS_SAI_DEV)))
-$(NEPHOS_SAI_DEV)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_2.0.4_sai_1.2.4_amd64.deb"
+$(NEPHOS_SAI_DEV)_URL = "https://github.com/NephosInc/SONiC/raw/master/sai/libsainps-dev_2.0.3_sai_1.2.4_3147dc_amd64.deb"
SONIC_ONLINE_DEBS += $(NEPHOS_SAI) $(NEPHOS_SAI_DEV)
$(NEPHOS_SAI_DEV)_DEPENDS += $(NEPHOS_SAI)
diff --git a/platform/nephos/sdk.mk b/platform/nephos/sdk.mk
index 743512366db6..ce5748745242 100644
--- a/platform/nephos/sdk.mk
+++ b/platform/nephos/sdk.mk
@@ -1,4 +1,4 @@
-NEPHOS_NPS_KERNEL = nps-modules-3.16.0-5-amd64_2.0.3_amd64.deb
-$(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-3.16.0-5-amd64_2.0.3_amd64.deb"
+NEPHOS_NPS_KERNEL = nps-modules-3.16.0-5_2.0.3_3147dc_amd64.deb
+$(NEPHOS_NPS_KERNEL)_URL = "https://github.com/NephosInc/SONiC/raw/master/sdk/nps-modules-3.16.0-5_2.0.3_3147dc_amd64.deb"
SONIC_ONLINE_DEBS += $(NEPHOS_NPS_KERNEL)
diff --git a/platform/nephos/sonic-platform-modules-accton/LICENSE b/platform/nephos/sonic-platform-modules-accton/LICENSE
new file mode 100644
index 000000000000..bc693f7a4c40
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/LICENSE
@@ -0,0 +1,16 @@
+Copyright (C) 2016 Microsoft, Inc
+Copyright (C) 2017 Accton Technology Corporation
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
diff --git a/platform/nephos/sonic-platform-modules-accton/README.md b/platform/nephos/sonic-platform-modules-accton/README.md
new file mode 100644
index 000000000000..0ff20bb2d21b
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/README.md
@@ -0,0 +1 @@
+platform drivers of Accton products for the SONiC project
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/classes/__init__.py b/platform/nephos/sonic-platform-modules-accton/as7116-54x/classes/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/classes/fanutil.py b/platform/nephos/sonic-platform-modules-accton/as7116-54x/classes/fanutil.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/classes/thermalutil.py b/platform/nephos/sonic-platform-modules-accton/as7116-54x/classes/thermalutil.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/Makefile b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/Makefile
new file mode 100644
index 000000000000..19c7029f14a2
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/Makefile
@@ -0,0 +1,2 @@
+obj-m := x86-64-accton-as7116-54x-cpld.o x86-64-accton-as7116-54x-fan.o \
+ x86-64-accton-as7116-54x-led.o x86-64-accton-as7116-54x-psu.o x86-64-accton-as7116-54x-sfp.o
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-cpld.c b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-cpld.c
new file mode 100644
index 000000000000..eb52512343a8
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-cpld.c
@@ -0,0 +1,242 @@
+/*
+ * A hwmon driver for the as7116_54x_cpld
+ *
+ * Copyright (C) 2017 Accton Technology Corporation.
+ * Brandon Chuang
+ *
+ * Based on ad7414.c
+ * Copyright 2006 Stefan Roese , DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+
+static LIST_HEAD(cpld_client_list);
+static struct mutex list_lock;
+
+struct cpld_client_node {
+ struct i2c_client *client;
+ struct list_head list;
+};
+
+/* Addresses scanned for as7116_54x_cpld
+ */
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
+
+static ssize_t show_cpld_version(struct device *dev, struct device_attribute *attr, char *buf)
+{
+ int val = 0;
+ struct i2c_client *client = to_i2c_client(dev);
+
+ val = i2c_smbus_read_byte_data(client, 0x1);
+
+ if (val < 0) {
+ dev_dbg(&client->dev, "cpld(0x%x) reg(0x1) err %d\n", client->addr, val);
+ }
+
+ return sprintf(buf, "%d\n", val);
+}
+
+static struct device_attribute ver = __ATTR(version, 0600, show_cpld_version, NULL);
+
+static void as7116_54x_cpld_add_client(struct i2c_client *client)
+{
+ struct cpld_client_node *node = kzalloc(sizeof(struct cpld_client_node), GFP_KERNEL);
+
+ if (!node) {
+ dev_dbg(&client->dev, "Can't allocate cpld_client_node (0x%x)\n", client->addr);
+ return;
+ }
+
+ node->client = client;
+
+ mutex_lock(&list_lock);
+ list_add(&node->list, &cpld_client_list);
+ mutex_unlock(&list_lock);
+}
+
+static void as7116_54x_cpld_remove_client(struct i2c_client *client)
+{
+ struct list_head *list_node = NULL;
+ struct cpld_client_node *cpld_node = NULL;
+ int found = 0;
+
+ mutex_lock(&list_lock);
+
+ list_for_each(list_node, &cpld_client_list)
+ {
+ cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+ if (cpld_node->client == client) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (found) {
+ list_del(list_node);
+ kfree(cpld_node);
+ }
+
+ mutex_unlock(&list_lock);
+}
+
+static int as7116_54x_cpld_probe(struct i2c_client *client,
+ const struct i2c_device_id *dev_id)
+{
+ int status;
+
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+ dev_dbg(&client->dev, "i2c_check_functionality failed (0x%x)\n", client->addr);
+ status = -EIO;
+ goto exit;
+ }
+
+ status = sysfs_create_file(&client->dev.kobj, &ver.attr);
+ if (status) {
+ goto exit;
+ }
+
+ dev_info(&client->dev, "chip found\n");
+ as7116_54x_cpld_add_client(client);
+
+ return 0;
+
+exit:
+ return status;
+}
+
+static int as7116_54x_cpld_remove(struct i2c_client *client)
+{
+ sysfs_remove_file(&client->dev.kobj, &ver.attr);
+ as7116_54x_cpld_remove_client(client);
+
+ return 0;
+}
+
+enum cpld_chips
+{
+ as7116_54x_cpld1,
+ as7116_54x_cpld2,
+ as7116_54x_cpld3
+};
+
+static const struct i2c_device_id as7116_54x_cpld_id[] = {
+ { "as7116_54x_cpld1", as7116_54x_cpld1 },
+ { "as7116_54x_cpld2", as7116_54x_cpld2 },
+ { "as7116_54x_cpld3", as7116_54x_cpld3 },
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, as7116_54x_cpld_id);
+
+static struct i2c_driver as7116_54x_cpld_driver = {
+ .class = I2C_CLASS_HWMON,
+ .driver = {
+ .name = "as7116_54x_cpld",
+ },
+ .probe = as7116_54x_cpld_probe,
+ .remove = as7116_54x_cpld_remove,
+ .id_table = as7116_54x_cpld_id,
+ .address_list = normal_i2c,
+};
+
+int as7116_54x_cpld_read(unsigned short cpld_addr, u8 reg)
+{
+ struct list_head *list_node = NULL;
+ struct cpld_client_node *cpld_node = NULL;
+ int ret = -EPERM;
+
+ mutex_lock(&list_lock);
+
+ list_for_each(list_node, &cpld_client_list)
+ {
+ cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+ if (cpld_node->client->addr == cpld_addr) {
+ ret = i2c_smbus_read_byte_data(cpld_node->client, reg);
+ break;
+ }
+ }
+
+ mutex_unlock(&list_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(as7116_54x_cpld_read);
+
+int as7116_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value)
+{
+ struct list_head *list_node = NULL;
+ struct cpld_client_node *cpld_node = NULL;
+ int ret = -EIO;
+
+ mutex_lock(&list_lock);
+
+ list_for_each(list_node, &cpld_client_list)
+ {
+ cpld_node = list_entry(list_node, struct cpld_client_node, list);
+
+ if (cpld_node->client->addr == cpld_addr) {
+ ret = i2c_smbus_write_byte_data(cpld_node->client, reg, value);
+ break;
+ }
+ }
+
+ mutex_unlock(&list_lock);
+
+ return ret;
+}
+EXPORT_SYMBOL(as7116_54x_cpld_write);
+
+static int __init as7116_54x_cpld_init(void)
+{
+ mutex_init(&list_lock);
+ return i2c_add_driver(&as7116_54x_cpld_driver);
+}
+
+static void __exit as7116_54x_cpld_exit(void)
+{
+ i2c_del_driver(&as7116_54x_cpld_driver);
+}
+
+static struct dmi_system_id as7116_54x_dmi_table[] = {
+ {
+ .ident = "Accton AS7716",
+ .matches = {
+ DMI_MATCH(DMI_BOARD_VENDOR, "Accton"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "AS7116"),
+ },
+ }
+};
+
+int platform_accton_as7116_54x(void)
+{
+ //return dmi_check_system(as7116_54x_dmi_table);
+ return 1;
+}
+EXPORT_SYMBOL(platform_accton_as7116_54x);
+
+MODULE_AUTHOR("Brandon Chuang ");
+MODULE_DESCRIPTION("accton_as7116_54x driver");
+MODULE_LICENSE("GPL");
+
+module_init(as7116_54x_cpld_init);
+module_exit(as7116_54x_cpld_exit);
+
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-fan.c b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-fan.c
new file mode 100644
index 000000000000..f5159c8f166e
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-fan.c
@@ -0,0 +1,544 @@
+/*
+ * A hwmon driver for the Accton as7716 32x fan
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define DRVNAME "as7116_54x_fan"
+
+static struct as7116_54x_fan_data *as7116_54x_fan_update_device(struct device *dev);
+static ssize_t fan_show_value(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t set_duty_cycle(struct device *dev, struct device_attribute *da,
+ const char *buf, size_t count);
+
+/* fan related data, the index should match sysfs_fan_attributes
+ */
+static const u8 fan_reg[] = {
+ 0x02, /* fan 1-6 present status */
+ 0x03, /* fan 1-6 direction(0:F2B 1:B2F) */
+ 0x06, /* fan PWM(for all fan) */
+ 0x04, /* front fan fault */
+ 0x05, /* rear fan fault */
+ 0x07, /* front fan 1 speed(rpm) */
+ 0x08, /* front fan 2 speed(rpm) */
+ 0x09, /* front fan 3 speed(rpm) */
+ 0x0A, /* front fan 4 speed(rpm) */
+ 0x0B, /* front fan 5 speed(rpm) */
+ 0x0C, /* rear fan 1 speed(rpm) */
+ 0x0D, /* rear fan 2 speed(rpm) */
+ 0x0E, /* rear fan 3 speed(rpm) */
+ 0x0f, /* rear fan 4 speed(rpm) */
+ 0x10, /* rear fan 5 speed(rpm) */
+};
+
+/* Each client has this additional data */
+struct as7116_54x_fan_data {
+ struct device *hwmon_dev;
+ struct mutex update_lock;
+ char valid; /* != 0 if registers are valid */
+ unsigned long last_updated; /* In jiffies */
+ u8 reg_val[ARRAY_SIZE(fan_reg)]; /* Register value */
+};
+
+enum fan_id {
+ FAN1_ID,
+ FAN2_ID,
+ FAN3_ID,
+ FAN4_ID,
+ FAN5_ID
+};
+
+enum sysfs_fan_attributes {
+ FAN_PRESENT_REG,
+ FAN_DIRECTION_REG,
+ FAN_DUTY_CYCLE_PERCENTAGE, /* Only one CPLD register to control duty cycle for all fans */
+ FAN_FRONT_FAULT_REG,
+ FAN_REAR_FAULT_REG,
+ FAN1_FRONT_SPEED_RPM,
+ FAN2_FRONT_SPEED_RPM,
+ FAN3_FRONT_SPEED_RPM,
+ FAN4_FRONT_SPEED_RPM,
+ FAN5_FRONT_SPEED_RPM,
+ FAN1_REAR_SPEED_RPM,
+ FAN2_REAR_SPEED_RPM,
+ FAN3_REAR_SPEED_RPM,
+ FAN4_REAR_SPEED_RPM,
+ FAN5_REAR_SPEED_RPM,
+ FAN1_DIRECTION,
+ FAN2_DIRECTION,
+ FAN3_DIRECTION,
+ FAN4_DIRECTION,
+ FAN5_DIRECTION,
+ FAN1_PRESENT,
+ FAN2_PRESENT,
+ FAN3_PRESENT,
+ FAN4_PRESENT,
+ FAN5_PRESENT,
+ FAN1_FRONT_FAULT,
+ FAN2_FRONT_FAULT,
+ FAN3_FRONT_FAULT,
+ FAN4_FRONT_FAULT,
+ FAN5_FRONT_FAULT,
+ FAN1_REAR_FAULT,
+ FAN2_REAR_FAULT,
+ FAN3_REAR_FAULT,
+ FAN4_REAR_FAULT,
+ FAN5_REAR_FAULT,
+ FAN1_INPUT, /* FAN1_FRONT_SPEED_RPM, */
+ FAN2_INPUT, /* FAN2_FRONT_SPEED_RPM, */
+ FAN3_INPUT, /* FAN3_FRONT_SPEED_RPM, */
+ FAN4_INPUT, /* FAN4_FRONT_SPEED_RPM, */
+ FAN5_INPUT, /* FAN5_FRONT_SPEED_RPM, */
+ FAN6_INPUT, /* FAN1_REAR_SPEED_RPM, */
+ FAN7_INPUT, /* FAN2_REAR_SPEED_RPM, */
+ FAN8_INPUT, /* FAN3_REAR_SPEED_RPM, */
+ FAN9_INPUT, /* FAN4_REAR_SPEED_RPM, */
+ FAN10_INPUT, /* FAN5_REAR_SPEED_RPM */
+};
+
+/* Define attributes
+ */
+#define DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(index) \
+ static SENSOR_DEVICE_ATTR(fan##index##_front_fault, S_IRUGO, fan_show_value, NULL, FAN##index##_FRONT_FAULT);\
+ static SENSOR_DEVICE_ATTR(fan##index##_rear_fault, S_IRUGO, fan_show_value, NULL, FAN##index##_REAR_FAULT)
+#define DECLARE_FAN_FAULT_ATTR(index) &sensor_dev_attr_fan##index##_front_fault.dev_attr.attr,\
+ &sensor_dev_attr_fan##index##_rear_fault.dev_attr.attr
+
+#define DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(index) \
+ static SENSOR_DEVICE_ATTR(fan##index##_direction, S_IRUGO, fan_show_value, NULL, FAN##index##_DIRECTION)
+#define DECLARE_FAN_DIRECTION_ATTR(index) &sensor_dev_attr_fan##index##_direction.dev_attr.attr
+
+#define DECLARE_FAN_DUTY_CYCLE_SENSOR_DEV_ATTR(index) \
+ static SENSOR_DEVICE_ATTR(fan##index##_duty_cycle_percentage, S_IWUSR | S_IRUGO, fan_show_value, set_duty_cycle, FAN##index##_DUTY_CYCLE_PERCENTAGE)
+#define DECLARE_FAN_DUTY_CYCLE_ATTR(index) &sensor_dev_attr_fan##index##_duty_cycle_percentage.dev_attr.attr
+
+#define DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(index) \
+ static SENSOR_DEVICE_ATTR(fan##index##_present, S_IRUGO, fan_show_value, NULL, FAN##index##_PRESENT)
+#define DECLARE_FAN_PRESENT_ATTR(index) &sensor_dev_attr_fan##index##_present.dev_attr.attr
+
+#define DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(index) \
+ static SENSOR_DEVICE_ATTR(fan##index##_front_speed_rpm, S_IRUGO, fan_show_value, NULL, FAN##index##_FRONT_SPEED_RPM);\
+ static SENSOR_DEVICE_ATTR(fan##index##_rear_speed_rpm, S_IRUGO, fan_show_value, NULL, FAN##index##_REAR_SPEED_RPM)
+#define DECLARE_FAN_SPEED_RPM_ATTR(index) &sensor_dev_attr_fan##index##_front_speed_rpm.dev_attr.attr, \
+ &sensor_dev_attr_fan##index##_rear_speed_rpm.dev_attr.attr
+
+#define DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(index) \
+ static SENSOR_DEVICE_ATTR(fan##index##_input, S_IRUGO, fan_show_value, NULL, FAN##index##_INPUT)
+#define DECLARE_FAN_INPUT_ATTR(index) &sensor_dev_attr_fan##index##_input.dev_attr.attr
+
+/* 6 fan fault attributes in this platform */
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_FAULT_SENSOR_DEV_ATTR(5);
+/* 6 fan speed(rpm) attributes in this platform */
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_SPEED_RPM_SENSOR_DEV_ATTR(5);
+/* 6 fan present attributes in this platform */
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_PRESENT_SENSOR_DEV_ATTR(5);
+/* 6 fan direction attribute in this platform */
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_DIRECTION_SENSOR_DEV_ATTR(5);
+/* 1 fan duty cycle attribute in this platform */
+DECLARE_FAN_DUTY_CYCLE_SENSOR_DEV_ATTR();
+
+/* fan input attributes in this platform */
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(1);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(2);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(3);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(4);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(5);
+
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(6);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(7);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(8);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(9);
+DECLARE_FAN_INPUT_SENSOR_DEV_ATTR(10);
+
+static struct attribute *as7116_54x_fan_attributes[] = {
+ /* fan related attributes */
+ DECLARE_FAN_FAULT_ATTR(1),
+ DECLARE_FAN_FAULT_ATTR(2),
+ DECLARE_FAN_FAULT_ATTR(3),
+ DECLARE_FAN_FAULT_ATTR(4),
+ DECLARE_FAN_FAULT_ATTR(5),
+ DECLARE_FAN_SPEED_RPM_ATTR(1),
+ DECLARE_FAN_SPEED_RPM_ATTR(2),
+ DECLARE_FAN_SPEED_RPM_ATTR(3),
+ DECLARE_FAN_SPEED_RPM_ATTR(4),
+ DECLARE_FAN_SPEED_RPM_ATTR(5),
+ DECLARE_FAN_PRESENT_ATTR(1),
+ DECLARE_FAN_PRESENT_ATTR(2),
+ DECLARE_FAN_PRESENT_ATTR(3),
+ DECLARE_FAN_PRESENT_ATTR(4),
+ DECLARE_FAN_PRESENT_ATTR(5),
+ DECLARE_FAN_DIRECTION_ATTR(1),
+ DECLARE_FAN_DIRECTION_ATTR(2),
+ DECLARE_FAN_DIRECTION_ATTR(3),
+ DECLARE_FAN_DIRECTION_ATTR(4),
+ DECLARE_FAN_DIRECTION_ATTR(5),
+ DECLARE_FAN_DUTY_CYCLE_ATTR(),
+ DECLARE_FAN_INPUT_ATTR(1),
+ DECLARE_FAN_INPUT_ATTR(2),
+ DECLARE_FAN_INPUT_ATTR(3),
+ DECLARE_FAN_INPUT_ATTR(4),
+ DECLARE_FAN_INPUT_ATTR(5),
+ DECLARE_FAN_INPUT_ATTR(6),
+ DECLARE_FAN_INPUT_ATTR(7),
+ DECLARE_FAN_INPUT_ATTR(8),
+ DECLARE_FAN_INPUT_ATTR(9),
+ DECLARE_FAN_INPUT_ATTR(10),
+ NULL
+};
+
+#define FAN_DUTY_CYCLE_REG_MASK 0x1F
+#define FAN_MIN_DUTY_CYCLE 20
+#define FAN_MAX_DUTY_CYCLE 100
+#define FAN_REG_VAL_TO_SPEED_RPM_STEP 150
+
+static int as7116_54x_fan_read_value(struct i2c_client *client, u8 reg)
+{
+ return i2c_smbus_read_byte_data(client, reg);
+}
+
+static int as7116_54x_fan_write_value(struct i2c_client *client, u8 reg, u8 value)
+{
+ return i2c_smbus_write_byte_data(client, reg, value);
+}
+
+/* fan utility functions
+ */
+static u32 reg_val_to_duty_cycle(u8 reg_val)
+{
+ return (reg_val & FAN_DUTY_CYCLE_REG_MASK) * 5;
+}
+
+static u8 duty_cycle_to_reg_val(u8 duty_cycle)
+{
+ return (duty_cycle / 5);
+}
+
+static u32 reg_val_to_speed_rpm(u8 reg_val)
+{
+ return (u32)reg_val * FAN_REG_VAL_TO_SPEED_RPM_STEP;
+}
+
+static u8 reg_val_to_direction(u8 reg_val, enum fan_id id)
+{
+ return !!(reg_val & (1 << id));
+}
+
+static u8 reg_val_to_is_present(u8 reg_val, enum fan_id id)
+{
+ return !(reg_val & (1 << id));
+}
+
+static u8 is_fan_fault(u8 reg_val, enum fan_id id)
+{
+ return !!(reg_val & (1 << id));
+}
+#if 0
+static u8 is_fan_fault(struct as7116_54x_fan_data *data, enum fan_id id)
+{
+ u8 ret = 1;
+ int front_fan_index = FAN1_FRONT_SPEED_RPM + id;
+ int rear_fan_index = FAN1_REAR_SPEED_RPM + id;
+
+ /* Check if the speed of front or rear fan is ZERO,
+ */
+ if (reg_val_to_speed_rpm(data->reg_val[front_fan_index]) &&
+ reg_val_to_speed_rpm(data->reg_val[rear_fan_index])) {
+ ret = 0;
+ }
+
+ return ret;
+}
+#endif
+
+static ssize_t set_duty_cycle(struct device *dev, struct device_attribute *da,
+ const char *buf, size_t count)
+{
+ int error, value;
+ struct i2c_client *client = to_i2c_client(dev);
+
+ error = kstrtoint(buf, 10, &value);
+ if (error)
+ return error;
+
+ if (value < FAN_MIN_DUTY_CYCLE) {
+ value = FAN_MIN_DUTY_CYCLE;
+ }
+
+ if (value > FAN_MAX_DUTY_CYCLE) {
+ value = FAN_MAX_DUTY_CYCLE;
+ }
+
+ as7116_54x_fan_write_value(client, fan_reg[FAN_DUTY_CYCLE_PERCENTAGE], duty_cycle_to_reg_val(value));
+ return count;
+}
+
+static ssize_t fan_show_value(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct as7116_54x_fan_data *data = as7116_54x_fan_update_device(dev);
+ ssize_t ret = 0;
+
+ if (data->valid) {
+ switch (attr->index) {
+ case FAN_DUTY_CYCLE_PERCENTAGE:
+ {
+ u32 duty_cycle = reg_val_to_duty_cycle(data->reg_val[FAN_DUTY_CYCLE_PERCENTAGE]);
+ ret = sprintf(buf, "%u\n", duty_cycle);
+ break;
+ }
+ case FAN1_FRONT_SPEED_RPM:
+ case FAN2_FRONT_SPEED_RPM:
+ case FAN3_FRONT_SPEED_RPM:
+ case FAN4_FRONT_SPEED_RPM:
+ case FAN5_FRONT_SPEED_RPM:
+ case FAN1_REAR_SPEED_RPM:
+ case FAN2_REAR_SPEED_RPM:
+ case FAN3_REAR_SPEED_RPM:
+ case FAN4_REAR_SPEED_RPM:
+ case FAN5_REAR_SPEED_RPM:
+ ret = sprintf(buf, "%u\n", reg_val_to_speed_rpm(data->reg_val[attr->index]));
+ break;
+ case FAN1_PRESENT:
+ case FAN2_PRESENT:
+ case FAN3_PRESENT:
+ case FAN4_PRESENT:
+ case FAN5_PRESENT:
+ ret = sprintf(buf, "%d\n",
+ reg_val_to_is_present(data->reg_val[FAN_PRESENT_REG],
+ attr->index - FAN1_PRESENT));
+ break;
+ case FAN1_FRONT_FAULT:
+ case FAN2_FRONT_FAULT:
+ case FAN3_FRONT_FAULT:
+ case FAN4_FRONT_FAULT:
+ case FAN5_FRONT_FAULT:
+ ret = sprintf(buf, "%d\n",
+ is_fan_fault(data->reg_val[FAN_FRONT_FAULT_REG],
+ attr->index - FAN1_FRONT_FAULT));
+ break;
+ case FAN1_REAR_FAULT:
+ case FAN2_REAR_FAULT:
+ case FAN3_REAR_FAULT:
+ case FAN4_REAR_FAULT:
+ case FAN5_REAR_FAULT:
+ ret = sprintf(buf, "%d\n",
+ is_fan_fault(data->reg_val[FAN_REAR_FAULT_REG],
+ attr->index - FAN1_REAR_FAULT));
+ break;
+ case FAN1_DIRECTION:
+ case FAN2_DIRECTION:
+ case FAN3_DIRECTION:
+ case FAN4_DIRECTION:
+ case FAN5_DIRECTION:
+ ret = sprintf(buf, "%d\n",
+ reg_val_to_direction(data->reg_val[FAN_DIRECTION_REG],
+ attr->index - FAN1_DIRECTION));
+ break;
+ case FAN1_INPUT:
+ case FAN2_INPUT:
+ case FAN3_INPUT:
+ case FAN4_INPUT:
+ case FAN5_INPUT:
+ case FAN6_INPUT:
+ case FAN7_INPUT:
+ case FAN8_INPUT:
+ case FAN9_INPUT:
+ case FAN10_INPUT:
+ ret = sprintf(buf, "%u\n", reg_val_to_speed_rpm(data->reg_val[attr->index
+ - FAN1_INPUT + FAN1_FRONT_SPEED_RPM]));
+ break;
+ default:
+ break;
+ }
+ }
+
+ return ret;
+}
+
+static const struct attribute_group as7116_54x_fan_group = {
+ .attrs = as7116_54x_fan_attributes,
+};
+
+static struct as7116_54x_fan_data *as7116_54x_fan_update_device(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct as7116_54x_fan_data *data = i2c_get_clientdata(client);
+
+ mutex_lock(&data->update_lock);
+
+ if (time_after(jiffies, data->last_updated + HZ + HZ / 2) ||
+ !data->valid) {
+ int i;
+
+ dev_dbg(&client->dev, "Starting as7116_54x_fan update\n");
+ data->valid = 0;
+
+ /* Update fan data
+ */
+ for (i = 0; i < ARRAY_SIZE(data->reg_val); i++) {
+ int status = as7116_54x_fan_read_value(client, fan_reg[i]);
+
+ if (status < 0) {
+ data->valid = 0;
+ mutex_unlock(&data->update_lock);
+ dev_dbg(&client->dev, "reg %d, err %d\n", fan_reg[i], status);
+ return data;
+ }
+ else {
+ data->reg_val[i] = status;
+ }
+ }
+
+ data->last_updated = jiffies;
+ data->valid = 1;
+ }
+
+ mutex_unlock(&data->update_lock);
+
+ return data;
+}
+
+static int as7116_54x_fan_probe(struct i2c_client *client,
+ const struct i2c_device_id *dev_id)
+{
+ struct as7116_54x_fan_data *data;
+ int status;
+
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
+ status = -EIO;
+ goto exit;
+ }
+
+ data = kzalloc(sizeof(struct as7116_54x_fan_data), GFP_KERNEL);
+ if (!data) {
+ status = -ENOMEM;
+ goto exit;
+ }
+
+ i2c_set_clientdata(client, data);
+ data->valid = 0;
+ mutex_init(&data->update_lock);
+
+ dev_info(&client->dev, "chip found\n");
+
+ /* Register sysfs hooks */
+ status = sysfs_create_group(&client->dev.kobj, &as7116_54x_fan_group);
+ if (status) {
+ goto exit_free;
+ }
+
+ data->hwmon_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->hwmon_dev)) {
+ status = PTR_ERR(data->hwmon_dev);
+ goto exit_remove;
+ }
+
+ dev_info(&client->dev, "%s: fan '%s'\n",
+ dev_name(data->hwmon_dev), client->name);
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &as7116_54x_fan_group);
+exit_free:
+ kfree(data);
+exit:
+
+ return status;
+}
+
+static int as7116_54x_fan_remove(struct i2c_client *client)
+{
+ struct as7116_54x_fan_data *data = i2c_get_clientdata(client);
+ hwmon_device_unregister(data->hwmon_dev);
+ sysfs_remove_group(&client->dev.kobj, &as7116_54x_fan_group);
+
+ return 0;
+}
+
+/* Addresses to scan */
+static const unsigned short normal_i2c[] = { 0x66, I2C_CLIENT_END };
+
+static const struct i2c_device_id as7116_54x_fan_id[] = {
+ { "as7116_54x_fan", 0 },
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, as7116_54x_fan_id);
+
+static struct i2c_driver as7116_54x_fan_driver = {
+ .class = I2C_CLASS_HWMON,
+ .driver = {
+ .name = DRVNAME,
+ },
+ .probe = as7116_54x_fan_probe,
+ .remove = as7116_54x_fan_remove,
+ .id_table = as7116_54x_fan_id,
+ .address_list = normal_i2c,
+};
+
+static int __init as7116_54x_fan_init(void)
+{
+#if 0
+ extern int platform_accton_as7116_54x(void);
+ if (!platform_accton_as7116_54x()) {
+ return -ENODEV;
+ }
+#endif
+ return i2c_add_driver(&as7116_54x_fan_driver);
+}
+
+static void __exit as7116_54x_fan_exit(void)
+{
+ i2c_del_driver(&as7116_54x_fan_driver);
+}
+
+module_init(as7116_54x_fan_init);
+module_exit(as7116_54x_fan_exit);
+
+MODULE_AUTHOR("Brandon Chuang ");
+MODULE_DESCRIPTION("as7116_54x_fan driver");
+MODULE_LICENSE("GPL");
+
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-led.c b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-led.c
new file mode 100644
index 000000000000..cd69f711c826
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-led.c
@@ -0,0 +1,448 @@
+/*
+ * A LED driver for the accton_as7116_54x_led
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define DRVNAME "as7116_54x_fan"
+
+#define DEBUG_MODE 0
+#if (DEBUG_MODE == 1)
+ #define DEBUG_PRINT(fmt, args...) \
+ printk (KERN_INFO "%s:%s[%d]: " fmt "\r\n", __FILE__, __FUNCTION__, __LINE__, ##args)
+#else
+ #define DEBUG_PRINT(fmt, args...)
+#endif
+
+extern int as7116_54x_cpld_read(unsigned short cpld_addr, u8 reg);
+extern int as7116_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
+
+struct as7116_54x_led_data {
+ struct platform_device *pdev;
+ struct mutex update_lock;
+ char valid; /* != 0 if registers are valid */
+ unsigned long last_updated; /* In jiffies */
+ u8 reg_val[1]; /* LOC/DIAG LED */
+};
+
+static struct as7116_54x_led_data *ledctl = NULL;
+
+/* LED related data
+ */
+
+#define LED_CNTRLER_I2C_ADDRESS (0x60)
+
+#define LED_TYPE_DIAG_REG_MASK (0x0C)
+#define LED_MODE_DIAG_GREEN_VALUE (0x08)
+#define LED_MODE_DIAG_AMBER_VALUE (0x04)
+#define LED_MODE_DIAG_YELLOW_VALUE (0x00)
+#define LED_MODE_DIAG_OFF_VALUE (0x0C)
+
+#define LED_TYPE_FAN_REG_MASK (0x03)
+#define LED_MODE_FAN_GREEN_VALUE (0x02)
+#define LED_MODE_FAN_AMBER_VALUE (0x01)
+#define LED_MODE_FAN_OFF_VALUE (0x03)
+#define LED_MODE_FAN_AUTO_VALUE (0x00)
+
+#define LED_TYPE_PSU1_REG_MASK (0x03)
+#define LED_MODE_PSU1_GREEN_VALUE (0x02)
+#define LED_MODE_PSU1_AMBER_VALUE (0x01)
+#define LED_MODE_PSU1_OFF_VALUE (0x03)
+#define LED_MODE_PSU1_AUTO_VALUE (0x00)
+
+#define LED_TYPE_PSU2_REG_MASK (0x0C)
+#define LED_MODE_PSU2_GREEN_VALUE (0x08)
+#define LED_MODE_PSU2_AMBER_VALUE (0x04)
+#define LED_MODE_PSU2_OFF_VALUE (0x0C)
+#define LED_MODE_PSU2_AUTO_VALUE (0x00)
+
+#define LED_TYPE_LOC_REG_MASK (0x30)
+#define LED_MODE_LOC_AMBER_VALUE (0x00)
+#define LED_MODE_LOC_AMBER_BLINKING_VALUE1 (0x20)
+#define LED_MODE_LOC_AMBER_BLINKING_VALUE2 (0x30)
+#define LED_MODE_LOC_OFF_VALUE (0x10)
+
+static const u8 led_reg[] = {
+ 0x0A, /* LOC/DIAG/FAN LED */
+ 0x0B, /* PSU1/PSU2 LED */
+};
+
+enum led_type {
+ LED_TYPE_DIAG,
+ LED_TYPE_LOC,
+ LED_TYPE_FAN,
+ LED_TYPE_PSU1,
+ LED_TYPE_PSU2
+};
+
+enum led_light_mode {
+ LED_MODE_OFF = 0,
+ LED_MODE_GREEN,
+ LED_MODE_GREEN_BLINK,
+ LED_MODE_AMBER,
+ LED_MODE_AMBER_BLINK,
+ LED_MODE_YELLOW,
+ LED_MODE_YELLOW_BLINK,
+ LED_MODE_BLUE,
+ LED_MODE_BLUE_BLINK,
+ LED_MODE_AUTO,
+ LED_MODE_UNKNOWN
+};
+
+struct led_type_mode {
+ enum led_type type;
+ enum led_light_mode mode;
+ int type_mask;
+ int mode_value;
+};
+
+static struct led_type_mode led_type_mode_data[] = {
+{LED_TYPE_FAN, LED_MODE_OFF, LED_TYPE_FAN_REG_MASK, LED_MODE_FAN_OFF_VALUE},
+{LED_TYPE_FAN, LED_MODE_GREEN, LED_TYPE_FAN_REG_MASK, LED_MODE_FAN_GREEN_VALUE},
+{LED_TYPE_FAN, LED_MODE_AMBER, LED_TYPE_FAN_REG_MASK, LED_MODE_FAN_AMBER_VALUE},
+{LED_TYPE_FAN, LED_MODE_AUTO, LED_TYPE_FAN_REG_MASK, LED_MODE_FAN_AUTO_VALUE},
+{LED_TYPE_PSU1, LED_MODE_OFF, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_OFF_VALUE},
+{LED_TYPE_PSU1, LED_MODE_GREEN, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_GREEN_VALUE},
+{LED_TYPE_PSU1, LED_MODE_AMBER, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_AMBER_VALUE},
+{LED_TYPE_PSU1, LED_MODE_AUTO, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_AUTO_VALUE},
+{LED_TYPE_PSU2, LED_MODE_OFF, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_OFF_VALUE},
+{LED_TYPE_PSU2, LED_MODE_GREEN, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_GREEN_VALUE},
+{LED_TYPE_PSU2, LED_MODE_AMBER, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_AMBER_VALUE},
+{LED_TYPE_PSU2, LED_MODE_AUTO, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_AUTO_VALUE},
+{LED_TYPE_DIAG, LED_MODE_OFF, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_OFF_VALUE},
+{LED_TYPE_DIAG, LED_MODE_GREEN, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_GREEN_VALUE},
+{LED_TYPE_DIAG, LED_MODE_AMBER, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_AMBER_VALUE},
+{LED_TYPE_DIAG, LED_MODE_YELLOW, LED_TYPE_DIAG_REG_MASK, LED_MODE_DIAG_YELLOW_VALUE},
+{LED_TYPE_LOC, LED_MODE_OFF, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_OFF_VALUE},
+{LED_TYPE_LOC, LED_MODE_AMBER, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_AMBER_VALUE},
+{LED_TYPE_LOC, LED_MODE_AMBER_BLINK, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_AMBER_BLINKING_VALUE1},
+{LED_TYPE_LOC, LED_MODE_AMBER_BLINK, LED_TYPE_LOC_REG_MASK, LED_MODE_LOC_AMBER_BLINKING_VALUE2}
+};
+
+static int led_reg_val_to_light_mode(enum led_type type, u8 reg_val) {
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(led_type_mode_data); i++) {
+ if (type != led_type_mode_data[i].type) {
+ continue;
+ }
+
+ if ((led_type_mode_data[i].type_mask & reg_val) ==
+ led_type_mode_data[i].mode_value) {
+ return led_type_mode_data[i].mode;
+ }
+ }
+
+ return LED_MODE_UNKNOWN;
+}
+
+static u8 led_light_mode_to_reg_val(enum led_type type,
+ enum led_light_mode mode, u8 reg_val) {
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(led_type_mode_data); i++) {
+ int type_mask, mode_value;
+
+ if (type != led_type_mode_data[i].type)
+ continue;
+
+ if (mode != led_type_mode_data[i].mode)
+ continue;
+
+ type_mask = led_type_mode_data[i].type_mask;
+ mode_value = led_type_mode_data[i].mode_value;
+ reg_val = (reg_val & ~type_mask) | mode_value;
+ }
+
+ return reg_val;
+}
+
+static int as7116_54x_led_read_value(u8 reg)
+{
+ return as7116_54x_cpld_read(LED_CNTRLER_I2C_ADDRESS, reg);
+}
+
+static int as7116_54x_led_write_value(u8 reg, u8 value)
+{
+ return as7116_54x_cpld_write(LED_CNTRLER_I2C_ADDRESS, reg, value);
+}
+
+static void as7116_54x_led_update(void)
+{
+ mutex_lock(&ledctl->update_lock);
+
+ if (time_after(jiffies, ledctl->last_updated + HZ + HZ / 2)
+ || !ledctl->valid) {
+ int i;
+
+ dev_dbg(&ledctl->pdev->dev, "Starting accton_as7116_54x_led update\n");
+ ledctl->valid = 0;
+
+ /* Update LED data
+ */
+ for (i = 0; i < ARRAY_SIZE(ledctl->reg_val); i++) {
+ int status = as7116_54x_led_read_value(led_reg[i]);
+
+ if (status < 0) {
+ dev_dbg(&ledctl->pdev->dev, "reg %d, err %d\n", led_reg[i], status);
+ goto exit;
+ }
+ else {
+ ledctl->reg_val[i] = status;
+ }
+ }
+
+ ledctl->last_updated = jiffies;
+ ledctl->valid = 1;
+ }
+
+exit:
+ mutex_unlock(&ledctl->update_lock);
+}
+
+static void as7116_54x_led_set(struct led_classdev *led_cdev,
+ enum led_brightness led_light_mode,
+ u8 reg, enum led_type type)
+{
+ int reg_val;
+
+ mutex_lock(&ledctl->update_lock);
+
+ reg_val = as7116_54x_led_read_value(reg);
+
+ if (reg_val < 0) {
+ dev_dbg(&ledctl->pdev->dev, "reg %d, err %d\n", reg, reg_val);
+ goto exit;
+ }
+ reg_val = led_light_mode_to_reg_val(type, led_light_mode, reg_val);
+ as7116_54x_led_write_value(reg, reg_val);
+
+ /* to prevent the slow-update issue */
+ ledctl->valid = 0;
+
+exit:
+ mutex_unlock(&ledctl->update_lock);
+}
+
+
+static void as7116_54x_led_diag_set(struct led_classdev *led_cdev,
+ enum led_brightness led_light_mode)
+{
+ as7116_54x_led_set(led_cdev, led_light_mode, led_reg[0], LED_TYPE_DIAG);
+}
+
+static enum led_brightness as7116_54x_led_diag_get(struct led_classdev *cdev)
+{
+ as7116_54x_led_update();
+ return led_reg_val_to_light_mode(LED_TYPE_DIAG, ledctl->reg_val[0]);
+}
+
+static void as7116_54x_led_loc_set(struct led_classdev *led_cdev,
+ enum led_brightness led_light_mode)
+{
+ as7116_54x_led_set(led_cdev, led_light_mode, led_reg[0], LED_TYPE_LOC);
+}
+
+static enum led_brightness as7116_54x_led_loc_get(struct led_classdev *cdev)
+{
+ as7116_54x_led_update();
+ return led_reg_val_to_light_mode(LED_TYPE_LOC, ledctl->reg_val[0]);
+}
+
+static void as7116_54x_led_fan_set(struct led_classdev *led_cdev,
+ enum led_brightness led_light_mode)
+{
+ as7116_54x_led_set(led_cdev, led_light_mode, led_reg[0], LED_TYPE_FAN);
+}
+
+static enum led_brightness as7116_54x_led_fan_get(struct led_classdev *cdev)
+{
+ as7116_54x_led_update();
+ return led_reg_val_to_light_mode(LED_TYPE_FAN, ledctl->reg_val[0]);
+}
+
+static void as7116_54x_led_psu1_set(struct led_classdev *led_cdev,
+ enum led_brightness led_light_mode)
+{
+ as7116_54x_led_set(led_cdev, led_light_mode, led_reg[1], LED_TYPE_PSU1);
+}
+
+static enum led_brightness as7116_54x_led_psu1_get(struct led_classdev *cdev)
+{
+ as7116_54x_led_update();
+ return led_reg_val_to_light_mode(LED_TYPE_PSU1, ledctl->reg_val[1]);
+}
+
+static void as7116_54x_led_psu2_set(struct led_classdev *led_cdev,
+ enum led_brightness led_light_mode)
+{
+ as7116_54x_led_set(led_cdev, led_light_mode, led_reg[1], LED_TYPE_PSU2);
+}
+
+static enum led_brightness as7116_54x_led_psu2_get(struct led_classdev *cdev)
+{
+ as7116_54x_led_update();
+ return led_reg_val_to_light_mode(LED_TYPE_PSU2, ledctl->reg_val[1]);
+}
+
+static struct led_classdev as7116_54x_leds[] = {
+ [LED_TYPE_DIAG] = {
+ .name = "as7116_54x_led::diag",
+ .default_trigger = "unused",
+ .brightness_set = as7116_54x_led_diag_set,
+ .brightness_get = as7116_54x_led_diag_get,
+ .max_brightness = LED_MODE_YELLOW,
+ },
+ [LED_TYPE_LOC] = {
+ .name = "as7116_54x_led::loc",
+ .default_trigger = "unused",
+ .brightness_set = as7116_54x_led_loc_set,
+ .brightness_get = as7116_54x_led_loc_get,
+ .max_brightness = LED_MODE_AMBER_BLINK,
+ },
+ [LED_TYPE_FAN] = {
+ .name = "as7116_54x_led::fan",
+ .default_trigger = "unused",
+ .brightness_set = as7116_54x_led_fan_set,
+ .brightness_get = as7116_54x_led_fan_get,
+ .max_brightness = LED_MODE_AUTO,
+ },
+ [LED_TYPE_PSU1] = {
+ .name = "as7116_54x_led::psu1",
+ .default_trigger = "unused",
+ .brightness_set = as7116_54x_led_psu1_set,
+ .brightness_get = as7116_54x_led_psu1_get,
+ .max_brightness = LED_MODE_AUTO,
+ },
+ [LED_TYPE_PSU2] = {
+ .name = "as7116_54x_led::psu2",
+ .default_trigger = "unused",
+ .brightness_set = as7116_54x_led_psu2_set,
+ .brightness_get = as7116_54x_led_psu2_get,
+ .max_brightness = LED_MODE_AUTO,
+ },
+};
+
+
+static int as7116_54x_led_probe(struct platform_device *pdev)
+{
+ int ret, i;
+
+ for (i = 0; i < ARRAY_SIZE(as7116_54x_leds); i++) {
+ ret = led_classdev_register(&pdev->dev, &as7116_54x_leds[i]);
+
+ if (ret < 0) {
+ break;
+ }
+ }
+
+ /* Check if all LEDs were successfully registered */
+ if (i != ARRAY_SIZE(as7116_54x_leds)){
+ int j;
+
+ /* only unregister the LEDs that were successfully registered */
+ for (j = 0; j < i; j++) {
+ led_classdev_unregister(&as7116_54x_leds[i]);
+ }
+ }
+
+ return ret;
+}
+
+static int as7116_54x_led_remove(struct platform_device *pdev)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(as7116_54x_leds); i++) {
+ led_classdev_unregister(&as7116_54x_leds[i]);
+ }
+
+ return 0;
+}
+
+static struct platform_driver as7116_54x_led_driver = {
+ .probe = as7116_54x_led_probe,
+ .remove = as7116_54x_led_remove,
+ .driver = {
+ .name = DRVNAME,
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init as7116_54x_led_init(void)
+{
+ int ret;
+
+#if 0
+ extern int platform_accton_as7116_54x(void);
+ if (!platform_accton_as7116_54x()) {
+ return -ENODEV;
+ }
+#endif
+
+ ret = platform_driver_register(&as7116_54x_led_driver);
+ if (ret < 0) {
+ goto exit;
+ }
+
+ ledctl = kzalloc(sizeof(struct as7116_54x_led_data), GFP_KERNEL);
+ if (!ledctl) {
+ ret = -ENOMEM;
+ goto exit_driver;
+ }
+
+ mutex_init(&ledctl->update_lock);
+
+ ledctl->pdev = platform_device_register_simple(DRVNAME, -1, NULL, 0);
+ if (IS_ERR(ledctl->pdev)) {
+ ret = PTR_ERR(ledctl->pdev);
+ goto exit_free;
+ }
+
+ return 0;
+
+exit_free:
+ kfree(ledctl);
+exit_driver:
+ platform_driver_unregister(&as7116_54x_led_driver);
+exit:
+ return ret;
+}
+
+static void __exit as7116_54x_led_exit(void)
+{
+ platform_device_unregister(ledctl->pdev);
+ platform_driver_unregister(&as7116_54x_led_driver);
+ kfree(ledctl);
+}
+
+module_init(as7116_54x_led_init);
+module_exit(as7116_54x_led_exit);
+
+MODULE_AUTHOR("Brandon Chuang ");
+MODULE_DESCRIPTION("accton_as7116_54x_led driver");
+MODULE_LICENSE("GPL");
+
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-psu.c b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-psu.c
new file mode 100644
index 000000000000..b4e14297f414
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-psu.c
@@ -0,0 +1,349 @@
+/*
+ * An hwmon driver for accton as7116_54x Power Module
+ *
+ * Copyright (C) 2014 Accton Technology Corporation.
+ * Brandon Chuang
+ *
+ * Based on ad7414.c
+ * Copyright 2006 Stefan Roese , DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define PSU_STATUS_I2C_ADDR 0x60
+#define PSU_STATUS_I2C_REG_OFFSET 0x2
+
+#define MODEL_NAME_LEN 11
+#define MODEL_NAME_REG_OFFSET 0x20
+
+#define SERIAL_NUM_LEN 18
+#define SERIAL_NUM_REG_OFFSET 0x35
+
+#define IS_POWER_GOOD(id, value) (!!(value & BIT(id*4 + 1)))
+#define IS_PRESENT(id, value) (!(value & BIT(id*4)))
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t show_string(struct device *dev, struct device_attribute *da, char *buf);
+static int as7116_54x_psu_read_block(struct i2c_client *client, u8 command, u8 *data,int data_len);
+extern int as7116_54x_cpld_read(unsigned short cpld_addr, u8 reg);
+static struct as7116_54x_psu_data *as7116_54x_psu_update_device(struct device *dev, u8 update_eeprom);
+
+/* Addresses scanned
+ */
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
+
+/* Each client has this additional data
+ */
+struct as7116_54x_psu_data {
+ struct device *hwmon_dev;
+ struct mutex update_lock;
+ char valid; /* !=0 if registers are valid */
+ unsigned long last_updated; /* In jiffies */
+ u8 index; /* PSU index */
+ u8 status; /* Status(present/power_good) register read from CPLD */
+ char model_name[MODEL_NAME_LEN+1]; /* Model name, read from eeprom */
+ char serial[SERIAL_NUM_LEN+1]; /* Serial number, read from eeprom*/
+};
+
+enum as7116_54x_psu_sysfs_attributes {
+ PSU_PRESENT,
+ PSU_MODEL_NAME,
+ PSU_POWER_GOOD,
+ PSU_SERIAL_NUMBER
+};
+
+/* sysfs attributes for hwmon
+ */
+static SENSOR_DEVICE_ATTR(psu_present, S_IRUGO, show_status, NULL, PSU_PRESENT);
+static SENSOR_DEVICE_ATTR(psu_model_name, S_IRUGO, show_string, NULL, PSU_MODEL_NAME);
+static SENSOR_DEVICE_ATTR(psu_power_good, S_IRUGO, show_status, NULL, PSU_POWER_GOOD);
+static SENSOR_DEVICE_ATTR(psu_serial_numer, S_IRUGO, show_string, NULL, PSU_SERIAL_NUMBER);
+
+static struct attribute *as7116_54x_psu_attributes[] = {
+ &sensor_dev_attr_psu_present.dev_attr.attr,
+ &sensor_dev_attr_psu_model_name.dev_attr.attr,
+ &sensor_dev_attr_psu_power_good.dev_attr.attr,
+ &sensor_dev_attr_psu_serial_numer.dev_attr.attr,
+ NULL
+};
+
+static ssize_t show_status(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct as7116_54x_psu_data *data = as7116_54x_psu_update_device(dev, 0);
+ u8 status = 0;
+
+ if (!data->valid) {
+ return -EIO;
+ }
+
+ if (attr->index == PSU_PRESENT) {
+ status = IS_PRESENT(data->index, data->status);
+ }
+ else { /* PSU_POWER_GOOD */
+ status = IS_POWER_GOOD(data->index, data->status);
+ }
+
+ return sprintf(buf, "%d\n", status);
+}
+
+static ssize_t show_string(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct as7116_54x_psu_data *data = as7116_54x_psu_update_device(dev, 1);
+ char *ptr = NULL;
+
+ if (!data->valid) {
+ return -EIO;
+ }
+
+ if (!IS_PRESENT(data->index, data->status)) {
+ return -ENXIO;
+ }
+
+ if (attr->index == PSU_MODEL_NAME) {
+ ptr = data->model_name;
+ }
+ else { /* PSU_SERIAL_NUBMER */
+ ptr = data->serial;
+ }
+
+ return sprintf(buf, "%s\n", ptr);
+}
+
+static const struct attribute_group as7116_54x_psu_group = {
+ .attrs = as7116_54x_psu_attributes,
+};
+
+static int as7116_54x_psu_probe(struct i2c_client *client,
+ const struct i2c_device_id *dev_id)
+{
+ struct as7116_54x_psu_data *data;
+ int status;
+
+ if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
+ status = -EIO;
+ goto exit;
+ }
+
+ data = kzalloc(sizeof(struct as7116_54x_psu_data), GFP_KERNEL);
+ if (!data) {
+ status = -ENOMEM;
+ goto exit;
+ }
+
+ i2c_set_clientdata(client, data);
+ data->valid = 0;
+ data->index = dev_id->driver_data;
+ mutex_init(&data->update_lock);
+
+ dev_info(&client->dev, "chip found\n");
+
+ /* Register sysfs hooks */
+ status = sysfs_create_group(&client->dev.kobj, &as7116_54x_psu_group);
+ if (status) {
+ goto exit_free;
+ }
+
+ data->hwmon_dev = hwmon_device_register(&client->dev);
+ if (IS_ERR(data->hwmon_dev)) {
+ status = PTR_ERR(data->hwmon_dev);
+ goto exit_remove;
+ }
+
+ dev_info(&client->dev, "%s: psu '%s'\n",
+ dev_name(data->hwmon_dev), client->name);
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &as7116_54x_psu_group);
+exit_free:
+ kfree(data);
+exit:
+
+ return status;
+}
+
+static int as7116_54x_psu_remove(struct i2c_client *client)
+{
+ struct as7116_54x_psu_data *data = i2c_get_clientdata(client);
+
+ hwmon_device_unregister(data->hwmon_dev);
+ sysfs_remove_group(&client->dev.kobj, &as7116_54x_psu_group);
+ kfree(data);
+
+ return 0;
+}
+
+enum psu_index
+{
+ as7116_54x_psu1,
+ as7116_54x_psu2
+};
+
+static const struct i2c_device_id as7116_54x_psu_id[] = {
+ { "as7116_54x_psu1", as7116_54x_psu1 },
+ { "as7116_54x_psu2", as7116_54x_psu2 },
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, as7116_54x_psu_id);
+
+static struct i2c_driver as7116_54x_psu_driver = {
+ .class = I2C_CLASS_HWMON,
+ .driver = {
+ .name = "as7116_54x_psu",
+ },
+ .probe = as7116_54x_psu_probe,
+ .remove = as7116_54x_psu_remove,
+ .id_table = as7116_54x_psu_id,
+ .address_list = normal_i2c,
+};
+
+static int as7116_54x_psu_read_block(struct i2c_client *client, u8 command, u8 *data,
+ int data_len)
+{
+ int result = 0;
+ int retry_count = 5;
+
+ while (retry_count) {
+ retry_count--;
+
+ result = i2c_smbus_read_i2c_block_data(client, command, data_len, data);
+
+ if (unlikely(result < 0)) {
+ msleep(10);
+ continue;
+ }
+
+ if (unlikely(result != data_len)) {
+ result = -EIO;
+ msleep(10);
+ continue;
+ }
+
+ result = 0;
+ break;
+ }
+
+ return result;
+}
+
+static struct as7116_54x_psu_data *as7116_54x_psu_update_device(struct device *dev, u8 update_eeprom)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct as7116_54x_psu_data *data = i2c_get_clientdata(client);
+
+ mutex_lock(&data->update_lock);
+
+ if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+ || !data->valid) {
+ int status;
+
+ data->valid = 0;
+ dev_dbg(&client->dev, "Starting as7116_54x update\n");
+
+ /* Read psu status */
+ status = as7116_54x_cpld_read(PSU_STATUS_I2C_ADDR, PSU_STATUS_I2C_REG_OFFSET);
+
+ if (status < 0) {
+ dev_dbg(&client->dev, "cpld reg (0x%x) err %d\n", PSU_STATUS_I2C_ADDR, status);
+ goto exit;
+ }
+ else {
+ data->status = status;
+ }
+
+
+ memset(data->model_name, 0, sizeof(data->model_name));
+ memset(data->serial, 0, sizeof(data->serial));
+
+ if (update_eeprom && IS_PRESENT(data->index, data->status)) {
+ /* Read model name */
+ status = as7116_54x_psu_read_block(client, MODEL_NAME_REG_OFFSET, data->model_name,
+ ARRAY_SIZE(data->model_name)-1);
+
+ if (status < 0) {
+ data->model_name[0] = '\0';
+ dev_dbg(&client->dev, "unable to read model name from (0x%x)\n", client->addr);
+ goto exit;
+ }
+ else {
+ /* Skip the meaningless data byte 8*/
+ data->model_name[8] = data->model_name[9];
+ data->model_name[9] = data->model_name[10];
+ data->model_name[10] = '\0';
+ }
+
+ /* Read serial number */
+ status = as7116_54x_psu_read_block(client, SERIAL_NUM_REG_OFFSET, data->serial,
+ ARRAY_SIZE(data->serial)-1);
+
+ if (status < 0) {
+ data->serial[0] = '\0';
+ dev_dbg(&client->dev, "unable to read serial number from (0x%x)\n", client->addr);
+ goto exit;
+ }
+ else {
+ data->serial[SERIAL_NUM_LEN] = '\0';
+ }
+ }
+
+ data->last_updated = jiffies;
+ data->valid = 1;
+ }
+
+exit:
+ mutex_unlock(&data->update_lock);
+
+ return data;
+}
+
+static int __init as7116_54x_psu_init(void)
+{
+ //extern int platform_accton_as7116_54x(void);
+ //if (!platform_accton_as7116_54x()) {
+ // return -ENODEV;
+ //}
+
+ return i2c_add_driver(&as7116_54x_psu_driver);
+}
+
+static void __exit as7116_54x_psu_exit(void)
+{
+ i2c_del_driver(&as7116_54x_psu_driver);
+}
+
+module_init(as7116_54x_psu_init);
+module_exit(as7116_54x_psu_exit);
+
+MODULE_AUTHOR("Brandon Chuang ");
+MODULE_DESCRIPTION("as7116_54x_psu driver");
+MODULE_LICENSE("GPL");
+
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-sfp.c b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-sfp.c
new file mode 100644
index 000000000000..540ceb21722f
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/modules/x86-64-accton-as7116-54x-sfp.c
@@ -0,0 +1,1384 @@
+/*
+ * SFP driver for accton as7116_54x sfp
+ *
+ * Copyright (C) Brandon Chuang
+ *
+ * Based on ad7414.c
+ * Copyright 2006 Stefan Roese , DENX Software Engineering
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define DRIVER_NAME "as7116_54x_sfp" /* Platform dependent */
+
+#define DEBUG_MODE 0
+
+#if (DEBUG_MODE == 1)
+ #define DEBUG_PRINT(fmt, args...) \
+ printk (KERN_INFO "%s:%s[%d]: " fmt "\r\n", __FILE__, __FUNCTION__, __LINE__, ##args)
+#else
+ #define DEBUG_PRINT(fmt, args...)
+#endif
+
+#define EEPROM_NAME "sfp_eeprom"
+#define EEPROM_SIZE 256 /* 256 byte eeprom */
+#define BIT_INDEX(i) (1ULL << (i))
+#define USE_I2C_BLOCK_READ 1 /* Platform dependent */
+#define I2C_RW_RETRY_COUNT 3
+#define I2C_RW_RETRY_INTERVAL 100 /* ms */
+
+#define SFP_EEPROM_A0_I2C_ADDR (0xA0 >> 1)
+#define SFP_EEPROM_A2_I2C_ADDR (0xA2 >> 1)
+
+#define SFF8024_PHYSICAL_DEVICE_ID_ADDR 0x0
+#define SFF8024_DEVICE_ID_SFP 0x3
+#define SFF8024_DEVICE_ID_QSFP 0xC
+#define SFF8024_DEVICE_ID_QSFP_PLUS 0xD
+#define SFF8024_DEVICE_ID_QSFP28 0x11
+
+#define SFF8472_DIAG_MON_TYPE_ADDR 92
+#define SFF8472_DIAG_MON_TYPE_DDM_MASK 0x40
+#define SFF8472_10G_ETH_COMPLIANCE_ADDR 0x3
+#define SFF8472_10G_BASE_MASK 0xF0
+
+#define SFF8436_RX_LOS_ADDR 3
+#define SFF8436_TX_FAULT_ADDR 4
+#define SFF8436_TX_DISABLE_ADDR 86
+
+static ssize_t show_port_number(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t show_port_type(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t show_present(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t sfp_show_tx_rx_status(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t qsfp_show_tx_rx_status(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t sfp_set_tx_disable(struct device *dev, struct device_attribute *da, const char *buf, size_t count);
+static ssize_t qsfp_set_tx_disable(struct device *dev, struct device_attribute *da, const char *buf, size_t count);;
+static ssize_t sfp_show_ddm_implemented(struct device *dev, struct device_attribute *da, char *buf);
+static ssize_t sfp_eeprom_read(struct i2c_client *, u8, u8 *,int);
+static ssize_t sfp_eeprom_write(struct i2c_client *, u8 , const char *,int);
+extern int as7116_54x_cpld_read(unsigned short cpld_addr, u8 reg);
+extern int as7116_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
+
+enum sfp_sysfs_attributes {
+ PRESENT,
+ PRESENT_ALL,
+ PORT_NUMBER,
+ PORT_TYPE,
+ DDM_IMPLEMENTED,
+ TX_FAULT,
+ TX_FAULT1,
+ TX_FAULT2,
+ TX_FAULT3,
+ TX_FAULT4,
+ TX_DISABLE,
+ TX_DISABLE1,
+ TX_DISABLE2,
+ TX_DISABLE3,
+ TX_DISABLE4,
+ RX_LOS,
+ RX_LOS1,
+ RX_LOS2,
+ RX_LOS3,
+ RX_LOS4,
+ RX_LOS_ALL
+};
+
+/* SFP/QSFP common attributes for sysfs */
+static SENSOR_DEVICE_ATTR(sfp_port_number, S_IRUGO, show_port_number, NULL, PORT_NUMBER);
+static SENSOR_DEVICE_ATTR(sfp_port_type, S_IRUGO, show_port_type, NULL, PORT_TYPE);
+static SENSOR_DEVICE_ATTR(sfp_is_present, S_IRUGO, show_present, NULL, PRESENT);
+static SENSOR_DEVICE_ATTR(sfp_is_present_all, S_IRUGO, show_present, NULL, PRESENT_ALL);
+static SENSOR_DEVICE_ATTR(sfp_rx_los, S_IRUGO, sfp_show_tx_rx_status, NULL, RX_LOS);
+static SENSOR_DEVICE_ATTR(sfp_tx_disable, S_IWUSR | S_IRUGO, sfp_show_tx_rx_status, sfp_set_tx_disable, TX_DISABLE);
+static SENSOR_DEVICE_ATTR(sfp_tx_fault, S_IRUGO, sfp_show_tx_rx_status, NULL, TX_FAULT);
+
+/* QSFP attributes for sysfs */
+static SENSOR_DEVICE_ATTR(sfp_rx_los1, S_IRUGO, qsfp_show_tx_rx_status, NULL, RX_LOS1);
+static SENSOR_DEVICE_ATTR(sfp_rx_los2, S_IRUGO, qsfp_show_tx_rx_status, NULL, RX_LOS2);
+static SENSOR_DEVICE_ATTR(sfp_rx_los3, S_IRUGO, qsfp_show_tx_rx_status, NULL, RX_LOS3);
+static SENSOR_DEVICE_ATTR(sfp_rx_los4, S_IRUGO, qsfp_show_tx_rx_status, NULL, RX_LOS4);
+static SENSOR_DEVICE_ATTR(sfp_tx_disable1, S_IWUSR | S_IRUGO, qsfp_show_tx_rx_status, qsfp_set_tx_disable, TX_DISABLE1);
+static SENSOR_DEVICE_ATTR(sfp_tx_disable2, S_IWUSR | S_IRUGO, qsfp_show_tx_rx_status, qsfp_set_tx_disable, TX_DISABLE2);
+static SENSOR_DEVICE_ATTR(sfp_tx_disable3, S_IWUSR | S_IRUGO, qsfp_show_tx_rx_status, qsfp_set_tx_disable, TX_DISABLE3);
+static SENSOR_DEVICE_ATTR(sfp_tx_disable4, S_IWUSR | S_IRUGO, qsfp_show_tx_rx_status, qsfp_set_tx_disable, TX_DISABLE4);
+static SENSOR_DEVICE_ATTR(sfp_tx_fault1, S_IRUGO, qsfp_show_tx_rx_status, NULL, TX_FAULT1);
+static SENSOR_DEVICE_ATTR(sfp_tx_fault2, S_IRUGO, qsfp_show_tx_rx_status, NULL, TX_FAULT2);
+static SENSOR_DEVICE_ATTR(sfp_tx_fault3, S_IRUGO, qsfp_show_tx_rx_status, NULL, TX_FAULT3);
+static SENSOR_DEVICE_ATTR(sfp_tx_fault4, S_IRUGO, qsfp_show_tx_rx_status, NULL, TX_FAULT4);
+static struct attribute *qsfp_attributes[] = {
+ &sensor_dev_attr_sfp_port_number.dev_attr.attr,
+ &sensor_dev_attr_sfp_port_type.dev_attr.attr,
+ &sensor_dev_attr_sfp_is_present.dev_attr.attr,
+ &sensor_dev_attr_sfp_is_present_all.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los1.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los2.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los3.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los4.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_disable.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_disable1.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_disable2.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_disable3.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_disable4.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_fault.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_fault1.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_fault2.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_fault3.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_fault4.dev_attr.attr,
+ NULL
+};
+
+/* SFP msa attributes for sysfs */
+static SENSOR_DEVICE_ATTR(sfp_ddm_implemented, S_IRUGO, sfp_show_ddm_implemented, NULL, DDM_IMPLEMENTED);
+static SENSOR_DEVICE_ATTR(sfp_rx_los_all, S_IRUGO, sfp_show_tx_rx_status, NULL, RX_LOS_ALL);
+static struct attribute *sfp_msa_attributes[] = {
+ &sensor_dev_attr_sfp_port_number.dev_attr.attr,
+ &sensor_dev_attr_sfp_port_type.dev_attr.attr,
+ &sensor_dev_attr_sfp_is_present.dev_attr.attr,
+ &sensor_dev_attr_sfp_is_present_all.dev_attr.attr,
+ &sensor_dev_attr_sfp_ddm_implemented.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_fault.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los.dev_attr.attr,
+ &sensor_dev_attr_sfp_rx_los_all.dev_attr.attr,
+ &sensor_dev_attr_sfp_tx_disable.dev_attr.attr,
+ NULL
+};
+
+/* SFP ddm attributes for sysfs */
+static struct attribute *sfp_ddm_attributes[] = {
+ NULL
+};
+
+/* Platform dependent +++ */
+#define CPLD_PORT_TO_FRONT_PORT(port) (port+1)
+
+enum port_numbers {
+as7116_54x_sfp1, as7116_54x_sfp2, as7116_54x_sfp3, as7116_54x_sfp4,
+as7116_54x_sfp5, as7116_54x_sfp6, as7116_54x_sfp7, as7116_54x_sfp8,
+as7116_54x_sfp9, as7116_54x_sfp10, as7116_54x_sfp11, as7116_54x_sfp12,
+as7116_54x_sfp13, as7116_54x_sfp14, as7116_54x_sfp15, as7116_54x_sfp16,
+as7116_54x_sfp17, as7116_54x_sfp18, as7116_54x_sfp19, as7116_54x_sfp20,
+as7116_54x_sfp21, as7116_54x_sfp22, as7116_54x_sfp23, as7116_54x_sfp24,
+as7116_54x_sfp25, as7116_54x_sfp26, as7116_54x_sfp27, as7116_54x_sfp28,
+as7116_54x_sfp29, as7116_54x_sfp30, as7116_54x_sfp31, as7116_54x_sfp32,
+as7116_54x_sfp33, as7116_54x_sfp34, as7116_54x_sfp35, as7116_54x_sfp36,
+as7116_54x_sfp37, as7116_54x_sfp38, as7116_54x_sfp39, as7116_54x_sfp40,
+as7116_54x_sfp41, as7116_54x_sfp42, as7116_54x_sfp43, as7116_54x_sfp44,
+as7116_54x_sfp45, as7116_54x_sfp46, as7116_54x_sfp47, as7116_54x_sfp48,
+as7116_54x_sfp49, as7116_54x_sfp50, as7116_54x_sfp51, as7116_54x_sfp52,
+as7116_54x_sfp53, as7116_54x_sfp54
+};
+
+#define I2C_DEV_ID(x) { #x, x}
+
+static const struct i2c_device_id sfp_device_id[] = {
+I2C_DEV_ID(as7116_54x_sfp1),
+I2C_DEV_ID(as7116_54x_sfp2),
+I2C_DEV_ID(as7116_54x_sfp3),
+I2C_DEV_ID(as7116_54x_sfp4),
+I2C_DEV_ID(as7116_54x_sfp5),
+I2C_DEV_ID(as7116_54x_sfp6),
+I2C_DEV_ID(as7116_54x_sfp7),
+I2C_DEV_ID(as7116_54x_sfp8),
+I2C_DEV_ID(as7116_54x_sfp9),
+I2C_DEV_ID(as7116_54x_sfp10),
+I2C_DEV_ID(as7116_54x_sfp11),
+I2C_DEV_ID(as7116_54x_sfp12),
+I2C_DEV_ID(as7116_54x_sfp13),
+I2C_DEV_ID(as7116_54x_sfp14),
+I2C_DEV_ID(as7116_54x_sfp15),
+I2C_DEV_ID(as7116_54x_sfp16),
+I2C_DEV_ID(as7116_54x_sfp17),
+I2C_DEV_ID(as7116_54x_sfp18),
+I2C_DEV_ID(as7116_54x_sfp19),
+I2C_DEV_ID(as7116_54x_sfp20),
+I2C_DEV_ID(as7116_54x_sfp21),
+I2C_DEV_ID(as7116_54x_sfp22),
+I2C_DEV_ID(as7116_54x_sfp23),
+I2C_DEV_ID(as7116_54x_sfp24),
+I2C_DEV_ID(as7116_54x_sfp25),
+I2C_DEV_ID(as7116_54x_sfp26),
+I2C_DEV_ID(as7116_54x_sfp27),
+I2C_DEV_ID(as7116_54x_sfp28),
+I2C_DEV_ID(as7116_54x_sfp29),
+I2C_DEV_ID(as7116_54x_sfp30),
+I2C_DEV_ID(as7116_54x_sfp31),
+I2C_DEV_ID(as7116_54x_sfp32),
+I2C_DEV_ID(as7116_54x_sfp33),
+I2C_DEV_ID(as7116_54x_sfp34),
+I2C_DEV_ID(as7116_54x_sfp35),
+I2C_DEV_ID(as7116_54x_sfp36),
+I2C_DEV_ID(as7116_54x_sfp37),
+I2C_DEV_ID(as7116_54x_sfp38),
+I2C_DEV_ID(as7116_54x_sfp39),
+I2C_DEV_ID(as7116_54x_sfp40),
+I2C_DEV_ID(as7116_54x_sfp41),
+I2C_DEV_ID(as7116_54x_sfp42),
+I2C_DEV_ID(as7116_54x_sfp43),
+I2C_DEV_ID(as7116_54x_sfp44),
+I2C_DEV_ID(as7116_54x_sfp45),
+I2C_DEV_ID(as7116_54x_sfp46),
+I2C_DEV_ID(as7116_54x_sfp47),
+I2C_DEV_ID(as7116_54x_sfp48),
+I2C_DEV_ID(as7116_54x_sfp49),
+I2C_DEV_ID(as7116_54x_sfp50),
+I2C_DEV_ID(as7116_54x_sfp51),
+I2C_DEV_ID(as7116_54x_sfp52),
+I2C_DEV_ID(as7116_54x_sfp53),
+I2C_DEV_ID(as7116_54x_sfp54),
+{ /* LIST END */ }
+};
+MODULE_DEVICE_TABLE(i2c, sfp_device_id);
+
+/*
+ * list of valid port types
+ * note OOM_PORT_TYPE_NOT_PRESENT to indicate no
+ * module is present in this port
+ */
+typedef enum oom_driver_port_type_e {
+ OOM_DRIVER_PORT_TYPE_INVALID,
+ OOM_DRIVER_PORT_TYPE_NOT_PRESENT,
+ OOM_DRIVER_PORT_TYPE_SFP,
+ OOM_DRIVER_PORT_TYPE_SFP_PLUS,
+ OOM_DRIVER_PORT_TYPE_QSFP,
+ OOM_DRIVER_PORT_TYPE_QSFP_PLUS,
+ OOM_DRIVER_PORT_TYPE_QSFP28
+} oom_driver_port_type_t;
+
+enum driver_type_e {
+ DRIVER_TYPE_SFP_MSA,
+ DRIVER_TYPE_SFP_DDM,
+ DRIVER_TYPE_QSFP
+};
+
+/* Each client has this additional data
+ */
+struct eeprom_data {
+ char valid; /* !=0 if registers are valid */
+ unsigned long last_updated; /* In jiffies */
+ struct bin_attribute bin; /* eeprom data */
+};
+
+struct sfp_msa_data {
+ char valid; /* !=0 if registers are valid */
+ unsigned long last_updated; /* In jiffies */
+ u64 status[6]; /* bit0:port0, bit1:port1 and so on */
+ /* index 0 => tx_fail
+ 1 => tx_disable
+ 2 => rx_loss
+ 3 => device id
+ 4 => 10G Ethernet Compliance Codes
+ to distinguish SFP or SFP+
+ 5 => DIAGNOSTIC MONITORING TYPE */
+ struct eeprom_data eeprom;
+};
+
+struct sfp_ddm_data {
+ struct eeprom_data eeprom;
+};
+
+struct qsfp_data {
+ char valid; /* !=0 if registers are valid */
+ unsigned long last_updated; /* In jiffies */
+ u8 status[3]; /* bit0:port0, bit1:port1 and so on */
+ /* index 0 => tx_fail
+ 1 => tx_disable
+ 2 => rx_loss */
+
+ u8 device_id;
+ struct eeprom_data eeprom;
+};
+
+struct sfp_port_data {
+ struct mutex update_lock;
+ enum driver_type_e driver_type;
+ int port; /* CPLD port index */
+ oom_driver_port_type_t port_type;
+ u64 present; /* present status, bit0:port0, bit1:port1 and so on */
+
+ struct sfp_msa_data *msa;
+ struct sfp_ddm_data *ddm;
+ struct qsfp_data *qsfp;
+
+ struct i2c_client *client;
+};
+
+static ssize_t show_port_number(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ return sprintf(buf, "%d\n", CPLD_PORT_TO_FRONT_PORT(data->port));
+}
+
+/* Platform dependent +++ */
+static struct sfp_port_data *sfp_update_present(struct i2c_client *client)
+{
+ int i = 0, j = 0, status = -1;
+ u8 reg;
+ unsigned short cpld_addr;
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ DEBUG_PRINT("Starting sfp present status update");
+ mutex_lock(&data->update_lock);
+ data->present = 0;
+
+ /* Read present status of port 1~48(SFP port) */
+ for (i = 0; i < 2; i++) {
+ for (j = 0; j < 3; j++) {
+ cpld_addr = 0x61+i;
+ reg = 0x6+j;
+ status = as7116_54x_cpld_read(cpld_addr, reg);
+
+ if (unlikely(status < 0)) {
+ dev_dbg(&client->dev, "cpld(0x%x) reg(0x%x) err %d\n", cpld_addr, reg, status);
+ goto exit;
+ }
+
+ DEBUG_PRINT("Present status = 0x%lx\r\n", data->present);
+ data->present |= (u64)status << ((i*24) + (j%3)*8);
+ }
+ }
+
+ /* Read present status of port 49-54(QSFP port) */
+ cpld_addr = 0x62;
+ reg = 0x14;
+ status = as7116_54x_cpld_read(cpld_addr, reg);
+
+ if (unlikely(status < 0)) {
+ dev_dbg(&client->dev, "cpld(0x%x) reg(0x%x) err %d\n", cpld_addr, reg, status);
+ goto exit;
+ }
+ else {
+ data->present |= (u64)status << 48;
+ }
+
+ DEBUG_PRINT("Present status = 0x%lx", data->present);
+exit:
+ mutex_unlock(&data->update_lock);
+ return (status < 0) ? ERR_PTR(status) : data;
+}
+
+static struct sfp_port_data *sfp_update_tx_rx_status(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ int i = 0, j = 0;
+ int status = -1;
+
+ if (time_before(jiffies, data->msa->last_updated + HZ + HZ / 2) && data->msa->valid) {
+ return data;
+ }
+
+ DEBUG_PRINT("Starting as7116_54x sfp tx rx status update");
+ mutex_lock(&data->update_lock);
+ data->msa->valid = 0;
+ memset(data->msa->status, 0, sizeof(data->msa->status));
+
+ /* Read status of port 1~48(SFP port) */
+ for (i = 0; i < 2; i++) {
+ for (j = 0; j < 9; j++) {
+ u8 reg;
+ unsigned short cpld_addr;
+ reg = 0x9+j;
+ cpld_addr = 0x61+i;
+
+ status = as7116_54x_cpld_read(cpld_addr, reg);
+ if (unlikely(status < 0)) {
+ dev_dbg(&client->dev, "cpld(0x%x) reg(0x%x) err %d\n", cpld_addr, reg, status);
+ goto exit;
+ }
+
+ data->msa->status[j/3] |= (u64)status << ((i*24) + (j%3)*8);
+ }
+ }
+
+ data->msa->valid = 1;
+ data->msa->last_updated = jiffies;
+
+exit:
+ mutex_unlock(&data->update_lock);
+ return (status < 0) ? ERR_PTR(status) : data;
+}
+
+static ssize_t sfp_set_tx_disable(struct device *dev, struct device_attribute *da,
+ const char *buf, size_t count)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ unsigned short cpld_addr = 0;
+ u8 cpld_reg = 0, cpld_val = 0, cpld_bit = 0;
+ long disable;
+ int error;
+
+ if (data->driver_type == DRIVER_TYPE_QSFP) {
+ return qsfp_set_tx_disable(dev, da, buf, count);
+ }
+
+ error = kstrtol(buf, 10, &disable);
+ if (error) {
+ return error;
+ }
+
+ mutex_lock(&data->update_lock);
+
+ if(data->port < 24) {
+ cpld_addr = 0x61;
+ cpld_reg = 0xC + data->port / 8;
+ cpld_bit = 1 << (data->port % 8);
+ }
+ else { /* port 24 ~ 48 */
+ cpld_addr = 0x62;
+ cpld_reg = 0xC + (data->port - 24) / 8;
+ cpld_bit = 1 << (data->port % 8);
+ }
+
+ /* Read current status */
+ cpld_val = as7116_54x_cpld_read(cpld_addr, cpld_reg);
+
+ /* Update tx_disable status */
+ if (disable) {
+ data->msa->status[1] |= BIT_INDEX(data->port);
+ cpld_val |= cpld_bit;
+ }
+ else {
+ data->msa->status[1] &= ~BIT_INDEX(data->port);
+ cpld_val &= ~cpld_bit;
+ }
+
+ as7116_54x_cpld_write(cpld_addr, cpld_reg, cpld_val);
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+/* Platform dependent --- */
+
+static int sfp_is_port_present(struct i2c_client *client, int port)
+{
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ data = sfp_update_present(client);
+ if (IS_ERR(data)) {
+ return PTR_ERR(data);
+ }
+
+ return !(data->present & BIT_INDEX(data->port)); /* Platform dependent */
+}
+
+/* Platform dependent +++ */
+static ssize_t show_present(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct i2c_client *client = to_i2c_client(dev);
+
+ if (PRESENT_ALL == attr->index) {
+ int i;
+ u8 values[7] = {0};
+ struct sfp_port_data *data = sfp_update_present(client);
+
+ if (IS_ERR(data)) {
+ return PTR_ERR(data);
+ }
+
+ for (i = 0; i < ARRAY_SIZE(values); i++) {
+ values[i] = ~(u8)(data->present >> (i * 8));
+ }
+
+ /* Return values 1 -> 54 in order */
+ return sprintf(buf, "%.2x %.2x %.2x %.2x %.2x %.2x %.2x\n",
+ values[0], values[1], values[2],
+ values[3], values[4], values[5],
+ values[6] & 0x3F);
+ }
+ else {
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ int present = sfp_is_port_present(client, data->port);
+
+ if (IS_ERR_VALUE(present)) {
+ return present;
+ }
+
+ /* PRESENT */
+ return sprintf(buf, "%d\n", present);
+ }
+}
+/* Platform dependent --- */
+
+static struct sfp_port_data *sfp_update_port_type(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ u8 buf = 0;
+ int status;
+
+ mutex_lock(&data->update_lock);
+
+ switch (data->driver_type) {
+ case DRIVER_TYPE_SFP_MSA:
+ {
+ status = sfp_eeprom_read(client, SFF8024_PHYSICAL_DEVICE_ID_ADDR, &buf, sizeof(buf));
+ if (unlikely(status < 0)) {
+ data->port_type = OOM_DRIVER_PORT_TYPE_INVALID;
+ break;
+ }
+
+ if (buf != SFF8024_DEVICE_ID_SFP) {
+ data->port_type = OOM_DRIVER_PORT_TYPE_INVALID;
+ break;
+ }
+
+ status = sfp_eeprom_read(client, SFF8472_10G_ETH_COMPLIANCE_ADDR, &buf, sizeof(buf));
+ if (unlikely(status < 0)) {
+ data->port_type = OOM_DRIVER_PORT_TYPE_INVALID;
+ break;
+ }
+
+ DEBUG_PRINT("sfp port type (0x3) data = (0x%x)", buf);
+ data->port_type = buf & SFF8472_10G_BASE_MASK ? OOM_DRIVER_PORT_TYPE_SFP_PLUS : OOM_DRIVER_PORT_TYPE_SFP;
+ break;
+ }
+ case DRIVER_TYPE_QSFP:
+ {
+ status = sfp_eeprom_read(client, SFF8024_PHYSICAL_DEVICE_ID_ADDR, &buf, sizeof(buf));
+ if (unlikely(status < 0)) {
+ data->port_type = OOM_DRIVER_PORT_TYPE_INVALID;
+ break;
+ }
+
+ DEBUG_PRINT("qsfp port type (0x0) buf = (0x%x)", buf);
+ switch (buf) {
+ case SFF8024_DEVICE_ID_QSFP:
+ data->port_type = OOM_DRIVER_PORT_TYPE_QSFP;
+ break;
+ case SFF8024_DEVICE_ID_QSFP_PLUS:
+ data->port_type = OOM_DRIVER_PORT_TYPE_QSFP_PLUS;
+ break;
+ case SFF8024_DEVICE_ID_QSFP28:
+ data->port_type = OOM_DRIVER_PORT_TYPE_QSFP_PLUS;
+ break;
+ default:
+ data->port_type = OOM_DRIVER_PORT_TYPE_INVALID;
+ break;
+ }
+
+ break;
+ }
+ default:
+ break;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return data;
+}
+
+static ssize_t show_port_type(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ int present = sfp_is_port_present(client, data->port);
+
+ if (IS_ERR_VALUE(present)) {
+ return present;
+ }
+
+ if (!present) {
+ /* port is not present */
+ return sprintf(buf, "%d\n", OOM_DRIVER_PORT_TYPE_NOT_PRESENT);
+ }
+
+ sfp_update_port_type(dev);
+ return sprintf(buf, "%d\n", data->port_type);
+}
+
+static struct sfp_port_data *qsfp_update_tx_rx_status(struct device *dev)
+{
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+ int i, status = -1;
+ u8 buf = 0;
+ u8 reg[] = {SFF8436_TX_FAULT_ADDR, SFF8436_TX_DISABLE_ADDR, SFF8436_RX_LOS_ADDR};
+
+ DEBUG_PRINT("");
+ if (time_before(jiffies, data->qsfp->last_updated + HZ + HZ / 2) && data->qsfp->valid) {
+ return data;
+ }
+
+ DEBUG_PRINT("Starting sfp tx rx status update");
+ mutex_lock(&data->update_lock);
+ data->qsfp->valid = 0;
+ memset(data->qsfp->status, 0, sizeof(data->qsfp->status));
+
+ DEBUG_PRINT("");
+ /* Notify device to update tx fault/ tx disable/ rx los status */
+ for (i = 0; i < ARRAY_SIZE(reg); i++) {
+ status = sfp_eeprom_read(client, reg[i], &buf, sizeof(buf));
+ if (unlikely(status < 0)) {
+ DEBUG_PRINT("");
+ goto exit;
+ }
+ }
+ msleep(200);
+ DEBUG_PRINT("");
+
+ /* Read actual tx fault/ tx disable/ rx los status */
+ for (i = 0; i < ARRAY_SIZE(reg); i++) {
+ status = sfp_eeprom_read(client, reg[i], &buf, sizeof(buf));
+ if (unlikely(status < 0)) {
+ DEBUG_PRINT("");
+ goto exit;
+ }
+
+ DEBUG_PRINT("qsfp reg(0x%x) status = (0x%x)", reg[i], data->qsfp->status[i]);
+ data->qsfp->status[i] = (buf & 0xF);
+ }
+
+ DEBUG_PRINT("");
+ data->qsfp->valid = 1;
+ data->qsfp->last_updated = jiffies;
+
+exit:
+ DEBUG_PRINT("");
+ mutex_unlock(&data->update_lock);
+ return (status < 0) ? ERR_PTR(status) : data;
+}
+
+static ssize_t qsfp_show_tx_rx_status(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ int present;
+ u8 val = 0;
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ DEBUG_PRINT("");
+ present = sfp_is_port_present(client, data->port);
+ if (IS_ERR_VALUE(present)) {
+ return present;
+ }
+
+ DEBUG_PRINT("");
+ if (present == 0) {
+ /* port is not present */
+ return -ENODEV;
+ }
+
+ DEBUG_PRINT("");
+ data = qsfp_update_tx_rx_status(dev);
+ DEBUG_PRINT("");
+ if (IS_ERR(data)) {
+ return PTR_ERR(data);
+ }
+
+ DEBUG_PRINT("");
+ switch (attr->index) {
+ case TX_FAULT:
+ val = !!(data->qsfp->status[2] & 0xF);
+ break;
+ case TX_FAULT1:
+ case TX_FAULT2:
+ case TX_FAULT3:
+ case TX_FAULT4:
+ val = !!(data->qsfp->status[2] & BIT_INDEX(attr->index - TX_FAULT1));
+ break;
+ case TX_DISABLE:
+ val = data->qsfp->status[1] & 0xF;
+ break;
+ case TX_DISABLE1:
+ case TX_DISABLE2:
+ case TX_DISABLE3:
+ case TX_DISABLE4:
+ val = !!(data->qsfp->status[1] & BIT_INDEX(attr->index - TX_DISABLE1));
+ break;
+ case RX_LOS:
+ val = !!(data->qsfp->status[0] & 0xF);
+ break;
+ case RX_LOS1:
+ case RX_LOS2:
+ case RX_LOS3:
+ case RX_LOS4:
+ val = !!(data->qsfp->status[0] & BIT_INDEX(attr->index - RX_LOS1));
+ break;
+ default:
+ break;
+ }
+
+ DEBUG_PRINT("");
+ return sprintf(buf, "%d\n", val);
+}
+
+static ssize_t qsfp_set_tx_disable(struct device *dev, struct device_attribute *da,
+ const char *buf, size_t count)
+{
+ long disable;
+ int status;
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ status = sfp_is_port_present(client, data->port);
+ if (IS_ERR_VALUE(status)) {
+ return status;
+ }
+
+ if (!status) {
+ /* port is not present */
+ return -ENXIO;
+ }
+
+ status = kstrtol(buf, 10, &disable);
+ if (status) {
+ return status;
+ }
+
+ data = qsfp_update_tx_rx_status(dev);
+ if (IS_ERR(data)) {
+ return PTR_ERR(data);
+ }
+
+ mutex_lock(&data->update_lock);
+
+ if (attr->index == TX_DISABLE) {
+ data->qsfp->status[1] = disable & 0xF;
+ }
+ else {/* TX_DISABLE1 ~ TX_DISABLE4*/
+ if (disable) {
+ data->qsfp->status[1] |= (1 << (attr->index - TX_DISABLE1));
+ }
+ else {
+ data->qsfp->status[1] &= ~(1 << (attr->index - TX_DISABLE1));
+ }
+ }
+
+ DEBUG_PRINT("index = (%d), status = (0x%x)", attr->index, data->qsfp->status[1]);
+ status = sfp_eeprom_write(data->client, SFF8436_TX_DISABLE_ADDR, &data->qsfp->status[1], sizeof(data->qsfp->status[1]));
+ if (unlikely(status < 0)) {
+ count = status;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return count;
+}
+
+static ssize_t sfp_show_ddm_implemented(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ int status;
+ char ddm;
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ status = sfp_is_port_present(client, data->port);
+ if (IS_ERR_VALUE(status)) {
+ return status;
+ }
+
+ if (status == 0) {
+ /* port is not present */
+ return -ENODEV;
+ }
+
+ status = sfp_eeprom_read(client, SFF8472_DIAG_MON_TYPE_ADDR, &ddm, sizeof(ddm));
+ if (unlikely(status < 0)) {
+ return status;
+ }
+
+ return sprintf(buf, "%d\n", !!(ddm & SFF8472_DIAG_MON_TYPE_DDM_MASK));
+}
+
+/* Platform dependent +++ */
+static ssize_t sfp_show_tx_rx_status(struct device *dev, struct device_attribute *da,
+ char *buf)
+{
+ u8 val = 0, index = 0;
+ struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+ struct i2c_client *client = to_i2c_client(dev);
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ DEBUG_PRINT("driver type = (%d)", data->driver_type);
+ if (data->driver_type == DRIVER_TYPE_QSFP) {
+ DEBUG_PRINT("");
+ return qsfp_show_tx_rx_status(dev, da, buf);
+ }
+
+ DEBUG_PRINT("");
+ data = sfp_update_tx_rx_status(dev);
+ if (IS_ERR(data)) {
+ return PTR_ERR(data);
+ }
+
+ if(attr->index == RX_LOS_ALL) {
+ int i = 0;
+ u8 values[6] = {0};
+
+ for (i = 0; i < ARRAY_SIZE(values); i++) {
+ values[i] = (u8)(data->msa->status[2] >> (i * 8));
+ }
+
+ /** Return values 1 -> 48 in order */
+ return sprintf(buf, "%.2x %.2x %.2x %.2x %.2x %.2x\n",
+ values[0], values[1], values[2],
+ values[3], values[4], values[5]);
+ }
+
+ switch (attr->index) {
+ case TX_FAULT:
+ index = 0;
+ break;
+ case TX_DISABLE:
+ index = 1;
+ break;
+ case RX_LOS:
+ index = 2;
+ break;
+ default:
+ break;
+ }
+
+ val = !!(data->msa->status[index] & BIT_INDEX(data->port));
+ return sprintf(buf, "%d\n", val);
+}
+/* Platform dependent --- */
+static ssize_t sfp_eeprom_write(struct i2c_client *client, u8 command, const char *data,
+ int data_len)
+{
+#if USE_I2C_BLOCK_READ
+ int status, retry = I2C_RW_RETRY_COUNT;
+
+ if (data_len > I2C_SMBUS_BLOCK_MAX) {
+ data_len = I2C_SMBUS_BLOCK_MAX;
+ }
+
+ while (retry) {
+ status = i2c_smbus_write_i2c_block_data(client, command, data_len, data);
+ if (unlikely(status < 0)) {
+ msleep(I2C_RW_RETRY_INTERVAL);
+ retry--;
+ continue;
+ }
+
+ break;
+ }
+
+ if (unlikely(status < 0)) {
+ return status;
+ }
+
+ return data_len;
+#else
+ int status, retry = I2C_RW_RETRY_COUNT;
+
+ while (retry) {
+ status = i2c_smbus_write_byte_data(client, command, *data);
+ if (unlikely(status < 0)) {
+ msleep(I2C_RW_RETRY_INTERVAL);
+ retry--;
+ continue;
+ }
+
+ break;
+ }
+
+ if (unlikely(status < 0)) {
+ return status;
+ }
+
+ return 1;
+#endif
+
+
+}
+
+static ssize_t sfp_port_write(struct sfp_port_data *data,
+ const char *buf, loff_t off, size_t count)
+{
+ ssize_t retval = 0;
+
+ if (unlikely(!count)) {
+ return count;
+ }
+
+ /*
+ * Write data to chip, protecting against concurrent updates
+ * from this host, but not from other I2C masters.
+ */
+ mutex_lock(&data->update_lock);
+
+ while (count) {
+ ssize_t status;
+
+ status = sfp_eeprom_write(data->client, off, buf, count);
+ if (status <= 0) {
+ if (retval == 0) {
+ retval = status;
+ }
+ break;
+ }
+ buf += status;
+ off += status;
+ count -= status;
+ retval += status;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return retval;
+}
+
+
+static ssize_t sfp_bin_write(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *attr,
+ char *buf, loff_t off, size_t count)
+{
+ int present;
+ struct sfp_port_data *data;
+ DEBUG_PRINT("%s(%d) offset = (%d), count = (%d)", off, count);
+ data = dev_get_drvdata(container_of(kobj, struct device, kobj));
+
+ present = sfp_is_port_present(data->client, data->port);
+ if (IS_ERR_VALUE(present)) {
+ return present;
+ }
+
+ if (present == 0) {
+ /* port is not present */
+ return -ENODEV;
+ }
+
+ return sfp_port_write(data, buf, off, count);
+}
+
+static ssize_t sfp_eeprom_read(struct i2c_client *client, u8 command, u8 *data,
+ int data_len)
+{
+#if USE_I2C_BLOCK_READ
+ int status, retry = I2C_RW_RETRY_COUNT;
+
+ if (data_len > I2C_SMBUS_BLOCK_MAX) {
+ data_len = I2C_SMBUS_BLOCK_MAX;
+ }
+
+ while (retry) {
+ status = i2c_smbus_read_i2c_block_data(client, command, data_len, data);
+ if (unlikely(status < 0)) {
+ msleep(I2C_RW_RETRY_INTERVAL);
+ retry--;
+ continue;
+ }
+
+ break;
+ }
+
+ if (unlikely(status < 0)) {
+ goto abort;
+ }
+ if (unlikely(status != data_len)) {
+ status = -EIO;
+ goto abort;
+ }
+
+ //result = data_len;
+
+abort:
+ return status;
+#else
+ int status, retry = I2C_RW_RETRY_COUNT;
+
+ while (retry) {
+ status = i2c_smbus_read_byte_data(client, command);
+ if (unlikely(status < 0)) {
+ msleep(I2C_RW_RETRY_INTERVAL);
+ retry--;
+ continue;
+ }
+
+ break;
+ }
+
+ if (unlikely(status < 0)) {
+ dev_dbg(&client->dev, "sfp read byte data failed, command(0x%2x), data(0x%2x)\r\n", command, status);
+ goto abort;
+ }
+
+ *data = (u8)status;
+ status = 1;
+
+abort:
+ return status;
+#endif
+}
+
+static ssize_t sfp_port_read(struct sfp_port_data *data,
+ char *buf, loff_t off, size_t count)
+{
+ ssize_t retval = 0;
+
+ if (unlikely(!count)) {
+ DEBUG_PRINT("Count = 0, return");
+ return count;
+ }
+
+ /*
+ * Read data from chip, protecting against concurrent updates
+ * from this host, but not from other I2C masters.
+ */
+ mutex_lock(&data->update_lock);
+
+ while (count) {
+ ssize_t status;
+
+ status = sfp_eeprom_read(data->client, off, buf, count);
+ if (status <= 0) {
+ if (retval == 0) {
+ retval = status;
+ }
+ break;
+ }
+
+ buf += status;
+ off += status;
+ count -= status;
+ retval += status;
+ }
+
+ mutex_unlock(&data->update_lock);
+ return retval;
+
+}
+
+static ssize_t sfp_bin_read(struct file *filp, struct kobject *kobj,
+ struct bin_attribute *attr,
+ char *buf, loff_t off, size_t count)
+{
+ int present;
+ struct sfp_port_data *data;
+ DEBUG_PRINT("offset = (%d), count = (%d)", off, count);
+ data = dev_get_drvdata(container_of(kobj, struct device, kobj));
+
+ present = sfp_is_port_present(data->client, data->port);
+ if (IS_ERR_VALUE(present)) {
+ return present;
+ }
+
+ if (present == 0) {
+ /* port is not present */
+ return -ENODEV;
+ }
+
+ return sfp_port_read(data, buf, off, count);
+}
+
+static int sfp_sysfs_eeprom_init(struct kobject *kobj, struct bin_attribute *eeprom)
+{
+ int err;
+
+ sysfs_bin_attr_init(eeprom);
+ eeprom->attr.name = EEPROM_NAME;
+ eeprom->attr.mode = S_IWUSR | S_IRUGO;
+ eeprom->read = sfp_bin_read;
+ eeprom->write = sfp_bin_write;
+ eeprom->size = EEPROM_SIZE;
+
+ /* Create eeprom file */
+ err = sysfs_create_bin_file(kobj, eeprom);
+ if (err) {
+ return err;
+ }
+
+ return 0;
+}
+
+static int sfp_sysfs_eeprom_cleanup(struct kobject *kobj, struct bin_attribute *eeprom)
+{
+ sysfs_remove_bin_file(kobj, eeprom);
+ return 0;
+}
+
+static const struct attribute_group sfp_msa_group = {
+ .attrs = sfp_msa_attributes,
+};
+
+static int sfp_i2c_check_functionality(struct i2c_client *client)
+{
+#if USE_I2C_BLOCK_READ
+ return i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_I2C_BLOCK);
+#else
+ return i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA);
+#endif
+}
+
+static int sfp_msa_probe(struct i2c_client *client, const struct i2c_device_id *dev_id,
+ struct sfp_msa_data **data)
+{
+ int status;
+ struct sfp_msa_data *msa;
+
+ if (!sfp_i2c_check_functionality(client)) {
+ status = -EIO;
+ goto exit;
+ }
+
+ msa = kzalloc(sizeof(struct sfp_msa_data), GFP_KERNEL);
+ if (!msa) {
+ status = -ENOMEM;
+ goto exit;
+ }
+
+ /* Register sysfs hooks */
+ status = sysfs_create_group(&client->dev.kobj, &sfp_msa_group);
+ if (status) {
+ goto exit_free;
+ }
+
+ /* init eeprom */
+ status = sfp_sysfs_eeprom_init(&client->dev.kobj, &msa->eeprom.bin);
+ if (status) {
+ goto exit_remove;
+ }
+
+ *data = msa;
+ dev_info(&client->dev, "sfp msa '%s'\n", client->name);
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &sfp_msa_group);
+exit_free:
+ kfree(msa);
+exit:
+
+ return status;
+}
+
+static const struct attribute_group sfp_ddm_group = {
+ .attrs = sfp_ddm_attributes,
+};
+
+static int sfp_ddm_probe(struct i2c_client *client, const struct i2c_device_id *dev_id,
+ struct sfp_ddm_data **data)
+{
+ int status;
+ struct sfp_ddm_data *ddm;
+
+ if (!sfp_i2c_check_functionality(client)) {
+ status = -EIO;
+ goto exit;
+ }
+
+ ddm = kzalloc(sizeof(struct sfp_ddm_data), GFP_KERNEL);
+ if (!ddm) {
+ status = -ENOMEM;
+ goto exit;
+ }
+
+ /* Register sysfs hooks */
+ status = sysfs_create_group(&client->dev.kobj, &sfp_ddm_group);
+ if (status) {
+ goto exit_free;
+ }
+
+ /* init eeprom */
+ status = sfp_sysfs_eeprom_init(&client->dev.kobj, &ddm->eeprom.bin);
+ if (status) {
+ goto exit_remove;
+ }
+
+ *data = ddm;
+ dev_info(&client->dev, "sfp ddm '%s'\n", client->name);
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &sfp_ddm_group);
+exit_free:
+ kfree(ddm);
+exit:
+
+ return status;
+}
+
+static const struct attribute_group qsfp_group = {
+ .attrs = qsfp_attributes,
+};
+
+static int qsfp_probe(struct i2c_client *client, const struct i2c_device_id *dev_id,
+ struct qsfp_data **data)
+{
+ int status;
+ struct qsfp_data *qsfp;
+
+ if (!sfp_i2c_check_functionality(client)) {
+ status = -EIO;
+ goto exit;
+ }
+
+ qsfp = kzalloc(sizeof(struct qsfp_data), GFP_KERNEL);
+ if (!qsfp) {
+ status = -ENOMEM;
+ goto exit;
+ }
+
+ /* Register sysfs hooks */
+ status = sysfs_create_group(&client->dev.kobj, &qsfp_group);
+ if (status) {
+ goto exit_free;
+ }
+
+ /* init eeprom */
+ status = sfp_sysfs_eeprom_init(&client->dev.kobj, &qsfp->eeprom.bin);
+ if (status) {
+ goto exit_remove;
+ }
+
+ /* Bring QSFPs out of reset */
+ as7116_54x_cpld_write(0x62, 0x15, 0x3F);
+
+ *data = qsfp;
+ dev_info(&client->dev, "qsfp '%s'\n", client->name);
+
+ return 0;
+
+exit_remove:
+ sysfs_remove_group(&client->dev.kobj, &qsfp_group);
+exit_free:
+ kfree(qsfp);
+exit:
+
+ return status;
+}
+
+/* Platform dependent +++ */
+static int sfp_device_probe(struct i2c_client *client,
+ const struct i2c_device_id *dev_id)
+{
+ struct sfp_port_data *data = NULL;
+
+ data = kzalloc(sizeof(struct sfp_port_data), GFP_KERNEL);
+ if (!data) {
+ return -ENOMEM;
+ }
+
+ i2c_set_clientdata(client, data);
+ mutex_init(&data->update_lock);
+ data->port = dev_id->driver_data;
+ data->client = client;
+
+ if (dev_id->driver_data >= as7116_54x_sfp1 && dev_id->driver_data <= as7116_54x_sfp48) {
+ if (client->addr == SFP_EEPROM_A0_I2C_ADDR) {
+ data->driver_type = DRIVER_TYPE_SFP_MSA;
+ return sfp_msa_probe(client, dev_id, &data->msa);
+ }
+ else if (client->addr == SFP_EEPROM_A2_I2C_ADDR) {
+ data->driver_type = DRIVER_TYPE_SFP_DDM;
+ return sfp_ddm_probe(client, dev_id, &data->ddm);
+ }
+ }
+ else { /* as7116_54x_sfp49 ~ as7116_54x_sfp54 */
+ if (client->addr == SFP_EEPROM_A0_I2C_ADDR) {
+ data->driver_type = DRIVER_TYPE_QSFP;
+ return qsfp_probe(client, dev_id, &data->qsfp);
+ }
+ }
+
+ return -ENODEV;
+}
+/* Platform dependent --- */
+
+static int sfp_msa_remove(struct i2c_client *client, struct sfp_msa_data *data)
+{
+ sfp_sysfs_eeprom_cleanup(&client->dev.kobj, &data->eeprom.bin);
+ sysfs_remove_group(&client->dev.kobj, &sfp_msa_group);
+ kfree(data);
+ return 0;
+}
+
+static int sfp_ddm_remove(struct i2c_client *client, struct sfp_ddm_data *data)
+{
+ sfp_sysfs_eeprom_cleanup(&client->dev.kobj, &data->eeprom.bin);
+ sysfs_remove_group(&client->dev.kobj, &sfp_ddm_group);
+ kfree(data);
+ return 0;
+}
+
+static int qfp_remove(struct i2c_client *client, struct qsfp_data *data)
+{
+ sfp_sysfs_eeprom_cleanup(&client->dev.kobj, &data->eeprom.bin);
+ sysfs_remove_group(&client->dev.kobj, &qsfp_group);
+ kfree(data);
+ return 0;
+}
+
+static int sfp_device_remove(struct i2c_client *client)
+{
+ struct sfp_port_data *data = i2c_get_clientdata(client);
+
+ switch (data->driver_type) {
+ case DRIVER_TYPE_SFP_MSA:
+ return sfp_msa_remove(client, data->msa);
+ case DRIVER_TYPE_SFP_DDM:
+ return sfp_ddm_remove(client, data->ddm);
+ case DRIVER_TYPE_QSFP:
+ return qfp_remove(client, data->qsfp);
+ }
+
+ return 0;
+}
+
+/* Addresses scanned
+ */
+static const unsigned short normal_i2c[] = { I2C_CLIENT_END };
+
+static struct i2c_driver sfp_driver = {
+ .driver = {
+ .name = DRIVER_NAME,
+ },
+ .probe = sfp_device_probe,
+ .remove = sfp_device_remove,
+ .id_table = sfp_device_id,
+ .address_list = normal_i2c,
+};
+
+static int __init sfp_init(void)
+{
+ //extern int platform_accton_as7116_54x(void);
+ //if (!platform_accton_as7116_54x()) {
+ // return -ENODEV;
+ //}
+
+ return i2c_add_driver(&sfp_driver);
+}
+
+static void __exit sfp_exit(void)
+{
+ i2c_del_driver(&sfp_driver);
+}
+
+MODULE_AUTHOR("Brandon Chuang ");
+MODULE_DESCRIPTION("accton as7116_54x_sfp driver");
+MODULE_LICENSE("GPL");
+
+module_init(sfp_init);
+module_exit(sfp_exit);
+
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/service/as7116-platform-init.service b/platform/nephos/sonic-platform-modules-accton/as7116-54x/service/as7116-platform-init.service
new file mode 100755
index 000000000000..be8688d2c2d2
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/service/as7116-platform-init.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Accton AS7116-54X Platform initialization service
+Before=pmon.service
+DefaultDependencies=no
+
+[Service]
+Type=oneshot
+ExecStart=/usr/local/bin/accton_as7116_util.py install
+ExecStop=/usr/local/bin/accton_as7116_util.py clean
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/setup.py b/platform/nephos/sonic-platform-modules-accton/as7116-54x/setup.py
new file mode 100644
index 000000000000..bb740409e310
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/setup.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+
+import os
+import sys
+from setuptools import setup
+os.listdir
+
+setup(
+ name='as7116-54x',
+ version='1.0.0',
+ description='Module to initialize Accton AS7116-54X platforms',
+
+ packages=['as7116-54x'],
+ package_dir={'as7116-54x': 'as7116-54x/classes'},
+ )
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/utils/README b/platform/nephos/sonic-platform-modules-accton/as7116-54x/utils/README
new file mode 100755
index 000000000000..0b9fc1633999
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/utils/README
@@ -0,0 +1,60 @@
+Copyright (C) 2016 Accton Networks, Inc.
+
+This program is free software: you can redistribute it and/or modify
+It under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+
+To initialize the system, run "accton_as7712_util.py install".
+To clean up the drivers & devices, run "accton_as7712_util.py clean".
+To dump information of sensors, run "accton_as7712_util.py show".
+To dump SFP EEPROM, run "accton_as7712_util.py sff".
+To set fan speed, run "accton_as7712_util.py set fan".
+To enable/disable SFP emission, run "accton_as7712_util.py set sfp".
+To set system LEDs' color, run "accton_as7712_util.py set led"
+For more information, run "accton_as7712_util.py --help".
+
+====================================================================
+Besides applying accton_as7712_util.py to access peripherals, you can
+access peripherals by sysfs nodes directly after the installation is run.
+
+LED controls can be found under /sys/class/leds. The sysfs interface
+color mappings are as follows:
+Brightness:
+ 0 => off
+ 1 => green
+ 2 => amber
+ 3 => red
+ 4 => blue
+
+There are 5 system LEDs, loc, diag, fan, ps1, and ps2.
+They are lit automatically by CPLD, but the loc and diag.
+The loc led has only 1 color, blue.
+The diag one has 3 colors: red, amber, and green.
+
+Fan controls can be found in /sys/bus/i2c/devices/2-0066.
+There are 12 fans inside 6 fan modules.
+All fans share 1 duty setting, ranged from 0~100.
+
+Three temperature sensors are controlled by the lm75 kernel modules.
+They should already be visible under /sys/bus/i2c/drivers/lm75/.
+
+Two power supplies are controlled by the CPLD.
+Here provide their status under
+/sys/bus/i2c/devices/10-0050 and /sys/bus/i2c/devices/11-0053.
+
+There are 32 QSFP+ modules are equipped.
+Apply "accton_as7712_util.py show" to get their status.
+Apply "accton_as7712_util.py set sfp" to turn on/off light transmission.
+Apply "accton_as7712_util.py sff" to dump EEPROM information.
+Before operating on that QSFP+, please make sure it is well plugged.
+Otherwise, operation is going to fail.
+
diff --git a/platform/nephos/sonic-platform-modules-accton/as7116-54x/utils/accton_as7116_util.py b/platform/nephos/sonic-platform-modules-accton/as7116-54x/utils/accton_as7116_util.py
new file mode 100755
index 000000000000..26a8a3cc8f84
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/as7116-54x/utils/accton_as7116_util.py
@@ -0,0 +1,526 @@
+#!/usr/bin/env python
+#
+# Copyright (C) 2016 Accton Networks, Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+"""
+Usage: %(scriptName)s [options] command object
+
+options:
+ -h | --help : this help message
+ -d | --debug : run with debug mode
+ -f | --force : ignore error during installation or clean
+command:
+ install : install drivers and generate related sysfs nodes
+ clean : uninstall drivers and remove related sysfs nodes
+ show : show all systen status
+ sff : dump SFP eeprom
+ set : change board setting with fan|led|sfp
+"""
+
+import os
+import commands
+import sys, getopt
+import logging
+import re
+import time
+from collections import namedtuple
+
+
+
+
+PROJECT_NAME = 'as7116_54x'
+version = '0.1.0'
+verbose = False
+DEBUG = False
+args = []
+ALL_DEVICE = {}
+DEVICE_NO = {'led':5, 'fan':1, 'thermal':3, 'psu':2, 'sfp':54}
+FORCE = 0
+#logging.basicConfig(filename= PROJECT_NAME+'.log', filemode='w',level=logging.DEBUG)
+#logging.basicConfig(level=logging.INFO)
+
+
+if DEBUG == True:
+ print sys.argv[0]
+ print 'ARGV :', sys.argv[1:]
+
+
+def main():
+ global DEBUG
+ global args
+ global FORCE
+
+ if len(sys.argv)<2:
+ show_help()
+
+ options, args = getopt.getopt(sys.argv[1:], 'hdf', ['help',
+ 'debug',
+ 'force',
+ ])
+ if DEBUG == True:
+ print options
+ print args
+ print len(sys.argv)
+
+ for opt, arg in options:
+ if opt in ('-h', '--help'):
+ show_help()
+ elif opt in ('-d', '--debug'):
+ DEBUG = True
+ logging.basicConfig(level=logging.INFO)
+ elif opt in ('-f', '--force'):
+ FORCE = 1
+ else:
+ logging.info('no option')
+ for arg in args:
+ if arg == 'install':
+ do_install()
+ elif arg == 'clean':
+ do_uninstall()
+ elif arg == 'show':
+ device_traversal()
+ elif arg == 'sff':
+ if len(args)!=2:
+ show_eeprom_help()
+ elif int(args[1]) ==0 or int(args[1]) > DEVICE_NO['sfp']:
+ show_eeprom_help()
+ else:
+ show_eeprom(args[1])
+ return
+ elif arg == 'set':
+ if len(args)<3:
+ show_set_help()
+ else:
+ set_device(args[1:])
+ return
+ else:
+ show_help()
+
+
+ return 0
+
+def show_help():
+ print __doc__ % {'scriptName' : sys.argv[0].split("/")[-1]}
+ sys.exit(0)
+
+def show_set_help():
+ cmd = sys.argv[0].split("/")[-1]+ " " + args[0]
+ print cmd +" [led|sfp|fan]"
+ print " use \""+ cmd + " led 0-4 \" to set led color"
+ print " use \""+ cmd + " fan 0-100\" to set fan duty percetage"
+ print " use \""+ cmd + " sfp 1-54 {0|1}\" to set sfp# tx_disable"
+ sys.exit(0)
+
+def show_eeprom_help():
+ cmd = sys.argv[0].split("/")[-1]+ " " + args[0]
+ print " use \""+ cmd + " 1-54 \" to dump sfp# eeprom"
+ sys.exit(0)
+
+def my_log(txt):
+ if DEBUG == True:
+ print "[ROY]"+txt
+ return
+
+def log_os_system(cmd, show):
+ logging.info('Run :'+cmd)
+ status, output = commands.getstatusoutput(cmd)
+ my_log (cmd +"with result:" + str(status))
+ my_log (" output:"+output)
+ if status:
+ logging.info('Failed :'+cmd)
+ if show:
+ print('Failed :'+cmd)
+ return status, output
+
+def driver_check():
+ ret, lsmod = log_os_system("lsmod| grep accton", 0)
+ logging.info('mods:'+lsmod)
+ if len(lsmod) ==0:
+ return False
+ return True
+
+
+
+kos = [
+ 'depmod',
+ 'modprobe i2c_dev',
+ 'modprobe i2c_mux_pca954x force_deselect_on_exit=1',
+ 'modprobe x86-64-accton-as7116-54x-cpld' ,
+ 'modprobe x86-64-accton-as7116-54x-fan' ,
+ 'modprobe x86-64-accton-as7116-54x-psu' ,
+ 'modprobe x86-64-accton-as7116-54x-sfp' ,
+ 'modprobe x86-64-accton-as7116-54x-led' ]
+
+def driver_install():
+ global FORCE
+ for i in range(0,len(kos)):
+ status, output = log_os_system(kos[i], 1)
+ if status:
+ if FORCE == 0:
+ return status
+ return 0
+
+def driver_uninstall():
+ global FORCE
+ for i in range(0,len(kos)):
+ rm = kos[-(i+1)].replace("modprobe", "modprobe -rq")
+ rm = rm.replace("insmod", "rmmod")
+ status, output = log_os_system(rm, 1)
+ if status:
+ if FORCE == 0:
+ return status
+ return 0
+
+led_prefix ='/sys/class/leds/'+PROJECT_NAME+'_led::'
+hwmon_types = {'led': ['diag','fan','loc','psu1','psu2']}
+hwmon_nodes = {'led': ['brightness'] }
+hwmon_prefix ={'led': led_prefix}
+
+i2c_prefix = '/sys/bus/i2c/devices/'
+i2c_bus = {'fan': ['1-0063'] ,
+ 'thermal': ['17-004b','19-0049', '20-004a'] ,
+ 'psu': ['10-0050','11-0058'],
+ 'sfp': ['-0050']}
+i2c_nodes = {'fan': ['present', 'front_speed_rpm', 'rear_speed_rpm'] ,
+ 'thermal': ['hwmon/hwmon*/temp1_input'] ,
+ 'psu': ['psu_present ', 'psu_power_good'] ,
+ 'sfp': ['sfp_is_present ', 'sfp_tx_disable_all']}
+
+sfp_map = [37,38,39,40,
+ 41,42,43,44,45,46,47,48,49,50,
+ 51,52,53,54,55,56,57,58,59,60,
+ 61,62,63,64,65,66,67,68,69,70,
+ 71,72,73,74,75,76,77,78,79,80,
+ 81,82,83,84,
+ 21,22,23,24,25,26]
+
+mknod =[
+ 'echo pca9548 0x77 > /sys/bus/i2c/devices/i2c-0/new_device',
+ 'echo pca9548 0x70 > /sys/bus/i2c/devices/i2c-1/new_device',
+ 'echo pca9545 0x71 > /sys/bus/i2c/devices/i2c-1/new_device',
+ 'echo pca9548 0x72 > /sys/bus/i2c/devices/i2c-1/new_device',
+ 'echo as7116_54x_fan 0x63 > /sys/bus/i2c/devices/i2c-1/new_device',
+ 'echo lm75 0x4b > /sys/bus/i2c/devices/i2c-17/new_device',
+ 'echo lm75 0x49 > /sys/bus/i2c/devices/i2c-19/new_device',
+ 'echo lm75 0x4a > /sys/bus/i2c/devices/i2c-20/new_device',
+ 'echo as7116_54x_cpld1 0x60 > /sys/bus/i2c/devices/i2c-2/new_device',
+ 'echo as7116_54x_cpld2 0x61 > /sys/bus/i2c/devices/i2c-2/new_device',
+ 'echo as7116_54x_cpld3 0x62 > /sys/bus/i2c/devices/i2c-2/new_device',
+ 'echo as7116_54x_psu1 0x50 > /sys/bus/i2c/devices/i2c-10/new_device',
+ 'echo ym2401 0x58 > /sys/bus/i2c/devices/i2c-10/new_device',
+ 'echo as7116_54x_psu2 0x53 > /sys/bus/i2c/devices/i2c-11/new_device',
+ 'echo ym2401 0x5b > /sys/bus/i2c/devices/i2c-11/new_device',
+ 'echo pca9548 0x70 > /sys/bus/i2c/devices/i2c-2/new_device',
+ 'echo pca9548 0x71 > /sys/bus/i2c/devices/i2c-29/new_device',
+ 'echo pca9548 0x72 > /sys/bus/i2c/devices/i2c-30/new_device',
+ 'echo pca9548 0x73 > /sys/bus/i2c/devices/i2c-31/new_device',
+ 'echo pca9548 0x74 > /sys/bus/i2c/devices/i2c-32/new_device',
+ 'echo pca9548 0x75 > /sys/bus/i2c/devices/i2c-33/new_device',
+ 'echo pca9548 0x76 > /sys/bus/i2c/devices/i2c-34/new_device',
+ 'echo 24c02 0x56 > /sys/bus/i2c/devices/i2c-0/new_device']
+
+def device_install():
+ global FORCE
+
+ for i in range(0,len(mknod)):
+ #for pca954x need times to built new i2c buses
+ if mknod[i].find('pca954') != -1:
+ time.sleep(1)
+
+ status, output = log_os_system(mknod[i], 1)
+ if status:
+ print output
+ if FORCE == 0:
+ return status
+
+ for i in range(0,len(sfp_map)):
+ status, output =log_os_system("echo as7116_54x_sfp"+str(i+1)+" 0x50 > /sys/bus/i2c/devices/i2c-"+str(sfp_map[i])+"/new_device", 1)
+ if status:
+ print output
+ if FORCE == 0:
+ return status
+
+ if i <= 47:
+ status, output =log_os_system("echo as7116_54x_sfp"+str(i+1)+" 0x51 > /sys/bus/i2c/devices/i2c-"+str(sfp_map[i])+"/new_device", 1)
+ if status:
+ print output
+ if FORCE == 0:
+ return status
+
+ return
+
+def device_uninstall():
+ global FORCE
+
+ status, output =log_os_system("ls /sys/bus/i2c/devices/1-0077", 0)
+
+ for i in range(0,len(sfp_map)):
+ target = "/sys/bus/i2c/devices/i2c-"+str(sfp_map[i])+"/delete_device"
+ status, output =log_os_system("echo 0x50 > "+ target, 1)
+ if status:
+ print output
+ if FORCE == 0:
+ return status
+
+ nodelist = mknod
+
+ for i in range(len(nodelist)):
+ target = nodelist[-(i+1)]
+ temp = target.split()
+ del temp[1]
+ temp[-1] = temp[-1].replace('new_device', 'delete_device')
+ status, output = log_os_system(" ".join(temp), 1)
+ if status:
+ print output
+ if FORCE == 0:
+ return status
+
+ return
+
+def system_ready():
+ if driver_check() == False:
+ return False
+ if not device_exist():
+ return False
+ return True
+
+def do_install():
+ print "Checking system...."
+ if driver_check() == False:
+ print "No driver, installing...."
+ status = driver_install()
+ if status:
+ if FORCE == 0:
+ return status
+ else:
+ print PROJECT_NAME.upper()+" drivers detected...."
+ if not device_exist():
+ print "No device, installing...."
+ status = device_install()
+ if status:
+ if FORCE == 0:
+ return status
+ else:
+ print PROJECT_NAME.upper()+" devices detected...."
+ return
+
+def do_uninstall():
+ print "Checking system...."
+ if not device_exist():
+ print PROJECT_NAME.upper() +" has no device installed...."
+ else:
+ print "Removing device...."
+ status = device_uninstall()
+ if status:
+ if FORCE == 0:
+ return status
+
+ if driver_check()== False :
+ print PROJECT_NAME.upper() +" has no driver installed...."
+ else:
+ print "Removing installed driver...."
+ status = driver_uninstall()
+ if status:
+ if FORCE == 0:
+ return status
+
+ return
+
+def devices_info():
+ global DEVICE_NO
+ global ALL_DEVICE
+ global i2c_bus, hwmon_types
+ for key in DEVICE_NO:
+ ALL_DEVICE[key]= {}
+ for i in range(0,DEVICE_NO[key]):
+ ALL_DEVICE[key][key+str(i+1)] = []
+
+ for key in i2c_bus:
+ buses = i2c_bus[key]
+ nodes = i2c_nodes[key]
+ for i in range(0,len(buses)):
+ for j in range(0,len(nodes)):
+ if 'fan' == key:
+ for k in range(0,DEVICE_NO[key]):
+ node = key+str(k+1)
+ path = i2c_prefix+ buses[i]+"/fan"+str(k+1)+"_"+ nodes[j]
+ my_log(node+": "+ path)
+ ALL_DEVICE[key][node].append(path)
+ elif 'sfp' == key:
+ for k in range(0,DEVICE_NO[key]):
+ node = key+str(k+1)
+ path = i2c_prefix+ str(sfp_map[k])+ buses[i]+"/"+ nodes[j]
+ my_log(node+": "+ path)
+ ALL_DEVICE[key][node].append(path)
+ else:
+ node = key+str(i+1)
+ path = i2c_prefix+ buses[i]+"/"+ nodes[j]
+ my_log(node+": "+ path)
+ ALL_DEVICE[key][node].append(path)
+
+ for key in hwmon_types:
+ itypes = hwmon_types[key]
+ nodes = hwmon_nodes[key]
+ for i in range(0,len(itypes)):
+ for j in range(0,len(nodes)):
+ node = key+"_"+itypes[i]
+ path = hwmon_prefix[key]+ itypes[i]+"/"+ nodes[j]
+ my_log(node+": "+ path)
+ ALL_DEVICE[key][ key+str(i+1)].append(path)
+
+ #show dict all in the order
+ if DEBUG == True:
+ for i in sorted(ALL_DEVICE.keys()):
+ print(i+": ")
+ for j in sorted(ALL_DEVICE[i].keys()):
+ print(" "+j)
+ for k in (ALL_DEVICE[i][j]):
+ print(" "+" "+k)
+ return
+
+def show_eeprom(index):
+ if system_ready()==False:
+ print("System's not ready.")
+ print("Please install first!")
+ return
+
+ if len(ALL_DEVICE)==0:
+ devices_info()
+ node = ALL_DEVICE['sfp'] ['sfp'+str(index)][0]
+ node = node.replace(node.split("/")[-1], 'sfp_eeprom')
+ # check if got hexdump command in current environment
+ ret, log = log_os_system("which hexdump", 0)
+ ret, log2 = log_os_system("which busybox hexdump", 0)
+ if len(log):
+ hex_cmd = 'hexdump'
+ elif len(log2):
+ hex_cmd = ' busybox hexdump'
+ else:
+ log = 'Failed : no hexdump cmd!!'
+ logging.info(log)
+ print log
+ return 1
+
+ print node + ":"
+ ret, log = log_os_system("cat "+node+"| "+hex_cmd+" -C", 1)
+ if ret==0:
+ print log
+ else:
+ print "**********device no found**********"
+ return
+
+def set_device(args):
+ global DEVICE_NO
+ global ALL_DEVICE
+ if system_ready()==False:
+ print("System's not ready.")
+ print("Please install first!")
+ return
+
+ if len(ALL_DEVICE)==0:
+ devices_info()
+
+ if args[0]=='led':
+ if int(args[1])>4:
+ show_set_help()
+ return
+ #print ALL_DEVICE['led']
+ for i in range(0,len(ALL_DEVICE['led'])):
+ for k in (ALL_DEVICE['led']['led'+str(i+1)]):
+ ret, log = log_os_system("echo "+args[1]+" >"+k, 1)
+ if ret:
+ return ret
+ elif args[0]=='fan':
+ if int(args[1])>100:
+ show_set_help()
+ return
+ #print ALL_DEVICE['fan']
+ #fan1~6 is all fine, all fan share same setting
+ node = ALL_DEVICE['fan'] ['fan1'][0]
+ node = node.replace(node.split("/")[-1], 'fan_duty_cycle_percentage')
+ ret, log = log_os_system("cat "+ node, 1)
+ if ret==0:
+ print ("Previous fan duty: " + log.strip() +"%")
+ ret, log = log_os_system("echo "+args[1]+" >"+node, 1)
+ if ret==0:
+ print ("Current fan duty: " + args[1] +"%")
+ return ret
+ elif args[0]=='sfp':
+ if int(args[1])> DEVICE_NO[args[0]] or int(args[1])==0:
+ show_set_help()
+ return
+ if len(args)<2:
+ show_set_help()
+ return
+
+ if int(args[2])>1:
+ show_set_help()
+ return
+
+ #print ALL_DEVICE[args[0]]
+ for i in range(0,len(ALL_DEVICE[args[0]])):
+ for j in ALL_DEVICE[args[0]][args[0]+str(args[1])]:
+ if j.find('tx_disable')!= -1:
+ ret, log = log_os_system("echo "+args[2]+" >"+ j, 1)
+ if ret:
+ return ret
+
+ return
+
+#get digits inside a string.
+#Ex: 31 for "sfp31"
+def get_value(input):
+ digit = re.findall('\d+', input)
+ return int(digit[0])
+
+def device_traversal():
+ if system_ready()==False:
+ print("System's not ready.")
+ print("Please install first!")
+ return
+
+ if len(ALL_DEVICE)==0:
+ devices_info()
+ for i in sorted(ALL_DEVICE.keys()):
+ print("============================================")
+ print(i.upper()+": ")
+ print("============================================")
+
+ for j in sorted(ALL_DEVICE[i].keys(), key=get_value):
+ print " "+j+":",
+ for k in (ALL_DEVICE[i][j]):
+ ret, log = log_os_system("cat "+k, 0)
+ func = k.split("/")[-1].strip()
+ func = re.sub(j+'_','',func,1)
+ func = re.sub(i.lower()+'_','',func,1)
+ if ret==0:
+ print func+"="+log+" ",
+ else:
+ print func+"="+"X"+" ",
+ print
+ print("----------------------------------------------------------------")
+
+
+ print
+ return
+
+def device_exist():
+ ret1, log = log_os_system("ls "+i2c_prefix+"*0077", 0)
+ ret2, log = log_os_system("ls "+i2c_prefix+"i2c-2", 0)
+ return not(ret1 or ret2)
+
+if __name__ == "__main__":
+ main()
diff --git a/platform/nephos/sonic-platform-modules-accton/debian/changelog b/platform/nephos/sonic-platform-modules-accton/debian/changelog
new file mode 100755
index 000000000000..49f8f44bca48
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/debian/changelog
@@ -0,0 +1,6 @@
+sonic-accton-platform-modules (1.0.0) unstable; urgency=low
+
+ * Add support for AS7116-54X series
+
+ -- developer Wed, 29 Mar 2017 11:00:00 +0800
+
diff --git a/platform/nephos/sonic-platform-modules-accton/debian/compat b/platform/nephos/sonic-platform-modules-accton/debian/compat
new file mode 100644
index 000000000000..ec635144f600
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/platform/nephos/sonic-platform-modules-accton/debian/control b/platform/nephos/sonic-platform-modules-accton/debian/control
new file mode 100755
index 000000000000..e1a403b3a719
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/debian/control
@@ -0,0 +1,11 @@
+Source: sonic-accton-platform-modules
+Section: main
+Priority: extra
+Maintainer: simon.ji@nephosinc.com
+Build-Depends: debhelper (>= 8.0.0), bzip2
+Standards-Version: 3.9.3
+
+Package: sonic-platform-accton-as7116-54x
+Architecture: amd64
+Depends: linux-image-3.16.0-5-amd64
+Description: kernel modules for platform devices such as fan, led, sfp
diff --git a/platform/nephos/sonic-platform-modules-accton/debian/rules b/platform/nephos/sonic-platform-modules-accton/debian/rules
new file mode 100755
index 000000000000..cb232bd42425
--- /dev/null
+++ b/platform/nephos/sonic-platform-modules-accton/debian/rules
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+include /usr/share/dpkg/pkg-info.mk
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+export INSTALL_MOD_DIR:=extra
+
+PYTHON ?= python2
+
+PACKAGE_PRE_NAME := sonic-platform-accton
+KVERSION ?= $(shell uname -r)
+KERNEL_SRC := /lib/modules/$(KVERSION)
+MOD_SRC_DIR:= $(shell pwd)
+MODULE_DIRS:= as7116-54x
+MODULE_DIR := modules
+UTILS_DIR := utils
+SERVICE_DIR := service
+CLASSES_DIR := classes
+CONF_DIR := conf
+
+%:
+ dh $@ --with systemd,python2,python3 --buildsystem=pybuild
+
+clean:
+ dh_testdir
+ dh_testroot
+ dh_clean
+
+build:
+ #make modules -C $(KERNEL_SRC)/build M=$(MODULE_SRC)
+ (for mod in $(MODULE_DIRS); do \
+ make modules -C $(KERNEL_SRC)/build M=$(MOD_SRC_DIR)/$${mod}/modules; \
+ $(PYTHON) $${mod}/setup.py build; \
+ done)
+
+binary: binary-arch binary-indep
+ # Nothing to do
+
+binary-arch:
+ # Nothing to do
+
+#install: build
+ #dh_testdir
+ #dh_testroot
+ #dh_clean -k
+ #dh_installdirs
+
+binary-indep:
+ dh_testdir
+ dh_installdirs
+
+ # Custom package commands
+ (for mod in $(MODULE_DIRS); do \
+ dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
+ dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin; \
+ dh_installdirs -p$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system; \
+ cp $(MOD_SRC_DIR)/$${mod}/$(MODULE_DIR)/*.ko debian/$(PACKAGE_PRE_NAME)-$${mod}/$(KERNEL_SRC)/$(INSTALL_MOD_DIR); \
+ cp $(MOD_SRC_DIR)/$${mod}/$(UTILS_DIR)/* debian/$(PACKAGE_PRE_NAME)-$${mod}/usr/local/bin/; \
+ cp $(MOD_SRC_DIR)/$${mod}/$(SERVICE_DIR)/*.service debian/$(PACKAGE_PRE_NAME)-$${mod}/lib/systemd/system/; \
+ $(PYTHON) $${mod}/setup.py install --root=$(MOD_SRC_DIR)/debian/$(PACKAGE_PRE_NAME)-$${mod} --install-layout=deb; \
+ done)
+ # Resuming debhelper scripts
+ dh_testroot
+ dh_install
+ dh_installchangelogs
+ dh_installdocs
+ dh_systemd_enable
+ dh_installinit
+ dh_systemd_start
+ dh_link
+ dh_fixperms
+ dh_compress
+ dh_strip
+ dh_installdeb
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+.PHONY: build binary binary-arch binary-indep clean
diff --git a/platform/p4/docker-sonic-p4/supervisord.conf b/platform/p4/docker-sonic-p4/supervisord.conf
index 46178e9f11f5..5815689f9301 100644
--- a/platform/p4/docker-sonic-p4/supervisord.conf
+++ b/platform/p4/docker-sonic-p4/supervisord.conf
@@ -133,9 +133,9 @@ stdout_logfile=syslog
stderr_logfile=syslog
[program:arp_update]
-command=bash -c "/usr/bin/arp_update; sleep 300"
+command=/usr/bin/arp_update
priority=15
autostart=false
-autorestart=true
+autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
diff --git a/platform/vs/README.md b/platform/vs/README.md
index 52f3f30eac6d..30d29b371b6e 100644
--- a/platform/vs/README.md
+++ b/platform/vs/README.md
@@ -44,7 +44,7 @@ sw-srv0 (id: 5)
2. Start sonic virtual switch docker
```
-$ docker run --privileged --network container:sw -d docker-sonic-vs
+$ docker run --privileged --network container:sw --name vs -d docker-sonic-vs
```
3. Setup IP in the virtual switch docker
diff --git a/platform/vs/docker-sonic-vs/supervisord.conf b/platform/vs/docker-sonic-vs/supervisord.conf
index 571c802cda1e..a4b24334d1bd 100644
--- a/platform/vs/docker-sonic-vs/supervisord.conf
+++ b/platform/vs/docker-sonic-vs/supervisord.conf
@@ -116,10 +116,10 @@ stdout_logfile=syslog
stderr_logfile=syslog
[program:arp_update]
-command=bash -c "/usr/bin/arp_update; sleep 300"
+command=/usr/bin/arp_update
priority=15
autostart=false
-autorestart=true
+autorestart=unexpected
stdout_logfile=syslog
stderr_logfile=syslog
diff --git a/platform/vs/tests/README.md b/platform/vs/tests/README.md
new file mode 100644
index 000000000000..29ba27db62fc
--- /dev/null
+++ b/platform/vs/tests/README.md
@@ -0,0 +1,4 @@
+Requirements:
+
+- Enable IPv6 for docker engine
+- pip install exabgp
diff --git a/platform/vs/tests/bgp/files/bgpd.conf b/platform/vs/tests/bgp/files/bgpd.conf
new file mode 100644
index 000000000000..b22bf17f92e3
--- /dev/null
+++ b/platform/vs/tests/bgp/files/bgpd.conf
@@ -0,0 +1,7 @@
+router bgp 65501
+ bgp router-id 1.1.1.1
+ no bgp default ipv4-unicast
+ neighbor fc00::2 remote-as 65502
+ address-family ipv6
+ neighbor fc00::2 activate
+ exit-address-family
diff --git a/platform/vs/tests/bgp/files/invalid_nexthop.conf b/platform/vs/tests/bgp/files/invalid_nexthop.conf
new file mode 100644
index 000000000000..60a327d7121d
--- /dev/null
+++ b/platform/vs/tests/bgp/files/invalid_nexthop.conf
@@ -0,0 +1,19 @@
+neighbor fc00::1 {
+ router-id 1.2.3.4;
+ local-address fc00::2;
+ local-as 65502;
+ peer-as 65501;
+ group-updates false;
+
+ family {
+ ipv4 unicast;
+ ipv6 unicast;
+ }
+
+ static {
+ route 3333::0/64 {
+ next-hop 0.0.0.0;
+ next-hop fc00::2;
+ }
+ }
+}
diff --git a/platform/vs/tests/bgp/test_invalid_nexthop.py b/platform/vs/tests/bgp/test_invalid_nexthop.py
new file mode 100644
index 000000000000..cdb67337b896
--- /dev/null
+++ b/platform/vs/tests/bgp/test_invalid_nexthop.py
@@ -0,0 +1,32 @@
+from swsscommon import swsscommon
+import os
+import re
+import time
+import json
+
+def test_InvalidNexthop(dvs):
+
+ dvs.copy_file("/etc/quagga/", "bgp/files/bgpd.conf")
+ dvs.runcmd("supervisorctl start bgpd")
+ dvs.runcmd("ip addr add fc00::1/126 dev Ethernet0")
+ dvs.runcmd("ifconfig Ethernet0 up")
+
+ dvs.servers[0].runcmd("ip addr add fc00::2/126 dev eth0")
+ dvs.servers[0].runcmd("ifconfig eth0 up")
+
+ time.sleep(5)
+
+ print dvs.runcmd("supervisorctl status")
+
+ p = dvs.servers[0].runcmd_async("exabgp -d bgp/files/invalid_nexthop.conf")
+
+ time.sleep(10)
+
+ output = dvs.runcmd(["vtysh", "-c", "show ipv6 bgp"])
+
+ p.terminate()
+ p = p.wait()
+
+ print output
+
+ assert "3333::/64" in output
diff --git a/platform/vs/tests/conftest.py b/platform/vs/tests/conftest.py
new file mode 100644
index 000000000000..98b6b2a2e1a6
--- /dev/null
+++ b/platform/vs/tests/conftest.py
@@ -0,0 +1,231 @@
+import os
+import os.path
+import re
+import time
+import docker
+import pytest
+import commands
+import tarfile
+import StringIO
+import subprocess
+from swsscommon import swsscommon
+
+def pytest_addoption(parser):
+ parser.addoption("--dvsname", action="store", default=None,
+ help="dvs name")
+
+class AsicDbValidator(object):
+ def __init__(self, dvs):
+ self.adb = swsscommon.DBConnector(1, dvs.redis_sock, 0)
+
+ # get default dot1q vlan id
+ atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_VLAN")
+
+ keys = atbl.getKeys()
+ assert len(keys) == 1
+ self.default_vlan_id = keys[0]
+
+ # build port oid to front port name mapping
+ self.portoidmap = {}
+ self.portnamemap = {}
+ self.hostifoidmap = {}
+ self.hostifnamemap = {}
+ atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_HOSTIF")
+ keys = atbl.getKeys()
+
+ assert len(keys) == 32
+ for k in keys:
+ (status, fvs) = atbl.get(k)
+
+ assert status == True
+
+ for fv in fvs:
+ if fv[0] == "SAI_HOSTIF_ATTR_OBJ_ID":
+ port_oid = fv[1]
+ elif fv[0] == "SAI_HOSTIF_ATTR_NAME":
+ port_name = fv[1]
+
+ self.portoidmap[port_oid] = port_name
+ self.portnamemap[port_name] = port_oid
+ self.hostifoidmap[k] = port_name
+ self.hostifnamemap[port_name] = k
+
+ # get default acl table and acl rules
+ atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE")
+ keys = atbl.getKeys()
+
+ assert len(keys) == 1
+ self.default_acl_table = keys[0]
+
+ atbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_ACL_ENTRY")
+ keys = atbl.getKeys()
+
+ assert len(keys) == 2
+ self.default_acl_entries = keys
+
+class VirtualServer(object):
+ def __init__(self, ctn_name, pid, i):
+ self.nsname = "%s-srv%d" % (ctn_name, i)
+ self.vifname = "vEthernet%d" % (i * 4)
+ self.cleanup = True
+
+ # create netns
+ if os.path.exists("/var/run/netns/%s" % self.nsname):
+ self.cleanup = False
+ else:
+ os.system("ip netns add %s" % self.nsname)
+
+ # create vpeer link
+ os.system("ip link add %s type veth peer name %s" % (self.nsname[0:12], self.vifname))
+ os.system("ip link set %s netns %s" % (self.nsname[0:12], self.nsname))
+ os.system("ip link set %s netns %d" % (self.vifname, pid))
+
+ # bring up link in the virtual server
+ os.system("ip netns exec %s ip link set dev %s name eth0" % (self.nsname, self.nsname[0:12]))
+ os.system("ip netns exec %s ip link set dev eth0 up" % (self.nsname))
+ os.system("ip netns exec %s ethtool -K eth0 tx off" % (self.nsname))
+
+ # bring up link in the virtual switch
+ os.system("nsenter -t %d -n ip link set dev %s up" % (pid, self.vifname))
+
+ def __del__(self):
+ if self.cleanup:
+ os.system("ip netns delete %s" % self.nsname)
+
+ def runcmd(self, cmd):
+ os.system("ip netns exec %s %s" % (self.nsname, cmd))
+
+ def runcmd_async(self, cmd):
+ return subprocess.Popen("ip netns exec %s %s" % (self.nsname, cmd), shell=True)
+
+class DockerVirtualSwitch(object):
+ def __init__(self, name=None):
+ self.pnames = ['fpmsyncd',
+ 'intfmgrd',
+ 'intfsyncd',
+ 'neighsyncd',
+ 'orchagent',
+ 'portsyncd',
+ 'redis-server',
+ 'rsyslogd',
+ 'syncd',
+ 'teamsyncd',
+ 'vlanmgrd',
+ 'zebra']
+ self.mount = "/var/run/redis-vs"
+ self.redis_sock = self.mount + '/' + "redis.sock"
+ self.client = docker.from_env()
+
+ self.ctn = None
+ self.cleanup = True
+ if name != None:
+ # get virtual switch container
+ for ctn in self.client.containers.list():
+ if ctn.name == name:
+ self.ctn = ctn
+ (status, output) = commands.getstatusoutput("docker inspect --format '{{.HostConfig.NetworkMode}}' %s" % name)
+ ctn_sw_id = output.split(':')[1]
+ self.cleanup = False
+ if self.ctn == None:
+ raise NameError("cannot find container %s" % name)
+
+ # get base container
+ for ctn in self.client.containers.list():
+ if ctn.id == ctn_sw_id or ctn.name == ctn_sw_id:
+ ctn_sw_name = ctn.name
+
+ (status, output) = commands.getstatusoutput("docker inspect --format '{{.State.Pid}}' %s" % ctn_sw_name)
+ self.ctn_sw_pid = int(output)
+
+ # create virtual servers
+ self.servers = []
+ for i in range(32):
+ server = VirtualServer(ctn_sw_name, self.ctn_sw_pid, i)
+ self.servers.append(server)
+
+ self.restart()
+ else:
+ self.ctn_sw = self.client.containers.run('debian:jessie', privileged=True, detach=True,
+ command="bash", stdin_open=True)
+ (status, output) = commands.getstatusoutput("docker inspect --format '{{.State.Pid}}' %s" % self.ctn_sw.name)
+ self.ctn_sw_pid = int(output)
+
+ # create virtual server
+ self.servers = []
+ for i in range(32):
+ server = VirtualServer(self.ctn_sw.name, self.ctn_sw_pid, i)
+ self.servers.append(server)
+
+ # create virtual switch container
+ self.ctn = self.client.containers.run('docker-sonic-vs', privileged=True, detach=True,
+ network_mode="container:%s" % self.ctn_sw.name,
+ volumes={ self.mount: { 'bind': '/var/run/redis', 'mode': 'rw' } })
+
+ self.ctn.exec_run("sysctl -w net.ipv6.conf.all.disable_ipv6=0")
+ self.check_ready()
+ self.init_asicdb_validator()
+
+ def destroy(self):
+ if self.cleanup:
+ self.ctn.remove(force=True)
+ self.ctn_sw.remove(force=True)
+ for s in self.servers:
+ del(s)
+
+ def check_ready(self, timeout=30):
+ '''check if all processes in the dvs is ready'''
+
+ re_space = re.compile('\s+')
+ process_status = {}
+ ready = False
+ started = 0
+ while True:
+ # get process status
+ out = self.ctn.exec_run("supervisorctl status")
+ for l in out.split('\n'):
+ fds = re_space.split(l)
+ if len(fds) < 2:
+ continue
+ process_status[fds[0]] = fds[1]
+
+ # check if all processes are running
+ ready = True
+ for pname in self.pnames:
+ try:
+ if process_status[pname] != "RUNNING":
+ ready = False
+ except KeyError:
+ ready = False
+
+ if ready == True:
+ break
+
+ started += 1
+ if started > timeout:
+ raise ValueError(out)
+
+ time.sleep(1)
+
+ def restart(self):
+ self.ctn.restart()
+
+ def init_asicdb_validator(self):
+ self.asicdb = AsicDbValidator(self)
+
+ def runcmd(self, cmd):
+ return self.ctn.exec_run(cmd)
+
+ def copy_file(self, path, filename):
+ tarstr = StringIO.StringIO()
+ tar = tarfile.open(fileobj=tarstr, mode="w")
+ tar.add(filename, os.path.basename(filename))
+ tar.close()
+ self.ctn.put_archive(path, tarstr.getvalue())
+ tarstr.close()
+
+@pytest.yield_fixture(scope="module")
+def dvs(request):
+ name = request.config.getoption("--dvsname")
+ dvs = DockerVirtualSwitch(name)
+ yield dvs
+ dvs.destroy()
diff --git a/rules/bash.mk b/rules/bash.mk
new file mode 100644
index 000000000000..e31b237ae11b
--- /dev/null
+++ b/rules/bash.mk
@@ -0,0 +1,17 @@
+# bash package
+#
+# Created to patch memory-leak issue in the bash-package included in Debian-8 (Jessie)
+# release. This rule file, and the associated building-infra created to solve this
+# bug (src/bash/), should be eliminated once the migration to Debian-9 (Stretch) is
+# completed.
+
+# Bash major release-number corresponding to Debian-8 (Jessie)
+BASH_VERSION_MAJOR = 4.3
+# Bash complete release-number. This image contains all 4.3 fixes up to patch '42'.
+BASH_VERSION_FULL = $(BASH_VERSION_MAJOR)-14
+
+export BASH_VERSION_MAJOR BASH_VERSION_FULL
+
+BASH = bash_$(BASH_VERSION_FULL)_amd64.deb
+$(BASH)_SRC_PATH = $(SRC_PATH)/bash
+SONIC_MAKE_DEBS += $(BASH)
diff --git a/rules/docker-base.mk b/rules/docker-base.mk
index 4a419008e915..a6b0cba47677 100644
--- a/rules/docker-base.mk
+++ b/rules/docker-base.mk
@@ -4,6 +4,7 @@ DOCKER_BASE = docker-base.gz
$(DOCKER_BASE)_PATH = $(DOCKERS_PATH)/docker-base
$(DOCKER_BASE)_DEPENDS += $(SUPERVISOR)
$(DOCKER_BASE)_DEPENDS += $(LIBWRAP)
+$(DOCKER_BASE)_DEPENDS += $(BASH)
ifeq ($(SONIC_CONFIG_DEBUG),y)
GDB = gdb
diff --git a/rules/docker-dhcp-relay.mk b/rules/docker-dhcp-relay.mk
index 44d3904d7394..53406ad1e15f 100644
--- a/rules/docker-dhcp-relay.mk
+++ b/rules/docker-dhcp-relay.mk
@@ -2,7 +2,7 @@
DOCKER_DHCP_RELAY = docker-dhcp-relay.gz
$(DOCKER_DHCP_RELAY)_PATH = $(DOCKERS_PATH)/docker-dhcp-relay
-$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY)
+$(DOCKER_DHCP_RELAY)_DEPENDS += $(ISC_DHCP_COMMON) $(ISC_DHCP_RELAY) $(ISC_DHCP_CLIENT)
$(DOCKER_DHCP_RELAY)_LOAD_DOCKERS = $(DOCKER_CONFIG_ENGINE)
SONIC_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_DHCP_RELAY)
diff --git a/rules/isc-dhcp.mk b/rules/isc-dhcp.mk
index 7b7f69c6cfc6..37c775da017a 100644
--- a/rules/isc-dhcp.mk
+++ b/rules/isc-dhcp.mk
@@ -8,5 +8,9 @@ ISC_DHCP_COMMON = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb
$(ISC_DHCP_COMMON)_SRC_PATH = $(SRC_PATH)/isc-dhcp
SONIC_MAKE_DEBS += $(ISC_DHCP_COMMON)
+ISC_DHCP_CLIENT = isc-dhcp-client_$(ISC_DHCP_VERSION)_amd64.deb
+$(ISC_DHCP_CLIENT)_SRC_PATH = $(SRC_PATH)/isc-dhcp
+SONIC_MAKE_DEBS += $(ISC_DHCP_CLIENT)
+
ISC_DHCP_RELAY = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb
-$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY)))
+$(eval $(call add_derived_package,$(ISC_DHCP_COMMON),$(ISC_DHCP_RELAY),$(ISC_DHCP_CLIENT)))
diff --git a/slave.mk b/slave.mk
index 7430f3a80d10..2beb127b0c6f 100644
--- a/slave.mk
+++ b/slave.mk
@@ -428,6 +428,7 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
$(IXGBE_DRIVER) \
$(SONIC_DEVICE_DATA) \
$(SONIC_UTILS) \
+ $(BASH) \
$(LIBWRAP) \
$(LIBPAM_TACPLUS) \
$(LIBNSS_TACPLUS)) \
diff --git a/sonic-slave/Dockerfile b/sonic-slave/Dockerfile
index ed85b0ca436a..cb4529e67aa4 100644
--- a/sonic-slave/Dockerfile
+++ b/sonic-slave/Dockerfile
@@ -184,16 +184,12 @@ RUN apt-get update && apt-get install -y \
libjs-sphinxdoc \
libjs-underscore \
python-docutils \
- python-jinja2 \
python-markupsafe \
python-pygments \
python-roman \
- python-sphinx \
sphinx-common \
- python3-sphinx \
# For sonic config engine testing
python-lxml \
- python-jinja2 \
python-netaddr \
python-ipaddr \
python-yaml \
@@ -217,7 +213,9 @@ RUN apt-get update && apt-get install -y \
linuxdoc-tools \
lynx \
texlive-latex-extra \
- texlive-latex-recommended
+ texlive-latex-recommended \
+# For bash
+ texi2html
# For linux build
RUN apt-get -y build-dep linux
@@ -229,16 +227,22 @@ RUN export VERSION=1.8.3 \
&& echo 'export GOROOT=/usr/local/go' >> /etc/bash.bashrc \
&& echo 'export PATH=$PATH:$GOROOT/bin' >> /etc/bash.bashrc
+# Upgrade pip2
+# Note: use pip2 specific version so jinja2 2.10 will install
+RUN python2 -m pip install -U pip==9.0.3
+
# For p4 build
RUN pip install \
ctypesgen \
crc16
-# For templating
-RUN pip install j2cli
-
# For sonic config engine testing
-RUN pip install pyangbind==0.5.10
+RUN pip install pyangbind==0.6.0
+# Note: force upgrade debian packaged jinja2, if installed
+RUN pip install --force-reinstall --upgrade jinja2>=2.10
+
+# For templating (requiring jinja2)
+RUN pip install j2cli
# For sonic utilities testing
RUN pip install click-default-group click natsort tabulate
diff --git a/src/bash/Makefile b/src/bash/Makefile
new file mode 100644
index 000000000000..2e9f093aedb4
--- /dev/null
+++ b/src/bash/Makefile
@@ -0,0 +1,16 @@
+SHELL = /bin/bash
+.ONESHELL:
+.SHELLFLAGS += -e
+
+MAIN_TARGET = bash_$(BASH_VERSION_FULL)_amd64.deb
+
+$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
+ rm -rf bash-$(BASH_VERSION_MAJOR)
+
+ dget -u https://launchpad.net/debian/+archive/primary/+sourcefiles/bash/$(BASH_VERSION_FULL)/bash_$(BASH_VERSION_FULL).dsc
+
+ pushd bash-$(BASH_VERSION_MAJOR)
+ DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -us -uc -b -j$(SONIC_CONFIG_MAKE_JOBS)
+ popd
+
+ mv $* $(DEST)/
diff --git a/src/initramfs-tools/Makefile b/src/initramfs-tools/Makefile
index 95d5c24d1185..c5010e876d8b 100644
--- a/src/initramfs-tools/Makefile
+++ b/src/initramfs-tools/Makefile
@@ -7,7 +7,7 @@ MAIN_TARGET = initramfs-tools_$(INITRAMFS_TOOLS_VERSION)_all.deb
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the initramfs-tools
rm -rf ./initramfs-tools
- git clone --branch v0.120 https://anonscm.debian.org/git/kernel/initramfs-tools.git ./initramfs-tools
+ git clone --branch v0.120 https://salsa.debian.org/kernel-team/initramfs-tools.git ./initramfs-tools
# Patch
pushd ./initramfs-tools
diff --git a/src/isc-dhcp/Makefile b/src/isc-dhcp/Makefile
index 5b1cb8407005..482abc58dd01 100644
--- a/src/isc-dhcp/Makefile
+++ b/src/isc-dhcp/Makefile
@@ -3,14 +3,15 @@ SHELL = /bin/bash
.SHELLFLAGS += -e
MAIN_TARGET = isc-dhcp-common_$(ISC_DHCP_VERSION)_amd64.deb
-DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb
+DERIVED_TARGETS = isc-dhcp-relay_$(ISC_DHCP_VERSION)_amd64.deb \
+ isc-dhcp-client_$(ISC_DHCP_VERSION)_amd64.deb
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Remove any stale files
rm -rf ./isc-dhcp
# Clone isc-dhcp repo
- git clone https://anonscm.debian.org/cgit/pkg-dhcp/isc-dhcp.git
+ git clone https://salsa.debian.org/berni/isc-dhcp.git
pushd ./isc-dhcp
# Reset HEAD to the commit of the proper tag
diff --git a/src/libnl3/Makefile b/src/libnl3/Makefile
index efd234424dff..6f50e4e389fa 100644
--- a/src/libnl3/Makefile
+++ b/src/libnl3/Makefile
@@ -16,7 +16,7 @@ DERIVED_TARGETS = libnl-3-dev_$(LIBNL3_VERSION)_amd64.deb \
$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Obtaining the libnl3
rm -rf ./libnl3
- git clone https://anonscm.debian.org/git/collab-maint/libnl3.git
+ git clone https://github.com/qiluo-msft/libnl3.git
pushd ./libnl3
git checkout -f b77c0e49cb
diff --git a/src/libteam/Makefile b/src/libteam/Makefile
index c96266a5c7fd..a20f8dbd35b0 100644
--- a/src/libteam/Makefile
+++ b/src/libteam/Makefile
@@ -22,7 +22,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
popd
# Obtain debian packaging
- git clone https://anonscm.debian.org/git/collab-maint/libteam.git tmp
+ git clone https://salsa.debian.org/debian/libteam.git tmp
pushd ./tmp
git checkout -f da006f2 # v1.26
popd
diff --git a/src/snmpd/Makefile b/src/snmpd/Makefile
index 457cd2ef05da..b372f0d22458 100644
--- a/src/snmpd/Makefile
+++ b/src/snmpd/Makefile
@@ -23,6 +23,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
dpkg-source -x net-snmp_$(SNMPD_VERSION_FULL).dsc
pushd net-snmp-$(SNMPD_VERSION)
+ patch -p0 < ../statfs_error.patch
fakeroot debian/rules -j$(SONIC_CONFIG_MAKE_JOBS) binary
popd
diff --git a/src/snmpd/statfs_error.patch b/src/snmpd/statfs_error.patch
new file mode 100644
index 000000000000..a07b59bc9175
--- /dev/null
+++ b/src/snmpd/statfs_error.patch
@@ -0,0 +1,22 @@
+--- agent/mibgroup/hardware/fsys/fsys_mntctl.c.old 2018-04-30 23:26:58.097636453 +0000
++++ agent/mibgroup/hardware/fsys/fsys_mntctl.c 2018-04-30 23:27:36.189499479 +0000
+@@ -163,8 +163,6 @@
+ continue;
+
+ if ( statfs( entry->path, &stat_buf ) < 0 ) {
+- snprintf( tmpbuf, sizeof(tmpbuf), "Cannot statfs %s", entry->path );
+- snmp_log_perror( tmpbuf );
+ continue;
+ }
+ entry->units = stat_buf.f_bsize;
+--- agent/mibgroup/hardware/fsys/fsys_mntent.c.old 2018-04-30 23:26:54.569649140 +0000
++++ agent/mibgroup/hardware/fsys/fsys_mntent.c 2018-04-30 23:27:22.001550497 +0000
+@@ -238,8 +238,6 @@
+ if ( NSFS_STATFS( entry->path, &stat_buf ) < 0 )
+ #endif
+ {
+- snprintf( tmpbuf, sizeof(tmpbuf), "Cannot statfs %s", entry->path );
+- snmp_log_perror( tmpbuf );
+ continue;
+ }
+ entry->units = stat_buf.NSFS_SIZE;
diff --git a/src/sonic-config-engine/data/l2switch.j2 b/src/sonic-config-engine/data/l2switch.j2
new file mode 100644
index 000000000000..ee24f5ebd19d
--- /dev/null
+++ b/src/sonic-config-engine/data/l2switch.j2
@@ -0,0 +1,21 @@
+{
+ "DEVICE_METADATA": {{ DEVICE_METADATA | tojson }},
+ "PORT": {{ PORT | tojson }},
+ "VLAN": {
+ "Vlan1000": {
+ "vlanid": "1000"
+ }
+ },
+ {% set ns = {'firstPrinted': False} -%}
+ "VLAN_MEMBER": {
+ {%- for port in PORT -%}
+ {%- if ns.firstPrinted %},{% endif %}
+
+ "Vlan1000|{{ port }}": {
+ "tagging_mode": "untagged"
+ }
+ {%- if ns.update({'firstPrinted': True}) %}{% endif -%}
+ {%- endfor %}
+
+ }
+}
diff --git a/src/sonic-config-engine/minigraph.py b/src/sonic-config-engine/minigraph.py
index 34fcf1bcee25..14bf34a34b05 100644
--- a/src/sonic-config-engine/minigraph.py
+++ b/src/sonic-config-engine/minigraph.py
@@ -62,6 +62,7 @@ def parse_png(png, hname):
console_port = ''
mgmt_dev = ''
mgmt_port = ''
+ port_speeds = {}
for child in png:
if child.tag == str(QName(ns, "DeviceInterfaceLinks")):
for link in child.findall(str(QName(ns, "DeviceLinkBase"))):
@@ -73,15 +74,21 @@ def parse_png(png, hname):
endport = link.find(str(QName(ns, "EndPort"))).text
startdevice = link.find(str(QName(ns, "StartDevice"))).text
startport = link.find(str(QName(ns, "StartPort"))).text
+ bandwidth_node = link.find(str(QName(ns, "Bandwidth")))
+ bandwidth = bandwidth_node.text if bandwidth_node is not None else None
- if enddevice == hname:
+ if enddevice.lower() == hname.lower():
if port_alias_map.has_key(endport):
endport = port_alias_map[endport]
neighbors[endport] = {'name': startdevice, 'port': startport}
+ if bandwidth:
+ port_speeds[endport] = bandwidth
else:
if port_alias_map.has_key(startport):
startport = port_alias_map[startport]
neighbors[startport] = {'name': enddevice, 'port': endport}
+ if bandwidth:
+ port_speeds[startport] = bandwidth
if child.tag == str(QName(ns, "Devices")):
for device in child.findall(str(QName(ns, "Device"))):
@@ -106,13 +113,13 @@ def parse_png(png, hname):
elif node.tag == str(QName(ns, "EndDevice")):
mgmt_dev = node.text
- return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port)
+ return (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speeds)
def parse_dpg(dpg, hname):
for child in dpg:
hostname = child.find(str(QName(ns, "Hostname")))
- if hostname.text != hname:
+ if hostname.text.lower() != hname.lower():
continue
ipintfs = child.find(str(QName(ns, "IPInterfaces")))
@@ -188,6 +195,10 @@ def parse_dpg(dpg, hname):
aclattach = aclintf.find(str(QName(ns, "AttachTo"))).text.split(';')
acl_intfs = []
is_mirror = False
+
+ # TODO: Ensure that acl_intfs will only ever contain front-panel interfaces (e.g.,
+ # maybe we should explicity ignore management and loopback interfaces?) because we
+ # decide an ACL is a Control Plane ACL if acl_intfs is empty below.
for member in aclattach:
member = member.strip()
if pcs.has_key(member):
@@ -207,11 +218,25 @@ def parse_dpg(dpg, hname):
'type': 'MIRROR' if is_mirror else 'L3'}
else:
# This ACL has no interfaces to attach to -- consider this a control plane ACL
- aclservice = aclintf.find(str(QName(ns, "Type"))).text
- acls[aclname] = {'policy_desc': aclname,
- 'ports': acl_intfs,
- 'type': 'CTRLPLANE',
- 'service': aclservice if aclservice is not None else 'UNKNOWN'}
+ try:
+ aclservice = aclintf.find(str(QName(ns, "Type"))).text
+
+ # If we already have an ACL with this name and this ACL is bound to a different service,
+ # append the service to our list of services
+ if aclname in acls:
+ if acls[aclname]['type'] != 'CTRLPLANE':
+ print >> sys.stderr, "Warning: ACL '%s' type mismatch. Not updating ACL." % aclname
+ elif acls[aclname]['services'] == aclservice:
+ print >> sys.stderr, "Warning: ACL '%s' already contains service '%s'. Not updating ACL." % (aclname, aclservice)
+ else:
+ acls[aclname]['services'].append(aclservice)
+ else:
+ acls[aclname] = {'policy_desc': aclname,
+ 'type': 'CTRLPLANE',
+ 'services': [aclservice]}
+ except:
+ print >> sys.stderr, "Warning: Ignoring Control Plane ACL %s without type" % aclname
+
return intfs, lo_intfs, mgmt_intf, vlans, vlan_members, pcs, acls
return None, None, None, None, None, None, None
@@ -238,7 +263,7 @@ def parse_cpg(cpg, hname):
else:
keepalive = 60
nhopself = 1 if session.find(str(QName(ns, "NextHopSelf"))) is not None else 0
- if end_router == hname:
+ if end_router.lower() == hname.lower():
bgp_sessions[start_peer.lower()] = {
'name': start_router,
'local_addr': end_peer.lower(),
@@ -260,7 +285,7 @@ def parse_cpg(cpg, hname):
for router in child.findall(str(QName(ns1, "BGPRouterDeclaration"))):
asn = router.find(str(QName(ns1, "ASN"))).text
hostname = router.find(str(QName(ns1, "Hostname"))).text
- if hostname == hname:
+ if hostname.lower() == hname.lower():
myasn = asn
peers = router.find(str(QName(ns1, "Peers")))
for bgpPeer in peers.findall(str(QName(ns, "BGPPeer"))):
@@ -276,7 +301,7 @@ def parse_cpg(cpg, hname):
else:
for peer in bgp_sessions:
bgp_session = bgp_sessions[peer]
- if hostname == bgp_session['name']:
+ if hostname.lower() == bgp_session['name'].lower():
bgp_session['asn'] = asn
bgp_sessions = { key: bgp_sessions[key] for key in bgp_sessions if bgp_sessions[key].has_key('asn') and int(bgp_sessions[key]['asn']) != 0 }
return bgp_sessions, myasn, bgp_peers_with_range
@@ -286,30 +311,33 @@ def parse_meta(meta, hname):
syslog_servers = []
dhcp_servers = []
ntp_servers = []
+ tacacs_servers = []
mgmt_routes = []
erspan_dst = []
deployment_id = None
device_metas = meta.find(str(QName(ns, "Devices")))
for device in device_metas.findall(str(QName(ns1, "DeviceMetadata"))):
- if device.find(str(QName(ns1, "Name"))).text == hname:
+ if device.find(str(QName(ns1, "Name"))).text.lower() == hname.lower():
properties = device.find(str(QName(ns1, "Properties")))
for device_property in properties.findall(str(QName(ns1, "DeviceProperty"))):
name = device_property.find(str(QName(ns1, "Name"))).text
value = device_property.find(str(QName(ns1, "Value"))).text
- value_group = value.split(';') if value and value != "" else []
+ value_group = value.strip().split(';') if value and value != "" else []
if name == "DhcpResources":
dhcp_servers = value_group
elif name == "NtpResources":
ntp_servers = value_group
elif name == "SyslogResources":
syslog_servers = value_group
+ elif name == "TacacsServer":
+ tacacs_servers = value_group
elif name == "ForcedMgmtRoutes":
mgmt_routes = value_group
elif name == "ErspanDestinationIpv4":
erspan_dst = value_group
elif name == "DeploymentId":
deployment_id = value
- return syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst, deployment_id
+ return syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id
def parse_deviceinfo(meta, hwsku):
port_speeds = {}
@@ -347,11 +375,13 @@ def parse_xml(filename, platform=None, port_config_file=None):
neighbors = None
devices = None
hostname = None
- port_speeds = {}
+ port_speeds_default = {}
+ port_speed_png = {}
port_descriptions = {}
syslog_servers = []
dhcp_servers = []
ntp_servers = []
+ tacacs_servers = []
mgmt_routes = []
erspan_dst = []
bgp_peers_with_range = None
@@ -373,21 +403,22 @@ def parse_xml(filename, platform=None, port_config_file=None):
elif child.tag == str(QName(ns, "CpgDec")):
(bgp_sessions, bgp_asn, bgp_peers_with_range) = parse_cpg(child, hostname)
elif child.tag == str(QName(ns, "PngDec")):
- (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port) = parse_png(child, hostname)
+ (neighbors, devices, console_dev, console_port, mgmt_dev, mgmt_port, port_speed_png) = parse_png(child, hostname)
elif child.tag == str(QName(ns, "UngDec")):
- (u_neighbors, u_devices, _, _, _, _) = parse_png(child, hostname)
+ (u_neighbors, u_devices, _, _, _, _, _) = parse_png(child, hostname)
elif child.tag == str(QName(ns, "MetadataDeclaration")):
- (syslog_servers, dhcp_servers, ntp_servers, mgmt_routes, erspan_dst, deployment_id) = parse_meta(child, hostname)
+ (syslog_servers, dhcp_servers, ntp_servers, tacacs_servers, mgmt_routes, erspan_dst, deployment_id) = parse_meta(child, hostname)
elif child.tag == str(QName(ns, "DeviceInfos")):
- (port_speeds, port_descriptions) = parse_deviceinfo(child, hwsku)
+ (port_speeds_default, port_descriptions) = parse_deviceinfo(child, hwsku)
+ current_device = [devices[key] for key in devices if key.lower() == hostname.lower()][0]
results = {}
results['DEVICE_METADATA'] = {'localhost': {
'bgp_asn': bgp_asn,
'deployment_id': deployment_id,
'hostname': hostname,
'hwsku': hwsku,
- 'type': devices[hostname]['type']
+ 'type': current_device['type']
}}
results['BGP_NEIGHBOR'] = bgp_sessions
results['BGP_PEER_RANGE'] = bgp_peers_with_range
@@ -414,25 +445,70 @@ def parse_xml(filename, platform=None, port_config_file=None):
results['INTERFACE'] = phyport_intfs
results['VLAN_INTERFACE'] = vlan_intfs
- results['PORTCHANNEL_INTERFACE'] = pc_intfs
- for port_name in port_speeds:
- ports.setdefault(port_name, {})['speed'] = port_speeds[port_name]
- if port_speeds[port_name] == '100000':
- ports.setdefault(port_name, {})['fec'] = 'rs'
+ for port_name in port_speeds_default:
+ # ignore port not in port_config.ini
+ if not ports.has_key(port_name):
+ continue
+
+ ports.setdefault(port_name, {})['speed'] = port_speeds_default[port_name]
+
+ for port_name in port_speed_png:
+ # not consider port not in port_config.ini
+ if port_name not in ports:
+ print >> sys.stderr, "Warning: ignore interface '%s' as it is not in the port_config.ini" % port_name
+ continue
+
+ ports.setdefault(port_name, {})['speed'] = port_speed_png[port_name]
+
+ for port_name, port in ports.items():
+ if port.get('speed') == '100000':
+ port['fec'] = 'rs'
+
for port_name in port_descriptions:
+ # ignore port not in port_config.ini
+ if not ports.has_key(port_name):
+ continue
+
ports.setdefault(port_name, {})['description'] = port_descriptions[port_name]
results['PORT'] = ports
+
+ if port_config_file:
+ port_set = set(ports.keys())
+ for (pc_name, mbr_map) in pcs.items():
+ # remove portchannels that contain ports not existing in port_config.ini
+ # when port_config.ini exists
+ if not set(mbr_map['members']).issubset(port_set):
+ print >> sys.stderr, "Warning: ignore '%s' as part of its member interfaces is not in the port_config.ini" % pc_name
+ del pcs[pc_name]
+
results['PORTCHANNEL'] = pcs
+
+
+ for pc_intf in pc_intfs.keys():
+ # remove portchannels not in PORTCHANNEL dictionary
+ if pc_intf[0] not in pcs:
+ print >> sys.stderr, "Warning: ignore '%s' interface '%s' as '%s' is not in the valid PortChannel list" % (pc_intf[0], pc_intf[1], pc_intf[0])
+ del pc_intfs[pc_intf]
+
+ results['PORTCHANNEL_INTERFACE'] = pc_intfs
+
results['VLAN'] = vlans
results['VLAN_MEMBER'] = vlan_members
+ for nghbr in neighbors.keys():
+ # remove port not in port_config.ini
+ if nghbr not in ports:
+ print >> sys.stderr, "Warning: ignore interface '%s' in DEVICE_NEIGHBOR as it is not in the port_config.ini" % nghbr
+ del neighbors[nghbr]
+
results['DEVICE_NEIGHBOR'] = neighbors
- results['DEVICE_NEIGHBOR_METADATA'] = { key:devices[key] for key in devices if key != hostname }
+ results['DEVICE_NEIGHBOR_METADATA'] = { key:devices[key] for key in devices if key.lower() != hostname.lower() }
results['SYSLOG_SERVER'] = dict((item, {}) for item in syslog_servers)
results['DHCP_SERVER'] = dict((item, {}) for item in dhcp_servers)
results['NTP_SERVER'] = dict((item, {}) for item in ntp_servers)
+ results['TACPLUS_SERVER'] = dict((item, {'priority': '1', 'tcp_port': '49'}) for item in tacacs_servers)
results['ACL_TABLE'] = acls
mirror_sessions = {}
diff --git a/src/sonic-config-engine/setup.py b/src/sonic-config-engine/setup.py
index 296b7a03a6b9..1d0c7f99fa41 100755
--- a/src/sonic-config-engine/setup.py
+++ b/src/sonic-config-engine/setup.py
@@ -3,6 +3,7 @@
from setuptools import setup
import os.path
import unittest
+import glob
def get_test_suite():
test_loader = unittest.TestLoader()
@@ -17,6 +18,9 @@ def get_test_suite():
url='https://github.com/Azure/sonic-buildimage',
py_modules=['portconfig', 'minigraph', 'openconfig_acl', 'sonic_platform'],
scripts=['sonic-cfggen'],
- install_requires=['lxml', 'jinja2', 'netaddr', 'ipaddr', 'pyyaml', 'pyangbind'],
+ install_requires=['lxml', 'jinja2>=2.10', 'netaddr', 'ipaddr', 'pyyaml', 'pyangbind==0.6.0'],
test_suite='setup.get_test_suite',
+ data_files=[
+ ('/usr/share/sonic/templates', glob.glob('data/*')),
+ ],
)
diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen
index b11385ab8c8b..11399926bc11 100755
--- a/src/sonic-config-engine/sonic-cfggen
+++ b/src/sonic-config-engine/sonic-cfggen
@@ -15,6 +15,7 @@ Examples:
See usage string for detail description for arguments.
"""
+from __future__ import print_function
import sys
import os.path
import argparse
@@ -26,9 +27,11 @@ from functools import partial
from minigraph import minigraph_encoder
from minigraph import parse_xml
from minigraph import parse_device_desc_xml
+from portconfig import get_port_config
from sonic_platform import get_machine_info
from sonic_platform import get_platform_info
from sonic_platform import get_system_mac
+from sonic_platform import get_fast_reboot_status
from swsssdk import ConfigDBConnector
from collections import OrderedDict
from natsort import natsorted
@@ -134,7 +137,8 @@ def main():
group = parser.add_mutually_exclusive_group()
group.add_argument("-m", "--minigraph", help="minigraph xml file", nargs='?', const='/etc/sonic/minigraph.xml')
group.add_argument("-M", "--device-description", help="device description xml file")
- parser.add_argument("-p", "--port-config", help="port config file, used with -m")
+ group.add_argument("-k", "--hwsku", help="HwSKU")
+ parser.add_argument("-p", "--port-config", help="port config file, used with -m or -k", nargs='?', const=None)
parser.add_argument("-y", "--yaml", help="yaml file that contains additional variables", action='append', default=[])
parser.add_argument("-j", "--json", help="json file that contains additional variables", action='append', default=[])
parser.add_argument("-a", "--additional-data", help="addition data, in json string")
@@ -156,7 +160,18 @@ def main():
db_kwargs['unix_socket_path'] = args.redis_unix_sock_file
data = {}
+ hwsku = args.hwsku
+ if hwsku is not None:
+ hardware_data = {'DEVICE_METADATA': {'localhost': {
+ 'hwsku': hwsku
+ }}}
+ deep_update(data, hardware_data)
+ (ports, _) = get_port_config(hwsku, platform, args.port_config)
+ if not ports:
+ print('Failed to get port config', file=sys.stderr)
+ sys.exit(1)
+ deep_update(data, {'PORT': ports})
if args.minigraph != None:
minigraph = args.minigraph
@@ -166,10 +181,7 @@ def main():
else:
deep_update(data, parse_xml(minigraph, platform))
else:
- if args.port_config != None:
- deep_update(data, parse_xml(minigraph, port_config_file=args.port_config))
- else:
- deep_update(data, parse_xml(minigraph))
+ deep_update(data, parse_xml(minigraph, port_config_file=args.port_config))
if args.device_description != None:
deep_update(data, parse_device_desc_xml(args.device_description))
@@ -194,7 +206,8 @@ def main():
if args.platform_info:
hardware_data = {'DEVICE_METADATA': {'localhost': {
'platform': platform,
- 'mac': get_system_mac()
+ 'mac': get_system_mac(),
+ 'fast_reboot': get_fast_reboot_status()
}}}
deep_update(data, hardware_data)
@@ -210,14 +223,14 @@ def main():
for attr in ['ip', 'network', 'prefixlen', 'netmask']:
env.filters[attr] = partial(prefix_attr, attr)
template = env.get_template(template_file)
- print template.render(data)
-
+ print(template.render(data))
+
if args.var != None:
template = jinja2.Template('{{' + args.var + '}}')
- print template.render(data)
+ print(template.render(data))
if args.var_json != None:
- print json.dumps(FormatConverter.to_serialized(data[args.var_json]), indent=4, cls=minigraph_encoder)
+ print(json.dumps(FormatConverter.to_serialized(data[args.var_json]), indent=4, cls=minigraph_encoder))
if args.write_to_db:
configdb = ConfigDBConnector(**db_kwargs)
@@ -225,7 +238,7 @@ def main():
configdb.mod_config(FormatConverter.output_to_db(data))
if args.print_data:
- print json.dumps(FormatConverter.to_serialized(data), indent=4, cls=minigraph_encoder)
+ print(json.dumps(FormatConverter.to_serialized(data), indent=4, cls=minigraph_encoder))
if __name__ == "__main__":
diff --git a/src/sonic-config-engine/sonic_platform.py b/src/sonic-config-engine/sonic_platform.py
index f573d6a6575d..9715b4b3e0e3 100644
--- a/src/sonic-config-engine/sonic_platform.py
+++ b/src/sonic-config-engine/sonic_platform.py
@@ -53,3 +53,6 @@ def get_system_mac():
mac = mac[:-2] + aligned_last_byte
return mac
+def get_fast_reboot_status():
+ with open('/proc/cmdline') as fp:
+ return 'fast-reboot' in fp.read()
diff --git a/src/sonic-config-engine/tests/sample_output/bgpd.conf b/src/sonic-config-engine/tests/sample_output/bgpd.conf
new file mode 100644
index 000000000000..1722d28fcf5b
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/bgpd.conf
@@ -0,0 +1,91 @@
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/bgpd.conf.j2 with config DB data
+! file: bgpd.conf
+!
+!
+hostname switch-t0
+password zebra
+log syslog informational
+log facility local4
+! enable password !
+!
+! bgp multiple-instance
+!
+route-map FROM_BGP_SPEAKER_V4 permit 10
+!
+route-map TO_BGP_SPEAKER_V4 deny 10
+!
+router bgp 65100
+ bgp log-neighbor-changes
+ bgp bestpath as-path multipath-relax
+ no bgp default ipv4-unicast
+ bgp graceful-restart
+ bgp router-id 10.1.0.32
+ network 10.1.0.32/32
+ address-family ipv6
+ network fc00:1::32/64
+ exit-address-family
+ network 192.168.0.1/27
+ neighbor 10.0.0.59 remote-as 64600
+ neighbor 10.0.0.59 description ARISTA02T1
+ address-family ipv4
+ neighbor 10.0.0.59 allowas-in 1
+ neighbor 10.0.0.59 activate
+ maximum-paths 64
+ exit-address-family
+ neighbor 10.0.0.61 remote-as 64600
+ neighbor 10.0.0.61 description ARISTA03T1
+ address-family ipv4
+ neighbor 10.0.0.61 allowas-in 1
+ neighbor 10.0.0.61 activate
+ maximum-paths 64
+ exit-address-family
+ neighbor 10.0.0.63 remote-as 64600
+ neighbor 10.0.0.63 description ARISTA04T1
+ address-family ipv4
+ neighbor 10.0.0.63 allowas-in 1
+ neighbor 10.0.0.63 activate
+ maximum-paths 64
+ exit-address-family
+ neighbor fc00::7e remote-as 64600
+ neighbor fc00::7e description ARISTA04T1
+ address-family ipv6
+ neighbor fc00::7e allowas-in 1
+ neighbor fc00::7e activate
+ maximum-paths 64
+ exit-address-family
+ neighbor fc00::7a remote-as 64600
+ neighbor fc00::7a description ARISTA03T1
+ address-family ipv6
+ neighbor fc00::7a allowas-in 1
+ neighbor fc00::7a activate
+ maximum-paths 64
+ exit-address-family
+ neighbor 10.0.0.57 remote-as 64600
+ neighbor 10.0.0.57 description ARISTA01T1
+ address-family ipv4
+ neighbor 10.0.0.57 allowas-in 1
+ neighbor 10.0.0.57 activate
+ maximum-paths 64
+ exit-address-family
+ neighbor fc00::76 remote-as 64600
+ neighbor fc00::76 description ARISTA02T1
+ address-family ipv6
+ neighbor fc00::76 allowas-in 1
+ neighbor fc00::76 activate
+ maximum-paths 64
+ exit-address-family
+ neighbor fc00::72 remote-as 64600
+ neighbor fc00::72 description ARISTA01T1
+ address-family ipv6
+ neighbor fc00::72 allowas-in 1
+ neighbor fc00::72 activate
+ maximum-paths 64
+ exit-address-family
+!
+maximum-paths 64
+!
+route-map ISOLATE permit 10
+set as-path prepend 65100
+!
diff --git a/src/sonic-config-engine/tests/sample_output/interfaces b/src/sonic-config-engine/tests/sample_output/interfaces
index c8da2fee8f76..96dc577ffe8b 100644
--- a/src/sonic-config-engine/tests/sample_output/interfaces
+++ b/src/sonic-config-engine/tests/sample_output/interfaces
@@ -15,6 +15,10 @@ iface lo inet6 static
address fc00:1::32
netmask 128
#
+iface lo inet static
+ address 10.10.0.99
+ netmask 255.255.255.255
+#
# The management network interface
auto eth0
iface eth0 inet static
diff --git a/src/sonic-config-engine/tests/sample_output/l2switch.json b/src/sonic-config-engine/tests/sample_output/l2switch.json
new file mode 100644
index 000000000000..7288b1c38cbd
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/l2switch.json
@@ -0,0 +1,107 @@
+{
+ "DEVICE_METADATA": {"localhost": {"hwsku": "Mellanox-SN2700"}},
+ "PORT": {"Ethernet0": {"alias": "fortyGigE0/0", "lanes": "29,30,31,32"}, "Ethernet100": {"alias": "fortyGigE0/100", "lanes": "125,126,127,128"}, "Ethernet104": {"alias": "fortyGigE0/104", "lanes": "85,86,87,88"}, "Ethernet108": {"alias": "fortyGigE0/108", "lanes": "81,82,83,84"}, "Ethernet112": {"alias": "fortyGigE0/112", "lanes": "89,90,91,92"}, "Ethernet116": {"alias": "fortyGigE0/116", "lanes": "93,94,95,96"}, "Ethernet12": {"alias": "fortyGigE0/12", "lanes": "33,34,35,36"}, "Ethernet120": {"alias": "fortyGigE0/120", "lanes": "97,98,99,100"}, "Ethernet124": {"alias": "fortyGigE0/124", "lanes": "101,102,103,104"}, "Ethernet16": {"alias": "fortyGigE0/16", "lanes": "41,42,43,44"}, "Ethernet20": {"alias": "fortyGigE0/20", "lanes": "45,46,47,48"}, "Ethernet24": {"alias": "fortyGigE0/24", "lanes": "5,6,7,8"}, "Ethernet28": {"alias": "fortyGigE0/28", "lanes": "1,2,3,4"}, "Ethernet32": {"alias": "fortyGigE0/32", "lanes": "9,10,11,12"}, "Ethernet36": {"alias": "fortyGigE0/36", "lanes": "13,14,15,16"}, "Ethernet4": {"alias": "fortyGigE0/4", "lanes": "25,26,27,28"}, "Ethernet40": {"alias": "fortyGigE0/40", "lanes": "21,22,23,24"}, "Ethernet44": {"alias": "fortyGigE0/44", "lanes": "17,18,19,20"}, "Ethernet48": {"alias": "fortyGigE0/48", "lanes": "49,50,51,52"}, "Ethernet52": {"alias": "fortyGigE0/52", "lanes": "53,54,55,56"}, "Ethernet56": {"alias": "fortyGigE0/56", "lanes": "61,62,63,64"}, "Ethernet60": {"alias": "fortyGigE0/60", "lanes": "57,58,59,60"}, "Ethernet64": {"alias": "fortyGigE0/64", "lanes": "65,66,67,68"}, "Ethernet68": {"alias": "fortyGigE0/68", "lanes": "69,70,71,72"}, "Ethernet72": {"alias": "fortyGigE0/72", "lanes": "77,78,79,80"}, "Ethernet76": {"alias": "fortyGigE0/76", "lanes": "73,74,75,76"}, "Ethernet8": {"alias": "fortyGigE0/8", "lanes": "37,38,39,40"}, "Ethernet80": {"alias": "fortyGigE0/80", "lanes": "105,106,107,108"}, "Ethernet84": {"alias": "fortyGigE0/84", "lanes": "109,110,111,112"}, "Ethernet88": {"alias": "fortyGigE0/88", "lanes": "117,118,119,120"}, "Ethernet92": {"alias": "fortyGigE0/92", "lanes": "113,114,115,116"}, "Ethernet96": {"alias": "fortyGigE0/96", "lanes": "121,122,123,124"}},
+ "VLAN": {
+ "Vlan1000": {
+ "vlanid": "1000"
+ }
+ },
+ "VLAN_MEMBER": {
+ "Vlan1000|Ethernet8": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet0": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet4": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet108": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet100": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet104": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet68": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet96": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet124": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet92": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet120": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet52": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet56": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet76": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet72": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet64": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet32": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet16": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet36": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet12": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet88": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet116": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet80": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet112": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet84": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet48": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet44": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet40": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet28": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet60": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet20": {
+ "tagging_mode": "untagged"
+ },
+ "Vlan1000|Ethernet24": {
+ "tagging_mode": "untagged"
+ }
+ }
+}
diff --git a/src/sonic-config-engine/tests/sample_output/lldpd.conf b/src/sonic-config-engine/tests/sample_output/lldpd.conf
index d906f909bc7d..29739cb890d0 100644
--- a/src/sonic-config-engine/tests/sample_output/lldpd.conf
+++ b/src/sonic-config-engine/tests/sample_output/lldpd.conf
@@ -1,6 +1,2 @@
configure ports eth0 lldp portidsubtype local eth0
-configure ports Ethernet116 lldp portidsubtype local fortyGigE0/116 description ARISTA02T1:Ethernet1/1
-configure ports Ethernet124 lldp portidsubtype local fortyGigE0/124 description ARISTA04T1:Ethernet1/1
-configure ports Ethernet112 lldp portidsubtype local fortyGigE0/112 description ARISTA01T1:Ethernet1/1
-configure ports Ethernet120 lldp portidsubtype local fortyGigE0/120 description ARISTA03T1:Ethernet1/1
diff --git a/src/sonic-config-engine/tests/sample_output/ports.json b/src/sonic-config-engine/tests/sample_output/ports.json
index 7533fb7377ef..3fa2e29a8b0a 100644
--- a/src/sonic-config-engine/tests/sample_output/ports.json
+++ b/src/sonic-config-engine/tests/sample_output/ports.json
@@ -1,7 +1,7 @@
[
{
"PORT_TABLE:Ethernet8": {
- "speed": "40000",
+ "speed": "1000",
"description": "Interface description"
},
"OP": "SET"
diff --git a/src/sonic-config-engine/tests/sample_output/zebra.conf b/src/sonic-config-engine/tests/sample_output/zebra.conf
new file mode 100644
index 000000000000..b1b791b252e8
--- /dev/null
+++ b/src/sonic-config-engine/tests/sample_output/zebra.conf
@@ -0,0 +1,44 @@
+!
+! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
+! generated by templates/quagga/zebra.conf.j2 using config DB data
+! file: zebra.conf
+!
+!
+hostname switch-t0
+password zebra
+enable password zebra
+!
+! Enable link-detect (default disabled)
+interface PortChannel03
+link-detect
+!
+interface PortChannel02
+link-detect
+!
+interface PortChannel01
+link-detect
+!
+interface PortChannel04
+link-detect
+!
+!
+! set static default route to mgmt gateway as a backup to learned default
+ip route 0.0.0.0/0 10.0.0.1 200
+!
+! Set ip source to loopback for bgp learned routes
+route-map RM_SET_SRC permit 10
+ set src 10.1.0.32
+!
+
+route-map RM_SET_SRC6 permit 10
+ set src fc00:1::32
+!
+ip protocol bgp route-map RM_SET_SRC
+!
+ipv6 protocol bgp route-map RM_SET_SRC6
+!
+!
+log syslog informational
+log facility local4
+!
+
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-case.xml b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
new file mode 100644
index 000000000000..2d2f08f4d0d2
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-graph-case.xml
@@ -0,0 +1,317 @@
+
+
+
+
+
+ false
+ switch-t0
+ 10.0.0.56
+ ARISTA01T1
+ 10.0.0.57
+ 1
+ 180
+ 60
+
+
+ switch-t0
+ FC00::71
+ ARISTA01T1
+ FC00::72
+ 1
+ 180
+ 60
+
+
+ false
+ switch-t0
+ 10.0.0.58
+ ARISTA02T1
+ 10.0.0.59
+ 1
+ 180
+ 60
+
+
+ switch-t0
+ FC00::75
+ ARISTA02T1
+ FC00::76
+ 1
+ 180
+ 60
+
+
+
+
+ 65100
+ switch-t0
+
+
+ 10.0.0.57
+
+
+
+
+
+ 10.0.0.59
+
+
+
+
+
+
+
+
+ 64600
+ ARISTA01T1
+
+
+
+ 64600
+ ARISTA02T1
+
+
+
+ 64600
+ ARISTA03T1
+
+
+
+ 64600
+ ARISTA04T1
+
+
+
+
+
+
+
+
+
+ HostIP
+ Loopback0
+
+ 10.1.0.32/32
+
+ 10.1.0.32/32
+
+
+ HostIP1
+ Loopback0
+
+ FC00:1::32/128
+
+ FC00:1::32/128
+
+
+
+
+ HostIP
+ eth0
+
+ 10.0.0.100/24
+
+ 10.0.0.100/24
+
+
+
+
+
+
+ switch-t0
+
+
+ PortChannel01
+ fortyGigE0/4
+
+
+
+
+
+ ab1
+ fortyGigE0/8
+ 192.0.0.1;192.0.0.2
+ 1000
+ 1000
+ 192.168.0.0/27
+
+
+
+
+
+ PortChannel01
+ 10.0.0.56/31
+
+
+
+ PortChannel01
+ FC00::71/126
+
+
+
+ fortyGigE0/0
+ 10.0.0.58/31
+
+
+
+ fortyGigE0/0
+ FC00::75/126
+
+
+
+ ab1
+ 192.168.0.1/27
+
+
+
+
+
+ PortChannel01
+ DataAcl
+ DataPlane
+
+
+ SNMP
+ SNMP_ACL
+ SNMP
+
+
+
+
+
+
+
+
+
+
+ switch-t0
+ Force10-S6000
+
+
+ ARISTA01T1
+ Arista
+
+
+ ARISTA02T1
+ Arista
+
+
+ ARISTA03T1
+ Arista
+
+
+ ARISTA04T1
+ Arista
+
+
+
+
+
+
+ switch-t0
+
+
+ DeploymentId
+
+ 1
+
+
+ ErspanDestinationIpv4
+
+ 10.0.100.1
+
+
+ NtpResources
+
+ 10.0.10.1;10.0.10.2
+
+
+
+ SnmpResources
+
+ 10.0.10.3;10.0.10.4
+
+
+
+ SyslogResources
+
+ 10.0.10.5;10.0.10.6;
+
+
+
+ TacacsServer
+
+ 10.0.10.7;10.0.10.8
+
+
+
+
+
+
+
+
+ true
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/0
+
+ false
+ 0
+ 0
+ 10000
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/4
+
+ false
+ 0
+ 0
+ 25000
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/8
+
+ false
+ 0
+ 0
+ 40000
+ Interface description
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/12
+
+ false
+ 0
+ 0
+ 100000
+ Interface description
+
+
+ true
+ 0
+ Force10-S6000
+
+
+ switch-T0
+ Force10-S6000
+
diff --git a/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
new file mode 100644
index 000000000000..28044f1c8780
--- /dev/null
+++ b/src/sonic-config-engine/tests/simple-sample-graph-metadata.xml
@@ -0,0 +1,317 @@
+
+
+
+
+
+ false
+ switch-t0
+ 10.0.0.56
+ ARISTA01T1
+ 10.0.0.57
+ 1
+ 180
+ 60
+
+
+ switch-t0
+ FC00::71
+ ARISTA01T1
+ FC00::72
+ 1
+ 180
+ 60
+
+
+ false
+ switch-t0
+ 10.0.0.58
+ ARISTA02T1
+ 10.0.0.59
+ 1
+ 180
+ 60
+
+
+ switch-t0
+ FC00::75
+ ARISTA02T1
+ FC00::76
+ 1
+ 180
+ 60
+
+
+
+
+ 65100
+ switch-t0
+
+
+ 10.0.0.57
+
+
+
+
+
+ 10.0.0.59
+
+
+
+
+
+
+
+
+ 64600
+ ARISTA01T1
+
+
+
+ 64600
+ ARISTA02T1
+
+
+
+ 64600
+ ARISTA03T1
+
+
+
+ 64600
+ ARISTA04T1
+
+
+
+
+
+
+
+
+
+ HostIP
+ Loopback0
+
+ 10.1.0.32/32
+
+ 10.1.0.32/32
+
+
+ HostIP1
+ Loopback0
+
+ FC00:1::32/128
+
+ FC00:1::32/128
+
+
+
+
+ HostIP
+ eth0
+
+ 10.0.0.100/24
+
+ 10.0.0.100/24
+
+
+
+
+
+
+ switch-t0
+
+
+ PortChannel01
+ fortyGigE0/4
+
+
+
+
+
+ ab1
+ fortyGigE0/8
+ 192.0.0.1;192.0.0.2
+ 1000
+ 1000
+ 192.168.0.0/27
+
+
+
+
+
+ PortChannel01
+ 10.0.0.56/31
+
+
+
+ PortChannel01
+ FC00::71/126
+
+
+
+ fortyGigE0/0
+ 10.0.0.58/31
+
+
+
+ fortyGigE0/0
+ FC00::75/126
+
+
+
+ ab1
+ 192.168.0.1/27
+
+
+
+
+
+ PortChannel01
+ DataAcl
+ DataPlane
+
+
+ SNMP
+ SNMP_ACL
+ SNMP
+
+
+
+
+
+
+
+
+
+
+ switch-t0
+ Force10-S6000
+
+
+ ARISTA01T1
+ Arista
+
+
+ ARISTA02T1
+ Arista
+
+
+ ARISTA03T1
+ Arista
+
+
+ ARISTA04T1
+ Arista
+
+
+
+
+
+
+ switch-t0
+
+
+ DeploymentId
+
+ 1
+
+
+ ErspanDestinationIpv4
+
+ 10.0.100.1
+
+
+ NtpResources
+
+ 10.0.10.1;10.0.10.2
+
+
+
+ SnmpResources
+
+ 10.0.10.3;10.0.10.4
+
+
+
+ SyslogResources
+
+ 10.0.10.5;10.0.10.6;
+
+
+
+ TacacsServer
+
+ 10.0.10.7;10.0.10.8
+
+
+
+
+
+
+
+
+ true
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/0
+
+ false
+ 0
+ 0
+ 10000
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/4
+
+ false
+ 0
+ 0
+ 25000
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/8
+
+ false
+ 0
+ 0
+ 40000
+ Interface description
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ fortyGigE0/12
+
+ false
+ 0
+ 0
+ 100000
+ Interface description
+
+
+ true
+ 0
+ Force10-S6000
+
+
+ switch-t0
+ Force10-S6000
+
diff --git a/src/sonic-config-engine/tests/simple-sample-graph.xml b/src/sonic-config-engine/tests/simple-sample-graph.xml
index d42a2650321e..f5054bb084d3 100644
--- a/src/sonic-config-engine/tests/simple-sample-graph.xml
+++ b/src/sonic-config-engine/tests/simple-sample-graph.xml
@@ -125,6 +125,11 @@
fortyGigE0/4
+
+ PortChannel1001
+ fortyGigE0/1;fortyGigE0/2
+
+
@@ -147,6 +152,16 @@
PortChannel01
FC00::71/126
+
+
+ PortChannel1001
+ 10.0.0.57/31
+
+
+
+ PortChannel1001
+ FC00::72/126
+
fortyGigE0/0
@@ -181,7 +196,41 @@
-
+
+
+ DeviceInterfaceLink
+ true
+ 1000
+ ARISTA01T1
+ et1
+ true
+ switch-t0
+ fortyGigE0/8
+ true
+
+
+ DeviceInterfaceLink
+ true
+ 10000
+ switch-t0
+ fortyGigE0/1
+ true
+ ARISTA05T1
+ Ethernet1/32
+ true
+
+
+ DeviceInterfaceLink
+ true
+ 10000
+ switch-t0
+ fortyGigE0/2
+ true
+ ARISTA06T1
+ Ethernet1/33
+ true
+
+
switch-t0
@@ -222,6 +271,32 @@
0
10000
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ Ethernet1
+
+ false
+ 0
+ 0
+ 10000
+
+
+ DeviceInterface
+
+ true
+ true
+ 1
+ Ethernet2
+
+ false
+ 0
+ 0
+ 10000
+
DeviceInterface
diff --git a/src/sonic-config-engine/tests/t0-sample-graph.xml b/src/sonic-config-engine/tests/t0-sample-graph.xml
index f3d05cbc22c1..5eace767c468 100644
--- a/src/sonic-config-engine/tests/t0-sample-graph.xml
+++ b/src/sonic-config-engine/tests/t0-sample-graph.xml
@@ -153,7 +153,15 @@
FC00:1::32/128
-
+
+ LoopbackIP1
+ Loopback1
+
+ 10.10.0.99/32
+
+ 10.10.0.99/32
+
+
HostIP
@@ -271,6 +279,30 @@
SNMP_ACL
SNMP
+
+ NTP
+ NTP_ACL
+ NTP
+
+
+ SSH
+ SSH_ACL
+ SSH
+
+
+ SSH
+ ROUTER-PROTECT
+ SSH
+
+
+ SNMP
+ ROUTER-PROTECT
+ SNMP
+
+
+ NTP
+ NTP_ACL
+
@@ -306,6 +338,17 @@
switch-t0
fortyGigE0/124
+
+ DeviceInterfaceLink
+ true
+ 10000
+ switch-t0
+ fortyGigE0/2
+ true
+ ARISTA05T1
+ Ethernet1/33
+ true
+
diff --git a/src/sonic-config-engine/tests/test_cfggen.py b/src/sonic-config-engine/tests/test_cfggen.py
index 3ee689622577..37b66a27b4c4 100644
--- a/src/sonic-config-engine/tests/test_cfggen.py
+++ b/src/sonic-config-engine/tests/test_cfggen.py
@@ -10,14 +10,19 @@ def setUp(self):
self.sample_graph = os.path.join(self.test_dir, 'sample_graph.xml')
self.sample_graph_t0 = os.path.join(self.test_dir, 't0-sample-graph.xml')
self.sample_graph_simple = os.path.join(self.test_dir, 'simple-sample-graph.xml')
+ self.sample_graph_metadata = os.path.join(self.test_dir, 'simple-sample-graph-metadata.xml')
self.sample_graph_pc_test = os.path.join(self.test_dir, 'pc-test-graph.xml')
self.sample_graph_bgp_speaker = os.path.join(self.test_dir, 't0-sample-bgp-speaker.xml')
self.sample_device_desc = os.path.join(self.test_dir, 'device.xml')
self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
- def run_script(self, argument):
+ def run_script(self, argument, check_stderr=False):
print '\n Running sonic-cfggen ' + argument
- output = subprocess.check_output(self.script_file + ' ' + argument, shell=True)
+ if check_stderr:
+ output = subprocess.check_output(self.script_file + ' ' + argument, stderr=subprocess.STDOUT, shell=True)
+ else:
+ output = subprocess.check_output(self.script_file + ' ' + argument, shell=True)
+
linecount = output.strip().count('\n')
if linecount <= 0:
print ' Output: ' + output.strip()
@@ -72,9 +77,15 @@ def test_render_template(self):
def test_minigraph_acl(self):
argument = '-m "' + self.sample_graph_t0 + '" -p "' + self.port_config + '" -v ACL_TABLE'
- output = self.run_script(argument)
- self.assertEqual(output.strip(), "{'SNMP_ACL': {'type': 'CTRLPLANE', 'policy_desc': 'SNMP_ACL', 'service': 'SNMP', 'ports': []},"
- " 'DATAACL': {'type': 'L3', 'policy_desc': 'DATAACL', 'ports': ['Ethernet112', 'Ethernet116', 'Ethernet120', 'Ethernet124']}}")
+ output = self.run_script(argument, True)
+ self.assertEqual(output.strip(), "Warning: Ignoring Control Plane ACL NTP_ACL without type\n"
+ "Warning: ignore interface 'fortyGigE0/2' as it is not in the port_config.ini\n"
+ "Warning: ignore interface 'fortyGigE0/2' in DEVICE_NEIGHBOR as it is not in the port_config.ini\n"
+ "{'SSH_ACL': {'services': ['SSH'], 'type': 'CTRLPLANE', 'policy_desc': 'SSH_ACL'},"
+ " 'SNMP_ACL': {'services': ['SNMP'], 'type': 'CTRLPLANE', 'policy_desc': 'SNMP_ACL'},"
+ " 'DATAACL': {'type': 'L3', 'policy_desc': 'DATAACL', 'ports': ['Ethernet112', 'Ethernet116', 'Ethernet120', 'Ethernet124']},"
+ " 'NTP_ACL': {'services': ['NTP'], 'type': 'CTRLPLANE', 'policy_desc': 'NTP_ACL'},"
+ " 'ROUTER_PROTECT': {'services': ['SSH', 'SNMP'], 'type': 'CTRLPLANE', 'policy_desc': 'ROUTER_PROTECT'}}")
def test_minigraph_everflow(self):
argument = '-m "' + self.sample_graph_t0 + '" -p "' + self.port_config + '" -v MIRROR_SESSION'
@@ -121,6 +132,15 @@ def test_minigraph_neighbors(self):
output = self.run_script(argument)
self.assertEqual(output.strip(), "{'name': 'ARISTA04T1', 'port': 'Ethernet1/1'}")
+ def test_minigraph_extra_neighbors(self):
+ argument = '-m "' + self.sample_graph_t0 + '" -p "' + self.port_config + '" -v DEVICE_NEIGHBOR'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), \
+ "{'Ethernet116': {'name': 'ARISTA02T1', 'port': 'Ethernet1/1'}, "
+ "'Ethernet124': {'name': 'ARISTA04T1', 'port': 'Ethernet1/1'}, "
+ "'Ethernet112': {'name': 'ARISTA01T1', 'port': 'Ethernet1/1'}, "
+ "'Ethernet120': {'name': 'ARISTA03T1', 'port': 'Ethernet1/1'}}")
+
def test_minigraph_bgp(self):
argument = '-m "' + self.sample_graph_bgp_speaker + '" -p "' + self.port_config + '" -v "BGP_NEIGHBOR[\'10.0.0.59\']"'
output = self.run_script(argument)
@@ -139,7 +159,60 @@ def test_minigraph_deployment_id(self):
def test_minigraph_ethernet_interfaces(self):
argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet8\']"'
output = self.run_script(argument)
- self.assertEqual(output.strip(), "{'alias': 'fortyGigE0/8', 'lanes': '37,38,39,40', 'description': 'Interface description', 'speed': '40000'}")
+ self.assertEqual(output.strip(), "{'alias': 'fortyGigE0/8', 'lanes': '37,38,39,40', 'description': 'Interface description', 'speed': '1000'}")
argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT[\'Ethernet12\']"'
output = self.run_script(argument)
self.assertEqual(output.strip(), "{'alias': 'fortyGigE0/12', 'lanes': '33,34,35,36', 'fec': 'rs', 'speed': '100000', 'description': 'Interface description'}")
+
+ def test_minigraph_extra_ethernet_interfaces(self):
+ argument = '-m "' + self.sample_graph_simple + '" -p "' + self.port_config + '" -v "PORT"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), \
+ "{'Ethernet8': {'alias': 'fortyGigE0/8', 'lanes': '37,38,39,40', 'description': 'Interface description', 'speed': '1000'}, "
+ "'Ethernet0': {'alias': 'fortyGigE0/0', 'lanes': '29,30,31,32', 'speed': '10000'}, "
+ "'Ethernet4': {'alias': 'fortyGigE0/4', 'lanes': '25,26,27,28', 'speed': '25000'}, "
+ "'Ethernet108': {'alias': 'fortyGigE0/108', 'lanes': '81,82,83,84'}, "
+ "'Ethernet100': {'alias': 'fortyGigE0/100', 'lanes': '125,126,127,128'}, "
+ "'Ethernet104': {'alias': 'fortyGigE0/104', 'lanes': '85,86,87,88'}, "
+ "'Ethernet68': {'alias': 'fortyGigE0/68', 'lanes': '69,70,71,72'}, "
+ "'Ethernet96': {'alias': 'fortyGigE0/96', 'lanes': '121,122,123,124'}, "
+ "'Ethernet124': {'alias': 'fortyGigE0/124', 'lanes': '101,102,103,104'}, "
+ "'Ethernet92': {'alias': 'fortyGigE0/92', 'lanes': '113,114,115,116'}, "
+ "'Ethernet120': {'alias': 'fortyGigE0/120', 'lanes': '97,98,99,100'}, "
+ "'Ethernet52': {'alias': 'fortyGigE0/52', 'lanes': '53,54,55,56'}, "
+ "'Ethernet56': {'alias': 'fortyGigE0/56', 'lanes': '61,62,63,64'}, "
+ "'Ethernet76': {'alias': 'fortyGigE0/76', 'lanes': '73,74,75,76'}, "
+ "'Ethernet72': {'alias': 'fortyGigE0/72', 'lanes': '77,78,79,80'}, "
+ "'Ethernet64': {'alias': 'fortyGigE0/64', 'lanes': '65,66,67,68'}, "
+ "'Ethernet32': {'alias': 'fortyGigE0/32', 'lanes': '9,10,11,12'}, "
+ "'Ethernet16': {'alias': 'fortyGigE0/16', 'lanes': '41,42,43,44'}, "
+ "'Ethernet36': {'alias': 'fortyGigE0/36', 'lanes': '13,14,15,16'}, "
+ "'Ethernet12': {'alias': 'fortyGigE0/12', 'lanes': '33,34,35,36', 'fec': 'rs', 'speed': '100000', 'description': 'Interface description'}, "
+ "'Ethernet88': {'alias': 'fortyGigE0/88', 'lanes': '117,118,119,120'}, "
+ "'Ethernet116': {'alias': 'fortyGigE0/116', 'lanes': '93,94,95,96'}, "
+ "'Ethernet80': {'alias': 'fortyGigE0/80', 'lanes': '105,106,107,108'}, "
+ "'Ethernet112': {'alias': 'fortyGigE0/112', 'lanes': '89,90,91,92'}, "
+ "'Ethernet84': {'alias': 'fortyGigE0/84', 'lanes': '109,110,111,112'}, "
+ "'Ethernet48': {'alias': 'fortyGigE0/48', 'lanes': '49,50,51,52'}, "
+ "'Ethernet44': {'alias': 'fortyGigE0/44', 'lanes': '17,18,19,20'}, "
+ "'Ethernet40': {'alias': 'fortyGigE0/40', 'lanes': '21,22,23,24'}, "
+ "'Ethernet28': {'alias': 'fortyGigE0/28', 'lanes': '1,2,3,4'}, "
+ "'Ethernet60': {'alias': 'fortyGigE0/60', 'lanes': '57,58,59,60'}, "
+ "'Ethernet20': {'alias': 'fortyGigE0/20', 'lanes': '45,46,47,48'}, "
+ "'Ethernet24': {'alias': 'fortyGigE0/24', 'lanes': '5,6,7,8'}}")
+
+ def test_metadata_everflow(self):
+ argument = '-m "' + self.sample_graph_metadata + '" -p "' + self.port_config + '" -v "MIRROR_SESSION"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'everflow0': {'src_ip': '10.1.0.32', 'dst_ip': '10.0.100.1'}}")
+
+ def test_metadata_tacacs(self):
+ argument = '-m "' + self.sample_graph_metadata + '" -p "' + self.port_config + '" -v "TACPLUS_SERVER"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'10.0.10.7': {'priority': '1', 'tcp_port': '49'}, '10.0.10.8': {'priority': '1', 'tcp_port': '49'}}")
+
+ def test_metadata_ntp(self):
+ argument = '-m "' + self.sample_graph_metadata + '" -p "' + self.port_config + '" -v "NTP_SERVER"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'10.0.10.1': {}, '10.0.10.2': {}}")
+
diff --git a/src/sonic-config-engine/tests/test_j2files.py b/src/sonic-config-engine/tests/test_j2files.py
index 129c3973d7b5..aba7feb194ad 100644
--- a/src/sonic-config-engine/tests/test_j2files.py
+++ b/src/sonic-config-engine/tests/test_j2files.py
@@ -20,6 +20,9 @@ def setUp(self):
def run_script(self, argument):
print 'CMD: sonic-cfggen ' + argument
return subprocess.check_output(self.script_file + ' ' + argument, shell=True)
+
+ def run_diff(self, file1, file2, diff):
+ return subprocess.check_output('diff {} {} >{}'.format(file1, file2, diff), shell=True)
def test_interfaces(self):
interfaces_template = os.path.join(self.test_dir, '..', '..', '..', 'files', 'image_config', 'interfaces', 'interfaces.j2')
@@ -59,6 +62,18 @@ def test_lldp(self):
self.run_script(argument)
self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', 'lldpd.conf'), self.output_file))
+ def test_bgpd(self):
+ conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-quagga', 'bgpd.conf.j2')
+ argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + conf_template + ' > ' + self.output_file
+ self.run_script(argument)
+ self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', 'bgpd.conf'), self.output_file))
+
+ def test_zebra(self):
+ conf_template = os.path.join(self.test_dir, '..', '..', '..', 'dockers', 'docker-fpm-quagga', 'zebra.conf.j2')
+ argument = '-m ' + self.t0_minigraph + ' -p ' + self.t0_port_config + ' -t ' + conf_template + ' > ' + self.output_file
+ self.run_script(argument)
+ self.assertTrue(filecmp.cmp(os.path.join(self.test_dir, 'sample_output', 'zebra.conf'), self.output_file))
+
def test_teamd(self):
def test_render_teamd(self, pc, minigraph, sample_output):
@@ -94,15 +109,13 @@ def test_ipinip(self):
self.run_script(argument)
sample_output_file = os.path.join(self.test_dir, 'sample_output', 'ipinip.json')
-
assert filecmp.cmp(sample_output_file, self.output_file)
- def test_msn27xx_32ports_buffers(self):
- buffer_file = os.path.join(self.test_dir, '..', '..', '..', 'device', 'mellanox', 'x86_64-mlnx_msn2700-r0', 'ACS-MSN2700', 'buffers.json.j2')
- argument = '-m ' + self.t1_mlnx_minigraph + ' -p ' + self.mlnx_port_config + ' -t ' + buffer_file + ' > ' + self.output_file
+ def test_sku_render_template(self):
+ argument = '-k Mellanox-SN2700 -t ' + os.path.join(self.test_dir, '../data/l2switch.j2') + ' -p ' + self.t0_port_config + ' > ' + self.output_file
self.run_script(argument)
- sample_output_file = os.path.join(self.test_dir, 'sample_output', 'msn27.32ports.json')
+ sample_output_file = os.path.join(self.test_dir, 'sample_output', 'l2switch.json')
self.assertTrue(filecmp.cmp(sample_output_file, self.output_file))
diff --git a/src/sonic-config-engine/tests/test_minigraph_case.py b/src/sonic-config-engine/tests/test_minigraph_case.py
new file mode 100644
index 000000000000..754bdae799f4
--- /dev/null
+++ b/src/sonic-config-engine/tests/test_minigraph_case.py
@@ -0,0 +1,111 @@
+from unittest import TestCase
+import subprocess
+import os
+
+class TestCfgGenCaseInsensitive(TestCase):
+
+ def setUp(self):
+ self.test_dir = os.path.dirname(os.path.realpath(__file__))
+ self.script_file = os.path.join(self.test_dir, '..', 'sonic-cfggen')
+ self.sample_graph = os.path.join(self.test_dir, 'simple-sample-graph-case.xml')
+ self.port_config = os.path.join(self.test_dir, 't0-sample-port-config.ini')
+
+ def run_script(self, argument, check_stderr=False):
+ print '\n Running sonic-cfggen ' + argument
+ if check_stderr:
+ output = subprocess.check_output(self.script_file + ' ' + argument, stderr=subprocess.STDOUT, shell=True)
+ else:
+ output = subprocess.check_output(self.script_file + ' ' + argument, shell=True)
+
+ linecount = output.strip().count('\n')
+ if linecount <= 0:
+ print ' Output: ' + output.strip()
+ else:
+ print ' Output: ({0} lines, {1} bytes)'.format(linecount + 1, len(output))
+ return output
+
+ def test_dummy_run(self):
+ argument = ''
+ output = self.run_script(argument)
+ self.assertEqual(output, '')
+
+ def test_minigraph_sku(self):
+ argument = '-v "DEVICE_METADATA[\'localhost\'][\'hwsku\']" -m "' + self.sample_graph + '"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), 'Force10-S6000')
+
+ def test_print_data(self):
+ argument = '-m "' + self.sample_graph + '" --print-data'
+ output = self.run_script(argument)
+ self.assertTrue(len(output.strip()) > 0)
+
+ def test_jinja_expression(self):
+ argument = '-m "' + self.sample_graph + '" -v "DEVICE_METADATA[\'localhost\'][\'type\']"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), 'ToRRouter')
+
+ def test_additional_json_data(self):
+ argument = '-a \'{"key1":"value1"}\' -v key1'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), 'value1')
+
+ def test_read_yaml(self):
+ argument = '-v yml_item -y ' + os.path.join(self.test_dir, 'test.yml')
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), '[\'value1\', \'value2\']')
+
+ def test_render_template(self):
+ argument = '-y ' + os.path.join(self.test_dir, 'test.yml') + ' -t ' + os.path.join(self.test_dir, 'test.j2')
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), 'value1\nvalue2')
+
+ def test_minigraph_everflow(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v MIRROR_SESSION'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'everflow0': {'src_ip': '10.1.0.32', 'dst_ip': '10.0.100.1'}}")
+
+ def test_minigraph_interfaces(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v \'INTERFACE.keys()\''
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "[('Ethernet0', '10.0.0.58/31'), ('Ethernet0', 'FC00::75/126')]")
+
+ def test_minigraph_vlans(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v VLAN'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'Vlan1000': {'alias': 'ab1', 'dhcp_servers': ['192.0.0.1', '192.0.0.2'], 'vlanid': '1000'}}")
+
+ def test_minigraph_vlan_members(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v VLAN_MEMBER'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'Vlan1000|Ethernet8': {'tagging_mode': 'untagged'}}")
+
+ def test_minigraph_vlan_interfaces(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "VLAN_INTERFACE.keys()"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "[('Vlan1000', '192.168.0.1/27')]")
+
+ def test_minigraph_portchannels(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v PORTCHANNEL'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'PortChannel01': {'members': ['Ethernet4']}}")
+
+ def test_minigraph_deployment_id(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "DEVICE_METADATA[\'localhost\'][\'deployment_id\']"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "1")
+
+ def test_metadata_everflow(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "MIRROR_SESSION"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'everflow0': {'src_ip': '10.1.0.32', 'dst_ip': '10.0.100.1'}}")
+
+ def test_metadata_tacacs(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "TACPLUS_SERVER"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'10.0.10.7': {'priority': '1', 'tcp_port': '49'}, '10.0.10.8': {'priority': '1', 'tcp_port': '49'}}")
+
+ def test_metadata_ntp(self):
+ argument = '-m "' + self.sample_graph + '" -p "' + self.port_config + '" -v "NTP_SERVER"'
+ output = self.run_script(argument)
+ self.assertEqual(output.strip(), "{'10.0.10.1': {}, '10.0.10.2': {}}")
+
diff --git a/src/sonic-dbsyncd b/src/sonic-dbsyncd
index 1d0b2165e097..94f2700f67f8 160000
--- a/src/sonic-dbsyncd
+++ b/src/sonic-dbsyncd
@@ -1 +1 @@
-Subproject commit 1d0b2165e097ee668c8e982cf3cf413e4f2555d2
+Subproject commit 94f2700f67f87b431c7ce45e4b9d7788707c6732
diff --git a/src/sonic-device-data/src/Makefile b/src/sonic-device-data/src/Makefile
new file mode 100644
index 000000000000..9c0037fd50c7
--- /dev/null
+++ b/src/sonic-device-data/src/Makefile
@@ -0,0 +1,11 @@
+.ONESHELL:
+SHELL = /bin/bash
+.SHELLFLAGS += -e
+
+test:
+ # Execute Broadcom config file test
+ pushd ../tests/
+ for f in $$(find ../../../device -name "*.config.bcm"); do
+ ./config_checker $$f
+ done
+ popd
diff --git a/src/sonic-device-data/tests/LICENSE b/src/sonic-device-data/tests/LICENSE
new file mode 100644
index 000000000000..fd8968a9bd4e
--- /dev/null
+++ b/src/sonic-device-data/tests/LICENSE
@@ -0,0 +1,42 @@
+Copyright: Copyright 2017 Broadcom Corporation.
+
+This program is the proprietary software of Broadcom Corporation
+and/or its licensors, and may only be used, duplicated, modified
+or distributed pursuant to the terms and conditions of a separate,
+written license agreement executed between you and Broadcom
+(an "Authorized License"). Except as set forth in an Authorized
+License, Broadcom grants no license (express or implied), right
+to use, or waiver of any kind with respect to the Software, and
+Broadcom expressly reserves all rights in and to the Software
+and all intellectual property rights therein. IF YOU HAVE
+NO AUTHORIZED LICENSE, THEN YOU HAVE NO RIGHT TO USE THIS SOFTWARE
+IN ANY WAY, AND SHOULD IMMEDIATELY NOTIFY BROADCOM AND DISCONTINUE
+ALL USE OF THE SOFTWARE.
+
+ Except as expressly set forth in the Authorized License,
+
+ 1. This program, including its structure, sequence and organization,
+constitutes the valuable trade secrets of Broadcom, and you shall use
+all reasonable efforts to protect the confidentiality thereof,
+and to use this information only in connection with your use of
+Broadcom integrated circuit products.
+
+ 2. TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS
+PROVIDED "AS IS" AND WITH ALL FAULTS AND BROADCOM MAKES NO PROMISES,
+REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY,
+OR OTHERWISE, WITH RESPECT TO THE SOFTWARE. BROADCOM SPECIFICALLY
+DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY,
+NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES,
+ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR
+CORRESPONDENCE TO DESCRIPTION. YOU ASSUME THE ENTIRE RISK ARISING
+OUT OF USE OR PERFORMANCE OF THE SOFTWARE.
+
+ 3. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL
+BROADCOM OR ITS LICENSORS BE LIABLE FOR (i) CONSEQUENTIAL,
+INCIDENTAL, SPECIAL, INDIRECT, OR EXEMPLARY DAMAGES WHATSOEVER
+ARISING OUT OF OR IN ANY WAY RELATING TO YOUR USE OF OR INABILITY
+TO USE THE SOFTWARE EVEN IF BROADCOM HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES; OR (ii) ANY AMOUNT IN EXCESS OF
+THE AMOUNT ACTUALLY PAID FOR THE SOFTWARE ITSELF OR USD 1.00,
+WHICHEVER IS GREATER. THESE LIMITATIONS SHALL APPLY NOTWITHSTANDING
+ANY FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY.
diff --git a/src/sonic-device-data/tests/config_checker b/src/sonic-device-data/tests/config_checker
new file mode 100755
index 000000000000..51c32c19c3e4
--- /dev/null
+++ b/src/sonic-device-data/tests/config_checker
@@ -0,0 +1,92 @@
+#!/usr/bin/env python
+import re
+import sys
+import glob
+
+permitted_properties = []
+
+def usage():
+ print "Usage: " + sys.argv[0] + " "
+ sys.exit(1)
+
+def check_property(p):
+ if p in permitted_properties:
+ return True
+ # Try to remove trailing .
+ if re.sub(r".\d+$", "", p) in permitted_properties:
+ return True
+ # Try to remove trailing _.
+ if re.sub(r"_\d+.\d+$", "", p) in permitted_properties:
+ return True
+ # Try to remove trailing _hg.
+ if re.sub(r"_hg.0$", "", p) in permitted_properties:
+ return True
+ # Try to remove trailing _[cx]e
+ if re.sub(r"_[cx]e\d*$", "", p) in permitted_properties:
+ return True
+ # Try to remove trailing _lane_
+ if re.sub(r"_lane\d_\d+$", "", p) in permitted_properties:
+ return True
+ # Try to remove trailing _lane_.
+ if re.sub(r"_lane\d_\d+.\d+$", "", p) in permitted_properties:
+ return True
+ # Try to remove trailing _lane_[cx]e
+ if re.sub(r"_lane\d_[cx]e\d+$", "", p) in permitted_properties:
+ return True
+ return False
+
+def check_file(file_name):
+ try:
+ file_ok = True
+ failed_properties = []
+ lineno = 0
+ with open(file_name) as f:
+ for line in f.readlines():
+ lineno = lineno + 1
+ # Check both commented and uncommented lines
+ line = line.strip().lstrip('#').strip().lower()
+ if line.find("=") == -1:
+ continue
+ p = line.split("=", 1)[0]
+ # Remove trailing "{.}"
+ p = re.sub('{[0-9]+\.[0-9]+}', '', p)
+ # Check if = in the line
+ if not check_property(p):
+ file_ok = False
+ print("[line %d] Error: %s is not permitted" % (lineno, p))
+ if file_ok:
+ print "Result: " + file_name + " PASSED the config check!"
+ else:
+ print "Result: " + file_name + " FAILED the config check!"
+ return file_ok
+ except IOError:
+ print "Error: Cannot open file " + file_name
+ return False
+
+
+def main(argv):
+ global permitted_properties
+
+ if len(argv) > 0 and argv[0] == "-h":
+ usage()
+
+ # Load permitted properties
+ with open("permitted_list") as f:
+ permitted_properties = [p.strip().lower() for p in f.readlines()]
+
+ # Load target file
+ if len(argv) == 0:
+ files = glob.glob('*.config.bcm')
+ else:
+ files = argv
+
+ all_good = True
+ for f in files:
+ good = check_file(f)
+ all_good = all_good and good
+
+ if not all_good:
+ sys.exit(-1)
+
+if __name__ == "__main__":
+ main(sys.argv[1:])
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
new file mode 100644
index 000000000000..150a16292c91
--- /dev/null
+++ b/src/sonic-device-data/tests/permitted_list
@@ -0,0 +1,134 @@
+arl_clean_timeout_usec
+asf_mem_profile
+bcm_linkscan_interval
+bcm_num_cos
+bcm_stat_flags
+bcm_stat_interval
+bcm_stat_jumbo
+bcm_tunnel_term_compatible_mode
+bcm_xlate_port_enable
+cdma_timeout_usec
+core_clock_frequency
+ctr_evict_enable
+dma_desc_timeout_usec
+dport_map_direct
+dport_map_enable
+dport_map_indexed
+dport_map_port
+dpp_clock_ratio
+force_core_pll
+fpem_mem_entries
+higig2_hdr_mode
+ipmc_do_vlan
+ipv6_lpm_128b_enable
+knet_filter_persist
+l2_mem_entries
+l2delete_chunks
+l2mod_dma_intr_enable
+l2xmsg_hostbuf_size
+l2xmsg_mode
+l3_alpm_enable
+l3_intf_vlan_split_egress
+l3_max_ecmp_mode
+l3_mem_entries
+lls_num_l2uc
+load_firmware
+logical_ports
+lpm_ipv6_128b_reserved
+lpm_scaling_enable
+max_vp_lags
+mdio_output_delay
+mem_cache_enable
+mem_check_nocache_override
+mem_clear_hw_a
+mem_nocache
+mem_scan_enable
+memcmd_intr_enable
+miim_intr_enable
+miim_timeout_usec
+mmu_init_config
+mmu_lossless
+module_64ports
+multicast_l2_r
+multicast_l2_range
+multicast_l3_range
+no_leds_proc
+num_ipv6_lpm_128b_entries
+os
+oversubscribe_mode
+parity_correction
+parity_enable
+pbmp_oversubscribe
+pbmp_xport_xe
+pci2eb_overrid
+pfc_deadlock_seq_control
+phy_84328
+phy_84752
+phy_an_allow_pll_change
+phy_an_allow_pll_change_hg
+phy_an_c37
+phy_an_c73
+phy_an_fec
+phy_aux_voltage_enable
+phy_chain_rx_lane_map_physical
+phy_chain_rx_polarity_flip_physical
+phy_chain_tx_lane_map_physical
+phy_chain_tx_polarity_flip_physical
+phy_ext_rom_boot
+phy_gearbox_enable
+phy_line_tx_mode
+phy_pcs_rx_polarity_flip
+phy_pcs_tx_polarity_flip
+phy_port_primary_and_offset
+phy_rx_polarity_flip
+phy_system_tx_mode
+phy_tx_polarity_flip
+phy_xaui_rx_polarity_flip
+phy_xaui_tx_polarity_flip
+physical_ports
+port_init_autoneg
+port_init_cl72
+port_init_cl72_hg
+port_init_speed_xe
+port_phy_addr
+port_phy_clause
+port_phy_id0
+port_phy_id1
+portmap
+prbs_polynomial
+ptp_bs_fref
+ptp_ts_pll_fref
+rate_ext_mdio_divisor
+robust_hash_disable_egress_vlan
+robust_hash_disable_mpls
+robust_hash_disable_vlan
+scache_filename
+schan_intr_enable
+schan_timeout_usec
+serdes_automed
+serdes_automedium
+serdes_driver_current
+serdes_fiber_pref
+serdes_firmware_mode
+serdes_if_type
+serdes_pre_driver_current
+serdes_preemphasis
+serdes_rx_los_xe
+serdes_sgmii_m
+skip_L2_USER_ENTRY
+sram_scan_enable
+stable_size
+start_vlan
+stat_if_parity_enable
+switch_bypass_mode
+table_dma_enable
+tdma_intr_enable
+tdma_timeout_usec
+tslam_dma_enable
+tslam_intr_enable
+tslam_timeout_usec
+uplink_ports
+xgxs_lcpll_xtal_refclk
+xgxs_pdetect_1
+xgxs_rx_lane_map
+xgxs_tx_lane_map
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 0581611b7be5..10bef06fd66b 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 0581611b7be5cc52aea2877199785fe72f759a58
+Subproject commit 10bef06fd66b233b8e3fdecb19809dedee9f0e75
diff --git a/src/sonic-platform-daemons b/src/sonic-platform-daemons
index 31c007e260ba..64ec0ca4c184 160000
--- a/src/sonic-platform-daemons
+++ b/src/sonic-platform-daemons
@@ -1 +1 @@
-Subproject commit 31c007e260ba081bc73cbf467eb27cd8747c2177
+Subproject commit 64ec0ca4c18418acf1a852b28313ce904481643c
diff --git a/src/sonic-quagga b/src/sonic-quagga
index e1217a526999..0bc6bd6b208e 160000
--- a/src/sonic-quagga
+++ b/src/sonic-quagga
@@ -1 +1 @@
-Subproject commit e1217a5269990926dff30624063975673b1da065
+Subproject commit 0bc6bd6b208e3701df89c3e231c48f3bdb3d046f
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index c860472a3d8c..17fd36e2e115 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit c860472a3d8c16cad8a44fd7f76e848c39651f2e
+Subproject commit 17fd36e2e115af90dea491f71689147fc06f7d30
diff --git a/src/sonic-snmpagent b/src/sonic-snmpagent
index 12bc0e0c9843..bf1b165458e4 160000
--- a/src/sonic-snmpagent
+++ b/src/sonic-snmpagent
@@ -1 +1 @@
-Subproject commit 12bc0e0c98432eb21add3b547e13bcf10e77ab51
+Subproject commit bf1b165458e4e19286d245a3398921057f4df21c
diff --git a/src/sonic-swss b/src/sonic-swss
index e217519c20c6..8f52e297e83a 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit e217519c20c60f7cf4e24688dd3eca6d380a1dd6
+Subproject commit 8f52e297e83acc3e5d8ce82ef67285ee730e0ea4
diff --git a/src/sonic-swss-common b/src/sonic-swss-common
index 14ca39fa0670..f907e9463bd9 160000
--- a/src/sonic-swss-common
+++ b/src/sonic-swss-common
@@ -1 +1 @@
-Subproject commit 14ca39fa0670b0e9b34d0ab63b12348bcba652ac
+Subproject commit f907e9463bd9eb81d5cfb6d632774de41a100f93
diff --git a/src/sonic-utilities b/src/sonic-utilities
index 68c3fbf79738..47c2bee08c89 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit 68c3fbf79738253ca5b1c8f225152a1cab55c5a1
+Subproject commit 47c2bee08c894c0ff4458e3fbb01e25868d2da11
diff --git a/src/tacacs/nss/0002-Enable-modifying-local-user-permission.patch b/src/tacacs/nss/0002-Enable-modifying-local-user-permission.patch
new file mode 100644
index 000000000000..2c476354705a
--- /dev/null
+++ b/src/tacacs/nss/0002-Enable-modifying-local-user-permission.patch
@@ -0,0 +1,71 @@
+From 7045acb8f530331d3fbabef20bcf2787d3430c55 Mon Sep 17 00:00:00 2001
+From: Taoyu Li
+Date: Thu, 21 Jun 2018 19:21:01 +0000
+Subject: [PATCH] Do authorization and modify user permission even if local
+ user exists
+
+---
+ nss_tacplus.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/nss_tacplus.c b/nss_tacplus.c
+index 63f01d4..a13c278 100644
+--- a/nss_tacplus.c
++++ b/nss_tacplus.c
+@@ -408,7 +408,7 @@ static int delete_conf_line(const char *name)
+ * conf, it will be written in conf and created by command 'useradd'. When
+ * useradd command use getpwnam(), it will return when username found in conf.
+ */
+-static int create_local_user(const char *name, int level)
++static int create_or_modify_local_user(const char *name, int level, bool existing_user)
+ {
+ FILE *fp;
+ useradd_info_t *user;
+@@ -416,6 +416,7 @@ static int create_local_user(const char *name, int level)
+ int len = 512;
+ int lvl, cnt;
+ bool found = false;
++ const char* command = existing_user ? "/usr/sbin/usermod": "/usr/sbin/useradd";
+
+ fp = fopen(user_conf, "ab+");
+ if(!fp) {
+@@ -458,17 +459,18 @@ static int create_local_user(const char *name, int level)
+ while(lvl >= MIN_TACACS_USER_PRIV) {
+ user = &useradd_grp_list[lvl];
+ if(user->info && user->secondary_grp && user->shell) {
+- snprintf(buf, len, "useradd -G %s \"%s\" -g %d -c \"%s\" -d /home/%s -m -s %s",
+- user->secondary_grp, name, user->gid, user->info, name, user->shell);
++ snprintf(buf, len, "%s -G %s \"%s\" -g %d -c \"%s\" -d /home/%s -m -s %s",
++ command, user->secondary_grp, name, user->gid, user->info, name, user->shell);
++ if(debug) syslog(LOG_DEBUG, "%s", buf);
+ fp = popen(buf, "r");
+ if(!fp || -1 == pclose(fp)) {
+- syslog(LOG_ERR, "%s: useradd popen failed errno=%d %s",
+- nssname, errno, strerror(errno));
++ syslog(LOG_ERR, "%s: %s popen failed errno=%d %s",
++ nssname, command, errno, strerror(errno));
+ delete_conf_line(name);
+ return -1;
+ }
+ if(debug)
+- syslog(LOG_DEBUG, "%s: create local user %s success", nssname, name);
++ syslog(LOG_DEBUG, "%s: %s %s success", nssname, command, name);
+ delete_conf_line(name);
+ return 0;
+ }
+@@ -558,10 +560,10 @@ static int lookup_user_pw(struct pwbuf *pb, int level)
+ if(debug)
+ syslog(LOG_DEBUG, "%s: %s passwd %s found in local", nssname, username,
+ found ? "is" : "isn't");
+- if(0 != ret || found)
++ if(0 != ret)
+ return ret;
+
+- if(0 != create_local_user(username, level))
++ if(0 != create_or_modify_local_user(username, level, found))
+ return -1;
+
+ ret = lookup_pw_local(username, pb, &found);
+--
+2.9.3
+
diff --git a/src/tacacs/nss/Makefile b/src/tacacs/nss/Makefile
index 4f1a337b34b4..259e9b281389 100644
--- a/src/tacacs/nss/Makefile
+++ b/src/tacacs/nss/Makefile
@@ -12,7 +12,8 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
git checkout -f 19008ab
# Apply patch
- git apply ../0001-Modify-user-map-profile.patch
+ git am ../0001-Modify-user-map-profile.patch
+ git am ../0002-Enable-modifying-local-user-permission.patch
dpkg-buildpackage -rfakeroot -b -us -uc
popd