[Broadcom] Upgrade Broadcom xgs SAI to 11.2.4.1 (#20101)

Why I did it Upgrade xgs SAI version to 11.2.4.1 Work item tracking Microsoft ADO (number only): 29003011 How I did it Upgrade xgs SAI and saibcm-modules to 11.2 How to verify it Load image on DUT and run test. https://elastictest.org/scheduler/testplan/66eabf21349061778cb0c987 Signed-off-by: zitingguo-ms [email protected]
sonic-net · Oct 9, 2024 · ffb9bc0 · ffb9bc0
1 parent c2f37a6
commit ffb9bc0
Show file tree

Hide file tree

Showing 553 changed files with 58,583 additions and 46,130 deletions.
diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk
@@ -1,6 +1,6 @@
 # Broadcom SAI modules
 
-BRCM_OPENNSL_KERNEL_VERSION = 10.1.0.0
+BRCM_OPENNSL_KERNEL_VERSION = 11.2.4.1
 
 BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
 $(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,6 +1,6 @@
-LIBSAIBCM_XGS_VERSION = 10.1.42.0
+LIBSAIBCM_XGS_VERSION = 11.2.4.1
 LIBSAIBCM_DNX_VERSION = 11.2.9.1
-LIBSAIBCM_XGS_BRANCH_NAME = SAI_10.1.0_GA
+LIBSAIBCM_XGS_BRANCH_NAME = SAI_11.2.0_GA
 LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
 LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"

diff --git a/platform/broadcom/saibcm-modules/debian/changelog b/platform/broadcom/saibcm-modules/debian/changelog
@@ -1,3 +1,9 @@
+opennsl (11.2.4.1) unstable; urgency=medium
+
+  * Update to Broadcom SAI 11.2.4.1
+
+ -- Ziting Guo <[email protected]> Mon, 2 Sep 2024 02:53:09 +0000
+
 opennsl (10.1.0.0) unstable; urgency=medium
 
   * Update to Broadcom SAI 10.1.0.0

diff --git a/platform/broadcom/saibcm-modules/include/ibde.h b/platform/broadcom/saibcm-modules/include/ibde.h
@@ -1,6 +1,6 @@
 /*
  * $Id: ibde.h,v 1.27 Broadcom SDK $
- * $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
+ * $Copyright: 2017-2024 Broadcom Inc. All rights reserved.
  * 
  * Permission is granted to use, copy, modify and/or distribute this
  * software under either one of the licenses below.
@@ -25,6 +25,7 @@
  * This software is governed by the Broadcom Open Network Switch APIs license:
  * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
  * 
+ * 
  */
 
 #ifndef __IBDE_H__

diff --git a/platform/broadcom/saibcm-modules/include/kcom.h b/platform/broadcom/saibcm-modules/include/kcom.h
@@ -1,6 +1,6 @@
 /*
  * $Id: kcom.h,v 1.9 Broadcom SDK $
- * $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
+ * $Copyright: 2017-2024 Broadcom Inc. All rights reserved.
  * 
  * Permission is granted to use, copy, modify and/or distribute this
  * software under either one of the licenses below.
@@ -25,6 +25,7 @@
  * This software is governed by the Broadcom Open Network Switch APIs license:
  * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
  * 
+ * 
  *
  * File:    kcom.h
  * Purpose: User/Kernel message definitions
@@ -71,7 +72,7 @@
 #define KCOM_M_CLOCK_CMD        52 /* Clock Commands */
 #define KCOM_M_PCIE_LINK_STATUS 53 /* PCIe link status */
 
-#define KCOM_VERSION            13 /* Protocol version */
+#define KCOM_VERSION            16 /* Protocol version */
 
 /*
  * Message status codes
@@ -134,10 +135,10 @@ typedef struct kcom_msg_hdr_s {
 
 /*
  * Max size of Sand System Headers
- * For DNX, Module Header(20B) + PTCH(2B) + ITMH(5B)
+ * For DNX, Module Header(16B) + PTCH(2B/3B) + ITMH(5B)
  * For DPP, PTCH(2B) + ITMH(4B)
  */
-#define KCOM_NETIF_SYSTEM_HEADERS_SIZE_MAX     27
+#define KCOM_NETIF_SYSTEM_HEADERS_SIZE_MAX     64
 
 typedef struct kcom_netif_s {
     uint16 id;
@@ -353,6 +354,7 @@ typedef struct kcom_msg_version_s {
     uint32 version;
     uint32 netif_max;
     uint32 filter_max;
+    uint32 module_reload;
 } kcom_msg_version_t;
 
 /*
@@ -419,20 +421,6 @@ typedef struct kcom_msg_hw_init_s {
     uint8 pkt_hdr_size;
     uint32 dma_hi;
     uint32 cdma_channels;
-    /*
-     * Information to parse Dune system headers
-     */
-    uint32 ftmh_lb_key_ext_size;
-    uint32 ftmh_stacking_ext_size;
-    uint32 pph_base_size;
-    uint32 pph_lif_ext_size[8];
-    uint32 udh_length_type[4];
-    uint32 udh_size;
-    uint32 oamp_punted;
-    uint8 no_skip_udh_check;
-    uint8 oam_dm_tod_exist;
-    uint8 system_headers_mode;
-    uint8 udh_enable;
     /*
      * Bitmap of DMA channels reserved for the user mode network driver.
      * These channels cannot be used by the kernel network driver (KNET).
@@ -589,6 +577,20 @@ typedef struct kcom_msg_dma_info_s {
 typedef struct kcom_msg_hw_info_s {
     kcom_msg_hdr_t hdr;
     kcom_oamp_info_t oamp_info;
+    /*
+     * Information to parse Dune system headers
+     */
+    uint32 ftmh_lb_key_ext_size;
+    uint32 ftmh_stacking_ext_size;
+    uint32 pph_base_size;
+    uint32 pph_lif_ext_size[8];
+    uint32 udh_length_type[4];
+    uint32 udh_size;
+    uint32 oamp_punted;
+    uint8 no_skip_udh_check;
+    uint8 oam_dm_tod_exist;
+    uint8 system_headers_mode;
+    uint8 udh_enable;
 } kcom_msg_hw_info_t;
 
 /*

diff --git a/platform/broadcom/saibcm-modules/include/sal/core/sync.h b/platform/broadcom/saibcm-modules/include/sal/core/sync.h
diff --git a/platform/broadcom/saibcm-modules/include/sal/core/thread.h b/platform/broadcom/saibcm-modules/include/sal/core/thread.h
diff --git a/platform/broadcom/saibcm-modules/include/sal/types.h b/platform/broadcom/saibcm-modules/include/sal/types.h
@@ -1,6 +1,6 @@
 /*
  * $Id: types.h,v 1.3 Broadcom SDK $
- * $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
+ * $Copyright: 2017-2024 Broadcom Inc. All rights reserved.
  * 
  * Permission is granted to use, copy, modify and/or distribute this
  * software under either one of the licenses below.
@@ -25,6 +25,7 @@
  * This software is governed by the Broadcom Open Network Switch APIs license:
  * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
  * 
+ * 
  *
  * File: 	types.h
  * Purpose: 	SAL type definitions
@@ -145,6 +146,8 @@ typedef union
 #define SAL_AXI_DEV_TYPE        0x00080 /* AXI device */
 #define SAL_EMMI_DEV_TYPE       0x10000 /* EMMI device */
 #define SAL_COMPOSITE_DEV_TYPE  0x20000 /* Composite device, composed of sub-devices with buses */
+#define SAL_USER_DEV_TYPE       0x40000 /* User implemented method of access to the device */
+#define SAL_SUB_DEV_TYPE        0x80000 /* A sub-device (with a bus) of a composite device */
 #define SAL_DEV_BUS_TYPE_MASK   0xf00ff /* Odd for historical reasons */
 
 /* Device types */

diff --git a/platform/broadcom/saibcm-modules/include/sdk_config.h b/platform/broadcom/saibcm-modules/include/sdk_config.h
@@ -1,6 +1,6 @@
 /*
  * $Id: sdk_config.h,v 1.5 Broadcom SDK $
- * $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
+ * $Copyright: 2017-2024 Broadcom Inc. All rights reserved.
  * 
  * Permission is granted to use, copy, modify and/or distribute this
  * software under either one of the licenses below.
@@ -25,6 +25,7 @@
  * This software is governed by the Broadcom Open Network Switch APIs license:
  * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
  * 
+ * 
  *
  *
  */

diff --git a/platform/broadcom/saibcm-modules/include/soc/devids.h b/platform/broadcom/saibcm-modules/include/soc/devids.h
@@ -1,6 +1,6 @@
 /*
  * $Id: devids.h,v 1.309 Broadcom SDK $
- * $Copyright: 2007-2023 Broadcom Inc. All rights reserved.
+ * $Copyright: 2017-2024 Broadcom Inc. All rights reserved.
  * 
  * Permission is granted to use, copy, modify and/or distribute this
  * software under either one of the licenses below.
@@ -26,6 +26,7 @@
  * https://www.broadcom.com/products/ethernet-connectivity/software/opennsa $
  * 
  * 
+ * 
  */
 
 #ifndef _SOC_DEVIDS_H
@@ -1187,7 +1188,7 @@
 #define BCM53394_A0_REV_ID      1
 
 /* Greyhound , Ranger 2 */
-#define BCM53400_DEVICE_ID      0x8400 /* FIXME */
+#define BCM53400_DEVICE_ID      0x8400 
 #define BCM53400_A0_REV_ID      1
 #define BCM56060_DEVICE_ID      0xb060
 #define BCM56060_A0_REV_ID      1
@@ -1995,6 +1996,23 @@
 #define BCM8884E_DEVICE_ID      0x884E
 #define BCM8884F_DEVICE_ID      0x884F
 
+#define BCM88810_DEVICE_ID      0x8810
+#define BCM88811_DEVICE_ID      0x8811
+#define BCM88812_DEVICE_ID      0x8812
+#define BCM88813_DEVICE_ID      0x8813
+#define BCM88814_DEVICE_ID      0x8814
+#define BCM88815_DEVICE_ID      0x8815
+#define BCM88816_DEVICE_ID      0x8816
+#define BCM88817_DEVICE_ID      0x8817
+#define BCM88818_DEVICE_ID      0x8818
+#define BCM88819_DEVICE_ID      0x8819
+#define BCM8881A_DEVICE_ID      0x881A
+#define BCM8881B_DEVICE_ID      0x881B
+#define BCM8881C_DEVICE_ID      0x881C
+#define BCM8881D_DEVICE_ID      0x881D
+#define BCM8881E_DEVICE_ID      0x881E
+#define BCM8881F_DEVICE_ID      0x881F
+
 #define J2X_DEVICE_ID                 0x8830
 #define J2X_A0_REV_ID           DNXC_A0_REV_ID
 #define BCM88830_DEVICE_ID      J2X_DEVICE_ID
@@ -2015,6 +2033,11 @@
 #define BCM8883E_DEVICE_ID      0x883E
 #define BCM8883F_DEVICE_ID      0x883F
 
+#define J2Z_DEVICE_ID           0x216
+#define J2Z_A0_REV_ID           DNXC_A0_REV_ID
+#define BCM8216_DEVICE_ID       J2Z_DEVICE_ID
+#define BCM8216_A0_REV_ID       J2Z_A0_REV_ID
+
 #ifdef BCM_DNX3_SUPPORT
 #define JERICHO3_DEVICE_ID      0x8860
 #define Q3_DEVICE_ID_START      0x886a
@@ -2179,6 +2202,10 @@
 #define BCM56692_DEVICE_ID 0xb692
 #define BCM56692_A0_REV_ID 0x0001
 
+/* Trident5 X12*/
+#define BCM78800_DEVICE_ID 0xf800
+#define BCM78800_A0_REV_ID 0x0001
+
 /* Trident4 */
 #define BCM56880_DEVICE_ID 0xb880
 #define BCM56880_A0_REV_ID 0x0001
@@ -2211,6 +2238,10 @@
 #define BCM56788_A1_REV_ID 0x0002
 #define BCM56789_DEVICE_ID 0xb789
 #define BCM56789_A0_REV_ID 0x0001
+/* Firelight3 */
+#define BCM56089_DEVICE_ID 0xb089
+#define BCM56089_A0_REV_ID 0x0001
+#define BCM56089_A1_REV_ID 0x0002
 
 /* Tomahawk4 */
 #define BCM56990_DEVICE_ID 0xb990