Skip to content

Commit 07f09ff

Browse files
authored
Merge pull request #297 from mssonicbld/sonicbld/202305-merge
[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305
2 parents 559a369 + 0444dcc commit 07f09ff

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

files/image_config/kdump/kdump-tools

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ KDUMP_CMDLINE_APPEND="irqpoll nr_cpus=1 nousb systemd.unit=kdump-tools.service a
77

88
# Reboot crash kernel on panic
99
# Enable debug level logging of crash kernel for better visibility
10+
# Set loglevel to reduce verbosity and print only warning conditions
1011
# Disable advanced pcie features
1112
# Disable high precision event timer as on some platforms it is interfering with the kdump operation
1213
# Pass platform identifier string as part of crash kernel command line to be used by the reboot script during kdump
13-
KDUMP_CMDLINE_APPEND="${KDUMP_CMDLINE_APPEND} panic=10 debug hpet=disable pcie_port=compat pci=nommconf sonic_platform=__PLATFORM__"
14+
KDUMP_CMDLINE_APPEND="${KDUMP_CMDLINE_APPEND} panic=10 debug loglevel=4 hpet=disable pcie_port=compat pci=nommconf sonic_platform=__PLATFORM__"
1415

1516
# Use SONiC reboot wrapper script present in /usr/local/bin post kdump
1617
PATH=/usr/local/bin:$PATH

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 = 8.4.41.1
1+
LIBSAIBCM_XGS_VERSION = 8.4.44.0
22
LIBSAIBCM_DNX_VERSION = 9.2.12.1
3-
LIBSAIBCM_XGS_BRANCH_NAME = SAI_8.4.0_GA
3+
LIBSAIBCM_XGS_BRANCH_NAME = SAI_8.4.0_GA_for_22_image
44
LIBSAIBCM_DNX_BRANCH_NAME = SAI_9.2.0.3
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"

0 commit comments

Comments
 (0)