From e784c2607c7e4d2e881f9442b3daea25f66773ef Mon Sep 17 00:00:00 2001
From: gechiang <62408185+gechiang@users.noreply.github.com>
Date: Thu, 1 Jul 2021 16:45:07 -0700
Subject: [PATCH] [202012] Add BRCM SOC Property to not count ACL drops towards
 interface RX_DRP fir DualToR platforms (#8000)

---
 .../Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm   | 1 +
 .../td3-a7050cx3-32s-48x50G+8x100G.config.bcm                    | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2    | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 | 1 +
 .../x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2    | 1 +
 src/sonic-device-data/tests/permitted_list                       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
index c9c8d8f26f..72e02fb8d2 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-C32/td3-a7050cx3-32s-32x100G.config.bcm
@@ -1,4 +1,5 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_adjust_acl_drop_in_rx_drop=1
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
index f9144f8d41..0a6740b58b 100644
--- a/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
+++ b/device/arista/x86_64-arista_7050cx3_32s/Arista-7050CX3-32S-D48C8/td3-a7050cx3-32s-48x50G+8x100G.config.bcm
@@ -1,4 +1,5 @@
 sai_load_hw_config=/etc/bcm/flex/bcm56870_a0_issu/b870.6.4.1/
+sai_adjust_acl_drop_in_rx_drop=1
 host_as_route_disable=1
 use_all_splithorizon_groups=1
 riot_enable=1
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
index 8e7129b179..5ef01f2ea5 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-C64/config.bcm.j2
@@ -13,6 +13,7 @@
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
                                    host_as_route_disable=1
+                                   sai_adjust_acl_drop_in_rx_drop=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
 {%-     endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
index 4f3daccaa3..300f00c014 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/config.bcm.j2
@@ -5,6 +5,7 @@
 {%-     if 'dualtor' in switch_subtype.lower() %}
 {%-         set IPinIP_sock = 'sai_tunnel_support=1
                                host_as_route_disable=1
+                               sai_adjust_acl_drop_in_rx_drop=1
                                l3_ecmp_levels=2' -%}
 {%-     endif %}
 {%- endif %}
diff --git a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2 b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
index 616ccb0e99..cc2df98342 100644
--- a/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
+++ b/device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/config.bcm.j2
@@ -13,6 +13,7 @@
 {%-         if 'dualtor' in switch_subtype.lower() %}
 {%-             set IPinIP_sock = 'sai_tunnel_support=1
                                    host_as_route_disable=1
+                                   sai_adjust_acl_drop_in_rx_drop=1
                                    l3_ecmp_levels=2' -%}
 {%-         endif %}
 {%-     endif %}
diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
index 467780f2b5..57f49ca307 100644
--- a/src/sonic-device-data/tests/permitted_list
+++ b/src/sonic-device-data/tests/permitted_list
@@ -235,3 +235,4 @@ sai_optimized_mmu
 buf.map.egress_pool0.ingress_pool
 buf.map.egress_pool1.ingress_pool
 buf.map.egress_pool2.ingress_pool
+sai_adjust_acl_drop_in_rx_drop