From 3d67b9603e80746ed9bf3a1a05862ff71b7af02f Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Mon, 27 Jan 2025 18:32:24 +0200
Subject: [PATCH 1/9] [202411][Mellanox] Update MFT version to 4.30.2-23
(#21511)
[202411][Mellanox] Update MFT version to 4.30.2-23
---
platform/mellanox/mft.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/platform/mellanox/mft.mk b/platform/mellanox/mft.mk
index 808ee7598..72f6e522f 100644
--- a/platform/mellanox/mft.mk
+++ b/platform/mellanox/mft.mk
@@ -17,8 +17,8 @@
#
# Mellanox SAI
-MFT_VERSION = 4.30.0
-MFT_REVISION = 136
+MFT_VERSION = 4.30.2
+MFT_REVISION = 23
MLNX_MFT_INTERNAL_SOURCE_BASE_URL =
From eaed51d4349da758459a51232aae22daf251f51f Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 28 Jan 2025 07:01:28 +0800
Subject: [PATCH 2/9] [Mellanox] get_error_descripton should return Not
supported for modules that does not support this API (#21537)
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
Not all xcvr API support get_error_description, for example sff8636. For those API types, get_error_description should return "Not supported".
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
get_error_description should return "Not supported".
#### How to verify it
Manual test
unit test
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [x] 202411
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
---
platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py | 6 ++++--
platform/mellanox/mlnx-platform-api/tests/test_sfp.py | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
index e1ec5dacc..6fe67bbc2 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py
@@ -359,7 +359,7 @@ def get_error_info_from_sdk_error_type(self):
Returns:
tuple: (error state, error description)
"""
- error_type = utils.read_int_from_file(f'/sys/module/sx_core/asic0/module{self.sdk_index}/temperature/statuserror', default=-1)
+ error_type = utils.read_int_from_file(f'/sys/module/sx_core/asic0/module{self.sdk_index}/statuserror', default=-1)
sfp_state_bits = NvidiaSFPCommon.SDK_ERRORS_TO_ERROR_BITS.get(error_type)
if sfp_state_bits is None:
logger.log_error(f"Unrecognized error {error_type} detected on SFP {self.sdk_index}")
@@ -678,7 +678,9 @@ def get_error_description(self):
if self.is_sw_control():
api = self.get_xcvr_api()
return api.get_error_description() if api else None
- except:
+ except NotImplementedError:
+ return 'Not supported'
+ except Exception:
return self.SFP_STATUS_INITIALIZING
oper_status, error_code = self._get_module_info(self.sdk_index)
diff --git a/platform/mellanox/mlnx-platform-api/tests/test_sfp.py b/platform/mellanox/mlnx-platform-api/tests/test_sfp.py
index fecfadc1d..147f14a1f 100644
--- a/platform/mellanox/mlnx-platform-api/tests/test_sfp.py
+++ b/platform/mellanox/mlnx-platform-api/tests/test_sfp.py
@@ -94,6 +94,10 @@ def test_sfp_get_error_status(self, mock_get_error_code, mock_control):
mock_control.side_effect = RuntimeError('')
description = sfp.get_error_description()
assert description == 'Initializing'
+
+ mock_control.side_effect = NotImplementedError('')
+ description = sfp.get_error_description()
+ assert description == 'Not supported'
@mock.patch('sonic_platform.sfp.SFP._get_page_and_page_offset')
@mock.patch('sonic_platform.sfp.SFP._is_write_protected')
From 8c971519f772ed43ece423bacd4de0c1a211d64d Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:01:31 +0800
Subject: [PATCH 3/9] [Mellanox] Add KV to SN5640-SIMx sai.profile (#21538)
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx", or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
Add SAI_KEY_SPC5_LOSSY_SCHEDULING=1 and
SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
to SN5640-simx sai.profile, to support those features in the SKU
##### Work item tracking
- Microsoft ADO **(number only)**:
#### How I did it
Added parameters to file
#### How to verify it
Deploy SKU and check SAI logs
<!--
If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
- [ ] 202305
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
---
.../x86_64-nvidia_sn5640_simx-r0/ACS-SN5640/sai.profile | 3 +++
1 file changed, 3 insertions(+)
diff --git a/device/mellanox/x86_64-nvidia_sn5640_simx-r0/ACS-SN5640/sai.profile b/device/mellanox/x86_64-nvidia_sn5640_simx-r0/ACS-SN5640/sai.profile
index a1d251ac1..fc98a5ebf 100644
--- a/device/mellanox/x86_64-nvidia_sn5640_simx-r0/ACS-SN5640/sai.profile
+++ b/device/mellanox/x86_64-nvidia_sn5640_simx-r0/ACS-SN5640/sai.profile
@@ -1 +1,4 @@
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/sai_5640.xml
+SAI_KEY_SPC5_LOSSY_SCHEDULING=1
+SAI_DEFAULT_SWITCHING_MODE_STORE_FORWARD=1
+
From 9b2e619e0a10c16e4895221970f6306da1640519 Mon Sep 17 00:00:00 2001
From: Gagan Punathil Ellath <gpunathilell@nvidia.com>
Date: Wed, 29 Jan 2025 10:03:38 -0800
Subject: [PATCH 4/9] Aligned platform with 202411 changes (#21513)
Aligned platform with 202411 changes
---
.../mellanox/mlnx-platform-api/sonic_platform/platform.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py b/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
index eb60329e7..aa08a05f9 100644
--- a/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
+++ b/platform/mellanox/mlnx-platform-api/sonic_platform/platform.py
@@ -23,7 +23,7 @@
try:
from sonic_platform_base.platform_base import PlatformBase
- from .chassis import Chassis, ModularChassis, SmartSwitchChassis
+ from .chassis import Chassis, ModularChassis
from .device_data import DeviceDataManager
except ImportError as e:
raise ImportError(str(e) + "- required module not found")
@@ -31,9 +31,7 @@
class Platform(PlatformBase):
def __init__(self):
PlatformBase.__init__(self)
- if DeviceDataManager.get_dpu_count():
- self._chassis = SmartSwitchChassis()
- elif DeviceDataManager.get_linecard_count() == 0:
+ if DeviceDataManager.get_linecard_count() == 0:
self._chassis = Chassis()
else:
self._chassis = ModularChassis()
From 927c2ab27f860a2b9132347983cbcecab1b51a32 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Thu, 30 Jan 2025 19:01:49 +0800
Subject: [PATCH 5/9] [submodule] Update submodule sonic-sairedis to the latest
HEAD automatically (#21568)
#### Why I did it
src/sonic-sairedis
```
* b39b9a60 - (HEAD -> 202411, origin/202411) Fix to not miss the entire set of counters to be added in addObject for CounterContext::updateSupportedCount (#1513) (2 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
---
src/sonic-sairedis | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 7ef82181c..b39b9a608 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 7ef82181c854cf4720abf21a53aac2b8b7118de8
+Subproject commit b39b9a60801ce1c43da0f7e44d7fe9d0db9863fc
From d22bd255f041153ef0c2e0e91e408b526fdc0818 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 31 Jan 2025 03:43:36 +0800
Subject: [PATCH 6/9] [submodule] Update submodule sonic-linux-kernel to the
latest HEAD automatically (#21563)
[submodule][202411] Update submodule sonic-linux-kernel to the latest HEAD
---
src/sonic-linux-kernel | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-linux-kernel b/src/sonic-linux-kernel
index f3f9a3771..e01fe8542 160000
--- a/src/sonic-linux-kernel
+++ b/src/sonic-linux-kernel
@@ -1 +1 @@
-Subproject commit f3f9a37715f8c2e4ed9821547585c3bbb2612619
+Subproject commit e01fe85426e1eb6b80e143bb4d93a612eb12cd82
From 60ddfc3354d4d4393736299c4a5170276ac907a0 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 31 Jan 2025 03:44:23 +0800
Subject: [PATCH 7/9] [submodule] Update submodule sonic-platform-common to the
latest HEAD automatically (#21566)
[submodule][202411] Update submodule sonic-platform-common to the latest HEAD
---
src/sonic-platform-common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index 89e8827c8..bede51f3a 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit 89e8827c8ffe10f60cd11b651b181e68b8e23b03
+Subproject commit bede51f3a375683a7f2c6542dc464fdcb156b16e
From 5ee4b84057f0b58a149325807ed1b362a0f6a81e Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 1 Feb 2025 01:12:36 +0800
Subject: [PATCH 8/9] [submodule] Update submodule sonic-utilities to the
latest HEAD automatically (#21582)
[submodule] Update submodule sonic-utilities to the latest HEAD automatically
---
src/sonic-utilities | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-utilities b/src/sonic-utilities
index a8f55a341..674691d7c 160000
--- a/src/sonic-utilities
+++ b/src/sonic-utilities
@@ -1 +1 @@
-Subproject commit a8f55a3410d0133d793ada4eba7ccb9e15684e23
+Subproject commit 674691d7cf878844e87f8a2d462e6a5bfdbec642
From 926f4f602f53344fb78b510ba62864e8d0ab6567 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 1 Feb 2025 19:01:08 +0800
Subject: [PATCH 9/9] [submodule] Update submodule sonic-platform-common to the
latest HEAD automatically (#21594)
#### Why I did it
src/sonic-platform-common
```
* 3276d57 - (HEAD -> 202411, origin/202411) Create is_transceiver_vdm_supported API for CMIS transceivers (#537) (61 minutes ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
---
src/sonic-platform-common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-platform-common b/src/sonic-platform-common
index bede51f3a..3276d57c3 160000
--- a/src/sonic-platform-common
+++ b/src/sonic-platform-common
@@ -1 +1 @@
-Subproject commit bede51f3a375683a7f2c6542dc464fdcb156b16e
+Subproject commit 3276d57c365253e17c553e7b8175daee4156a135