-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'sonic-net:master' into add_rsyslog_plugin_support
- Loading branch information
Showing
121 changed files
with
7,246 additions
and
174,175 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| CONSOLE_PORT=0x2f8 | ||
| CONSOLE_DEV=1 | ||
| CONSOLE_SPEED=9600 | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich processor.max_cstate=1 intel_idle.max_cstate=0" | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich processor.max_cstate=1 intel_idle.max_cstate=0 i2c-i801.disable_features=0x10" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| CONSOLE_PORT=0x3f8 | ||
| CONSOLE_DEV=0 | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich" | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich i2c-i801.disable_features=0x10" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| CONSOLE_PORT=0x2f8 | ||
| CONSOLE_DEV=1 | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 logs_inram=on" | ||
| ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,wdat_wdt acpi_no_watchdog=1 nos-config-part=/dev/sda12 logs_inram=on i2c-i801.disable_features=0x10" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_5600.xml | ||
| SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps | ||
| SAI_DUMP_STORE_AMOUNT=10 | ||
| SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg |
1 change: 0 additions & 1 deletion
1
device/mellanox/x86_64-nvidia_sn5600_simx-r0/ACS-SN5600/sai.profile
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_5600.xml | ||
| SAI_DUMP_STORE_PATH=/var/log/mellanox/sdk-dumps | ||
| SAI_DUMP_STORE_AMOUNT=10 | ||
| SAI_DUMP_MFT_CFG_PATH=/etc/mft/fwtrace_cfg |
2 changes: 2 additions & 0 deletions
2
device/netberg/x86_64-netberg_aurora_750-r0/aurora-750/buffers.json.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| {%- set default_topo = 't0' %} | ||
| {%- include 'buffers_config.j2' %} |
83 changes: 83 additions & 0 deletions
83
device/netberg/x86_64-netberg_aurora_750-r0/aurora-750/buffers_defaults_t0.j2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| {% 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,64) %} | ||
| {%- if PORT_ALL.append("Ethernet%d" % (port_idx * 4)) %}{%- 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":"ingress_lossless_pool", | ||
| "size":"4096", | ||
| "dynamic_th":"0" | ||
| }, | ||
| "ingress_lossy_profile": { | ||
| "pool":"ingress_lossy_pool", | ||
| "size":"4096", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "egress_lossless_profile": { | ||
| "pool":"egress_lossless_pool", | ||
| "size":"4096", | ||
| "dynamic_th":"7" | ||
| }, | ||
| "egress_lossy_profile": { | ||
| "pool":"egress_lossy_pool", | ||
| "size":"4096", | ||
| "dynamic_th":"3" | ||
| }, | ||
| "q_lossy_profile": { | ||
| "pool":"egress_lossy_pool", | ||
| "size":"4096", | ||
| "dynamic_th":"3" | ||
| } | ||
| }, | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_pg_profils(port_names) %} | ||
| "BUFFER_PG": { | ||
| "{{ port_names }}|3-4": { | ||
| "profile" : "ingress_lossless_profile" | ||
| } | ||
| }, | ||
| {%- endmacro %} | ||
|
|
||
| {%- macro generate_queue_buffers(port_names) %} | ||
| "BUFFER_QUEUE": { | ||
| "{{ port_names }}|3-4": { | ||
| "profile" : "egress_lossless_profile" | ||
| }, | ||
| "{{ port_names }}|0-1": { | ||
| "profile" : "q_lossy_profile" | ||
| } | ||
| } | ||
| {%- endmacro %} |
Oops, something went wrong.