From 7d3cbfe2545c7d57ec87c0fc7757d4b37ecc755e Mon Sep 17 00:00:00 2001 From: Bernhard Stoeckner Date: Tue, 19 Nov 2024 17:39:27 +0100 Subject: [PATCH] 550.127.08 --- README.md | 8 +++-- kernel-open/Kbuild | 2 +- src/common/inc/nvBldVer.h | 16 ++++----- src/common/inc/nvUnixVersion.h | 2 +- src/common/nvswitch/kernel/ls10/link_ls10.c | 36 +++++++++++++++++++++ src/nvidia/generated/g_nv_name_released.h | 2 ++ version.mk | 2 +- 7 files changed, 54 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index a6b66ee15..ffe385f9a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # NVIDIA Linux Open GPU Kernel Module Source This is the source release of the NVIDIA Linux open GPU kernel modules, -version 550.127.05. +version 550.127.08. ## How to Build @@ -17,7 +17,7 @@ as root: Note that the kernel modules built here must be used with GSP firmware and user-space NVIDIA GPU driver components from a corresponding -550.127.05 driver release. This can be achieved by installing +550.127.08 driver release. This can be achieved by installing the NVIDIA GPU driver from the .run file using the `--no-kernel-modules` option. E.g., @@ -188,7 +188,7 @@ encountered specific to them. For details on feature support and limitations, see the NVIDIA GPU driver end user README here: -https://us.download.nvidia.com/XFree86/Linux-x86_64/550.127.05/README/kernel_open.html +https://us.download.nvidia.com/XFree86/Linux-x86_64/550.127.08/README/kernel_open.html For vGPU support, please refer to the README.vgpu packaged in the vGPU Host Package for more details. @@ -754,6 +754,8 @@ Subsystem Device ID. | NVIDIA H800 | 2324 10DE 17A8 | | NVIDIA H20 | 2329 10DE 198B | | NVIDIA H20 | 2329 10DE 198C | +| NVIDIA H20-3e | 232C 10DE 2063 | +| NVIDIA H20-3e | 232C 10DE 2064 | | NVIDIA H100 80GB HBM3 | 2330 10DE 16C0 | | NVIDIA H100 80GB HBM3 | 2330 10DE 16C1 | | NVIDIA H100 PCIe | 2331 10DE 1626 | diff --git a/kernel-open/Kbuild b/kernel-open/Kbuild index f748c06d2..888d5344f 100644 --- a/kernel-open/Kbuild +++ b/kernel-open/Kbuild @@ -72,7 +72,7 @@ EXTRA_CFLAGS += -I$(src)/common/inc EXTRA_CFLAGS += -I$(src) EXTRA_CFLAGS += -Wall $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-format-extra-args EXTRA_CFLAGS += -D__KERNEL__ -DMODULE -DNVRM -EXTRA_CFLAGS += -DNV_VERSION_STRING=\"550.127.05\" +EXTRA_CFLAGS += -DNV_VERSION_STRING=\"550.127.08\" ifneq ($(SYSSRCHOST1X),) EXTRA_CFLAGS += -I$(SYSSRCHOST1X) diff --git a/src/common/inc/nvBldVer.h b/src/common/inc/nvBldVer.h index 2dd234b3d..dabbc82bc 100644 --- a/src/common/inc/nvBldVer.h +++ b/src/common/inc/nvBldVer.h @@ -43,18 +43,18 @@ #endif #if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) -#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r550/r553_17-429" -#define NV_BUILD_CHANGELIST_NUM (34957518) +#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r550/r553_17-432" +#define NV_BUILD_CHANGELIST_NUM (35042495) #define NV_BUILD_TYPE "Official" -#define NV_BUILD_NAME "rel/gpu_drv/r550/r553_17-429" -#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34957518) +#define NV_BUILD_NAME "rel/gpu_drv/r550/r553_17-432" +#define NV_LAST_OFFICIAL_CHANGELIST_NUM (35042495) #else /* Windows builds */ -#define NV_BUILD_BRANCH_VERSION "r553_17-2" -#define NV_BUILD_CHANGELIST_NUM (34902203) +#define NV_BUILD_BRANCH_VERSION "r553_17-3" +#define NV_BUILD_CHANGELIST_NUM (34957518) #define NV_BUILD_TYPE "Official" -#define NV_BUILD_NAME "553.20" -#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34902203) +#define NV_BUILD_NAME "553.24" +#define NV_LAST_OFFICIAL_CHANGELIST_NUM (34957518) #define NV_BUILD_BRANCH_BASE_VERSION R550 #endif // End buildmeister python edited section diff --git a/src/common/inc/nvUnixVersion.h b/src/common/inc/nvUnixVersion.h index 2007c4390..b00086ab4 100644 --- a/src/common/inc/nvUnixVersion.h +++ b/src/common/inc/nvUnixVersion.h @@ -4,7 +4,7 @@ #if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_VMWARE) || defined(NV_QNX) || defined(NV_INTEGRITY) || \ (defined(RMCFG_FEATURE_PLATFORM_GSP) && RMCFG_FEATURE_PLATFORM_GSP == 1) -#define NV_VERSION_STRING "550.127.05" +#define NV_VERSION_STRING "550.127.08" #else diff --git a/src/common/nvswitch/kernel/ls10/link_ls10.c b/src/common/nvswitch/kernel/ls10/link_ls10.c index 9d066a350..2ad28d803 100644 --- a/src/common/nvswitch/kernel/ls10/link_ls10.c +++ b/src/common/nvswitch/kernel/ls10/link_ls10.c @@ -383,6 +383,42 @@ nvswitch_corelib_set_dl_link_mode_ls10 switch (mode) { + case NVLINK_LINKSTATE_SAFE: + { + // check if link is in reset + if (nvswitch_is_link_in_reset(device, link)) + { + NVSWITCH_PRINT(device, ERROR, + "%s: link #%d is still in reset, cannot change link state\n", + __FUNCTION__, link->linkNumber); + return NVL_ERR_INVALID_STATE; + } + + NVSWITCH_PRINT(device, INFO, + "%s : Link state request to Safe for (%s):(%s) not needed. Skipping.\n", + __FUNCTION__, device->name, link->linkName); + + break; + } + + case NVLINK_LINKSTATE_HS: + { + // check if link is in reset + if (nvswitch_is_link_in_reset(device, link)) + { + NVSWITCH_PRINT(device, ERROR, + "%s: link #%d is still in reset, cannot change link state\n", + __FUNCTION__, link->linkNumber); + return -NVL_ERR_INVALID_STATE; + } + + NVSWITCH_PRINT(device, INFO, + "%s : Link state request to Active for (%s):(%s) not needed. Skipping.\n", + __FUNCTION__, device->name, link->linkName); + + break; + } + case NVLINK_LINKSTATE_INITPHASE1: { // Apply appropriate SIMMODE settings diff --git a/src/nvidia/generated/g_nv_name_released.h b/src/nvidia/generated/g_nv_name_released.h index 62d787909..ad69f30bc 100644 --- a/src/nvidia/generated/g_nv_name_released.h +++ b/src/nvidia/generated/g_nv_name_released.h @@ -901,6 +901,8 @@ static const CHIPS_RELEASED sChipsReleased[] = { { 0x2324, 0x17a8, 0x10de, "NVIDIA H800" }, { 0x2329, 0x198b, 0x10de, "NVIDIA H20" }, { 0x2329, 0x198c, 0x10de, "NVIDIA H20" }, + { 0x232C, 0x2063, 0x10de, "NVIDIA H20-3e" }, + { 0x232C, 0x2064, 0x10de, "NVIDIA H20-3e" }, { 0x2330, 0x16c0, 0x10de, "NVIDIA H100 80GB HBM3" }, { 0x2330, 0x16c1, 0x10de, "NVIDIA H100 80GB HBM3" }, { 0x2331, 0x1626, 0x10de, "NVIDIA H100 PCIe" }, diff --git a/version.mk b/version.mk index 524bd3550..1d507d0cf 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ -NVIDIA_VERSION = 550.127.05 +NVIDIA_VERSION = 550.127.08 # This file. VERSION_MK_FILE := $(lastword $(MAKEFILE_LIST))