Skip to content

Commit 6a8ff97

Browse files
r12fr12f
authored
Merge pull request sonic-net#553 from r12f/code-sync-202412
[202412] Code sync sonic-net/sonic-buildimage:202411 => 202412
2 parents 77b75db + fd89a8f commit 6a8ff97

27 files changed

Lines changed: 281 additions & 55 deletions

File tree

‎azure-pipelines.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ stages:
109109
- job:
110110
pool: sonictest
111111
displayName: "vstest"
112+
condition: false # agent pool don't work. disable this job to unblock PRs.
112113
timeoutInMinutes: 60
113114
steps:
114115
- template: .azure-pipelines/cleanup.yml

‎device/mellanox/x86_64-nvidia_sn4280-r0/installer.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq module_blacklist=mlx5_ib,mlx5_core ima_hash=sha384 amd_iommu=off"
1+
ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="libata.force=noncq module_blacklist=mlx5_ib,mlx5_core ima_hash=sha384 amd_iommu=off cpufreq.default_governor=performance"

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t0.j2‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
limitations under the License.
1717
#}
1818
{% set default_cable = '40m' %}
19-
{% set ingress_lossless_pool_size = '115245056' %}
20-
{% set ingress_lossless_pool_xoff = '14826496' %}
19+
{% set ingress_lossless_pool_size = '142703616' %}
20+
{% set ingress_lossless_pool_xoff = '1024' %}
2121
{% set egress_lossless_pool_size = '158229504' %}
22-
{% set egress_lossy_pool_size = '115245056' %}
22+
{% set egress_lossy_pool_size = '142703616' %}
2323

2424
{% import 'buffers_defaults_objects.j2' as defs with context %}
2525

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t1.j2‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,18 @@
1515
See the License for the specific language governing permissions and
1616
limitations under the License.
1717
#}
18-
{% set default_cable = '300m' %}
19-
{% set ingress_lossless_pool_size = '137779200' %}
20-
{% set ingress_lossless_pool_xoff = '10092544' %}
18+
{% set default_cable = '250m' %}
19+
{% set ingress_lossless_pool_size = '142703616' %}
20+
{% set ingress_lossless_pool_xoff = '1024' %}
2121
{% set egress_lossless_pool_size = '158229504' %}
22-
{% set egress_lossy_pool_size = '137779200' %}
22+
{% set egress_lossy_pool_size = '142703616' %}
23+
24+
{%-set ports2cable = {
25+
'torrouter_server' : '40m',
26+
'leafrouter_torrouter' : '250m',
27+
'spinerouter_leafrouter' : '1000m'
28+
}
29+
-%}
2330

2431
{% import 'buffers_defaults_objects.j2' as defs with context %}
2532

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pg_profile_lookup.ini‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,11 @@
4949
200000 300m 19456 19456 130048 0
5050
400000 300m 19456 19456 243712 0
5151
800000 300m 38912 38912 411648 0
52+
10000 1000m 19456 19456 24576 0
53+
25000 1000m 19456 19456 46080 0
54+
40000 1000m 19456 19456 68608 0
55+
50000 1000m 19456 19456 83968 0
56+
100000 1000m 19456 19456 168960 0
57+
200000 1000m 19456 19456 308224 0
58+
400000 1000m 19456 19456 610304 0
59+
800000 1000m 38912 38912 1153024 0

‎platform/broadcom/docker-syncd-brcm-rpc/Dockerfile.j2‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ RUN apt-get update \
2020
wget \
2121
cmake \
2222
libnanomsg5 \
23-
libnanomsg-dev
23+
libnanomsg-dev \
24+
libthrift-0.17.0
2425

2526
{% if docker_syncd_brcm_rpc_debs.strip() -%}
2627
# Copy locally-built Debian package dependencies

‎platform/broadcom/sai.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
LIBSAIBCM_XGS_VERSION = 12.1.0.2
1+
LIBSAIBCM_XGS_VERSION = 12.3.0.3
22
LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
3-
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.1.0_GA
3+
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
44
LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
55
LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
66
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"

‎platform/mellanox/fw.mk‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,29 @@ SIMX_VERSION = 25.1-1070
2525

2626
FW_FROM_URL = y
2727

28-
MLNX_FW_ASSETS_RELEASE_TAG = fw-2014.2152
28+
MLNX_FW_ASSETS_RELEASE_TAG = fw-2014.2166
2929
MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)
3030

3131
ifeq ($(MLNX_FW_BASE_URL), )
3232
MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
3333
endif
3434

35-
MLNX_SPC_FW_VERSION = 13.2014.2152
35+
MLNX_SPC_FW_VERSION = 13.2014.2166
3636
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
3737
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
3838
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
3939

40-
MLNX_SPC2_FW_VERSION = 29.2014.2152
40+
MLNX_SPC2_FW_VERSION = 29.2014.2166
4141
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
4242
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
4343
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
4444

45-
MLNX_SPC3_FW_VERSION = 30.2014.2152
45+
MLNX_SPC3_FW_VERSION = 30.2014.2166
4646
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
4747
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
4848
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
4949

50-
MLNX_SPC4_FW_VERSION = 34.2014.2152
50+
MLNX_SPC4_FW_VERSION = 34.2014.2166
5151
MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
5252
$(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
5353
$(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)

‎platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
3-
# Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
# Copyright (c) 2019-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
44
# Apache-2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -447,7 +447,7 @@ def get_change_event_for_module_host_management_mode(self, timeout):
447447
timeout = 1000.0 if timeout >= 1000 else float(timeout)
448448
port_dict = {}
449449
error_dict = {}
450-
begin = time.time()
450+
begin = time.monotonic()
451451
wait_ready_task = sfp.SFP.get_wait_ready_task()
452452

453453
while True:
@@ -524,7 +524,7 @@ def get_change_event_for_module_host_management_mode(self, timeout):
524524
}
525525
else:
526526
if not wait_forever:
527-
elapse = time.time() - begin
527+
elapse = time.monotonic() - begin
528528
if elapse * 1000 >= timeout:
529529
return True, {'sfp': {}}
530530

@@ -569,7 +569,7 @@ def get_change_event_legacy(self, timeout):
569569
timeout = 1000.0 if timeout >= 1000 else float(timeout)
570570
port_dict = {}
571571
error_dict = {}
572-
begin = time.time()
572+
begin = time.monotonic()
573573

574574
while True:
575575
fds_events = self.poll_obj.poll(timeout)
@@ -619,7 +619,7 @@ def get_change_event_legacy(self, timeout):
619619
}
620620
else:
621621
if not wait_forever:
622-
elapse = time.time() - begin
622+
elapse = time.monotonic() - begin
623623
if elapse * 1000 >= timeout:
624624
return True, {'sfp': {}}
625625

‎platform/mellanox/mlnx-platform-api/sonic_platform/dpuctlplat.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
3-
# Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
3+
# Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
44
# Apache-2.0
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -206,8 +206,8 @@ def wait_for_pci(self):
206206
return True
207207
poll_obj = poll()
208208
poll_obj.register(dir_fd, POLLIN)
209-
start = time.time()
210-
while (time.time() - start) < WAIT_FOR_PCI_DEV:
209+
start = time.monotonic()
210+
while (time.monotonic() - start) < WAIT_FOR_PCI_DEV:
211211
events = poll_obj.poll(WAIT_FOR_PCI_DEV * 1000)
212212
if events:
213213
if os.path.exists(os.path.dirname(self.get_pci_dev_path())):
@@ -473,9 +473,9 @@ def boot_prog_context(self):
473473
@contextmanager
474474
def time_check_context(self, msg):
475475
if self.verbosity:
476-
start_time = time.time()
476+
start_time = time.monotonic()
477477
yield
478-
end_time = time.time()
478+
end_time = time.monotonic()
479479
self.log_info(f"Total time taken = {end_time - start_time} for {msg}")
480480
return
481481
yield

0 commit comments

Comments
 (0)