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.

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

[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
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion platform/broadcom/sai-modules.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Broadcom SAI modules

BRCM_OPENNSL_KERNEL_VERSION = 4.2.1.3-1
BRCM_OPENNSL_KERNEL_VERSION = 4.3.0.10-2

BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
Expand Down
8 changes: 4 additions & 4 deletions platform/broadcom/sai.mk
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_DEV = libsaibcm-dev_4.2.1.5-10_amd64.deb
BRCM_SAI = libsaibcm_4.3.0.10-2_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/master/libsaibcm_4.3.0.10-2_amd64.deb?sv=2015-04-05&sr=b&sig=1L2kJwYBuXDc9ObuVBBUS%2F%2FBVIfAA651ig5k6O1ZztE%3D&se=2022-06-10T21%3A25%3A43Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_4.3.0.10-2_amd64.deb
smaheshm marked this conversation as resolved.
Show resolved Hide resolved
$(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-2_amd64.deb?sv=2015-04-05&sr=b&sig=2Vm6o8HtbjI%2BfVoHJUiO5b75USqGra9CLSFXViQm8yM%3D&se=2022-06-10T21%3A26%3A35Z&sp=r"

SONIC_ONLINE_DEBS += $(BRCM_SAI)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
Expand Down
7 changes: 7 additions & 0 deletions platform/broadcom/saibcm-modules/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
opennsl (4.3.0.10-2) unstable; urgency=medium

* Update to Broadcom SAI 4.3.0.10
* Added SDKLT modules 4.3.0.10-2

-- 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
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ function create_devices()
rm -f /dev/linux-bcm-knet
rm -f /dev/linux-bcm-bde
rm -f /dev/linux-kernel-bde
rm -f /dev/linux_ngbde

mknod /dev/linux_ngbde c 120 0
mknod /dev/linux-knet-cb c 121 0
mknod /dev/linux-bcm-knet c 122 0
mknod /dev/linux-bcm-bde c 126 0
Expand Down Expand Up @@ -57,8 +59,9 @@ 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
modprobe linux_ngbde
}

function remove_kernel_modules()
Expand All @@ -68,6 +71,7 @@ function remove_kernel_modules()
rmmod linux-bcm-knet
rmmod linux-user-bde
rmmod linux-kernel-bde
rmmod linux_ngbde
}

case "$1" in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/4.19.0-9-
systems/linux/user/x86-smp_generic_64-2_6/psample.ko lib/modules/4.19.0-9-2-amd64/extra
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-ptp-clock.ko lib/modules/4.19.0-9-2-amd64/extra
systemd/opennsl-modules.service lib/systemd/system
sdklt/linux/bde/linux_ngbde.ko lib/modules/4.19.0-9-2-amd64/extra
11 changes: 11 additions & 0 deletions platform/broadcom/saibcm-modules/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ kdist_clean: clean
KERNDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
KERNEL_SRC=/usr/src/linux-headers-$(KERNVERSION)-amd64 \
$(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean
SDK=$(realpath .) BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
lguohan marked this conversation as resolved.
Show resolved Hide resolved
KDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
$(MAKE) -C sdklt/ clean
# rm -f driver/*.o driver/*.ko
#
### end KERNEL SETUP
Expand Down Expand Up @@ -100,6 +103,10 @@ build-arch-stamp:
KERNEL_SRC=/usr/src/linux-headers-$(KERNVERSION)-amd64 \
$(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6

SDK=$(realpath .) BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
lguohan marked this conversation as resolved.
Show resolved Hide resolved
KDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
$(MAKE) -C sdklt/ kmod

touch $@

#k = $(shell echo $(KVERS) | grep -q ^2.6 && echo k)
Expand Down Expand Up @@ -128,6 +135,10 @@ clean:
KERNEL_SRC=/usr/src/linux-headers-$(KERNVERSION)-amd64 \
$(MAKE) -C systems/linux/user/x86-smp_generic_64-2_6 clean

SDK=$(realpath .) BUILD_KNET_CB=1 BUILD_PSAMPLE=1 \
lguohan marked this conversation as resolved.
Show resolved Hide resolved
KDIR=/usr/src/linux-headers-$(KERNVERSION)-common \
$(MAKE) -C sdklt/ clean

dh_clean

install: DH_OPTIONS=
Expand Down
13 changes: 12 additions & 1 deletion platform/broadcom/saibcm-modules/include/ibde.h
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
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
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
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
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
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