550.76

src/common/nvswitch/kernel/ls10/fsprpc_ls10.c

@@ -28,12 +28,6 @@
 #include "fsprpc_nvswitch.h"
 #include "ls10/ls10.h"
 
-#include "fsp/fsp_emem_channels.h"
-#include "fsp/nvdm_payload_cmd_response.h"
-#include "fsp/fsp_nvdm_format.h"
-#include "fsp/fsp_mctp_format.h"
-#include "fsp/fsp_tnvl_rpc.h"
-
 #include "nvswitch/ls10/dev_fsp_pri.h"
 
 /*!
@@ -346,6 +340,7 @@ nvswitch_fsp_process_nvdm_msg_ls10
 
     switch (nvdmType)
     {
+        case NVDM_TYPE_TNVL:
         case NVDM_TYPE_FSP_RESPONSE:
             status = nvswitch_fsp_process_cmd_response(device, pBuffer, size);
             break;
@@ -606,7 +601,6 @@ nvswitch_fsprpc_get_caps_ls10
     params->responseNvdmType = responsePayload.nvdmType;
     params->commandNvdmType  = responsePayload.cmdResponse.commandNvdmType;
     params->errorCode        = responsePayload.cmdResponse.errorCode;
-    params->pRspPayload      = responsePayload.rspPayload;
 
     return NVL_SUCCESS;
 }

src/common/nvswitch/kernel/ls10/ls10.c

@@ -2979,6 +2979,13 @@ nvswitch_is_soe_supported_ls10
         NVSWITCH_PRINT(device, WARN, "SOE can not be disabled via regkey.\n");
     }
 
+    if (nvswitch_is_tnvl_mode_locked(device))
+    {
+        NVSWITCH_PRINT(device, INFO,
+            "SOE is not supported when TNVL mode is locked\n");
+        return NV_FALSE;
+    }
+
     return NV_TRUE;
 }
 
@@ -3026,6 +3033,13 @@ nvswitch_is_inforom_supported_ls10
         return NV_FALSE;
     }
 
+    if (nvswitch_is_tnvl_mode_enabled(device))
+    {
+        NVSWITCH_PRINT(device, INFO,
+            "INFOROM is not supported when TNVL mode is enabled\n");
+        return NV_FALSE; 
+    }
+
     if (!nvswitch_is_soe_supported(device))
     {
         NVSWITCH_PRINT(device, INFO,
@@ -3124,6 +3138,13 @@ nvswitch_is_smbpbi_supported_ls10
         return NV_FALSE;
     }
 
+    if (nvswitch_is_tnvl_mode_enabled(device))
+    {
+        NVSWITCH_PRINT(device, INFO,
+            "SMBPBI is not supported when TNVL mode is enabled\n");
+        return NV_FALSE; 
+    }
+
     status = _nvswitch_get_bios_version(device, &version);
     if (status != NVL_SUCCESS)
     {