sonic-net · lguohan · Jul 2, 2019 · Apr 16, 2019 · Feb 16, 2019 · Jun 26, 2019
diff --git a/platform/barefoot/libsaithrift-dev.mk b/platform/barefoot/libsaithrift-dev.mk
@@ -1,7 +1,20 @@
 # libsaithrift-dev package
 
-LIBSAITHRIFT_DEV_BFN = libsaithrift-dev_0.9.4_amd64.deb
-$(LIBSAITHRIFT_DEV_BFN)_SRC_PATH = $(SRC_PATH)/SAI
-$(LIBSAITHRIFT_DEV_BFN)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(BFN_SAI) $(BFN_SAI_DEV)
-$(LIBSAITHRIFT_DEV_BFN)_RDEPENDS += $(LIBTHRIFT) $(BFN_SAI)
-#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_BFN)
+SAI_VER = 0.9.4
+
+LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
+$(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI
+$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER) $(BFN_SAI) $(BFN_SAI_DEV)
+$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT) $(BFN_SAI)
+SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
+
+PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
+
+SAISERVER = saiserver_$(SAI_VER)_amd64.deb
+$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
+
+SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb
+$(SAISERVER_DBG)_RDEPENDS += $(SAISERVER)
+$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER_DBG)))
diff --git a/platform/barefoot/python-saithrift.mk b/platform/barefoot/python-saithrift.mk
diff --git a/platform/broadcom/libsaithrift-dev.mk b/platform/broadcom/libsaithrift-dev.mk
@@ -1,6 +1,6 @@
 # libsaithrift-dev package
 
-SAI_VER = 1.3.5
+SAI_VER = 0.9.4
 
 LIBSAITHRIFT_DEV = libsaithrift-dev_$(SAI_VER)_amd64.deb
 $(LIBSAITHRIFT_DEV)_SRC_PATH = $(SRC_PATH)/sonic-sairedis/SAI

diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,9 +1,9 @@
-BRCM_SAI = libsaibcm_3.3.6.1-9_amd64.deb
-$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.3/libsaibcm_3.3.6.1-9_amd64.deb?sv=2015-04-05&sr=b&sig=ZsZxC0bmXIX9PCa73BpyMatePq8m2jWvCahFx3OJ%2F8I%3D&se=2033-02-13T21%3A31%3A33Z&sp=r"
+BRCM_SAI = libsaibcm_3.5.2.3_amd64.deb
+$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.5/jessie/libsaibcm_3.5.2.3_amd64.deb?sv=2015-04-05&sr=b&sig=OCYEP1DOHEVlfy6qjckfME%2FoD%2F914zIueu4UKgNsyQA%3D&se=2156-05-18T17%3A37%3A54Z&sp=r"
 
-BRCM_SAI_DEV = libsaibcm-dev_3.3.6.1-9_amd64.deb
+BRCM_SAI_DEV = libsaibcm-dev_3.5.2.3_amd64.deb
 $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
-$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.3/libsaibcm-dev_3.3.6.1-9_amd64.deb?sv=2015-04-05&sr=b&sig=RUAbTNEcmaSvNeAKz%2F8x06hPC%2BS%2BVlGPA2%2FiwHZMF4o%3D&se=2033-02-13T21%3A31%3A02Z&sp=r"
+$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.5/jessie/libsaibcm-dev_3.5.2.3_amd64.deb?sv=2015-04-05&sr=b&sig=Ohiw%2FaNhnbB%2FKFn%2BTaZgDrG1ziGfwjwrr2l%2BoIKCmA4%3D&se=2156-05-18T17%3A38%3A34Z&sp=r"
 
 SONIC_ONLINE_DEBS += $(BRCM_SAI)
 $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
diff --git a/platform/broadcom/saibcm-modules/include/ibde.h b/platform/broadcom/saibcm-modules/include/ibde.h
@@ -148,6 +148,28 @@ typedef struct ibde_s {
      */
     int   (*get_cmic_ver)(int d,  uint32 *ver);
 
+    /*
+     * Probe available devices.
+     * Return value :
+     *   0: success to probe available devices
+     *  -1: error happens during probe
+     */
+    int     (*probe)(void);
+
+    /*
+     * I2C operations on the Device, assuming it is connected by I2C to the CPU.
+     */
+    /* Read from the internal device Address space using I2C */
+    int (*i2c_device_read)(
+        int dev,       /* The device ID to access */
+        uint32 addr,   /* The address to access in the internal device address space */
+        uint32 *value);/* the value to be read. */
+    /* Write to the internal device Address space using I2C */
+    int (*i2c_device_write)(
+        int dev,       /* The device ID to access */
+        uint32 addr,   /* The address to access in the internal device address space */
+        uint32 value); /* the value to be written. */
+
 } ibde_t;
 
 

diff --git a/platform/broadcom/saibcm-modules/include/kcom.h b/platform/broadcom/saibcm-modules/include/kcom.h
@@ -46,6 +46,7 @@
 #define KCOM_M_HW_INIT          4  /* H/W initialized */
 #define KCOM_M_ETH_HW_CONFIG    5  /* ETH HW config*/
 #define KCOM_M_DETACH           6  /* Detach kernel module */
+#define KCOM_M_REPROBE          7  /* Reprobe device */
 #define KCOM_M_NETIF_CREATE     11 /* Create network interface */
 #define KCOM_M_NETIF_DESTROY    12 /* Destroy network interface */
 #define KCOM_M_NETIF_LIST       13 /* Get list of network interface IDs */
@@ -59,7 +60,7 @@
 #define KCOM_M_DBGPKT_GET       42 /* Get debug packet function info */
 #define KCOM_M_WB_CLEANUP       51 /* Clean up for warmbooting */
 
-#define KCOM_VERSION            9  /* Protocol version */
+#define KCOM_VERSION            10 /* Protocol version */
 
 /*
  * Message status codes
@@ -305,7 +306,7 @@ typedef struct kcom_eth_hw_config_s {
     uint8 chan;
     uint32 flags;
     uint32 value;
-  } kcom_eth_hw_config_t;
+} kcom_eth_hw_config_t;
 
 /*
  * Message types
@@ -379,6 +380,14 @@ typedef struct kcom_msg_detach_s {
     uint32 flags;
 } kcom_msg_detach_t;
 
+/*
+ * Reprobe switch device.
+ */
+typedef struct kcom_msg_reprobe_s {
+    kcom_msg_hdr_t hdr;
+    uint32 flags;
+} kcom_msg_reprobe_t;
+
 /*
  * Enable/Disable debugging packet function.
  */
@@ -498,6 +507,7 @@ typedef union kcom_msg_s {
     kcom_msg_hw_init_t hw_init;
     kcom_msg_eth_hw_config_t eth_hw_config;
     kcom_msg_detach_t detach;
+    kcom_msg_reprobe_t reprobe;
     kcom_msg_netif_create_t netif_create;
     kcom_msg_netif_destroy_t netif_destroy;
     kcom_msg_netif_list_t netif_list;

diff --git a/platform/broadcom/saibcm-modules/include/soc/devids.h b/platform/broadcom/saibcm-modules/include/soc/devids.h
@@ -1238,6 +1238,15 @@
 
 #define BCM56980_DEVICE_ID      0xb980
 #define BCM56980_A0_REV_ID      1
+#define BCM56980_B0_REV_ID      0x11
+#define BCM56981_DEVICE_ID      0xb981
+#define BCM56981_A0_REV_ID      1
+#define BCM56982_DEVICE_ID      0xb982
+#define BCM56982_A0_REV_ID      1
+#define BCM56983_DEVICE_ID      0xb983
+#define BCM56983_A0_REV_ID      1
+#define BCM56984_DEVICE_ID      0xb984
+#define BCM56984_A0_REV_ID      1
 
 #define BCM56968_DEVICE_ID      0xb968
 #define BCM56968_A0_REV_ID      1
@@ -1289,15 +1298,20 @@
 
 #define BCM56670_DEVICE_ID      0xb670
 #define BCM56670_A0_REV_ID      1
+#define BCM56670_B0_REV_ID      0x11
 
 #define BCM56671_DEVICE_ID      0xb671
 #define BCM56671_A0_REV_ID      1
+#define BCM56671_B0_REV_ID      0x11
 
 #define BCM56672_DEVICE_ID      0xb672
 #define BCM56672_A0_REV_ID      1
+#define BCM56672_B0_REV_ID      0x11
 
 #define BCM56675_DEVICE_ID      0xb675
 #define BCM56675_A0_REV_ID      1
+#define BCM56675_B0_REV_ID      0x11
+
 
 #define BCM56565_DEVICE_ID      0xb565
 #define BCM56565_A0_REV_ID      1
@@ -1317,12 +1331,19 @@
 
 #define BCM56760_DEVICE_ID      0xb760
 #define BCM56760_A0_REV_ID      1
+#define BCM56760_A1_REV_ID      2
 #define BCM56760_B0_REV_ID      0x11
 
 #define BCM56761_DEVICE_ID      0xb761
 #define BCM56761_A0_REV_ID      1
 #define BCM56761_B0_REV_ID      0x11
 
+#define BCM56761_DEVICE_ID      0xb761
+#define BCM56761_A0_REV_ID      1
+#define BCM56761_A1_REV_ID      2
+#define BCM56761_B0_REV_ID      0x11
+#define BCM56761_B1_REV_ID      0x12
+
 #define BCM56762_DEVICE_ID      0xb762
 #define BCM56762_A0_REV_ID      1
 #define BCM56762_B0_REV_ID      0x11
@@ -1347,6 +1368,11 @@
 #define BCM56068_A0_REV_ID      1
 #define BCM56068_B0_REV_ID      0x11
 
+#define BCM56068_DEVICE_ID      0xb068
+#define BCM56068_A0_REV_ID      1
+#define BCM56068_B0_REV_ID      0x11
+#define BCM56068_B1_REV_ID      0x12
+
 #define BCM56069_DEVICE_ID      0xb069
 #define BCM56069_A0_REV_ID      1
 #define BCM56069_B0_REV_ID      0x11
@@ -1400,6 +1426,42 @@
 #define BCM56873_DEVICE_ID      0xb873
 #define BCM56873_A0_REV_ID      1
 
+#define BCM56370_DEVICE_ID      0xb370
+#define BCM56370_A0_REV_ID      1
+
+#define BCM56371_DEVICE_ID      0xb371
+#define BCM56371_A0_REV_ID      1
+
+#define BCM56372_DEVICE_ID      0xb372
+#define BCM56372_A0_REV_ID      1
+
+#define BCM56374_DEVICE_ID      0xb374
+#define BCM56374_A0_REV_ID      1
+
+#define BCM56375_DEVICE_ID      0xb375
+#define BCM56375_A0_REV_ID      1
+
+#define BCM56376_DEVICE_ID      0xb376
+#define BCM56376_A0_REV_ID      1
+
+#define BCM56377_DEVICE_ID      0xb377
+#define BCM56377_A0_REV_ID      1
+
+#define BCM56577_DEVICE_ID      0xb577
+#define BCM56577_A0_REV_ID      1
+
+#define BCM56578_DEVICE_ID      0xb578
+#define BCM56578_A0_REV_ID      1
+
+#define BCM56579_DEVICE_ID      0xb579
+#define BCM56579_A0_REV_ID      1
+
+#define BCM56770_DEVICE_ID      0xb770
+#define BCM56770_A0_REV_ID      1
+
+#define BCM56771_DEVICE_ID      0xb771
+#define BCM56771_A0_REV_ID      1
+
 #define BCM53540_DEVICE_ID      0x8540
 #define BCM53540_A0_REV_ID      1
 #define BCM53547_DEVICE_ID      0x8547
@@ -1718,6 +1780,7 @@
 #define DNXC_B0_REV_ID          0x0011
 #define BCM88790_DEVICE_ID      0x8790
 #define BCM88790_A0_REV_ID      DNXC_A0_REV_ID
+#define BCM88790_B0_REV_ID      DNXC_B0_REV_ID
 #define BCM88791_DEVICE_ID      0x8791
 #define BCM88792_DEVICE_ID      0x8792
 #define BCM88793_DEVICE_ID      0x8793

diff --git a/platform/broadcom/saibcm-modules/make/Makefile.linux-gto b/platform/broadcom/saibcm-modules/make/Makefile.linux-gto
@@ -86,15 +86,19 @@ endif
 endif
 
 ifdef DPP_CHIPS
-CFLAGS += -DDUNE_BCM -D__DUNE_GTO_BCM_CPU__ -D__DUNE_LINUX_BCM_CPU_PCIE__ -D__DUNE_LINUX_BCM_CPU_PCP_DMA__
+CFLAGS += -DDUNE_BCM -D__DUNE_LINUX_BCM_CPU_PCP_DMA__
 CFGFLAGS += -DSOC_CM_FUNCTION
 endif
 
 ifdef DFE_CHIPS
-CFLAGS += -DDUNE_BCM -D__DUNE_GTO_BCM_CPU__ -D__DUNE_LINUX_BCM_CPU_PCIE__
+CFLAGS += -DDUNE_BCM
 CFGFLAGS += -DSOC_CM_FUNCTION
 endif
 
+ifdef SAND_CHIPS
+CFLAGS += -D__DUNE_GTO_BCM_CPU__ -D__DUNE_LINUX_BCM_CPU_PCIE__
+endif
+
 ifdef SHADOW_PLX
 CFLAGS += -DBCM_PLX9656_LOCAL_BUS -DBDE_LINUX_NON_INTERRUPTIBLE -DSHADOW_SVK
 endif