openbcm

commit 3161c9ce0ed4310896150ef6e5ac3e6d9ff0b6cd
parent 7362190ac553005e70d1be148997b67d93587fc2
Author: Broadcom SDK Release <sdk.releases@broadcom.com>
Date:   Tue, 21 Jan 2020 13:52:59 -0800

SDK-171142: This release fixes deadlock issues caused due to sramscan thread

Devices: 56565_A0
Module: ALPM

Diffstat:
M
sdk-6.5.16/src/soc/common/sramscan.c
 | 
41
++++++++++++++++++++++++++++++++++++++---
M
sdk-6.5.16/src/soc/esw/helix5/ser.c
 | 
6
+++---
M
sdk-6.5.16/src/soc/esw/maverick2/ser.c
 | 
6
+++---

3 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/sdk-6.5.16/src/soc/common/sramscan.c b/sdk-6.5.16/src/soc/common/sramscan.c
@@ -69,6 +69,20 @@
 #include <soc/tomahawk3.h>
 #endif /* BCM_TOMAHAWK3_SUPPORT */
 
+#if defined(ALPM_ENABLE)
+#include <soc/l3x.h>
+#define _ALPM_LOCK(unit) \
+    L3_LOCK(unit); \
+    _alpm_lock = 1
+#define _ALPM_UNLOCK(unit) \
+    if (_alpm_lock) { \
+        L3_UNLOCK(unit); \
+    }
+#else
+#define _ALPM_LOCK(unit)
+#define _ALPM_UNLOCK(unit)
+#endif /* ALPM_ENABLE */
+
 
 STATIC void _soc_sram_scan_thread(void *unit_vp);
 
@@ -433,6 +447,9 @@ _soc_sram_scan_thread(void *unit_vp)
     sal_thread_t thread;
     int     pipe, num_pipe;
     int     ser_flags[SOC_MAX_NUM_PIPES];
+#if defined(ALPM_ENABLE)
+    uint8 _alpm_lock = 0;
+#endif /* ALPM_ENABLE */
 
     chunk_size = soc_property_get(unit, spn_SRAM_SCAN_CHUNK_SIZE, 256);
 
@@ -508,7 +525,13 @@ _soc_sram_scan_thread(void *unit_vp)
                     if (mem == L2_ENTRY_ONLYm ||
                         mem == L2_ENTRY_ONLY_ECCm) {
                         SOC_L2X_MEM_LOCK(unit);
-                    } else {
+                    } else if (mem == L3_DEFIP_ALPM_IPV4m || mem == L3_DEFIP_ALPM_IPV4_1m ||
+                        mem == L3_DEFIP_ALPM_IPV6_64m || mem == L3_DEFIP_ALPM_IPV6_64_1m ||
+                        mem == L3_DEFIP_ALPM_IPV6_128m || mem == L3_DEFIP_PAIR_128m ||
+                        mem == L3_DEFIPm || mem == L3_DEFIP_AUX_TABLEm) {
+                       _ALPM_LOCK(unit);
+                    } else
+                    {
                         MEM_LOCK(unit, mem);
                     }
 
@@ -551,7 +574,13 @@ _soc_sram_scan_thread(void *unit_vp)
                             if (mem == L2_ENTRY_ONLYm ||
                                 mem == L2_ENTRY_ONLY_ECCm) {
                                 SOC_L2X_MEM_UNLOCK(unit);
-                            } else {
+                            } else if (mem == L3_DEFIP_ALPM_IPV4m || mem == L3_DEFIP_ALPM_IPV4_1m ||
+                                mem == L3_DEFIP_ALPM_IPV6_64m || mem == L3_DEFIP_ALPM_IPV6_64_1m ||
+                                mem == L3_DEFIP_ALPM_IPV6_128m || mem == L3_DEFIP_PAIR_128m ||
+                                mem == L3_DEFIPm || mem == L3_DEFIP_AUX_TABLEm) {
+                                _ALPM_UNLOCK(unit);
+                            } else
+                            {
                                 MEM_UNLOCK(unit, mem);
                             }
                             goto cleanup_exit;
@@ -560,7 +589,13 @@ _soc_sram_scan_thread(void *unit_vp)
                     if (mem == L2_ENTRY_ONLYm ||
                         mem == L2_ENTRY_ONLY_ECCm) {
                         SOC_L2X_MEM_UNLOCK(unit);
-                    } else {
+                    } else if (mem == L3_DEFIP_ALPM_IPV4m || mem == L3_DEFIP_ALPM_IPV4_1m ||
+                        mem == L3_DEFIP_ALPM_IPV6_64m || mem == L3_DEFIP_ALPM_IPV6_64_1m ||
+                        mem == L3_DEFIP_ALPM_IPV6_128m || mem == L3_DEFIP_PAIR_128m ||
+                        mem == L3_DEFIPm || mem == L3_DEFIP_AUX_TABLEm) {
+                        _ALPM_UNLOCK(unit);
+                    } else
+                    {
                         MEM_UNLOCK(unit, mem);
                     }
 
diff --git a/sdk-6.5.16/src/soc/esw/helix5/ser.c b/sdk-6.5.16/src/soc/esw/helix5/ser.c
@@ -1271,9 +1271,9 @@ soc_hx5_ser_register(int unit)
 #ifdef INCLUDE_MEM_SCAN
     if (!soc_feature(unit, soc_feature_tcam_scan_engine)) {
         /* To access Narrow view for HME stage TCAMs */
-        WRITE_IP_PARSER1_HME_STAGE_CONFIG_2r(unit, 0);
-        WRITE_IP_PARSER2_HME_STAGE_CONFIG_2r(unit, 0);
-        WRITE_IP_PARSER2_HME_STAGE_CONFIG_3r(unit, 0);
+        (void)WRITE_IP_PARSER1_HME_STAGE_CONFIG_2r(unit, 0);
+        (void)WRITE_IP_PARSER2_HME_STAGE_CONFIG_2r(unit, 0);
+        (void)WRITE_IP_PARSER2_HME_STAGE_CONFIG_3r(unit, 0);
         soc_mem_scan_ser_list_register(unit, TRUE, _soc_hx5_tcam_ser_info);
     }
 #endif
diff --git a/sdk-6.5.16/src/soc/esw/maverick2/ser.c b/sdk-6.5.16/src/soc/esw/maverick2/ser.c
@@ -1276,9 +1276,9 @@ soc_mv2_ser_register(int unit)
 #ifdef INCLUDE_MEM_SCAN
     if (!soc_feature(unit, soc_feature_tcam_scan_engine)) {
         /* To access Narrow view for HME stage TCAMs */
-        WRITE_IP_PARSER1_HME_STAGE_CONFIG_2r(unit, 0);
-        WRITE_IP_PARSER2_HME_STAGE_CONFIG_2r(unit, 0);
-        WRITE_IP_PARSER2_HME_STAGE_CONFIG_3r(unit, 0);
+        (void)WRITE_IP_PARSER1_HME_STAGE_CONFIG_2r(unit, 0);
+        (void)WRITE_IP_PARSER2_HME_STAGE_CONFIG_2r(unit, 0);
+        (void)WRITE_IP_PARSER2_HME_STAGE_CONFIG_3r(unit, 0);
         soc_mem_scan_ser_list_register(unit, TRUE, _soc_mv2_tcam_ser_info);
     }
 #endif