Merge pull request sonic-net#87 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
mlok-nokia · Aug 19, 2023 · 78173ce · 78173ce
2 parents d2ba7b0 + cddfe10
commit 78173ce
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 18 deletions.
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.md5 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.md5
@@ -1 +1 @@
-54e297465548abc057d1d513075f848e
+429e9dc38eebb3093b21e687edf55e79
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.xml b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-Board-M0-48x1G-4x10G.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askboard" dsig="md5">
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askboard" dsig="md5">
  <askboardplt:ASK-Board xmlns:askboardplt="urn:marvell:askboard:yang">
  <askboardplt:typedefs>
  <askboardplt:typedef>
@@ -1199,6 +1199,7 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledPosition askboardplt:type="led-position-type">0</askboardplt:ledPosition>
  <askboardplt:polarityInvertList-list>
  <askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
+ <askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
  </askboardplt:polarityInvertList-list>
  <askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
  <askboardplt:portForceDataLocation>
@@ -1226,6 +1227,7 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledPosition askboardplt:type="led-position-type">1</askboardplt:ledPosition>
  <askboardplt:polarityInvertList-list>
  <askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
+ <askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
  </askboardplt:polarityInvertList-list>
  <askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
  <askboardplt:portForceDataLocation>
@@ -1365,11 +1367,11 @@ lowercase characters.</askboardplt:description>
  <askboardplt:class13select askboardplt:type="led-stream-class13-select-type">CLASS_13_SELECT_LINK_DOWN</askboardplt:class13select>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:ledClockFrequency askboardplt:type="led-stream-clock-out-frequency-type">CLOCK_OUT_FREQUENCY_1000</askboardplt:ledClockFrequency>
+ <askboardplt:ledClockPosEdgeModeEnable askboardplt:type="boolean-type">false</askboardplt:ledClockPosEdgeModeEnable>
  </askboardplt:ledstream-configSet>
  <askboardplt:ledstream-class-manipulation-list>
  <askboardplt:classNum askboardplt:type="led-class-num-type">1</askboardplt:classNum>
  <askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
- <askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
  <askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -1381,7 +1383,6 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledstream-class-manipulation-list>
  <askboardplt:classNum askboardplt:type="led-class-num-type">2</askboardplt:classNum>
  <askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
- <askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:blinkEnable askboardplt:type="boolean-type">true</askboardplt:blinkEnable>
  <askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -1392,7 +1393,6 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledstream-class-manipulation-list>
  <askboardplt:classNum askboardplt:type="led-class-num-type">3</askboardplt:classNum>
  <askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
- <askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
  <askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -1930,6 +1930,7 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledPosition askboardplt:type="led-position-type">0</askboardplt:ledPosition>
  <askboardplt:polarityInvertList-list>
  <askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
+ <askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
  </askboardplt:polarityInvertList-list>
  <askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
  <askboardplt:portForceDataLocation>
@@ -1957,6 +1958,7 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledPosition askboardplt:type="led-position-type">1</askboardplt:ledPosition>
  <askboardplt:polarityInvertList-list>
  <askboardplt:polarityClassNum askboardplt:type="led-class-num-type">2</askboardplt:polarityClassNum>
+ <askboardplt:invertEnable askboardplt:type="boolean-type">true</askboardplt:invertEnable>
  </askboardplt:polarityInvertList-list>
  <askboardplt:portForceDataSupported askboardplt:type="boolean-type">true</askboardplt:portForceDataSupported>
  <askboardplt:portForceDataLocation>
@@ -2096,11 +2098,11 @@ lowercase characters.</askboardplt:description>
  <askboardplt:class13select askboardplt:type="led-stream-class13-select-type">CLASS_13_SELECT_LINK_DOWN</askboardplt:class13select>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:ledClockFrequency askboardplt:type="led-stream-clock-out-frequency-type">CLOCK_OUT_FREQUENCY_1000</askboardplt:ledClockFrequency>
+ <askboardplt:ledClockPosEdgeModeEnable askboardplt:type="boolean-type">false</askboardplt:ledClockPosEdgeModeEnable>
  </askboardplt:ledstream-configSet>
  <askboardplt:ledstream-class-manipulation-list>
  <askboardplt:classNum askboardplt:type="led-class-num-type">1</askboardplt:classNum>
  <askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
- <askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
  <askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -2112,7 +2114,6 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledstream-class-manipulation-list>
  <askboardplt:classNum askboardplt:type="led-class-num-type">2</askboardplt:classNum>
  <askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
- <askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:blinkEnable askboardplt:type="boolean-type">true</askboardplt:blinkEnable>
  <askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>
@@ -2123,7 +2124,6 @@ lowercase characters.</askboardplt:description>
  <askboardplt:ledstream-class-manipulation-list>
  <askboardplt:classNum askboardplt:type="led-class-num-type">3</askboardplt:classNum>
  <askboardplt:portType askboardplt:type="led-stream-port-type">PORT_TYPE_XG</askboardplt:portType>
- <askboardplt:ledUnit askboardplt:type="led-unit-or-no-unit-type">0</askboardplt:ledUnit>
  <askboardplt:invertEnable askboardplt:type="boolean-type">false</askboardplt:invertEnable>
  <askboardplt:blinkEnable askboardplt:type="boolean-type">false</askboardplt:blinkEnable>
  <askboardplt:blinkSelect askboardplt:type="led-stream-blink-select-type">BLINK_SELECT_0</askboardplt:blinkSelect>

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.md5 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.md5
@@ -1 +1 @@
-679406dae2038d14c9ace67308239951
+c2fad8d9eea6eb57614af010b4c7ad17
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.xml b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D0-48x1G-4x10G.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askl1" dsig="md5">
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askl1" dsig="md5">
  <ASKL1plt:ASK-L1 xmlns:ASKL1plt="urn:marvell:ASKL1:yang">
  <ASKL1plt:typedefs>
  <ASKL1plt:typedef>

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.md5 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.md5
@@ -1 +1 @@
-6f799ecf09e39b4045ec08fea269b2e2
+d1884cf0a6d9728290e522a41337e86e
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.xml b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-L1-M0-D1-48x1G-4x10G.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askl1" dsig="md5">
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askl1" dsig="md5">
  <ASKL1plt:ASK-L1 xmlns:ASKL1plt="urn:marvell:ASKL1:yang">
  <ASKL1plt:typedefs>
  <ASKL1plt:typedef>

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.md5 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.md5
@@ -1 +1 @@
-2c99d80d226cbb8da7f34fbd55b1af5f
+8fdb417a68122b4d127e5b7c6750bd68
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.xml b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/ASK-PP-M0-48x1G-4x10G.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="Askpp" dsig="md5">
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="Askpp" dsig="md5">
  <askppplt:ASK-PP xmlns:askppplt="urn:marvell:askpp:yang">
  <askppplt:typedefs>
  <askppplt:typedef>

diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.md5 b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.md5
@@ -1 +1 @@
-986a0c912dd5aa7db7907e95b2fc1e4a
+6a6dc37a64244b9e80f31008ea68f276
diff --git a/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.xml b/device/nokia/armhf-nokia_ixs7215_52x-r0/Nokia-7215/SAI-M0-48x1G-4x10G.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2022-09-23-1.1" profile="SAI" dsig="md5">
+<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" version="2023-05-05-1.04" profile="SAI" dsig="md5">
  <SAIplt:SAI xmlns:SAIplt="urn:marvell:SAI:yang">
  <SAIplt:typedefs>
  <SAIplt:typedef>
@@ -16,6 +16,33 @@
  <SAIplt:min>0</SAIplt:min>
  <SAIplt:max>1023</SAIplt:max>
  </SAIplt:typedef>
+ <SAIplt:typedef>
+ <SAIplt:name>logDest-type</SAIplt:name>
+ <SAIplt:type>enumeration</SAIplt:type>
+ <SAIplt:description>Logging Feature Options</SAIplt:description>
+ <SAIplt:enum>
+ <SAIplt:name>SAI_LOG_SYSLOG</SAIplt:name>
+ <SAIplt:description>SYSLOG {Syslog service should be running to use this option}</SAIplt:description>
+ <SAIplt:value>0</SAIplt:value>
+ </SAIplt:enum>
+ <SAIplt:enum>
+ <SAIplt:name>SAI_LOG_CONSOLE</SAIplt:name>
+ <SAIplt:description>CONSOLE</SAIplt:description>
+ <SAIplt:value>1</SAIplt:value>
+ </SAIplt:enum>
+ <SAIplt:enum>
+ <SAIplt:name>SAI_LOG_FILE</SAIplt:name>
+ <SAIplt:description>FILE {Warning !!! Use with caution. Can cause disk full issues}</SAIplt:description>
+ <SAIplt:value>2</SAIplt:value>
+ </SAIplt:enum>
+ </SAIplt:typedef>
+ <SAIplt:typedef>
+ <SAIplt:name>log-dest-file-path-type</SAIplt:name>
+ <SAIplt:type>string</SAIplt:type>
+ <SAIplt:description>A string with path to file for logging feature</SAIplt:description>
+ <SAIplt:min>2</SAIplt:min>
+ <SAIplt:max>30</SAIplt:max>
+ </SAIplt:typedef>
  </SAIplt:typedefs>
  <SAIplt:ASK-BOARD-Profile-Name SAIplt:type="string">ASK-Board-M0-48x1G-4x10G.xml</SAIplt:ASK-BOARD-Profile-Name>
  <SAIplt:Features>
@@ -292,11 +319,15 @@
  <SAIplt:max_ipv6_tunnel SAIplt:type="uint32">8</SAIplt:max_ipv6_tunnel>
  <SAIplt:max_tti SAIplt:type="uint32">1024</SAIplt:max_tti>
  <SAIplt:wred_size SAIplt:type="uint32">0</SAIplt:wred_size>
+ <SAIplt:max_nat SAIplt:type="uint32">0</SAIplt:max_nat>
  </SAIplt:Scaling>
  <SAIplt:Counters>
  <SAIplt:cnc-base-list>
  <SAIplt:counter-base SAIplt:type="uint32">4096</SAIplt:counter-base>
  </SAIplt:cnc-base-list>
  </SAIplt:Counters>
+ <SAIplt:Logging>
+ <SAIplt:log_dest SAIplt:type="logDest-type">SAI_LOG_SYSLOG</SAIplt:log_dest>
+ </SAIplt:Logging>
  </SAIplt:SAI>
 </data>
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,4 +1,4 @@
-LIBSAIBCM_XGS_VERSION = 7.1.54.4
+LIBSAIBCM_XGS_VERSION = 7.1.54.4-3
 LIBSAIBCM_DNX_VERSION = 7.1.54.4
 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"

diff --git a/platform/marvell-armhf/sai.mk b/platform/marvell-armhf/sai.mk
@@ -1,6 +1,6 @@
 # Marvell SAI
 
-export MRVL_SAI_VERSION = 1.10.2-4
+export MRVL_SAI_VERSION = 1.10.2-5
 export MRVL_SAI = mrvllibsai_$(MRVL_SAI_VERSION)_$(PLATFORM_ARCH).deb
 
 $(MRVL_SAI)_SRC_PATH = $(PLATFORM_PATH)/sai