Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time #7168

Merged
merged 4 commits into from
Mar 31, 2021
Merged

7260cx3 DualToR config.bcm support based on DualToR setting in device metadata at boot time #7168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75f4c94
7260cx3 DualToR config.bcm support based on DualToR setting in device…
gechiang Mar 26, 2021
6d15870
7260cx3 DualToR config.bcm support based on DualToR setting in device…
gechiang Mar 26, 2021
7bb0bb8
Fixed typo for mmu tier0/1, renamed file, moved new soc properties to…
gechiang Mar 28, 2021
526602d
Fix the comment to indicate 3rd possibility where it needs to copy sa…
gechiang Mar 30, 2021
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
24 changes: 23 additions & 1 deletion ...C64/th2-a7260cx3-64-64x100G-t0.config.bcm → ...60cx3_64/Arista-7260CX3-C64/config.bcm.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
{%- set IPinIP_sock = '' -%}
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined -%}
{%- if DEVICE_METADATA['localhost']['type'] is defined -%}
{%- set switch_role = DEVICE_METADATA['localhost']['type'] -%}
{%- if 'torrouter' in switch_role.lower() or 'torswitch' in switch_role.lower() %}
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier0"' -%}
{%- endif %}
{%- endif %}
{%- if DEVICE_METADATA['localhost']['subtype'] is defined -%}
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
{%- if 'dualtor' in switch_subtype.lower() %}
{%- set IPinIP_sock = 'sai_tunnel_support=1
host_as_route_disable=1
l3_ecmp_levels=2' -%}
{%- endif %}
{%- endif %}
{%- endif %}
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}

PHY_AN_ALLOW_PLL_CHANGE=1
arl_clean_timeout_usec=15000000
asf_mem_profile=2
Expand Down Expand Up @@ -1012,4 +1033,5 @@ serdes_preemphasis_115=0x184606
serdes_preemphasis_116=0x103706
serdes_preemphasis_117=0x133c06

mmu_init_config="MSFT-TH2-Tier0"
{{ mmu_sock }}
{{ IPinIP_sock }}
2 changes: 2 additions & 0 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
SAI_INIT_CONFIG_FILE=/etc/sai.d/config.bcm
SAI_NUM_ECMP_MEMBERS=64
14 changes: 0 additions & 14 deletions device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/sai.profile.j2
View file
Open in desktop

This file was deleted.

Loading