Skip to content

Commit

Permalink
[mellanox]: MSN4700 support 8 lanes 400G with new SAI/SDK/FW (#4509)
Browse files Browse the repository at this point in the history 
Update SAI/SDK/FW and MSN4700 device files to support 8 lanes 400G

Update SAI to 1.16.3
Update SDK to 4.4.0914
Update FW to *.2007.1112
Update MSN4700 device files to support 8 lanes 400G
  • Loading branch information
@keboliu
keboliu committed Apr 30, 2020
1 parent aca5bec commit 352a397
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 73 deletions.
66 changes: 33 additions & 33 deletions device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/port_config.ini
View file
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
# name lanes alias
Ethernet0 0,1,2,3 etp1
Ethernet4 4,5,6,7 etp2
Ethernet8 8,9,10,11 etp3
Ethernet12 12,13,14,15 etp4
Ethernet16 16,17,18,19 etp5
Ethernet20 20,21,22,23 etp6
Ethernet24 24,25,26,27 etp7
Ethernet28 28,29,30,31 etp8
Ethernet32 32,33,34,35 etp9
Ethernet36 36,37,38,39 etp10
Ethernet40 40,41,42,43 etp11
Ethernet44 44,45,46,47 etp12
Ethernet48 48,49,50,51 etp13
Ethernet52 52,53,54,55 etp14
Ethernet56 56,57,58,59 etp15
Ethernet60 60,61,62,63 etp16
Ethernet64 64,65,66,67 etp17
Ethernet68 68,69,70,71 etp18
Ethernet72 72,73,74,75 etp19
Ethernet76 76,77,78,79 etp20
Ethernet80 80,81,82,83 etp21
Ethernet84 84,85,86,87 etp22
Ethernet88 88,89,90,91 etp23
Ethernet92 92,93,94,95 etp24
Ethernet96 96,97,98,99 etp25
Ethernet100 100,101,102,103 etp26
Ethernet104 104,105,106,107 etp27
Ethernet108 108,109,110,111 etp28
Ethernet112 112,113,114,115 etp29
Ethernet116 116,117,118,119 etp30
Ethernet120 120,121,122,123 etp31
Ethernet124 124,125,126,127 etp32
# name lanes alias index
Ethernet0 0,1,2,3,4,5,6,7 etp1 0
Ethernet8 8,9,10,11,12,13,14,15 etp2 1
Ethernet16 16,17,18,19,20,21,22,23 etp3 2
Ethernet24 24,25,26,27,28,29,30,31 etp4 3
Ethernet32 32,33,34,35,36,37,38,39 etp5 4
Ethernet40 40,41,42,43,44,45,46,47 etp6 5
Ethernet48 48,49,50,51,52,53,54,55 etp7 6
Ethernet56 56,57,58,59,60,61,62,63 etp8 7
Ethernet64 64,65,66,67,68,69,70,71 etp9 8
Ethernet72 72,73,74,75,76,77,78,79 etp10 9
Ethernet80 80,81,82,83,84,85,86,87 etp11 10
Ethernet88 88,89,90,91,92,93,94,95 etp12 11
Ethernet96 96,97,98,99,100,101,102,103 etp13 12
Ethernet104 104,105,106,107,108,109,110,111 etp14 13
Ethernet112 112,113,114,115,116,117,118,119 etp15 14
Ethernet120 120,121,122,123,124,125,126,127 etp16 15
Ethernet128 128,129,130,131,132,133,134,135 etp17 16
Ethernet136 136,137,138,139,140,141,142,143 etp18 17
Ethernet144 144,145,146,147,148,149,150,151 etp19 18
Ethernet152 152,153,154,155,156,157,158,159 etp20 19
Ethernet160 160,161,162,163,164,165,166,167 etp21 20
Ethernet168 168,169,170,171,172,173,174,175 etp22 21
Ethernet176 176,177,178,179,180,181,182,183 etp23 22
Ethernet184 184,185,186,187,188,189,190,191 etp24 23
Ethernet192 192,193,194,195,196,197,198,199 etp25 24
Ethernet200 200,201,202,203,204,205,206,207 etp26 25
Ethernet208 208,209,210,211,212,213,214,215 etp27 26
Ethernet216 216,217,218,219,220,221,222,223 etp28 27
Ethernet224 224,225,226,227,228,229,230,231 etp29 28
Ethernet232 232,233,234,235,236,237,238,239 etp30 29
Ethernet240 240,241,242,243,244,245,246,247 etp31 30
Ethernet248 248,249,250,251,252,253,254,255 etp32 31
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn4700-r0/ACS-MSN4700/sai.profile
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700_100G.xml
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_4700.xml
64 changes: 32 additions & 32 deletions ..._msn4700-r0/ACS-MSN4700/sai_4700_100G.xml → ...-mlnx_msn4700-r0/ACS-MSN4700/sai_4700.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,189 +12,189 @@
<ports-list>
<port-info>
<local-port>1</local-port>
<width>4</width>
<width>8</width>
<module>17</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>5</local-port>
<width>4</width>
<width>8</width>
<module>16</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>9</local-port>
<width>4</width>
<width>8</width>
<module>19</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>13</local-port>
<width>4</width>
<width>8</width>
<module>18</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>17</local-port>
<width>4</width>
<width>8</width>
<module>21</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>21</local-port>
<width>4</width>
<width>8</width>
<module>20</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>25</local-port>
<width>4</width>
<width>8</width>
<module>23</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>29</local-port>
<width>4</width>
<width>8</width>
<module>22</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>33</local-port>
<width>4</width>
<width>8</width>
<module>29</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>37</local-port>
<width>4</width>
<width>8</width>
<module>28</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>41</local-port>
<width>4</width>
<width>8</width>
<module>31</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>45</local-port>
<width>4</width>
<width>8</width>
<module>30</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>49</local-port>
<width>4</width>
<width>8</width>
<module>25</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>53</local-port>
<width>4</width>
<width>8</width>
<module>24</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>57</local-port>
<width>4</width>
<width>8</width>
<module>27</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>61</local-port>
<width>4</width>
<width>8</width>
<module>26</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>65</local-port>
<width>4</width>
<width>8</width>
<module>14</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>69</local-port>
<width>4</width>
<width>8</width>
<module>15</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>73</local-port>
<width>4</width>
<width>8</width>
<module>12</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>77</local-port>
<width>4</width>
<width>8</width>
<module>13</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>81</local-port>
<width>4</width>
<width>8</width>
<module>10</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>85</local-port>
<width>4</width>
<width>8</width>
<module>11</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>89</local-port>
<width>4</width>
<width>8</width>
<module>8</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>93</local-port>
<width>4</width>
<width>8</width>
<module>9</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>97</local-port>
<width>4</width>
<width>8</width>
<module>2</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>101</local-port>
<width>4</width>
<width>8</width>
<module>3</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>105</local-port>
<width>4</width>
<width>8</width>
<module>0</module>

<!-- 0 none, 1=2, 2=4, 3=2,4 -->
Expand All @@ -205,35 +205,35 @@
</port-info>
<port-info>
<local-port>109</local-port>
<width>4</width>
<width>8</width>
<module>1</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>113</local-port>
<width>4</width>
<width>8</width>
<module>6</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>117</local-port>
<width>4</width>
<width>8</width>
<module>7</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>121</local-port>
<width>4</width>
<width>8</width>
<module>4</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
</port-info>
<port-info>
<local-port>125</local-port>
<width>4</width>
<width>8</width>
<module>5</module>
<breakout-modes>3</breakout-modes>
<port-speed>1536</port-speed>
Expand Down
6 changes: 3 additions & 3 deletions platform/mellanox/fw.mk
View file
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.0872
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.0872
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.0872
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIRel1.16.2-master
MLNX_SAI_VERSION = SAIRel1.16.3-master

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Submodule SAI-Implementation updated 12 files
+1 −1 mlnx_sai/debian/changelog
+3 −2 mlnx_sai/inc/mlnx_sai.h
+1 −4 mlnx_sai/src/mlnx_sai_bridge.c
+6 −6 mlnx_sai/src/mlnx_sai_host_interface.c
+2 −2 mlnx_sai/src/mlnx_sai_lag.c
+46 −16 mlnx_sai/src/mlnx_sai_port.c
+57 −6 mlnx_sai/src/mlnx_sai_rif.c
+50 −4 mlnx_sai/src/mlnx_sai_router.c
+1 −1 mlnx_sai/src/mlnx_sai_scheduler.c
+118 −0 mlnx_sai/src/mlnx_sai_switch.c
+32 −32 mlnx_sai/src/sai_4700_1G.xml
+3 −2 release notes.txt
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
Submodule Switch-SDK-drivers updated 90 files
+4 −4 bin/README.md
+ − bin/applibs-dev_1.mlnx.4.4.0880_amd64.deb
+ − bin/applibs-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/applibs_1.mlnx.4.4.0880_amd64.deb
+ − bin/applibs_1.mlnx.4.4.0914_amd64.deb
+ − bin/fw-SPC-rel-13_2007_0872-EVB.mfa
+ − bin/fw-SPC-rel-13_2007_1112-EVB.mfa
+ − bin/fw-SPC2-rel-29_2007_0872-EVB.mfa
+ − bin/fw-SPC2-rel-29_2007_1112-EVB.mfa
+ − bin/fw-SPC3-rel-30_2007_0872-EVB.mfa
+ − bin/fw-SPC3-rel-30_2007_1112-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.0880_amd64.deb
+ − bin/python-sdk-api_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-acl-helper-dev-static_1.mlnx.4.4.0880_amd64.deb
+ − bin/sx-acl-helper-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-acl-helper-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-acl-helper_1.mlnx.4.4.0880_amd64.deb
+ − bin/sx-acl-helper_1.mlnx.4.4.0914_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.0880_amd64.deb
+ − bin/sx-examples-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sx-examples_1.mlnx.4.4.0880_amd64.deb
+ − bin/sx-examples_1.mlnx.4.4.0914_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.0880_amd64.deb
+ − bin/sxd-libs-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/sxd-libs-dev_1.mlnx.4.4.0880_amd64.deb
+ − bin/sxd-libs-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/sxd-libs_1.mlnx.4.4.0880_amd64.deb
+ − bin/sxd-libs_1.mlnx.4.4.0914_amd64.deb
+ − bin/wjh-libs-dev-static_1.mlnx.4.4.0880_amd64.deb
+ − bin/wjh-libs-dev-static_1.mlnx.4.4.0914_amd64.deb
+ − bin/wjh-libs-dev_1.mlnx.4.4.0914_amd64.deb
+ − bin/wjh-libs_1.mlnx.4.4.0880_amd64.deb
+ − bin/wjh-libs_1.mlnx.4.4.0914_amd64.deb
+1 −1 debian/changelog
+5 −0 drivers/net/mlx_sx/Makefile
+58 −1 drivers/net/mlx_sx/auto_registers/fw_reg_auto.c
+3 −1 drivers/net/mlx_sx/auto_registers/ioctl_reg_auto.c
+100 −1 drivers/net/mlx_sx/auto_registers/reg.c
+178 −231 drivers/net/mlx_sx/cq.c
+14 −1 drivers/net/mlx_sx/cq.h
+2 −0 drivers/net/mlx_sx/dq.c
+6 −0 drivers/net/mlx_sx/fw_cmd.c
+0 −48 drivers/net/mlx_sx/fw_reg.c
+2 −1 drivers/net/mlx_sx/ioctl_db.c
+36 −34 drivers/net/mlx_sx/ioctl_host_ifc.c
+0 −1 drivers/net/mlx_sx/ioctl_internal.h
+5 −41 drivers/net/mlx_sx/ioctl_misc.c
+126 −0 drivers/net/mlx_sx/ptp.h
+442 −0 drivers/net/mlx_sx/ptp_common.c
+768 −0 drivers/net/mlx_sx/ptp_spc1.c
+147 −0 drivers/net/mlx_sx/ptp_spc2.c
+22 −8 drivers/net/mlx_sx/sgmii_transport.c
+56 −49 drivers/net/mlx_sx/sx.h
+114 −1,080 drivers/net/mlx_sx/sx_clock.c
+107 −106 drivers/net/mlx_sx/sx_clock.h
+343 −0 drivers/net/mlx_sx/sx_clock_spc1.c
+216 −0 drivers/net/mlx_sx/sx_clock_spc2.c
+93 −135 drivers/net/mlx_sx/sx_core_main.c
+2 −0 drivers/net/mlx_sx/sx_dbg_dump_proc.c
+1 −1 drivers/net/mlx_sx/sx_proc.c
+3 −4 drivers/net/sx_netdev/sx_netdev.h
+11 −11 drivers/net/sx_netdev/sx_netdev_main.c
+2 −1 include/linux/mlx_sx/auto_registers/cmd_auto.h
+2 −1 include/linux/mlx_sx/auto_registers/kernel_cmd_access_auto.h
+24 −1 include/linux/mlx_sx/auto_registers/kernel_user_auto.h
+40 −1 include/linux/mlx_sx/auto_registers/reg.h
+0 −1 include/linux/mlx_sx/cmd.h
+16 −5 include/linux/mlx_sx/device.h
+1 −6 include/linux/mlx_sx/driver.h
+18 −20 include/linux/mlx_sx/kernel_user.h
+21 −0 sx_scripts/kernel_backports/3.10.0-693/0001_mlx_sx_clock_c.patch
+12 −0 sx_scripts/kernel_backports/3.10.0-693/0001_mlx_sx_h.patch
+0 −12 sx_scripts/kernel_backports/4.15.15/0004_mlx_sx_clock.patch
+13 −0 sx_scripts/kernel_backports/4.15.15/0004_mlx_sx_clock_spc1.patch
+0 −31 sx_scripts/kernel_backports/4.19.0/0001_mlx_sx_clock.patch
+0 −45 sx_scripts/kernel_backports/4.9.0/0001_mlx_sx_clock_c.patch
+13 −0 sx_scripts/kernel_backports/4.9.0/0001_mlx_sx_clock_h.patch
+23 −0 sx_scripts/kernel_backports/4.9.0/0001_mlx_sx_clock_spc1_c.patch
+5 −7 sx_scripts/kernel_backports/4.9.0/0001_mlx_sx_h.patch
+1 −22 sx_scripts/sxdkernel
2 changes: 1 addition & 1 deletion platform/mellanox/sdk.mk
View file
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.0880
MLNX_SDK_VERSION = 4.4.0914
MLNX_SDK_ISSU_VERSION = 101

MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))
Expand Down

0 comments on commit 352a397

Please sign in to comment.