matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[201911] Broadcom SAI 3.7.5.2 (#5330)

Browse Source 
* Broadcom SAI 3.7.5.2, with the fixes for following CSP's 

e5e06f4 Fix for CS00010914668(KB0029456/SDK-218585) and CS00010503275(KB0029315/SDK-213475)
cf4f8da Solution for CS00010775359 in 3.7
0348f03 Patch for CS00010897814
a2d2fdd Patch for CS00010817763
4d362e8 Patch for CS00010636736
557ddc6 Solution for CS00010443542
0f122f1 Port SDK SER fix for dynamic tables (SDK-175398 / SDK-221245) to SAI 3.7
37e5c5e Fix for CS00010790550
64daf8a Fix for CS00010726597
e7f000e Fix for CS00010697761
44b7ab3 Solution for CS00010617498.
1475c24 CSP10503275 request to pull KB0029314 into 3.7
This commit is contained in:
judyjoseph 2020-09-18 17:17:30 -07:00 committed by GitHub
parent 75068f3a62
commit ef89cb96a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/broadcom/sai-modules.mk
View File

@ -1,7 +1,7 @@
# Broadcom SAI modules
KVERSION = 4.9.0-11-2-amd64
BRCM_OPENNSL_KERNEL_VERSION = 3.7.5.1
BRCM_OPENNSL_KERNEL_VERSION = 3.7.5.2
BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules

8
platform/broadcom/sai.mk
View File

@ -1,8 +1,8 @@
BRCM_SAI = libsaibcm_3.7.5.1-3_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm_3.7.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=jKyO230pW7whAMsTPZeUvcCjfE7sFin5JKzdvKswgKQ%3D&se=2034-04-19T15%3A59%3A16Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_3.7.5.1-3_amd64.deb
BRCM_SAI = libsaibcm_3.7.5.2_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm_3.7.5.2_amd64.deb?sv=2015-04-05&sr=b&sig=wVtVNSk6%2BiWoUefcr%2FeyyI0Z8w1CrRGRryL%2BLLMdBKo%3D&se=2034-05-27T22%3A06%3A37Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_3.7.5.2_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.7/libsaibcm-dev_3.7.5.1-3_amd64.deb?sv=2015-04-05&sr=b&sig=eqVrbb2kbr%2Bz4B8OeyJ2mchjOL70Og9W0demES3uCF0%3D&se=2034-04-19T16%3A00%3A02Z&sp=r"
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm-dev_3.7.5.2_amd64.deb?sv=2015-04-05&sr=b&sig=Qd0aKbLKiAi3pOZDwL6SfgfKW2eaP6RVfrZSS5YV49s%3D&se=2034-05-27T22%3A07%3A12Z&sp=r"
SONIC_ONLINE_DEBS += $(BRCM_SAI)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

7
platform/broadcom/saibcm-modules/debian/changelog
View File

@ -1,3 +1,10 @@
opennsl (3.7.5.2) unstable; urgency=medium
* Port Broadcom SAI 3.7.5.2
* Cherry-pick change from master branch, 3.7.5.2
-- Judy Joseph <jujoseph@microsoft.com> Fri, 20 Aug 2020 15:32:47 +0000
opennsl (3.7.5.1) unstable; urgency=medium
* Port Broadcom SAI 3.7.5.1

27
platform/broadcom/saibcm-modules/systems/linux/kernel/modules/bcm-knet/bcm-knet.c
View File

@ -65,6 +65,10 @@
#include <kcom.h>
#include <bcm-knet.h>
#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,16,0)
#include <linux/nsproxy.h>
#endif
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
#include <linux/ethtool.h>
@ -890,6 +894,13 @@ typedef struct bkn_filter_s {
kcom_filter_t kf;
} bkn_filter_t;
#ifdef SAI_FIXUP /* SDK-224448 */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
#define BKN_NETDEV_TX_BUSY NETDEV_TX_BUSY
#else
#define BKN_NETDEV_TX_BUSY 1
#endif
#endif /* SDK-224448 */
/*
* Multiple instance support in KNET
@ -5758,15 +5769,15 @@ bkn_tx(struct sk_buff *skb, struct net_device *dev)
priv->stats.tx_bytes += pktlen;
sinfo->tx.pkts++;
} else {
DBG_WARN(("Tx drop: No DMA resources\n"));
priv->stats.tx_dropped++;
#ifdef SAI_FIXUP /* SDK-224448 */
DBG_VERB(("Tx busy: No DMA resources\n"));
sinfo->tx.pkts_d_dma_resrc++;
dev_kfree_skb_any(skb);
}
/* Check our Tx resources */
if (sinfo->tx.free <= 1) {
#endif /* SDK-224448 */
bkn_suspend_tx(sinfo);
#ifdef SAI_FIXUP /* SDK-224448 */
spin_unlock_irqrestore(&sinfo->lock, flags);
return BKN_NETDEV_TX_BUSY;
#endif /* SDK-224448 */
}
NETDEV_UPDATE_TRANS_START_TIME(dev);
@ -7707,7 +7718,7 @@ bkn_knet_netif_create(kcom_msg_netif_create_t *kmsg, int len)
kmsg->netif.id = priv->id;
memcpy(kmsg->netif.macaddr, dev->dev_addr, 6);
memcpy(kmsg->netif.name, dev->name, KCOM_NETIF_NAME_MAX - 1);
if (knet_netif_create_cb != NULL) {
int retv = knet_netif_create_cb(kmsg->hdr.unit, &(kmsg->netif), dev);
if (retv) {