[brcm] Update SOC properties for DLR_INIT based pfcwd recovery (#15286)
* [202205] Update SOC properties for DLR_INIT based pfcwd recovery (#15217) Why I did it Update soc properties for certain roles that need to use pfcwd dlr init based recovery mechanism How to verify it Updated the templates on a 7050cx3 dual tor and 7260 T1 which satisfies these conditions and validated pfcwd recovery which uses DLR_INIT based mechanism. Also validated that this mechanism is not used on 7050cx3 single tor with the updated templates Signed-off-by: Neetha John <nejo@microsoft.com>
This commit is contained in:
parent
3f4b959d3f
commit
6a8f1bad63
@ -1,16 +1,24 @@
|
||||
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_sock = '' -%}
|
||||
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
|
||||
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
|
||||
{%- if 'dualtor' in switch_subtype.lower() %}
|
||||
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
|
||||
l3_alpm_hit_skip=1
|
||||
sai_adjust_acl_drop_in_rx_drop=1
|
||||
sai_verify_incoming_chksum=0
|
||||
{{ map_prio }}
|
||||
{{ pfcwd_sock }}
|
||||
host_as_route_disable=1
|
||||
use_all_splithorizon_groups=1
|
||||
riot_enable=1
|
||||
|
@ -1,16 +1,24 @@
|
||||
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_sock = '' -%}
|
||||
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and DEVICE_METADATA['localhost']['subtype'] is defined -%}
|
||||
{%- set switch_subtype = DEVICE_METADATA['localhost']['subtype'] -%}
|
||||
{%- if 'dualtor' in switch_subtype.lower() %}
|
||||
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_premium_issu/b870.6.4.1/
|
||||
l3_alpm_hit_skip=1
|
||||
sai_adjust_acl_drop_in_rx_drop=1
|
||||
sai_verify_incoming_chksum=0
|
||||
{{ map_prio }}
|
||||
{{ pfcwd_sock }}
|
||||
host_as_route_disable=1
|
||||
use_all_splithorizon_groups=1
|
||||
riot_enable=1
|
||||
|
@ -2,6 +2,7 @@
|
||||
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
|
||||
{%- set IPinIP_sock = '' -%}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_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'] -%}
|
||||
@ -12,7 +13,8 @@
|
||||
{%- 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
|
||||
{%- set IPinIP_sock =
|
||||
'sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2' -%}
|
||||
@ -20,11 +22,18 @@
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
|
||||
|
||||
l3_alpm_hit_skip=1
|
||||
sai_adjust_acl_drop_in_rx_drop=1
|
||||
{{ map_prio }}
|
||||
{{ pfcwd_sock }}
|
||||
PHY_AN_ALLOW_PLL_CHANGE=1
|
||||
arl_clean_timeout_usec=15000000
|
||||
asf_mem_profile=2
|
||||
|
@ -1,20 +1,29 @@
|
||||
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
|
||||
{%- set IPinIP_sock = '' -%}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_sock = '' -%}
|
||||
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and 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
|
||||
{%- set IPinIP_sock =
|
||||
'sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2' -%}
|
||||
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
|
||||
l3_alpm_hit_skip=1
|
||||
sai_adjust_acl_drop_in_rx_drop=1
|
||||
{{ map_prio }}
|
||||
{{ pfcwd_sock }}
|
||||
PHY_AN_ALLOW_PLL_CHANGE=1
|
||||
arl_clean_timeout_usec=15000000
|
||||
asf_mem_profile=2
|
||||
|
@ -1,20 +1,29 @@
|
||||
{# Construct config.bcm to include additional soc properties per specific device metadata requirement #}
|
||||
{%- set IPinIP_sock = '' -%}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_sock = '' -%}
|
||||
{%- if DEVICE_METADATA is defined and DEVICE_METADATA['localhost'] is defined and 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
|
||||
{%- set IPinIP_sock =
|
||||
'sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2' -%}
|
||||
{%- set map_prio = 'sai_remap_prio_on_tnl_egress=1' -%}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-112x50G+8x100G.config.bcm" #}
|
||||
l3_alpm_hit_skip=1
|
||||
sai_adjust_acl_drop_in_rx_drop=1
|
||||
{{ map_prio }}
|
||||
{{ pfcwd_sock }}
|
||||
PHY_AN_ALLOW_PLL_CHANGE=1
|
||||
arl_clean_timeout_usec=15000000
|
||||
asf_mem_profile=2
|
||||
|
@ -2,6 +2,7 @@
|
||||
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
|
||||
{%- set IPinIP_sock = '' -%}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_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'] -%}
|
||||
@ -12,7 +13,8 @@
|
||||
{%- 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
|
||||
{%- set IPinIP_sock =
|
||||
'sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2' -%}
|
||||
@ -20,10 +22,17 @@
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x40G.config.bcm" #}
|
||||
l3_alpm_hit_skip=1
|
||||
sai_adjust_acl_drop_in_rx_drop=1
|
||||
{{ map_prio }}
|
||||
{{ pfcwd_sock }}
|
||||
PHY_AN_ALLOW_PLL_CHANGE=1
|
||||
arl_clean_timeout_usec=15000000
|
||||
asf_mem_profile=2
|
||||
|
@ -2,6 +2,7 @@
|
||||
{%- set mmu_sock = 'mmu_init_config="MSFT-TH2-Tier1"' -%}
|
||||
{%- set IPinIP_sock = '' -%}
|
||||
{%- set map_prio = '' -%}
|
||||
{%- set pfcwd_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'] -%}
|
||||
@ -12,7 +13,8 @@
|
||||
{%- 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
|
||||
{%- set IPinIP_sock =
|
||||
'sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2' -%}
|
||||
@ -20,9 +22,16 @@
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
{%- if SYSTEM_DEFAULTS is defined and 'tunnel_qos_remap' in SYSTEM_DEFAULTS and SYSTEM_DEFAULTS['tunnel_qos_remap']['status'] == 'enabled' -%}
|
||||
{%- set pfcwd_sock =
|
||||
'hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1' -%}
|
||||
{%- endif %}
|
||||
{# The following is the common soc properties that used to be named "th2-a7260cx3-64-64x100G-t1.config.bcm" #}
|
||||
|
||||
l3_alpm_hit_skip=1
|
||||
{{ map_prio }}
|
||||
{{ mmu_sock }}
|
||||
{{ IPinIP_sock }}
|
||||
{{ pfcwd_sock }}
|
||||
|
@ -6,3 +6,6 @@ sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2
|
||||
hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1
|
||||
|
@ -6,3 +6,6 @@ sai_tunnel_support=1
|
||||
sai_tunnel_underlay_route_mode=1
|
||||
host_as_route_disable=1
|
||||
l3_ecmp_levels=2
|
||||
hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1
|
||||
|
@ -3,3 +3,6 @@ l3_alpm_hit_skip=1
|
||||
|
||||
mmu_init_config="MSFT-TH2-Tier1"
|
||||
|
||||
hybrid_pfc_deadlock_enable=1
|
||||
pfc_deadlock_seq_control=1
|
||||
sai_pfc_dlr_init_capability=1
|
||||
|
Loading…
Reference in New Issue
Block a user