Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 6 commits into from
Mar 1, 2025
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202411 to 202412 #750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87e9f82
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
mssonicbld Feb 25, 2025
8334851
Update PG flow control threshold based on port speed (not on hwsku) (…
mssonicbld Feb 25, 2025
dac861a
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld Feb 27, 2025
f3dd569
Update Broadcom DNX SAI to 12.3 and update kernel drivers (#21873)
tjchadaga Feb 28, 2025
d8287d8
[Mellanox] Fix the issue with sensors with discrete indexes initializ…
mssonicbld Feb 28, 2025
6b3df0b
Merge branch '202411' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/broadcom/sai-modules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)

# SAI bcm modules for DNX family ASIC
BRCM_DNX_OPENNSL_KERNEL_VERSION = 11.2.13.1-1
BRCM_DNX_OPENNSL_KERNEL_VERSION = 12.3.2.2

BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx
Expand Down
4 changes: 2 additions & 2 deletions platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
LIBSAIBCM_XGS_VERSION = 12.3.2.2
LIBSAIBCM_DNX_VERSION = 11.2.13.1-1
LIBSAIBCM_DNX_VERSION = 12.3.2.2
LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA
LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA
LIBSAIBCM_DNX_BRANCH_NAME = SAI_12.3.0_GA
LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"

Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules-dnx
Open in desktop
Submodule saibcm-modules-dnx updated 42 files
+3 −2 include/kcom.h
+10 −0 include/soc/devids.h
+32 −1 make/Make.config
+9 −0 make/Make.depend
+0 −10 make/Make.kernlib
+7 −10 make/Make.lib
+4 −36 make/Make.linux
+1 −1 make/Make.subdirs
+45 −46 make/Makefile.linux-gts
+17 −17 make/Makefile.linux-iproc
+19 −19 make/Makefile.linux-iproc_64
+1 −0 make/Makefile.linux-kernel-4_18
+4 −4 make/Makefile.linux-slk
+28 −45 make/Makefile.linux-x86-5_10
+16 −40 make/Makefile.linux-x86-64-fc28
+4 −1 make/Makefile.linux-x86-generic-common-2_6
+13 −0 make/Makefile.linux-x86-smp_generic_64-2_6
+45 −46 make/Makefile.linux-xlr
+6 −0 systems/bde/linux/include/linux-bde.h
+76 −20 systems/bde/linux/kernel/linux-kernel-bde.c
+22 −16 systems/bde/linux/kernel/linux_dma.c
+33 −4 systems/bde/linux/user/kernel/linux-user-bde.c
+0 −7 systems/bde/shared/shbde_iproc.c
+88 −9 systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.c
+4 −1 systems/linux/kernel/modules/bcm-genl/bcm-genl-dev.h
+8 −8 systems/linux/kernel/modules/bcm-genl/bcm-genl-packet.c
+68 −35 systems/linux/kernel/modules/bcm-genl/bcm-genl-psample.c
+189 −119 systems/linux/kernel/modules/bcm-knet/bcm-knet.c
+255 −50 systems/linux/kernel/modules/bcm-ptp-clock/bcm-ptp-clock.c
+7 −7 systems/linux/kernel/modules/include/lkm.h
+1 −1 systems/linux/kernel/modules/shared/gmodule.c
+1 −0 systems/linux/user/common/Makefile
+1 −3 systems/linux/user/gts/Makefile
+0 −1 systems/linux/user/iproc-3_14/Makefile
+0 −1 systems/linux/user/iproc-4_4/Makefile
+1 −2 systems/linux/user/iproc/Makefile
+1 −2 systems/linux/user/iproc_64/Makefile
+0 −1 systems/linux/user/slk/Makefile
+0 −1 systems/linux/user/x86-5_10/Makefile
+0 −1 systems/linux/user/x86-64-fc28/Makefile
+0 −1 systems/linux/user/x86-smp_generic_64-2_6/Makefile
+1 −3 systems/linux/user/xlr/Makefile
8 changes: 5 additions & 3 deletions platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,10 @@ def initialize_chassis_thermals():
thermal_list.append(create_indexable_thermal(rule, index, CHASSIS_THERMAL_SYSFS_FOLDER, position))
position += 1
elif thermal_type == 'discrete':
thermal_list.extend(create_discrete_thermal(rule))
discrete_thermals = create_discrete_thermal(rule, position)
if discrete_thermals:
position += len(discrete_thermals)
thermal_list.extend(discrete_thermals)
else:
thermal_object = create_single_thermal(rule, CHASSIS_THERMAL_SYSFS_FOLDER, position)
if thermal_object:
Expand Down Expand Up @@ -280,10 +283,9 @@ def create_single_thermal(rule, sysfs_folder, position, presence_cb=None):
return RemovableThermal(name, temp_file, high_th_file, high_crit_th_file, high_th_default, high_crit_th_default, scale, position, presence_cb)


def create_discrete_thermal(rule):
def create_discrete_thermal(rule, position):
search_pattern = rule.get('search_pattern')
index_pattern = rule.get('index_pattern')
position = 1
thermal_list = []
for file_path in glob.iglob(search_pattern):
file_name = os.path.basename(file_path)
Expand Down