Skip to content

centec x86 platform update #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
taocy001 merged 24 commits into from
Mar 9, 2020
Merged

centec x86 platform update #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e2dad85
Merge pull request #2 from Azure/201911
taocy001 Feb 21, 2020
1988ef8
set NOJESSIE=1, and default USERNAME PASSWORD
Feb 21, 2020
348ffd7
update SAI to 1.5.1 for branch 201911
Feb 21, 2020
fb4d391
syncd docker unable to start
Feb 25, 2020
a0b902e
default used l2 template
Feb 25, 2020
c8aa524
remove config files
Feb 25, 2020
13642f2
remove config files
Feb 25, 2020
a6155d2
for centec x86 E582-48x2q4z
Feb 27, 2020
86bfff9
change interrupt mode for E580 x86
Feb 29, 2020
88a853b
Modify for E582-48x6q
Mar 2, 2020
0110be7
modified codes for ES6428A-X48Q2H4
Mar 2, 2020
8c9e53a
embedway sonic e582
Mar 4, 2020
9981d33
remove ptf
Mar 4, 2020
9443080
Merge branch 'x86_test_201911' of https://github.com/taocy001/sonic-b…
Mar 4, 2020
d0ece05
ptf
Mar 4, 2020
f76772f
embedway es6220
Mar 4, 2020
8d0542c
embedway
Mar 4, 2020
ffae72f
embedway platform
Mar 4, 2020
981f57e
set router mac
Mar 5, 2020
1c9d709
move chipprofile.ini and datapath.ini to libsai.deb
Mar 6, 2020
937517f
embedway sai.profile
Mar 6, 2020
14fb1a9
Merge pull request #3 from taocy001/embedway
taocy001 Mar 6, 2020
35edbc1
Merge pull request #4 from Azure/201911
taocy001 Mar 7, 2020
14de1be
fix bug for 100G port cannot link up
LuiSzee Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# SONiC make file

NOJESSIE ?= 0
# NOJESSIE ?= 0
NOJESSIE = 1

%::
@echo "+++ --- Making $@ --- +++"
Expand Down
54 changes: 27 additions & 27 deletions device/centec/x86_64-centec_e582_48x2q4z-r0/E582-48x2q4z/port_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
# name lanes alias speed
Ethernet1 75 eth-0-1 1000
Ethernet2 73 eth-0-2 1000
Ethernet3 72 eth-0-3 1000
Ethernet4 70 eth-0-4 1000
Ethernet5 69 eth-0-5 1000
Ethernet6 67 eth-0-6 1000
Ethernet7 66 eth-0-7 1000
Ethernet8 64 eth-0-8 1000
Ethernet9 63 eth-0-9 1000
Ethernet10 61 eth-0-10 1000
Ethernet11 60 eth-0-11 1000
Ethernet12 58 eth-0-12 1000
Ethernet13 57 eth-0-13 10000
Ethernet14 56 eth-0-14 10000
Ethernet15 55 eth-0-15 10000
Ethernet16 53 eth-0-16 10000
Ethernet17 52 eth-0-17 10000
Ethernet18 50 eth-0-18 10000
Ethernet19 49 eth-0-19 10000
Ethernet20 48 eth-0-20 10000
Ethernet1 91 eth-0-1 10000
Ethernet2 89 eth-0-2 10000
Ethernet3 88 eth-0-3 10000
Ethernet4 86 eth-0-4 10000
Ethernet5 85 eth-0-5 10000
Ethernet6 83 eth-0-6 10000
Ethernet7 82 eth-0-7 10000
Ethernet8 80 eth-0-8 10000
Ethernet9 79 eth-0-9 10000
Ethernet10 77 eth-0-10 10000
Ethernet11 76 eth-0-11 10000
Ethernet12 74 eth-0-12 10000
Ethernet13 73 eth-0-13 10000
Ethernet14 72 eth-0-14 10000
Ethernet15 71 eth-0-15 10000
Ethernet16 69 eth-0-16 10000
Ethernet17 68 eth-0-17 10000
Ethernet18 66 eth-0-18 10000
Ethernet19 65 eth-0-19 10000
Ethernet20 64 eth-0-20 10000
Ethernet21 0 eth-0-21 10000
Ethernet22 1 eth-0-22 10000
Ethernet23 3 eth-0-23 10000
Expand Down Expand Up @@ -46,10 +46,10 @@ Ethernet44 30 eth-0-44 10000
Ethernet45 31 eth-0-45 10000
Ethernet46 33 eth-0-46 10000
Ethernet47 34 eth-0-47 10000
Ethernet48 36 eth-0-48 10000
Ethernet49 42,41,43,40 eth-0-49 40000
Ethernet50 45,46,44,47 eth-0-50 40000
Ethernet51 94,93,95,92 eth-0-51 100000
Ethernet52 89,90,88,91 eth-0-52 100000
Ethernet53 85,86,84,87 eth-0-53 100000
Ethernet54 81,82,80,83 eth-0-54 100000
Ethernet48 48 eth-0-48 10000
Ethernet49 38,37,39,36 eth-0-49 100000
Ethernet50 53,54,52,55 eth-0-50 100000
Ethernet51 118,117,119,116 eth-0-51 100000
Ethernet52 101,102,100,103 eth-0-52 100000
Ethernet53 113,114,112,115 eth-0-53 40000
Ethernet54 97,98,96,99 eth-0-54 40000
2 changes: 1 addition & 1 deletion device/centec/x86_64-centec_e582_48x2q4z-r0/default_sku
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
E582-48x2q4z t1
E582-48x2q4z l2
84 changes: 42 additions & 42 deletions device/centec/x86_64-centec_e582_48x6q-r0/E582-48x6q/port_config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# name lanes alias speed
Ethernet1 4 eth-0-1 1000
Ethernet2 5 eth-0-2 1000
Ethernet3 6 eth-0-3 1000
Ethernet4 8 eth-0-4 1000
Ethernet5 9 eth-0-5 1000
Ethernet6 10 eth-0-6 1000
Ethernet7 12 eth-0-7 1000
Ethernet8 13 eth-0-8 1000
Ethernet9 14 eth-0-9 1000
Ethernet10 16 eth-0-10 1000
Ethernet11 17 eth-0-11 1000
Ethernet12 18 eth-0-12 1000
Ethernet1 4 eth-0-1 10000
Ethernet2 5 eth-0-2 10000
Ethernet3 6 eth-0-3 10000
Ethernet4 8 eth-0-4 10000
Ethernet5 9 eth-0-5 10000
Ethernet6 10 eth-0-6 10000
Ethernet7 12 eth-0-7 10000
Ethernet8 13 eth-0-8 10000
Ethernet9 14 eth-0-9 10000
Ethernet10 16 eth-0-10 10000
Ethernet11 17 eth-0-11 10000
Ethernet12 18 eth-0-12 10000
Ethernet13 20 eth-0-13 10000
Ethernet14 21 eth-0-14 10000
Ethernet15 22 eth-0-15 10000
Expand All @@ -23,33 +23,33 @@ Ethernet21 31 eth-0-21 10000
Ethernet22 32 eth-0-22 10000
Ethernet23 34 eth-0-23 10000
Ethernet24 35 eth-0-24 10000
Ethernet25 36 eth-0-25 10000
Ethernet26 37 eth-0-26 10000
Ethernet27 39 eth-0-27 10000
Ethernet28 40 eth-0-28 10000
Ethernet29 41 eth-0-29 10000
Ethernet30 43 eth-0-30 10000
Ethernet31 47 eth-0-31 10000
Ethernet32 46 eth-0-32 10000
Ethernet33 45 eth-0-33 10000
Ethernet34 44 eth-0-34 10000
Ethernet35 92 eth-0-35 10000
Ethernet36 93 eth-0-36 10000
Ethernet37 94 eth-0-37 10000
Ethernet38 95 eth-0-38 10000
Ethernet39 90 eth-0-39 10000
Ethernet40 89 eth-0-40 10000
Ethernet41 88 eth-0-41 10000
Ethernet42 87 eth-0-42 10000
Ethernet43 86 eth-0-43 10000
Ethernet44 85 eth-0-44 10000
Ethernet45 84 eth-0-45 10000
Ethernet46 82 eth-0-46 10000
Ethernet47 81 eth-0-47 10000
Ethernet48 80 eth-0-48 10000
Ethernet49 77,78,76,79 eth-0-49 40000
Ethernet50 73,74,72,75 eth-0-50 40000
Ethernet51 70,71,69,68 eth-0-51 40000
Ethernet52 61,63,60,62 eth-0-52 40000
Ethernet53 59,57,58,56 eth-0-53 40000
Ethernet54 53,55,54,52 eth-0-54 40000
Ethernet25 48 eth-0-25 10000
Ethernet26 49 eth-0-26 10000
Ethernet27 51 eth-0-27 10000
Ethernet28 36 eth-0-28 10000
Ethernet29 37 eth-0-29 10000
Ethernet30 39 eth-0-30 10000
Ethernet31 55 eth-0-31 10000
Ethernet32 54 eth-0-32 10000
Ethernet33 53 eth-0-33 10000
Ethernet34 52 eth-0-34 10000
Ethernet35 116 eth-0-35 10000
Ethernet36 117 eth-0-36 10000
Ethernet37 118 eth-0-37 10000
Ethernet38 119 eth-0-38 10000
Ethernet39 102 eth-0-39 10000
Ethernet40 101 eth-0-40 10000
Ethernet41 100 eth-0-41 10000
Ethernet42 115 eth-0-42 10000
Ethernet43 114 eth-0-43 10000
Ethernet44 113 eth-0-44 10000
Ethernet45 112 eth-0-45 10000
Ethernet46 98 eth-0-46 10000
Ethernet47 97 eth-0-47 10000
Ethernet48 96 eth-0-48 10000
Ethernet49 93,94,92,95 eth-0-49 40000
Ethernet50 89,90,88,91 eth-0-50 40000
Ethernet51 86,87,85,84 eth-0-51 40000
Ethernet52 77,79,76,78 eth-0-52 40000
Ethernet53 75,73,74,72 eth-0-53 40000
Ethernet54 69,71,70,68 eth-0-54 40000
2 changes: 1 addition & 1 deletion device/centec/x86_64-centec_e582_48x6q-r0/default_sku
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
E582-48x6q t1
E582-48x6q l2
70 changes: 70 additions & 0 deletions device/centec/x86_64-ew_es6220_x48q2h4-r0/ES6428A-X48Q2H4/buffers.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{# Default values which will be used if no actual configura available #}
{% set default_cable = '40m' %}
{% 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(1,default_ports_num+1) %}
{% 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 %}
}
}
}

Loading