Skip to content

Commit 615763f

Browse files
authored
[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 (sonic-net#750)
```<br>* 6b3df0bc5 - (HEAD -> 202412) Merge branch '202411' of https://github.com/sonic-net/sonic-buildimage into 202412 (2025-03-01) [Sonic Automation] * d8287d8 - (head/202411) [Mellanox] Fix the issue with sensors with discrete indexes initialization (sonic-net#21890) (2025-03-01) [mssonicbld] * f3dd569 - Update Broadcom DNX SAI to 12.3 and update kernel drivers (sonic-net#21873) (2025-02-28) [Tejaswini Chadaga] * dac861a - [submodule] Update submodule sonic-utilities to the latest HEAD automatically (sonic-net#21859) (2025-02-27) [mssonicbld] * 8334851 - Update PG flow control threshold based on port speed (not on hwsku) (sonic-net#21834) (2025-02-26) [mssonicbld] * 87e9f82 - [submodule] Update submodule sonic-swss to the latest HEAD automatically (sonic-net#21839) (2025-02-25) [mssonicbld]<br>```
1 parent 67361c8 commit 615763f

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

platform/broadcom/sai-modules.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
1010
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)
1111

1212
# SAI bcm modules for DNX family ASIC
13-
BRCM_DNX_OPENNSL_KERNEL_VERSION = 11.2.13.1-1
13+
BRCM_DNX_OPENNSL_KERNEL_VERSION = 12.3.2.2
1414

1515
BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
1616
$(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx

platform/broadcom/sai.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
LIBSAIBCM_XGS_VERSION = 12.3.2.2
2-
LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
2+
LIBSAIBCM_DNX_VERSION = 12.3.2.2
33
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
4-
LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
4+
LIBSAIBCM_DNX_BRANCH_NAME = SAI_12.3.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"
77

platform/broadcom/saibcm-modules-dnx

Submodule saibcm-modules-dnx updated 42 files

platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,10 @@ def initialize_chassis_thermals():
173173
thermal_list.append(create_indexable_thermal(rule, index, CHASSIS_THERMAL_SYSFS_FOLDER, position))
174174
position += 1
175175
elif thermal_type == 'discrete':
176-
thermal_list.extend(create_discrete_thermal(rule))
176+
discrete_thermals = create_discrete_thermal(rule, position)
177+
if discrete_thermals:
178+
position += len(discrete_thermals)
179+
thermal_list.extend(discrete_thermals)
177180
else:
178181
thermal_object = create_single_thermal(rule, CHASSIS_THERMAL_SYSFS_FOLDER, position)
179182
if thermal_object:
@@ -280,10 +283,9 @@ def create_single_thermal(rule, sysfs_folder, position, presence_cb=None):
280283
return RemovableThermal(name, temp_file, high_th_file, high_crit_th_file, high_th_default, high_crit_th_default, scale, position, presence_cb)
281284

282285

283-
def create_discrete_thermal(rule):
286+
def create_discrete_thermal(rule, position):
284287
search_pattern = rule.get('search_pattern')
285288
index_pattern = rule.get('index_pattern')
286-
position = 1
287289
thermal_list = []
288290
for file_path in glob.iglob(search_pattern):
289291
file_name = os.path.basename(file_path)

0 commit comments

Comments
 (0)