Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BCMSAI] Update BCMSAI debian to 4.3.0.10 with 6.5.21 SDK, and opennsl module to 6.5.21 #6526

Merged
merged 11 commits into from
Jan 28, 2021
Merged

[BCMSAI] Update BCMSAI debian to 4.3.0.10 with 6.5.21 SDK, and opennsl module to 6.5.21 #6526

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4d37c2f
update SAI GPL modules to 6.5.21
smaheshm Jan 20, 2021
e334277
update Makefile and add default MTU arg for module install
smaheshm Jan 20, 2021
7d1622b
update changelog, update makefile to build psample and PTP clock kern…
smaheshm Jan 21, 2021
95f70c7
update BCMSAI link to 4.3.0.10 (with 6.5.21 SDK)
smaheshm Jan 21, 2021
bfb663b
update opennsl version
smaheshm Jan 22, 2021
14f9213
update opennsl kernel version
smaheshm Jan 22, 2021
e410389
Merge remote-tracking branch 'upstream/master' into bcmsai4.3
smaheshm Jan 22, 2021
ccc60bb
fix the libsaibcm version
smaheshm Jan 23, 2021
9b73229
udpate libsaibcm with unresolved symbol fix
smaheshm Jan 26, 2021
c4a5824
updated libsaibcm with premium cancun firmware packages
smaheshm Jan 26, 2021
c1b14a4
Added sdklt modules, update opennsl version to match BCMSAI version
smaheshm Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BRCM_SAI = libsaibcm_4.2.1.5-10_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A30%3A31Z&se=2035-01-13T07%3A30%3A00Z&sr=b&sp=r&sig=yCGwk%2FW%2Fg%2FaFxhr0oNSTZ%2BVy5B6kX1WDEsbbyz9J088%3D"
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10_amd64.deb?sv=2015-04-05&sr=b&sig=yKic6%2FwJ2mHM6n4lXrR32yqEsLt01EUzqxIuOAvV7uQ%3D&se=2022-01-21T23%3A13%3A54Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_4.2.1.5-10_amd64.deb
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.2/master/buster/libsaibcm-dev_4.2.1.5-10_amd64.deb?sv=2019-12-12&st=2021-01-12T07%3A32%3A43Z&se=2035-01-13T07%3A32%3A00Z&sr=b&sp=r&sig=wuCNc6pa12JQCBi%2BM9rLWvVI92ldan9hKNF%2BfVfUWN8%3D"
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm-dev_4.3.0.10_amd64.deb?sv=2015-04-05&sr=b&sig=IAx7bmd0mgQL8DyF345jQOQHRxwx9wen2AyWdacfmw4%3D&se=2022-01-21T23%3A15%3A30Z&sp=r"
smaheshm marked this conversation as resolved.
Show resolved Hide resolved

SONIC_ONLINE_DEBS += $(BRCM_SAI)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
Expand Down
6 changes: 6 additions & 0 deletions platform/broadcom/saibcm-modules/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
opennsl (4.2.1.3-1) unstable; urgency=medium
smaheshm marked this conversation as resolved.
Show resolved Hide resolved

* Update to Broadcom SAI 4.3.0.10

-- Mahesh Maddikayala <samaddik@microsoft.com> Thu, 21 Jan 2021 18:36:38 +0000

opennsl (4.2.1.3-1) unstable; urgency=medium

* Update to Broadcom SAI 4.2.1.3
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules/debian/opennsl-modules.init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function load_kernel_modules()
# There is a different psample.ko module getting created at net/psample/psample.ko
insmod /lib/modules/$(uname -r)/extra/psample.ko

modprobe linux-bcm-knet use_rx_skb=1 rx_buffer_size=9238 debug=0x5020
modprobe linux-bcm-knet use_rx_skb=1 rx_buffer_size=9238 debug=0x5020 default_mtu=9100
modprobe linux-knet-cb
}

Expand Down
13 changes: 12 additions & 1 deletion platform/broadcom/saibcm-modules/include/ibde.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright 2017 Broadcom
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
*
* License Option 1: GPL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
Expand All @@ -12,6 +17,12 @@
*
* You should have received a copy of the GNU General Public License
* version 2 (GPLv2) along with this source code.
*
*
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: ibde.h,v 1.27 Broadcom SDK $
Expand Down
15 changes: 14 additions & 1 deletion platform/broadcom/saibcm-modules/include/kcom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright 2017 Broadcom
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
*
* License Option 1: GPL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
Expand All @@ -12,6 +17,12 @@
*
* You should have received a copy of the GNU General Public License
* version 2 (GPLv2) along with this source code.
*
*
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: kcom.h,v 1.9 Broadcom SDK $
Expand Down Expand Up @@ -341,6 +352,8 @@ typedef struct kcom_msg_version_s {
#define KSYNC_M_HW_DEINIT 1
#define KSYNC_M_VERSION 2
#define KSYNC_M_HW_TS_DISABLE 3
#define KSYNC_M_MTP_TS_UPDATE_ENABLE 4
#define KSYNC_M_MTP_TS_UPDATE_DISABLE 5

typedef struct kcom_clock_info_s {
uint8 cmd;
Expand Down
13 changes: 12 additions & 1 deletion platform/broadcom/saibcm-modules/include/sal/core/sync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright 2017 Broadcom
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
*
* License Option 1: GPL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
Expand All @@ -12,6 +17,12 @@
*
* You should have received a copy of the GNU General Public License
* version 2 (GPLv2) along with this source code.
*
*
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: sync.h,v 1.1 Broadcom SDK $
Expand Down
13 changes: 12 additions & 1 deletion platform/broadcom/saibcm-modules/include/sal/core/thread.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright 2017 Broadcom
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
*
* License Option 1: GPL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
Expand All @@ -12,6 +17,12 @@
*
* You should have received a copy of the GNU General Public License
* version 2 (GPLv2) along with this source code.
*
*
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: thread.h,v 1.1 Broadcom SDK $
Expand Down
13 changes: 12 additions & 1 deletion platform/broadcom/saibcm-modules/include/sal/types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright 2017 Broadcom
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
*
* License Option 1: GPL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
Expand All @@ -12,6 +17,12 @@
*
* You should have received a copy of the GNU General Public License
* version 2 (GPLv2) along with this source code.
*
*
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: types.h,v 1.3 Broadcom SDK $
Expand Down
13 changes: 12 additions & 1 deletion platform/broadcom/saibcm-modules/include/sdk_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/*
* Copyright 2017 Broadcom
* Copyright 2007-2020 Broadcom Inc. All rights reserved.
*
* Permission is granted to use, copy, modify and/or distribute this
* software under either one of the licenses below.
*
* License Option 1: GPL
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 2, as
Expand All @@ -12,6 +17,12 @@
*
* You should have received a copy of the GNU General Public License
* version 2 (GPLv2) along with this source code.
*
*
* License Option 2: Broadcom Open Network Switch APIs (OpenNSA) license
*
* This software is governed by the Broadcom Open Network Switch APIs license:
* https://www.broadcom.com/products/ethernet-connectivity/software/opennsa
*/
/*
* $Id: sdk_config.h,v 1.5 Broadcom SDK $
Expand Down
Loading