From f80afb466e17dbeb674db8979d55e07ce28b078a Mon Sep 17 00:00:00 2001 From: keboliu Date: Thu, 31 Oct 2019 03:53:42 +0200 Subject: [PATCH 01/14] add MSN4700 device files --- .../ACS-MSN4700/buffers.json.j2 | 1 + .../ACS-MSN4700/buffers_defaults_t0.j2 | 91 +++++++ .../ACS-MSN4700/buffers_defaults_t1.j2 | 91 +++++++ .../ACS-MSN4700/pg_profile_lookup.ini | 22 ++ .../ACS-MSN4700/port_config.ini | 33 +++ .../ACS-MSN4700/qos.json.j2 | 1 + .../ACS-MSN4700/sai.profile | 1 + .../ACS-MSN4700/sai_4700.xml | 243 +++++++++++++++++ .../x86_64-mlnx_msn4700-r0/default_sku | 1 + .../x86_64-mlnx_msn4700-r0/platform_reboot | 1 + .../x86_64-mlnx_msn4700-r0/platform_wait | 1 + .../x86_64-mlnx_msn4700-r0/plugins/eeprom.py | 1 + .../x86_64-mlnx_msn4700-r0/plugins/psuutil.py | 1 + .../plugins/sfplpmget.py | 1 + .../plugins/sfplpmset.py | 1 + .../plugins/sfpreset.py | 1 + .../x86_64-mlnx_msn4700-r0/plugins/sfputil.py | 1 + .../pmon_daemon_control.json | 1 + .../x86_64-mlnx_msn4700-r0/sensors.conf | 116 ++++++++ .../x86_64-mlnx_msn4700_simx-r0/ACS-MSN4700 | 1 + .../x86_64-mlnx_msn4700_simx-r0/default_sku | 1 + .../platform_reboot | 1 + .../x86_64-mlnx_msn4700_simx-r0/plugins | 1 + .../pmon_daemon_control.json | 5 + .../x86_64-mlnx_msn4700_simx-r0/syseeprom.hex | 256 ++++++++++++++++++ 25 files changed, 874 insertions(+) create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers.json.j2 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/qos.json.j2 create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/default_sku create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/platform_wait create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/plugins/eeprom.py create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/plugins/psuutil.py create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmget.py create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmset.py create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfpreset.py create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfputil.py create mode 120000 device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf create mode 120000 device/mellanox/x86_64-mlnx_msn4700_simx-r0/ACS-MSN4700 create mode 120000 device/mellanox/x86_64-mlnx_msn4700_simx-r0/default_sku create mode 120000 device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot create mode 120000 device/mellanox/x86_64-mlnx_msn4700_simx-r0/plugins create mode 100644 device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json create mode 100644 device/mellanox/x86_64-mlnx_msn4700_simx-r0/syseeprom.hex diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers.json.j2 new file mode 120000 index 00000000000..add8bf8bb7c --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/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_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..ca07124a51d --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 @@ -0,0 +1,91 @@ +{% set default_cable = '5m' %} +{% set ingress_lossless_pool_size = '20807680' %} +{% set ingress_lossy_pool_size = '20807680' %} +{% set egress_lossless_pool_size = '20807680' %} +{% set egress_lossy_pool_size = '20807680' %} + +{%- 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]" + }, + "{{ port_names }}|5": { + "profile" : "[BUFFER_PROFILE|q_lossy_profile]" + } + } +{%- endmacro %} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 new file mode 100644 index 00000000000..c5a269320e0 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 @@ -0,0 +1,91 @@ +{% set default_cable = '5m' %} +{% set ingress_lossless_pool_size = '31522816' %} +{% set ingress_lossy_pool_size = '31522816' %} +{% set egress_lossless_pool_size = '67108864' %} +{% set egress_lossy_pool_size = '31522816' %} + +{%- 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]" + }, + "{{ port_names }}|5": { + "profile" : "[BUFFER_PROFILE|q_lossy_profile]" + } + } +{%- endmacro %} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini new file mode 100644 index 00000000000..6cd06326cf3 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -0,0 +1,22 @@ +# speed cable size xon xoff threshold + 1000 5m 35840 18432 17408 0 + 10000 5m 36864 18432 18432 0 + 25000 5m 36864 18432 18432 0 + 40000 5m 36864 18432 18432 0 + 50000 5m 37888 18432 19456 0 + 100000 5m 38912 18432 20480 0 + 200000 5m 41984 18432 23552 0 + 1000 40m 36864 18432 18432 0 + 10000 40m 38912 18432 20480 0 + 25000 40m 41984 18432 23552 0 + 40000 40m 45056 18432 26624 0 + 50000 40m 47104 18432 28672 0 + 100000 40m 59392 18432 40960 0 + 200000 40m 81920 18432 63488 0 + 1000 300m 37888 18432 19456 0 + 10000 300m 53248 18432 34816 0 + 25000 300m 78848 18432 60416 0 + 40000 300m 104448 18432 86016 0 + 50000 300m 121856 18432 103424 0 + 100000 300m 206848 18432 188416 0 + 200000 300m 376832 18432 358400 0 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini new file mode 100644 index 00000000000..4b2464cc48c --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini @@ -0,0 +1,33 @@ +# name lanes alias +Ethernet0 0,1,2,3,4,5,6,7 etp1 +Ethernet4 8,9,10,11,12,13,14,15 etp2 +Ethernet8 16,17,18,19,20,21,22,23 etp3 +Ethernet12 24,25,26,27,28,29,30,31 etp4 +Ethernet16 32,33,34,35,36,37,38,39 etp5 +Ethernet20 40,41,42,43,44,45,46,47 etp6 +Ethernet24 48,49,50,51,52,53,54,55 etp7 +Ethernet28 56,57,58,59,60,61,62,63 etp8 +Ethernet32 64,65,66,67,68,69,70,71 etp9 +Ethernet36 72,73,74,75,76,77,78,79 etp10 +Ethernet40 80,81,82,83,84,85,86,87 etp11 +Ethernet44 88,89,90,91,92,93,94,95 etp12 +Ethernet48 96,97,98,99,100,101,102,103 etp13 +Ethernet52 104,105,106,107,108,109,110,111 etp14 +Ethernet56 112,113,114,115,116,117,118,119 etp15 +Ethernet60 120,121,122,123,124,125,126,127 etp16 +Ethernet64 128,129,130,131,132,133,134,135 etp17 +Ethernet68 136,137,138,139,140,141,142,143 etp18 +Ethernet72 144,145,146,147,148,149,150,151 etp19 +Ethernet76 152,153,154,155,156,157,158,159 etp20 +Ethernet80 160,161,162,163,164,165,166,167 etp21 +Ethernet84 168,169,170,171,172,173,174,175 etp22 +Ethernet88 176,177,178,179,180,181,182,183 etp23 +Ethernet92 184,185,186,187,188,189,190,191 etp24 +Ethernet96 192,193,194,195,196,197,198,199 etp25 +Ethernet100 200,201,202,203,204,205,206,207 etp26 +Ethernet104 208,209,210,211,212,213,214,215 etp27 +Ethernet108 216,217,218,219,220,221,222,223 etp28 +Ethernet112 224,225,226,227,228,229,230,231 etp29 +Ethernet116 232,233,234,235,236,237,238,239 etp30 +Ethernet120 240,241,242,243,244,245,246,247 etp31 +Ethernet124 248,249,250,251,252,253,254,255 etp32 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/qos.json.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/qos.json.j2 new file mode 120000 index 00000000000..eccf286dc87 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/qos.json.j2 @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile new file mode 100644 index 00000000000..d145093cab9 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile @@ -0,0 +1 @@ +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml new file mode 100644 index 00000000000..5f916ec670f --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml @@ -0,0 +1,243 @@ + + + + + + 00:02:03:04:05:40 + + + 32 + + + + + 101 + 8 + 0 + + + 3 + + 2147516416 + + + 97 + 8 + 1 + 3 + 2147516416 + + + 109 + 8 + 2 + 3 + 2147516416 + + + 105 + 8 + 3 + 3 + 2147516416 + + + 117 + 8 + 4 + 3 + 2147516416 + + + 113 + 8 + 5 + 3 + 2147516416 + + + 125 + 8 + 6 + 3 + 2147516416 + + + 121 + 8 + 7 + 3 + 2147516416 + + + 61 + 8 + 8 + 3 + 2147516416 + + + 57 + 8 + 9 + 3 + 2147516416 + + + 53 + 8 + 10 + 3 + 2147516416 + + + 49 + 8 + 11 + 3 + 2147516416 + + + 45 + 8 + 12 + 3 + 2147516416 + + + 41 + 8 + 13 + 3 + 2147516416 + + + 37 + 8 + 14 + 3 + 2147516416 + + + 33 + 8 + 15 + 3 + 2147516416 + + + 1 + 8 + 16 + 3 + 2147516416 + + + 5 + 8 + 17 + 3 + 2147516416 + + + 9 + 8 + 18 + 3 + 2147516416 + + + 13 + 8 + 19 + 3 + 2147516416 + + + 17 + 8 + 20 + 3 + 2147516416 + + + 21 + 8 + 21 + 3 + 2147516416 + + + 25 + 8 + 22 + 3 + 2147516416 + + + 29 + 8 + 23 + 3 + 2147516416 + + + 89 + 8 + 24 + 3 + 2147516416 + + + 93 + 8 + 25 + 3 + 2147516416 + + + 81 + 8 + 26 + 3 + 2147516416 + + + 85 + 8 + 27 + 3 + 2147516416 + + + 73 + 8 + 28 + 3 + 2147516416 + + + 77 + 8 + 29 + 3 + 2147516416 + + + 65 + 8 + 30 + 3 + 2147516416 + + + 69 + 8 + 31 + 3 + 2147516416 + + + + + diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/default_sku b/device/mellanox/x86_64-mlnx_msn4700-r0/default_sku new file mode 100644 index 00000000000..80e541477f7 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/default_sku @@ -0,0 +1 @@ +ACS-MSN4700 t1 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot new file mode 120000 index 00000000000..43c8ea56749 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_reboot @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_wait b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_wait new file mode 120000 index 00000000000..4b30bd42985 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_wait @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/platform_wait \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/eeprom.py b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/eeprom.py new file mode 120000 index 00000000000..b4e2a6a6167 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/eeprom.py @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/plugins/eeprom.py \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/psuutil.py b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/psuutil.py new file mode 120000 index 00000000000..9f724238a8d --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/psuutil.py @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/plugins/psuutil.py \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmget.py b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmget.py new file mode 120000 index 00000000000..2e84f435abd --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmget.py @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/plugins/sfplpmget.py \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmset.py b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmset.py new file mode 120000 index 00000000000..6a88bac3046 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfplpmset.py @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/plugins/sfplpmset.py \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfpreset.py b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfpreset.py new file mode 120000 index 00000000000..fef2063e349 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfpreset.py @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/plugins/sfpreset.py \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfputil.py new file mode 120000 index 00000000000..45909b880fc --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/plugins/sfputil.py @@ -0,0 +1 @@ +../../x86_64-mlnx_msn2700-r0/plugins/sfputil.py \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json new file mode 120000 index 00000000000..435a2ce7c0b --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/pmon_daemon_control.json @@ -0,0 +1 @@ +../x86_64-mlnx_msn2700-r0/pmon_daemon_control.json \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf new file mode 100644 index 00000000000..376d079390a --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf @@ -0,0 +1,116 @@ +################################################################################ +# Copyright (c) 2019 Mellanox Technologies +# +# Platform specific sensors config for SN3700 +################################################################################ + +# Temperature sensors +bus "i2c-2" "i2c-1-mux (chan_id 1)" + chip "mlxsw-i2c-*-48" + label temp1 "Ambient ASIC Temp" + +bus "i2c-7" "i2c-1-mux (chan_id 6)" + chip "tmp102-i2c-*-49" + label temp1 "Ambient Fan Side Temp (air intake)" + chip "tmp102-i2c-*-4a" + label temp1 "Ambient Port Side Temp (air exhaust)" + +bus "i2c-15" "i2c-1-mux (chan_id 6)" + chip "tmp102-i2c-15-49" + label temp1 "Ambient COMEX Temp" + +# Power controllers +bus "i2c-5" "i2c-1-mux (chan_id 4)" + chip "tps53679-i2c-*-70" + label in1 "PMIC-1 PSU 12V Rail (in)" + label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)" + label in3 "PMIC-1 ASIC 1.2V Rail (out)" + label temp1 "PMIC-1 Temp 1" + label temp2 "PMIC-1 Temp 2" + label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)" + label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)" + label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)" + label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)" + chip "tps53679-i2c-*-71" + label in1 "PMIC-2 PSU 12V Rail (in)" + label in2 "PMIC-2 ASIC 3.3V Rail (out)" + compute in2 (1.5)*@, @/(1.5) + label in3 "PMIC-2 ASIC 1.8V Rail (out)" + label temp1 "PMIC-2 Temp 1" + label temp2 "PMIC-2 Temp 2" + label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)" + label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)" + label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)" + label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)" + +bus "i2c-15" "i2c-1-mux (chan_id 6)" + chip "tps53679-i2c-*-58" + label in1 "PMIC-3 PSU 12V Rail (in)" + label in2 "PMIC-3 COMEX 1.8V Rail (out)" + label in3 "PMIC-3 COMEX 1.05V Rail (out)" + label temp1 "PMIC-3 Temp 1" + label temp2 "PMIC-3 Temp 2" + label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)" + label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)" + label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)" + label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)" + chip "tps53679-i2c-*-61" + label in1 "PMIC-4 PSU 12V Rail (in)" + label in2 "PMIC-4 COMEX 1.2V Rail (out)" + ignore in3 + label temp1 "PMIC-4 Temp 1" + label temp2 "PMIC-4 Temp 2" + label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)" + ignore power2 + label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)" + ignore curr2 + +# Power supplies +bus "i2c-4" "i2c-1-mux (chan_id 3)" + chip "dps460-i2c-*-58" + label in1 "PSU-1 220V Rail (in)" + ignore in2 + label in3 "PSU-1 12V Rail (out)" + label fan1 "PSU-1 Fan 1" + ignore fan2 + ignore fan3 + label temp1 "PSU-1 Temp 1" + label temp2 "PSU-1 Temp 2" + label temp3 "PSU-1 Temp 3" + label power1 "PSU-1 220V Rail Pwr (in)" + label power2 "PSU-1 12V Rail Pwr (out)" + label curr1 "PSU-1 220V Rail Curr (in)" + label curr2 "PSU-1 12V Rail Curr (out)" + chip "dps460-i2c-*-59" + label in1 "PSU-2 220V Rail (in)" + ignore in2 + label in3 "PSU-2 12V Rail (out)" + label fan1 "PSU-2 Fan 1" + ignore fan2 + ignore fan3 + label temp1 "PSU-2 Temp 1" + label temp2 "PSU-2 Temp 2" + label temp3 "PSU-2 Temp 3" + label power1 "PSU-2 220V Rail Pwr (in)" + label power2 "PSU-2 12V Rail Pwr (out)" + label curr1 "PSU-2 220V Rail Curr (in)" + label curr2 "PSU-2 12V Rail Curr (out)" + +# Chassis fans +chip "mlxreg_fan-isa-*" + label fan1 "Chassis Fan Drawer-1 Tach 1" + label fan2 "Chassis Fan Drawer-1 Tach 2" + label fan3 "Chassis Fan Drawer-2 Tach 1" + label fan4 "Chassis Fan Drawer-2 Tach 2" + label fan5 "Chassis Fan Drawer-3 Tach 1" + label fan6 "Chassis Fan Drawer-3 Tach 2" + label fan7 "Chassis Fan Drawer-4 Tach 1" + label fan8 "Chassis Fan Drawer-4 Tach 2" + label fan9 "Chassis Fan Drawer-5 Tach 1" + label fan10 "Chassis Fan Drawer-5 Tach 2" + label fan11 "Chassis Fan Drawer-6 Tach 1" + label fan12 "Chassis Fan Drawer-6 Tach 2" + +# Miscellaneous +chip "*-virtual-*" + ignore temp1 diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/ACS-MSN4700 b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/ACS-MSN4700 new file mode 120000 index 00000000000..3f61c9909a6 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/ACS-MSN4700 @@ -0,0 +1 @@ +../x86_64-mlnx_msn4700-r0/ACS-MSN4700 \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/default_sku b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/default_sku new file mode 120000 index 00000000000..6f72f84de68 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/default_sku @@ -0,0 +1 @@ +../x86_64-mlnx_msn4700-r0/default_sku \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot new file mode 120000 index 00000000000..217dd41dbf8 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot @@ -0,0 +1 @@ +../x86_64-mlnx_msn4700-r0/platform_reboot \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/plugins b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/plugins new file mode 120000 index 00000000000..e98a1d3fbae --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/plugins @@ -0,0 +1 @@ +../x86_64-mlnx_msn4700-r0/plugins \ No newline at end of file diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json new file mode 100644 index 00000000000..40fc367acf3 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/pmon_daemon_control.json @@ -0,0 +1,5 @@ +{ + "skip_ledd": true, + "skip_xcvrd": true, + "skip_psud": true +} diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/syseeprom.hex b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/syseeprom.hex new file mode 100644 index 00000000000..b50ffa5a023 --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/syseeprom.hex @@ -0,0 +1,256 @@ +54 6c 76 49 6e 66 6f 00 01 02 53 21 40 4d 53 4e +33 37 30 30 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 22 14 4d +53 4e 33 37 30 30 2d 56 53 32 46 00 00 00 00 00 +00 00 00 23 18 4d 54 31 38 35 31 58 30 32 39 36 +31 00 00 00 00 00 00 00 00 00 00 00 00 24 06 98 +03 9b 94 d4 80 25 13 31 32 2f 32 38 2f 32 30 31 +38 20 30 34 3a 34 32 3a 31 38 26 01 00 2a 02 00 +fe 2b 08 4d 65 6c 6c 61 6e 6f 78 fd 24 00 00 81 +19 00 16 01 01 00 56 00 00 4d 4c 4e 58 02 01 0c +05 0e 02 10 06 12 07 00 00 00 00 00 00 00 00 00 +00 fd a4 00 00 81 19 00 92 00 03 01 01 00 00 4d +54 31 38 35 31 58 30 32 39 36 31 00 00 00 00 00 +00 00 00 00 00 00 00 4d 53 4e 33 37 30 30 2d 56 +53 32 46 00 00 00 00 00 00 00 00 41 32 00 00 00 +3a 82 b8 41 6e 61 63 6f 6e 64 61 20 45 74 68 20 +32 30 30 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 70 00 00 00 0e 74 4d 53 4e 33 37 +30 30 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 fd 24 00 00 81 19 00 10 00 +03 05 e8 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 fd 24 00 +00 81 19 00 1e 00 11 02 85 00 00 0d 00 00 00 00 +00 00 00 98 03 9b 94 d4 80 00 fe 98 03 9b 03 00 +94 d4 80 fd 24 00 00 81 19 00 12 00 01 06 81 00 +00 00 46 00 00 08 00 06 06 06 06 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 fd 14 00 00 81 19 00 +0e 00 02 07 99 00 00 30 00 20 00 00 00 00 00 28 +40 78 38 36 5f 36 34 2d 6d 6c 6e 78 5f 6d 73 6e +33 37 30 30 2d 72 30 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 29 15 32 30 31 38 2e 31 31 2d 35 2e 32 2e 30 +30 30 38 2d 39 36 30 30 fe 04 89 cb 82 5b 00 00 +00 00 00 fe 04 72 60 7f 13 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 From 6e87e75efcdad80291fc1703f622449ca5dea8f4 Mon Sep 17 00:00:00 2001 From: keboliu Date: Fri, 13 Dec 2019 10:53:11 +0200 Subject: [PATCH 02/14] update ACS-MSN4700 sai profile --- .../ACS-MSN4700/sai_4700.xml | 135 +++++++++--------- 1 file changed, 68 insertions(+), 67 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml index 5f916ec670f..d3ef5bb0683 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml @@ -11,229 +11,230 @@ - 101 + 1 8 - 0 - - + 17 3 - 2147516416 - 97 + 5 8 - 1 + 16 3 2147516416 - 109 + 9 8 - 2 + 19 3 2147516416 - 105 + 13 8 - 3 + 18 3 2147516416 - 117 + 17 8 - 4 + 21 3 2147516416 - 113 + 21 8 - 5 + 20 3 2147516416 - 125 + 25 8 - 6 + 23 3 2147516416 - 121 + 29 8 - 7 + 22 3 2147516416 - 61 + 33 8 - 8 + 29 3 2147516416 - 57 + 37 8 - 9 + 28 3 2147516416 - 53 + 41 8 - 10 + 31 3 2147516416 - 49 + 45 8 - 11 + 30 3 2147516416 - 45 + 49 8 - 12 + 25 3 2147516416 - 41 + 53 8 - 13 + 24 3 2147516416 - 37 + 57 8 - 14 + 27 3 2147516416 - 33 + 61 8 - 15 + 26 3 2147516416 - 1 + 65 8 - 16 + 14 3 2147516416 - 5 + 69 8 - 17 + 15 3 2147516416 - 9 + 73 8 - 18 + 12 3 2147516416 - 13 + 77 8 - 19 + 13 3 2147516416 - 17 + 81 8 - 20 + 10 3 2147516416 - 21 + 85 8 - 21 + 11 3 2147516416 - 25 + 89 8 - 22 + 8 3 2147516416 - 29 + 93 8 - 23 + 9 3 2147516416 - 89 + 97 8 - 24 + 2 3 2147516416 - 93 + 101 8 - 25 + 3 3 2147516416 - 81 + 105 8 - 26 + 0 + + 3 + + 2147516416 - 85 + 109 8 - 27 + 1 3 2147516416 - 73 + 113 8 - 28 + 6 3 2147516416 - 77 + 117 8 - 29 + 7 3 2147516416 - 65 + 121 8 - 30 + 4 3 2147516416 - 69 + 125 8 - 31 + 5 3 2147516416 From dab58cfb381837252dcfbec585614a52b6c88fb9 Mon Sep 17 00:00:00 2001 From: keboliu Date: Mon, 20 Jan 2020 08:07:08 +0200 Subject: [PATCH 03/14] update buffer pool size, headroom, sensor conf, port config and reboot scripts --- .../ACS-MSN4700/buffers_defaults_t0.j2 | 8 +- .../ACS-MSN4700/buffers_defaults_t1.j2 | 6 +- .../ACS-MSN4700/pg_profile_lookup.ini | 3 + .../ACS-MSN4700/port_config.ini | 62 +++---- .../ACS-MSN4700/sai_4700.xml | 2 +- .../x86_64-mlnx_msn4700-r0/sensors.conf | 152 ++++++++++++------ .../platform_reboot | 2 +- 7 files changed, 142 insertions(+), 93 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 index ca07124a51d..0f974367285 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '20807680' %} -{% set ingress_lossy_pool_size = '20807680' %} -{% set egress_lossless_pool_size = '20807680' %} -{% set egress_lossy_pool_size = '20807680' %} +{% set ingress_lossless_pool_size = '30973952' %} +{% set ingress_lossy_pool_size = '30973952' %} +{% set egress_lossless_pool_size = '67108864' %} +{% set egress_lossy_pool_size = '30973952' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 index c5a269320e0..c2927623416 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '31522816' %} -{% set ingress_lossy_pool_size = '31522816' %} +{% set ingress_lossless_pool_size = '19283968' %} +{% set ingress_lossy_pool_size = '19283968' %} {% set egress_lossless_pool_size = '67108864' %} -{% set egress_lossy_pool_size = '31522816' %} +{% set egress_lossy_pool_size = '19283968' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini index 6cd06326cf3..174f72baef0 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -6,6 +6,7 @@ 50000 5m 37888 18432 19456 0 100000 5m 38912 18432 20480 0 200000 5m 41984 18432 23552 0 + 400000 5m 48128 19456 28672 0 1000 40m 36864 18432 18432 0 10000 40m 38912 18432 20480 0 25000 40m 41984 18432 23552 0 @@ -13,6 +14,7 @@ 50000 40m 47104 18432 28672 0 100000 40m 59392 18432 40960 0 200000 40m 81920 18432 63488 0 + 400000 40m 128000 19456 108544 0 1000 300m 37888 18432 19456 0 10000 300m 53248 18432 34816 0 25000 300m 78848 18432 60416 0 @@ -20,3 +22,4 @@ 50000 300m 121856 18432 103424 0 100000 300m 206848 18432 188416 0 200000 300m 376832 18432 358400 0 + 400000 300m 718848 19456 699392 0 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini index 4b2464cc48c..99606f24bd0 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini @@ -1,33 +1,33 @@ # name lanes alias Ethernet0 0,1,2,3,4,5,6,7 etp1 -Ethernet4 8,9,10,11,12,13,14,15 etp2 -Ethernet8 16,17,18,19,20,21,22,23 etp3 -Ethernet12 24,25,26,27,28,29,30,31 etp4 -Ethernet16 32,33,34,35,36,37,38,39 etp5 -Ethernet20 40,41,42,43,44,45,46,47 etp6 -Ethernet24 48,49,50,51,52,53,54,55 etp7 -Ethernet28 56,57,58,59,60,61,62,63 etp8 -Ethernet32 64,65,66,67,68,69,70,71 etp9 -Ethernet36 72,73,74,75,76,77,78,79 etp10 -Ethernet40 80,81,82,83,84,85,86,87 etp11 -Ethernet44 88,89,90,91,92,93,94,95 etp12 -Ethernet48 96,97,98,99,100,101,102,103 etp13 -Ethernet52 104,105,106,107,108,109,110,111 etp14 -Ethernet56 112,113,114,115,116,117,118,119 etp15 -Ethernet60 120,121,122,123,124,125,126,127 etp16 -Ethernet64 128,129,130,131,132,133,134,135 etp17 -Ethernet68 136,137,138,139,140,141,142,143 etp18 -Ethernet72 144,145,146,147,148,149,150,151 etp19 -Ethernet76 152,153,154,155,156,157,158,159 etp20 -Ethernet80 160,161,162,163,164,165,166,167 etp21 -Ethernet84 168,169,170,171,172,173,174,175 etp22 -Ethernet88 176,177,178,179,180,181,182,183 etp23 -Ethernet92 184,185,186,187,188,189,190,191 etp24 -Ethernet96 192,193,194,195,196,197,198,199 etp25 -Ethernet100 200,201,202,203,204,205,206,207 etp26 -Ethernet104 208,209,210,211,212,213,214,215 etp27 -Ethernet108 216,217,218,219,220,221,222,223 etp28 -Ethernet112 224,225,226,227,228,229,230,231 etp29 -Ethernet116 232,233,234,235,236,237,238,239 etp30 -Ethernet120 240,241,242,243,244,245,246,247 etp31 -Ethernet124 248,249,250,251,252,253,254,255 etp32 +Ethernet8 8,9,10,11,12,13,14,15 etp2 +Ethernet16 16,17,18,19,20,21,22,23 etp3 +Ethernet24 24,25,26,27,28,29,30,31 etp4 +Ethernet32 32,33,34,35,36,37,38,39 etp5 +Ethernet40 40,41,42,43,44,45,46,47 etp6 +Ethernet48 48,49,50,51,52,53,54,55 etp7 +Ethernet56 56,57,58,59,60,61,62,63 etp8 +Ethernet64 64,65,66,67,68,69,70,71 etp9 +Ethernet72 72,73,74,75,76,77,78,79 etp10 +Ethernet80 80,81,82,83,84,85,86,87 etp11 +Ethernet88 88,89,90,91,92,93,94,95 etp12 +Ethernet96 96,97,98,99,100,101,102,103 etp13 +Ethernet104 104,105,106,107,108,109,110,111 etp14 +Ethernet112 112,113,114,115,116,117,118,119 etp15 +Ethernet120 120,121,122,123,124,125,126,127 etp16 +Ethernet128 128,129,130,131,132,133,134,135 etp17 +Ethernet136 136,137,138,139,140,141,142,143 etp18 +Ethernet144 144,145,146,147,148,149,150,151 etp19 +Ethernet152 152,153,154,155,156,157,158,159 etp20 +Ethernet160 160,161,162,163,164,165,166,167 etp21 +Ethernet168 168,169,170,171,172,173,174,175 etp22 +Ethernet176 176,177,178,179,180,181,182,183 etp23 +Ethernet184 184,185,186,187,188,189,190,191 etp24 +Ethernet192 192,193,194,195,196,197,198,199 etp25 +Ethernet200 200,201,202,203,204,205,206,207 etp26 +Ethernet208 208,209,210,211,212,213,214,215 etp27 +Ethernet216 216,217,218,219,220,221,222,223 etp28 +Ethernet224 224,225,226,227,228,229,230,231 etp29 +Ethernet232 232,233,234,235,236,237,238,239 etp30 +Ethernet240 240,241,242,243,244,245,246,247 etp31 +Ethernet248 248,249,250,251,252,253,254,255 etp32 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml index d3ef5bb0683..402c2fdd3e5 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml @@ -3,7 +3,7 @@ - 00:02:03:04:05:40 + 00:02:03:04:05:00 32 diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf index 376d079390a..b720b346d1b 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf @@ -1,7 +1,7 @@ ################################################################################ # Copyright (c) 2019 Mellanox Technologies # -# Platform specific sensors config for SN3700 +# Platform specific sensors config for SN4700 ################################################################################ # Temperature sensors @@ -21,80 +21,126 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)" # Power controllers bus "i2c-5" "i2c-1-mux (chan_id 4)" - chip "tps53679-i2c-*-70" + chip "tps53679-i2c-*-62" label in1 "PMIC-1 PSU 12V Rail (in)" - label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)" - label in3 "PMIC-1 ASIC 1.2V Rail (out)" + label in2 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail (out)" + ignore in3 label temp1 "PMIC-1 Temp 1" label temp2 "PMIC-1 Temp 2" - label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)" - label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)" - label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)" - label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)" - chip "tps53679-i2c-*-71" + label power1 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Pwr (out)" + ignore power2 + label curr1 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Curr (out)" + ignore curr2 + chip "tps53679-i2c-*-64" label in1 "PMIC-2 PSU 12V Rail (in)" - label in2 "PMIC-2 ASIC 3.3V Rail (out)" + label in2 "PMIC-2 ASIC 1.8V MAIN Rail (out)" compute in2 (1.5)*@, @/(1.5) - label in3 "PMIC-2 ASIC 1.8V Rail (out)" + label in3 "PMIC-2 ASIC 1.2V MAIN Rail (out)" label temp1 "PMIC-2 Temp 1" label temp2 "PMIC-2 Temp 2" - label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)" - label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)" - label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)" - label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)" - -bus "i2c-15" "i2c-1-mux (chan_id 6)" - chip "tps53679-i2c-*-58" + label power1 "PMIC-2 ASIC 1.8V MAIN Rail Pwr (out)" + label power2 "PMIC-2 ASIC 1.2V MAIN Rail Pwr (out)" + label curr1 "PMIC-2 ASIC 1.8V MAIN Rail Curr (out)" + label curr2 "PMIC-2 ASIC 1.2V MAIN Rail Curr (out)" + chip "tps53679-i2c-*-66" label in1 "PMIC-3 PSU 12V Rail (in)" - label in2 "PMIC-3 COMEX 1.8V Rail (out)" - label in3 "PMIC-3 COMEX 1.05V Rail (out)" + label in2 "PMIC-3 ASIC 0.85V VCORE_T0_1 Rail (out)" + label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)" label temp1 "PMIC-3 Temp 1" label temp2 "PMIC-3 Temp 2" - label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)" - label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)" - label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)" - label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)" - chip "tps53679-i2c-*-61" + label power1 "PMIC-3 ASIC 0.85V VCORE_T0_1 Rail Pwr (out)" + label power2 "PMIC-3 ASIC 1.8V T0_1 Rail Pwr (out)" + label curr1 "PMIC-3 ASIC 0.85V VCORE_T0_1 Rail Curr (out)" + label curr2 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)" + chip "tps53679-i2c-*-68" label in1 "PMIC-4 PSU 12V Rail (in)" - label in2 "PMIC-4 COMEX 1.2V Rail (out)" - ignore in3 + label in2 "PMIC-4 ASIC 0.85V VCORE_T2_3 Rail (out)" + label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)" label temp1 "PMIC-4 Temp 1" label temp2 "PMIC-4 Temp 2" - label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)" + label power1 "PMIC-4 ASIC 0.85V VCORE_T2_3 Rail Pwr (out)" + label power2 "PMIC-4 ASIC 1.8V T2_3 Rail Pwr (out)" + label curr1 "PMIC-4 ASIC 0.85V VCORE_T2_3 Rail Curr (out)" + label curr2 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)" + chip "tps53679-i2c-*-6a" + label in1 "PMIC-5 PSU 12V Rail (in)" + label in2 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail (out)" + label in3 "PMIC-5 ASIC 1.8V T4_5 Rail (out)" + label temp1 "PMIC-5 Temp 1" + label temp2 "PMIC-5 Temp 2" + label power1 "PMIC-5 ASIC 0.85V VCORE_T4_4 Rail Pwr (out)" + label power2 "PMIC-5 ASIC 1.8V T4_5 Rail Pwr (out)" + label curr1 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail Curr (out)" + label curr2 "PMIC-5 ASIC 1.8V T4_5 Rail Curr (out)" + chip "tps53679-i2c-*-6c" + label in1 "PMIC-6 PSU 12V Rail (in)" + label in2 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail (out)" + label in3 "PMIC-6 ASIC 1.8V T6_7 Rail (out)" + label temp1 "PMIC-6 Temp 1" + label temp2 "PMIC-6 Temp 2" + label power1 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)" + label power2 "PMIC-6 ASIC 1.8V T6_7 Rail Pwr (out)" + label curr1 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Curr (out)" + label curr2 "PMIC-6 ASIC 1.8V T6_7 Rail Curr (out)" + chip "tps53679-i2c-*-6e" + label in1 "PMIC-7 PSU 12V Rail (in)" + label in2 "PMIC-7 ASIC 1.2V T0_3 Rail (out)" + label in3 "PMIC-7 ASIC 1.2V T4_7 Rail (out)" + label temp1 "PMIC-7 Temp 1" + label temp2 "PMIC-7 Temp 2" + label power1 "PMIC-7 ASIC 1.2V T0_3 Rail Pwr (out)" + label power2 "PMIC-7 ASIC 1.2V T4_7 Rail Pwr (out)" + label curr1 "PMIC-7 ASIC 1.2V T0_3 Rail Curr (out)" + label curr2 "PMIC-7 ASIC 1.2V T4_7 Rail Curr (out)" + +bus "i2c-15" "i2c-1-mux (chan_id 6)" + chip "tps53679-i2c-*-58" + label in1 "PMIC-8 PSU 12V Rail (in)" + label in2 "PMIC-8 COMEX 1.8V Rail (out)" + label in3 "PMIC-8 COMEX 1.05V Rail (out)" + label temp1 "PMIC-8 Temp 1" + label temp2 "PMIC-8 Temp 2" + label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)" + label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)" + label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)" + label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)" + chip "tps53679-i2c-*-61" + label in1 "PMIC-9 PSU 12V Rail (in)" + label in2 "PMIC-9 COMEX 1.2V Rail (out)" + ignore in3 + label temp1 "PMIC-9 Temp 1" + label temp2 "PMIC-9 Temp 2" + label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)" ignore power2 - label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)" + label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)" ignore curr2 # Power supplies bus "i2c-4" "i2c-1-mux (chan_id 3)" chip "dps460-i2c-*-58" - label in1 "PSU-1 220V Rail (in)" + label in1 "PSU-1(L) 220V Rail (in)" ignore in2 - label in3 "PSU-1 12V Rail (out)" - label fan1 "PSU-1 Fan 1" - ignore fan2 - ignore fan3 - label temp1 "PSU-1 Temp 1" - label temp2 "PSU-1 Temp 2" - label temp3 "PSU-1 Temp 3" - label power1 "PSU-1 220V Rail Pwr (in)" - label power2 "PSU-1 12V Rail Pwr (out)" - label curr1 "PSU-1 220V Rail Curr (in)" - label curr2 "PSU-1 12V Rail Curr (out)" + label in3 "PSU-1(L) 12V Rail (out)" + label fan1 "PSU-1(L) Fan 1" + label temp1 "PSU-1(L) Temp 1" + label temp2 "PSU-1(L) Temp 2" + label temp3 "PSU-1(L) Temp 3" + label power1 "PSU-1(L) 220V Rail Pwr (in)" + label power2 "PSU-1(L) 12V Rail Pwr (out)" + label curr1 "PSU-1(L) 220V Rail Curr (in)" + label curr2 "PSU-1(L) 12V Rail Curr (out)" chip "dps460-i2c-*-59" - label in1 "PSU-2 220V Rail (in)" + label in1 "PSU-2(R) 220V Rail (in)" ignore in2 - label in3 "PSU-2 12V Rail (out)" - label fan1 "PSU-2 Fan 1" - ignore fan2 - ignore fan3 - label temp1 "PSU-2 Temp 1" - label temp2 "PSU-2 Temp 2" - label temp3 "PSU-2 Temp 3" - label power1 "PSU-2 220V Rail Pwr (in)" - label power2 "PSU-2 12V Rail Pwr (out)" - label curr1 "PSU-2 220V Rail Curr (in)" - label curr2 "PSU-2 12V Rail Curr (out)" + label in3 "PSU-2(R) 12V Rail (out)" + label fan1 "PSU-2(R) Fan 1" + label temp1 "PSU-2(R) Temp 1" + label temp2 "PSU-2(R) Temp 2" + label temp3 "PSU-2(R) Temp 3" + label power1 "PSU-2(R) 220V Rail Pwr (in)" + label power2 "PSU-2(R) 12V Rail Pwr (out)" + label curr1 "PSU-2(R) 220V Rail Curr (in)" + label curr2 "PSU-2(R) 12V Rail Curr (out)" # Chassis fans chip "mlxreg_fan-isa-*" diff --git a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot index 217dd41dbf8..dfaf5341766 120000 --- a/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot +++ b/device/mellanox/x86_64-mlnx_msn4700_simx-r0/platform_reboot @@ -1 +1 @@ -../x86_64-mlnx_msn4700-r0/platform_reboot \ No newline at end of file +../x86_64-mlnx_msn2700_simx-r0/platform_reboot \ No newline at end of file From 0a3d73bb450c7e75eb7e5d9e38c53a8b2eb7ee52 Mon Sep 17 00:00:00 2001 From: keboliu Date: Wed, 22 Jan 2020 03:26:29 +0200 Subject: [PATCH 04/14] fix ident --- .../x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini index 174f72baef0..47b3e9abffe 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -14,7 +14,7 @@ 50000 40m 47104 18432 28672 0 100000 40m 59392 18432 40960 0 200000 40m 81920 18432 63488 0 - 400000 40m 128000 19456 108544 0 + 400000 40m 128000 19456 108544 0 1000 300m 37888 18432 19456 0 10000 300m 53248 18432 34816 0 25000 300m 78848 18432 60416 0 From 5a68a0b970ce6a21f47804abbb5128ef1e996da0 Mon Sep 17 00:00:00 2001 From: keboliu Date: Mon, 3 Feb 2020 16:56:31 +0200 Subject: [PATCH 05/14] update sensor conf and buffer pool --- .../ACS-MSN4700/buffers_defaults_t0.j2 | 8 ++++---- .../ACS-MSN4700/buffers_defaults_t1.j2 | 8 ++++---- device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 index 0f974367285..633e7e05551 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '30973952' %} -{% set ingress_lossy_pool_size = '30973952' %} -{% set egress_lossless_pool_size = '67108864' %} -{% set egress_lossy_pool_size = '30973952' %} +{% set ingress_lossless_pool_size = '27828216' %} +{% set ingress_lossy_pool_size = '27828216' %} +{% set egress_lossless_pool_size = '60817392' %} +{% set egress_lossy_pool_size = '27828216' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 index c2927623416..f22cad82e4b 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '19283968' %} -{% set ingress_lossy_pool_size = '19283968' %} -{% set egress_lossless_pool_size = '67108864' %} -{% set egress_lossy_pool_size = '19283968' %} +{% set ingress_lossless_pool_size = '16138232' %} +{% set ingress_lossy_pool_size = '16138232' %} +{% set egress_lossless_pool_size = '60817392' %} +{% set egress_lossy_pool_size = '16138232' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf index b720b346d1b..b4eaf76f2ec 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf @@ -68,7 +68,7 @@ bus "i2c-5" "i2c-1-mux (chan_id 4)" label in3 "PMIC-5 ASIC 1.8V T4_5 Rail (out)" label temp1 "PMIC-5 Temp 1" label temp2 "PMIC-5 Temp 2" - label power1 "PMIC-5 ASIC 0.85V VCORE_T4_4 Rail Pwr (out)" + label power1 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail Pwr (out)" label power2 "PMIC-5 ASIC 1.8V T4_5 Rail Pwr (out)" label curr1 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail Curr (out)" label curr2 "PMIC-5 ASIC 1.8V T4_5 Rail Curr (out)" From ac37b1e28acf737c3ff789c0c990527ff42ab5bd Mon Sep 17 00:00:00 2001 From: Nazarii Hnydyn Date: Tue, 28 Jan 2020 11:34:40 +0200 Subject: [PATCH 06/14] [sn4700] add sku 4700 to chassis.py --- platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py index d34245390c5..a3324d3f2b3 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py @@ -48,7 +48,7 @@ # magic code defnition for port number, qsfp port position of each hwsku # port_position_tuple = (PORT_START, QSFP_PORT_START, PORT_END, PORT_IN_BLOCK, EEPROM_OFFSET) -hwsku_dict_port = {'ACS-MSN2010': 3, 'ACS-MSN2100': 1, 'ACS-MSN2410': 2, 'ACS-MSN2700': 0, 'Mellanox-SN2700': 0, 'Mellanox-SN2700-D48C8': 0, 'LS-SN2700':0, 'ACS-MSN2740': 0, 'ACS-MSN3700': 0, 'ACS-MSN3700C': 0, 'ACS-MSN3800': 4} +hwsku_dict_port = {'ACS-MSN2010': 3, 'ACS-MSN2100': 1, 'ACS-MSN2410': 2, 'ACS-MSN2700': 0, 'Mellanox-SN2700': 0, 'Mellanox-SN2700-D48C8': 0, 'LS-SN2700':0, 'ACS-MSN2740': 0, 'ACS-MSN3700': 0, 'ACS-MSN3700C': 0, 'ACS-MSN3800': 4, 'ACS-MSN4700': 0} port_position_tuple_list = [(0, 0, 31, 32, 1), (0, 0, 15, 16, 1), (0, 48, 55, 56, 1), (0, 18, 21, 22, 1), (0, 0, 63, 64, 1)] class Chassis(ChassisBase): From bffa31b5169113d3cb7d215050db854a97deba2b Mon Sep 17 00:00:00 2001 From: junchao Date: Tue, 18 Feb 2020 16:48:51 +0800 Subject: [PATCH 07/14] [Mellanox-4700] Add 4700 info to psu and thermal platform API --- .../mlnx-platform-api/sonic_platform/psu.py | 4 ++-- .../sonic_platform/thermal.py | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py index 0e4c3fd50f7..302db43228c 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/psu.py @@ -37,7 +37,7 @@ # in most SKUs the file psuX_curr, psuX_volt and psuX_power contain current, voltage and power data respectively. # but there are exceptions which will be handled by the following dictionary -hwsku_dict_psu = {'ACS-MSN3700': 1, 'ACS-MSN3700C': 1, 'ACS-MSN3800': 1} +hwsku_dict_psu = {'ACS-MSN3700': 1, 'ACS-MSN3700C': 1, 'ACS-MSN3800': 1, 'ACS-MSN4700': 1} psu_profile_list = [ # default filename convention { @@ -45,7 +45,7 @@ PSU_VOLTAGE : "power/psu{}_volt", PSU_POWER : "power/psu{}_power" }, - # for 3700, 3700c, 3800 + # for 3700, 3700c, 3800, 4700 { PSU_CURRENT : "power/psu{}_curr", PSU_VOLTAGE : "power/psu{}_volt_out2", diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py index 6862b3fb258..038f7147af2 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py @@ -106,7 +106,7 @@ THERMAL_API_GET_HIGH_THRESHOLD ] -hwsku_dict_thermal = {'ACS-MSN2700': 0, 'LS-SN2700':0, 'ACS-MSN2740': 3, 'ACS-MSN2100': 1, 'ACS-MSN2410': 2, 'ACS-MSN2010': 4, 'ACS-MSN3700': 5, 'ACS-MSN3700C': 6, 'Mellanox-SN2700': 0, 'Mellanox-SN2700-D48C8': 0, 'ACS-MSN3800': 7} +hwsku_dict_thermal = {'ACS-MSN2700': 0, 'LS-SN2700':0, 'ACS-MSN2740': 3, 'ACS-MSN2100': 1, 'ACS-MSN2410': 2, 'ACS-MSN2010': 4, 'ACS-MSN3700': 5, 'ACS-MSN3700C': 6, 'Mellanox-SN2700': 0, 'Mellanox-SN2700-D48C8': 0, 'ACS-MSN3800': 7, 'ACS-MSN4700': 8} thermal_profile_list = [ # 2700 { @@ -231,6 +231,22 @@ ] ) }, + # 4700 + { + THERMAL_DEV_CATEGORY_CPU_CORE:(0, 4), + THERMAL_DEV_CATEGORY_MODULE:(1, 32), + THERMAL_DEV_CATEGORY_PSU:(1, 2), + THERMAL_DEV_CATEGORY_CPU_PACK:(0,1), + THERMAL_DEV_CATEGORY_GEARBOX:(0,0), + THERMAL_DEV_CATEGORY_AMBIENT:(0, + [ + THERMAL_DEV_ASIC_AMBIENT, + THERMAL_DEV_COMEX_AMBIENT, + THERMAL_DEV_PORT_AMBIENT, + THERMAL_DEV_FAN_AMBIENT + ] + ) + } ] def initialize_thermals(sku, thermal_list, psu_list): From 8a5aa219477a90f5149191c80fc38e2675354c81 Mon Sep 17 00:00:00 2001 From: keboliu Date: Mon, 2 Mar 2020 15:29:42 +0800 Subject: [PATCH 08/14] update buffer config file template to the latest. update SAI profile to use 100G X 4lanes for now update port_config.ini according to the SAI profile --- .../ACS-MSN4700/buffers_defaults_t0.j2 | 31 +++-- .../ACS-MSN4700/buffers_defaults_t1.j2 | 31 +++-- .../ACS-MSN4700/port_config.ini | 66 ++++----- .../ACS-MSN4700/sai.profile | 2 +- .../{sai_4700.xml => sai_4700_100G.xml} | 128 +++++++++--------- 5 files changed, 144 insertions(+), 114 deletions(-) rename device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/{sai_4700.xml => sai_4700_100G.xml} (69%) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 index 633e7e05551..f26b0353261 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 @@ -65,27 +65,42 @@ {%- macro generate_profile_lists(port_names) %} "BUFFER_PORT_INGRESS_PROFILE_LIST": { - "{{ port_names }}": { +{% for port in port_names.split(',') %} + "{{ port }}": { "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]" - } + }{% if not loop.last %},{% endif %} + +{% endfor %} }, "BUFFER_PORT_EGRESS_PROFILE_LIST": { - "{{ port_names }}": { +{% for port in port_names.split(',') %} + "{{ port }}": { "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" - } + }{% if not loop.last %},{% endif %} + +{% endfor %} } {%- endmacro %} {%- macro generate_queue_buffers(port_names) %} "BUFFER_QUEUE": { - "{{ port_names }}|3-4": { +{% for port in port_names.split(',') %} + "{{ port }}|3-4": { "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" }, - "{{ port_names }}|0-1": { +{% endfor %} +{% for port in port_names.split(',') %} + "{{ port }}|0-2": { "profile" : "[BUFFER_PROFILE|q_lossy_profile]" }, - "{{ port_names }}|5": { +{% endfor %} +{% for port in port_names.split(',') %} + "{{ port }}|5-6": { "profile" : "[BUFFER_PROFILE|q_lossy_profile]" - } + }{% if not loop.last %},{% endif %} + +{% endfor %} } {%- endmacro %} + + diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 index f22cad82e4b..51b51d2479c 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 @@ -65,27 +65,42 @@ {%- macro generate_profile_lists(port_names) %} "BUFFER_PORT_INGRESS_PROFILE_LIST": { - "{{ port_names }}": { +{% for port in port_names.split(',') %} + "{{ port }}": { "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]" - } + }{% if not loop.last %},{% endif %} + +{% endfor %} }, "BUFFER_PORT_EGRESS_PROFILE_LIST": { - "{{ port_names }}": { +{% for port in port_names.split(',') %} + "{{ port }}": { "profile_list" : "[BUFFER_PROFILE|egress_lossless_profile],[BUFFER_PROFILE|egress_lossy_profile]" - } + }{% if not loop.last %},{% endif %} + +{% endfor %} } {%- endmacro %} {%- macro generate_queue_buffers(port_names) %} "BUFFER_QUEUE": { - "{{ port_names }}|3-4": { +{% for port in port_names.split(',') %} + "{{ port }}|3-4": { "profile" : "[BUFFER_PROFILE|egress_lossless_profile]" }, - "{{ port_names }}|0-1": { +{% endfor %} +{% for port in port_names.split(',') %} + "{{ port }}|0-2": { "profile" : "[BUFFER_PROFILE|q_lossy_profile]" }, - "{{ port_names }}|5": { +{% endfor %} +{% for port in port_names.split(',') %} + "{{ port }}|5-6": { "profile" : "[BUFFER_PROFILE|q_lossy_profile]" - } + }{% if not loop.last %},{% endif %} + +{% endfor %} } {%- endmacro %} + + diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini index 99606f24bd0..1e1906ff0ef 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini @@ -1,33 +1,33 @@ -# name lanes alias -Ethernet0 0,1,2,3,4,5,6,7 etp1 -Ethernet8 8,9,10,11,12,13,14,15 etp2 -Ethernet16 16,17,18,19,20,21,22,23 etp3 -Ethernet24 24,25,26,27,28,29,30,31 etp4 -Ethernet32 32,33,34,35,36,37,38,39 etp5 -Ethernet40 40,41,42,43,44,45,46,47 etp6 -Ethernet48 48,49,50,51,52,53,54,55 etp7 -Ethernet56 56,57,58,59,60,61,62,63 etp8 -Ethernet64 64,65,66,67,68,69,70,71 etp9 -Ethernet72 72,73,74,75,76,77,78,79 etp10 -Ethernet80 80,81,82,83,84,85,86,87 etp11 -Ethernet88 88,89,90,91,92,93,94,95 etp12 -Ethernet96 96,97,98,99,100,101,102,103 etp13 -Ethernet104 104,105,106,107,108,109,110,111 etp14 -Ethernet112 112,113,114,115,116,117,118,119 etp15 -Ethernet120 120,121,122,123,124,125,126,127 etp16 -Ethernet128 128,129,130,131,132,133,134,135 etp17 -Ethernet136 136,137,138,139,140,141,142,143 etp18 -Ethernet144 144,145,146,147,148,149,150,151 etp19 -Ethernet152 152,153,154,155,156,157,158,159 etp20 -Ethernet160 160,161,162,163,164,165,166,167 etp21 -Ethernet168 168,169,170,171,172,173,174,175 etp22 -Ethernet176 176,177,178,179,180,181,182,183 etp23 -Ethernet184 184,185,186,187,188,189,190,191 etp24 -Ethernet192 192,193,194,195,196,197,198,199 etp25 -Ethernet200 200,201,202,203,204,205,206,207 etp26 -Ethernet208 208,209,210,211,212,213,214,215 etp27 -Ethernet216 216,217,218,219,220,221,222,223 etp28 -Ethernet224 224,225,226,227,228,229,230,231 etp29 -Ethernet232 232,233,234,235,236,237,238,239 etp30 -Ethernet240 240,241,242,243,244,245,246,247 etp31 -Ethernet248 248,249,250,251,252,253,254,255 etp32 +# 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_msn4700-r0/ACS-MSN4700/sai.profile b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile index d145093cab9..31b3fd09ddd 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile @@ -1 +1 @@ -SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_100G.xml diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700_100G.xml similarity index 69% rename from device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml rename to device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700_100G.xml index 402c2fdd3e5..a76e23d5d11 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai_4700_100G.xml @@ -12,231 +12,231 @@ 1 - 8 + 4 17 3 - 2147516416 + 1536 5 - 8 + 4 16 3 - 2147516416 + 1536 9 - 8 + 4 19 3 - 2147516416 + 1536 13 - 8 + 4 18 3 - 2147516416 + 1536 17 - 8 + 4 21 3 - 2147516416 + 1536 21 - 8 + 4 20 3 - 2147516416 + 1536 25 - 8 + 4 23 3 - 2147516416 + 1536 29 - 8 + 4 22 3 - 2147516416 + 1536 33 - 8 + 4 29 3 - 2147516416 + 1536 37 - 8 + 4 28 3 - 2147516416 + 1536 41 - 8 + 4 31 3 - 2147516416 + 1536 45 - 8 + 4 30 3 - 2147516416 + 1536 49 - 8 + 4 25 3 - 2147516416 + 1536 53 - 8 + 4 24 3 - 2147516416 + 1536 57 - 8 + 4 27 3 - 2147516416 + 1536 61 - 8 + 4 26 3 - 2147516416 + 1536 65 - 8 + 4 14 3 - 2147516416 + 1536 69 - 8 + 4 15 3 - 2147516416 + 1536 73 - 8 + 4 12 3 - 2147516416 + 1536 77 - 8 + 4 13 3 - 2147516416 + 1536 81 - 8 + 4 10 3 - 2147516416 + 1536 85 - 8 + 4 11 3 - 2147516416 + 1536 89 - 8 + 4 8 3 - 2147516416 + 1536 93 - 8 + 4 9 3 - 2147516416 + 1536 97 - 8 + 4 2 3 - 2147516416 + 1536 101 - 8 + 4 3 3 - 2147516416 + 1536 105 - 8 + 4 0 3 - 2147516416 + 1536 109 - 8 + 4 1 3 - 2147516416 + 1536 113 - 8 + 4 6 3 - 2147516416 + 1536 117 - 8 + 4 7 3 - 2147516416 + 1536 121 - 8 + 4 4 3 - 2147516416 + 1536 125 - 8 + 4 5 3 - 2147516416 + 1536 From af29ae24e6519b13be066569616b4842350c3a1d Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Thu, 5 Mar 2020 09:47:17 +0800 Subject: [PATCH 09/14] [Mellanox]Update the buffer configurations for 4700 --- .../ACS-MSN4700/buffers_defaults_t0.j2 | 6 +-- .../ACS-MSN4700/buffers_defaults_t1.j2 | 6 +-- .../ACS-MSN4700/pg_profile_lookup.ini | 50 +++++++++---------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 index f26b0353261..a48de99151d 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '27828216' %} -{% set ingress_lossy_pool_size = '27828216' %} +{% set ingress_lossless_pool_size = '402653184' %} +{% set ingress_lossy_pool_size = '402653184' %} {% set egress_lossless_pool_size = '60817392' %} -{% set egress_lossy_pool_size = '27828216' %} +{% set egress_lossy_pool_size = '402653184' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 index 51b51d2479c..87e55d5a46e 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t1.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '16138232' %} -{% set ingress_lossy_pool_size = '16138232' %} +{% set ingress_lossless_pool_size = '36011952' %} +{% set ingress_lossy_pool_size = '36011952' %} {% set egress_lossless_pool_size = '60817392' %} -{% set egress_lossy_pool_size = '16138232' %} +{% set egress_lossy_pool_size = '36011952' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini index 47b3e9abffe..bbd2ae14701 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -1,25 +1,25 @@ -# speed cable size xon xoff threshold - 1000 5m 35840 18432 17408 0 - 10000 5m 36864 18432 18432 0 - 25000 5m 36864 18432 18432 0 - 40000 5m 36864 18432 18432 0 - 50000 5m 37888 18432 19456 0 - 100000 5m 38912 18432 20480 0 - 200000 5m 41984 18432 23552 0 - 400000 5m 48128 19456 28672 0 - 1000 40m 36864 18432 18432 0 - 10000 40m 38912 18432 20480 0 - 25000 40m 41984 18432 23552 0 - 40000 40m 45056 18432 26624 0 - 50000 40m 47104 18432 28672 0 - 100000 40m 59392 18432 40960 0 - 200000 40m 81920 18432 63488 0 - 400000 40m 128000 19456 108544 0 - 1000 300m 37888 18432 19456 0 - 10000 300m 53248 18432 34816 0 - 25000 300m 78848 18432 60416 0 - 40000 300m 104448 18432 86016 0 - 50000 300m 121856 18432 103424 0 - 100000 300m 206848 18432 188416 0 - 200000 300m 376832 18432 358400 0 - 400000 300m 718848 19456 699392 0 +# speed cable size xon xoff threshold + 1000 5m 32768 18432 14336 0 + 10000 5m 32768 18432 14336 0 + 25000 5m 33792 18432 15360 0 + 40000 5m 33792 18432 15360 0 + 50000 5m 33792 18432 15360 0 + 100000 5m 35840 18432 17408 0 + 200000 5m 37888 18432 19456 0 + 400000 5m 43008 18432 24576 0 + 1000 40m 32768 18432 14336 0 + 10000 40m 34816 18432 16384 0 + 25000 40m 37888 18432 19456 0 + 40000 40m 40960 18432 22528 0 + 50000 40m 43008 18432 24576 0 + 100000 40m 53248 18432 34816 0 + 200000 40m 72704 18432 54272 0 + 400000 40m 112640 18432 94208 0 + 1000 300m 34816 18432 16384 0 + 10000 300m 48128 18432 29696 0 + 25000 300m 70656 18432 52224 0 + 40000 300m 93184 18432 74752 0 + 50000 300m 108544 18432 90112 0 + 100000 300m 183296 18432 164864 0 + 200000 300m 333824 18432 315392 0 + 400000 300m 634880 18432 616448 0 From 796ca3badc7234e862ee0f6d923603f043519ea3 Mon Sep 17 00:00:00 2001 From: keboliu Date: Tue, 10 Mar 2020 19:10:35 +0800 Subject: [PATCH 10/14] fix alignment in pg_profile_lookup.ini --- .../ACS-MSN4700/pg_profile_lookup.ini | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini index bbd2ae14701..b3d910f2dcd 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -1,25 +1,25 @@ # speed cable size xon xoff threshold - 1000 5m 32768 18432 14336 0 - 10000 5m 32768 18432 14336 0 - 25000 5m 33792 18432 15360 0 - 40000 5m 33792 18432 15360 0 - 50000 5m 33792 18432 15360 0 - 100000 5m 35840 18432 17408 0 - 200000 5m 37888 18432 19456 0 - 400000 5m 43008 18432 24576 0 - 1000 40m 32768 18432 14336 0 - 10000 40m 34816 18432 16384 0 - 25000 40m 37888 18432 19456 0 - 40000 40m 40960 18432 22528 0 - 50000 40m 43008 18432 24576 0 - 100000 40m 53248 18432 34816 0 - 200000 40m 72704 18432 54272 0 - 400000 40m 112640 18432 94208 0 - 1000 300m 34816 18432 16384 0 - 10000 300m 48128 18432 29696 0 - 25000 300m 70656 18432 52224 0 - 40000 300m 93184 18432 74752 0 - 50000 300m 108544 18432 90112 0 - 100000 300m 183296 18432 164864 0 - 200000 300m 333824 18432 315392 0 - 400000 300m 634880 18432 616448 0 +1000 5m 32768 18432 14336 0 +10000 5m 32768 18432 14336 0 +25000 5m 33792 18432 15360 0 +40000 5m 33792 18432 15360 0 +50000 5m 33792 18432 15360 0 +100000 5m 35840 18432 17408 0 +200000 5m 37888 18432 19456 0 +400000 5m 43008 18432 24576 0 +1000 40m 32768 18432 14336 0 +10000 40m 34816 18432 16384 0 +25000 40m 37888 18432 19456 0 +40000 40m 40960 18432 22528 0 +50000 40m 43008 18432 24576 0 +100000 40m 53248 18432 34816 0 +200000 40m 72704 18432 54272 0 +400000 40m 112640 18432 94208 0 +1000 300m 34816 18432 16384 0 +10000 300m 48128 18432 29696 0 +25000 300m 70656 18432 52224 0 +40000 300m 93184 18432 74752 0 +50000 300m 108544 18432 90112 0 +100000 300m 183296 18432 164864 0 +200000 300m 333824 18432 315392 0 +400000 300m 634880 18432 616448 0 From 397c3307152dcd867fc34c8cf88e9268b50fa6b5 Mon Sep 17 00:00:00 2001 From: keboliu Date: Tue, 10 Mar 2020 19:17:50 +0800 Subject: [PATCH 11/14] add platform components file for new sku --- .../x86_64-mlnx_msn4700-r0/platform_components.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json new file mode 100644 index 00000000000..2804e29e11b --- /dev/null +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/platform_components.json @@ -0,0 +1,10 @@ +{ + "chassis": { + "x86_64-mlnx_msn4700-r0": { + "component": { + "BIOS": { }, + "CPLD": { } + } + } + } +} From 95a6f9688ca5e84595fba68eceef14ae9e2bc48c Mon Sep 17 00:00:00 2001 From: Kebo Liu Date: Tue, 10 Mar 2020 19:35:26 +0800 Subject: [PATCH 12/14] Update device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini Co-Authored-By: Nazarii Hnydyn --- .../x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini index b3d910f2dcd..3344e93b4d3 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -1,4 +1,5 @@ -# speed cable size xon xoff threshold +# speed cable size xon xoff threshold +1000 5m 32768 18432 14336 0 1000 5m 32768 18432 14336 0 10000 5m 32768 18432 14336 0 25000 5m 33792 18432 15360 0 From efd8a4238fd041091aef3c1e4373a59fc2d179a1 Mon Sep 17 00:00:00 2001 From: keboliu Date: Tue, 10 Mar 2020 19:39:39 +0800 Subject: [PATCH 13/14] remove redundant line --- .../x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini index 3344e93b4d3..950cf943496 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/pg_profile_lookup.ini @@ -1,6 +1,5 @@ # speed cable size xon xoff threshold 1000 5m 32768 18432 14336 0 -1000 5m 32768 18432 14336 0 10000 5m 32768 18432 14336 0 25000 5m 33792 18432 15360 0 40000 5m 33792 18432 15360 0 From 79fb24535c5105eb0d77681400ad66eae14ab798 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Fri, 13 Mar 2020 18:38:04 +0800 Subject: [PATCH 14/14] [Mellanox]Correct type, buffer size --- .../ACS-MSN4700/buffers_defaults_t0.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 index a48de99151d..b71e6b35fa2 100644 --- a/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 +++ b/device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/buffers_defaults_t0.j2 @@ -1,8 +1,8 @@ {% set default_cable = '5m' %} -{% set ingress_lossless_pool_size = '402653184' %} -{% set ingress_lossy_pool_size = '402653184' %} +{% set ingress_lossless_pool_size = '56623104' %} +{% set ingress_lossy_pool_size = '56623104' %} {% set egress_lossless_pool_size = '60817392' %} -{% set egress_lossy_pool_size = '402653184' %} +{% set egress_lossy_pool_size = '56623104' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #}