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

Update packages and pointers to use SAI1.6 headers. #4597

Merged
merged 23 commits into from
May 30, 2020
Merged

Update packages and pointers to use SAI1.6 headers. #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5b5d1a1
Update sonic-sairedis (sairedis with SAI 1.6 headers)
smaheshm May 6, 2020
4dd0ac5
Merge remote-tracking branch 'upstream/master'
smaheshm May 6, 2020
6b5acc3
Update SAIBCM to 3.7.4.2, which is built upon SAI1.6 headers
smaheshm May 6, 2020
b0899a4
missed updating BRCM_SAI variable, fixed it
smaheshm May 6, 2020
b849ab2
Update SAIBCM to 3.7.4.2, updated link to libsaibcm
smaheshm May 7, 2020
138bb7b
[Mellanox] Update SAI (release:v1.16.3; API:v1.6)
May 13, 2020
af50315
Merge pull request #2 from volodymyrsamotiy/202006_sai1.6
smaheshm May 13, 2020
60552d0
Merge Mellanox changes (SAI1.6 update) from master
smaheshm May 14, 2020
9f84c96
Update sonic-sairedis pointer to include SAI1.6 headers
smaheshm May 14, 2020
f2a4a79
Merge remote-tracking branch 'upstream/master'
smaheshm May 15, 2020
093ed9d
[Mellanox] Update SDK to 4.4.0914 and FW to xx.2007.1112 to match SAI…
May 15, 2020
69a8628
Merge pull request #3 from volodymyrsamotiy/202006_sai1.6
smaheshm May 18, 2020
9155bfc
Merge remote-tracking branch 'upstream/master'
smaheshm May 18, 2020
448b7bb
Merge remote-tracking branch 'upstream/master'
smaheshm May 21, 2020
7a91d7f
ensure the veth link is up in docker VS container
smaheshm May 27, 2020
8744234
Merge remote-tracking branch 'upstream/master'
smaheshm May 27, 2020
8a3fd88
Merge remote-tracking branch 'upstream/master'
smaheshm May 28, 2020
ddd55c0
ensure the veth link is up in docker VS container
smaheshm May 28, 2020
c17f22a
[Mellanox] Update SAI (release:v1.16.3.2; API:v1.6)
May 29, 2020
ea02427
Merge pull request #4 from volodymyrsamotiy/202006_sai1.6
smaheshm May 29, 2020
c7f479f
use 'config interface startup' instead of using ifconfig command, als…
smaheshm May 29, 2020
23ac34e
Merge branch 'master' of github.com:smaheshm/sonic-buildimage
smaheshm May 29, 2020
b824559
Merge remote-tracking branch 'upstream/master'
smaheshm May 29, 2020
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
8 changes: 4 additions & 4 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_3.7.3.3-4_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm_3.7.3.3-4_amd64.deb?sv=2015-04-05&sr=b&sig=9z7vLhweD%2B%2FZylkr9XsDAJ3DdE5NJlcPTslFYyBuAXU%3D&se=2033-12-25T14%3A52%3A25Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_3.7.3.3-4_amd64.deb
BRCM_SAI = libsaibcm_3.7.4.2_amd64.deb
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm_3.7.4.2_amd64.deb?sv=2015-04-05&sr=b&sig=Iqgd1HDmXOa%2F2OEnez1D4dQ4wVICZlnvVOYao1FYlio%3D&se=2034-01-14T18%3A51%3A07Z&sp=r"
BRCM_SAI_DEV = libsaibcm-dev_3.7.4.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.3.3-4_amd64.deb?sv=2015-04-05&sr=b&sig=SAOoGh2zdljiPuKeDoa%2B1lSJzZ8uXh2Irl2RZX1uAiA%3D&se=2033-12-25T14%3A53%3A44Z&sp=r"
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.7/libsaibcm-dev_3.7.4.2_amd64.deb?sv=2015-04-05&sr=b&sig=cbQJOwQcILWYbjuI3LObY6H7bvCNijKfEkdAIrm3Q64%3D&se=2034-01-14T18%3A49%3A15Z&sp=r"

SONIC_ONLINE_DEBS += $(BRCM_SAI)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
6 changes: 3 additions & 3 deletions platform/mellanox/fw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ else
FW_FROM_URL = n
endif

MLNX_SPC_FW_VERSION = 13.2007.1140
MLNX_SPC_FW_VERSION = 13.2007.1112
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)

MLNX_SPC2_FW_VERSION = 29.2007.1140
MLNX_SPC2_FW_VERSION = 29.2007.1112
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)

MLNX_SPC3_FW_VERSION = 30.2007.1140
MLNX_SPC3_FW_VERSION = 30.2007.1112
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIRel1.16.4-master
MLNX_SAI_VERSION = SAIRel1.16.3.2-sai16

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Open in desktop
Submodule SAI-Implementation updated 53 files
+1 −1 README.md
+1 −1 mlnx_sai/debian/changelog
+1 −10 mlnx_sai/inc/mlnx_sai.h
+3 −1 mlnx_sai/inc/sai/sai.h
+84 −5 mlnx_sai/inc/sai/saiacl.h
+5 −2 mlnx_sai/inc/sai/saibfd.h
+5 −15 mlnx_sai/inc/sai/saibridge.h
+2 −4 mlnx_sai/inc/sai/saidebugcounter.h
+55 −0 mlnx_sai/inc/sai/saidtel.h
+96 −0 mlnx_sai/inc/sai/saifdb.h
+18 −0 mlnx_sai/inc/sai/saihash.h
+28 −4 mlnx_sai/inc/sai/saihostif.h
+1,369 −0 mlnx_sai/inc/sai/saimacsec.h
+66 −0 mlnx_sai/inc/sai/saimpls.h
+1 −7 mlnx_sai/inc/sai/sainat.h
+1 −0 mlnx_sai/inc/sai/saineighbor.h
+9 −0 mlnx_sai/inc/sai/sainexthop.h
+69 −3 mlnx_sai/inc/sai/sainexthopgroup.h
+397 −20 mlnx_sai/inc/sai/saiport.h
+9 −0 mlnx_sai/inc/sai/saiqosmap.h
+10 −2 mlnx_sai/inc/sai/sairouterinterface.h
+3 −0 mlnx_sai/inc/sai/saistp.h
+408 −0 mlnx_sai/inc/sai/saiswitch.h
+15 −28 mlnx_sai/inc/sai/saitam.h
+42 −2 mlnx_sai/inc/sai/saitunnel.h
+89 −7 mlnx_sai/inc/sai/saitypes.h
+3 −12 mlnx_sai/inc/sai/saivlan.h
+5 −0 mlnx_sai/inc/sai/saiwred.h
+1 −0 mlnx_sai/mlnx_sai.vcxproj
+3 −0 mlnx_sai/mlnx_sai.vcxproj.filters
+4 −3 mlnx_sai/src/Makefile.am
+0 −45 mlnx_sai/src/dbgdump/mlnx_sai_dbg_tunnel.c
+1 −0 mlnx_sai/src/meta/Doxyfile
+23 −0 mlnx_sai/src/meta/acronyms.txt
+8 −0 mlnx_sai/src/meta/aspell.en.pws
+203 −0 mlnx_sai/src/meta/checkheaders.pl
+341 −18 mlnx_sai/src/meta/parse.pl
+18,727 −6,112 mlnx_sai/src/meta/saimetadata.c
+203 −2 mlnx_sai/src/meta/saimetadata.h
+82 −0 mlnx_sai/src/meta/saimetadatatypes.h
+104 −22 mlnx_sai/src/meta/saisanitycheck.c
+126 −0 mlnx_sai/src/meta/saiserialize.c
+78 −0 mlnx_sai/src/meta/saiserialize.h
+144 −0 mlnx_sai/src/meta/saiserializetest.c
+7 −4 mlnx_sai/src/meta/serialize.pm
+107 −7 mlnx_sai/src/meta/style.pm
+0 −1 mlnx_sai/src/meta/test.pm
+4 −2 mlnx_sai/src/meta/xmlutils.pm
+5 −1 mlnx_sai/src/mlnx_sai_fdb.c
+12 −12 mlnx_sai/src/mlnx_sai_port.c
+3 −1 mlnx_sai/src/mlnx_sai_switch.c
+110 −284 mlnx_sai/src/mlnx_sai_tunnel.c
+3 −2 release notes.txt
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
Open in desktop
Submodule Switch-SDK-drivers updated 57 files
+4 −4 bin/README.md
+ − bin/applibs-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/applibs-dev_1.mlnx.4.4.0918_amd64.deb
+ − bin/applibs_1.mlnx.4.4.0914_amd64.deb
+ − bin/applibs_1.mlnx.4.4.0918_amd64.deb
+ − bin/fw-SPC-rel-13_2007_1112-EVB.mfa
+ − bin/fw-SPC-rel-13_2007_1140-EVB.mfa
+ − bin/fw-SPC2-rel-29_2007_1112-EVB.mfa
+ − bin/fw-SPC2-rel-29_2007_1140-EVB.mfa
+ − bin/fw-SPC3-rel-30_2007_1112-EVB.mfa
+ − bin/fw-SPC3-rel-30_2007_1140-EVB.mfa
+ − bin/iproute2-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/iproute2_1.mlnx.4.4.0914_amd64.deb
+ − bin/python-sdk-api_1.mlnx.4.4.0914_amd64.deb
+ − bin/python-sdk-api_1.mlnx.4.4.0918_amd64.deb
+ − bin/sx-acl-helper-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-acl-helper-dev-static_1.mlnx.4.4.0918_amd64.deb
+ − bin/sx-acl-helper-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-acl-helper_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-acl-helper_1.mlnx.4.4.0918_amd64.deb
+ − bin/sx-complib-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-complib-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-complib_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-examples-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-examples-dev_1.mlnx.4.4.0918_amd64.deb
+ − bin/sx-examples_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-examples_1.mlnx.4.4.0918_amd64.deb
+ − bin/sx-gen-utils-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-gen-utils_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-scew-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-scew-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-scew_1.mlnx.4.4.0914_amd64.deb
+ − bin/sxd-libs-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/sxd-libs-dev-static_1.mlnx.4.4.0918_amd64.deb
+ − bin/sxd-libs-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sxd-libs-dev_1.mlnx.4.4.0918_amd64.deb
+ − bin/sxd-libs_1.mlnx.4.4.0914_amd64.deb
+ − bin/sxd-libs_1.mlnx.4.4.0918_amd64.deb
+ − bin/wjh-libs-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/wjh-libs-dev-static_1.mlnx.4.4.0918_amd64.deb
+ − bin/wjh-libs-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/wjh-libs_1.mlnx.4.4.0914_amd64.deb
+ − bin/wjh-libs_1.mlnx.4.4.0918_amd64.deb
+1 −1 debian/changelog
+2 −0 debian/sx-kernel.postinst
+1 −0 debian/sx-kernel.prerm
+2 −2 drivers/net/mlx_sx/Makefile
+0 −48 drivers/net/mlx_sx/fw_reg.c
+2 −16 drivers/net/mlx_sx/ptp_spc2.c
+22 −58 drivers/net/mlx_sx/sx_clock.c
+0 −6 drivers/net/mlx_sx/sx_clock.h
+0 −35 drivers/net/mlx_sx/sx_clock_spc1.c
+19 −48 drivers/net/mlx_sx/sx_clock_spc2.c
+2 −2 drivers/net/mlx_sx/sx_core_main.c
+0 −1 include/linux/mlx_sx/cmd.h
+0 −1 include/linux/mlx_sx/device.h
+0 −22 include/linux/mlx_sx/kernel_user.h
2 changes: 1 addition & 1 deletion platform/mellanox/sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_VERSION = 4.4.0918
MLNX_SDK_VERSION = 4.4.0914
MLNX_SDK_ISSU_VERSION = 101

MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))
Expand Down
4 changes: 2 additions & 2 deletions platform/vs/tests/bgp/test_gr_livelock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ def test_gr_livelock(dvs, testlog):
time.sleep(5)
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0")
dvs.runcmd("ifconfig Ethernet0 up")
dvs.runcmd("config interface startup Ethernet0")

dvs.runcmd("ip addr add 10.0.0.2/31 dev Ethernet4")
dvs.runcmd("ifconfig Ethernet4 up")
dvs.runcmd("config interface startup Ethernet4")

dvs.servers[0].runcmd("ip addr add 10.0.0.1/31 dev eth0")
dvs.servers[0].runcmd("ifconfig eth0 up")
Expand Down
2 changes: 1 addition & 1 deletion platform/vs/tests/bgp/test_invalid_nexthop.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def test_InvalidNexthop(dvs, testlog):
dvs.copy_file("/etc/frr/", "bgp/files/invalid_nexthop/bgpd.conf")
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add fc00::1/126 dev Ethernet0")
dvs.runcmd("ifconfig Ethernet0 up")
dvs.runcmd("config interface startup Ethernet0")

dvs.servers[0].runcmd("ip addr add fc00::2/126 dev eth0")
dvs.servers[0].runcmd("ifconfig eth0 up")
Expand Down
4 changes: 2 additions & 2 deletions platform/vs/tests/bgp/test_no_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ def test_bounce(dvs, testlog):
dvs.copy_file("/etc/frr/", "bgp/files/no_export/bgpd.conf")
dvs.runcmd("supervisorctl start bgpd")
dvs.runcmd("ip addr add 10.0.0.0/31 dev Ethernet0")
dvs.runcmd("ifconfig Ethernet0 up")
dvs.runcmd("config interface startup Ethernet0")

dvs.runcmd("ip addr add 10.0.0.2/31 dev Ethernet4")
dvs.runcmd("ifconfig Ethernet4 up")
dvs.runcmd("config interface startup Ethernet4")

dvs.servers[0].runcmd("ip addr add 10.0.0.1/31 dev eth0")
dvs.servers[0].runcmd("ifconfig eth0 up")
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-sairedis
Open in desktop
Submodule sonic-sairedis updated from f97207 to ebdf4f