From 8103bafdc36294abdfae43796c87c6c5bee6bfd9 Mon Sep 17 00:00:00 2001 From: Mahesh Kumar Date: Thu, 4 Jan 2024 19:58:06 +0000 Subject: [PATCH] dce: handle DCE_ADMIN_CMD_VERSION failure Fail on DCE_ADMIN_CMD_VERSION command failure. Also print dce-kmd admin version for comparison. Bug 4264719 Change-Id: Ifde58147fd0ed3c311e0d342d664ab446a7eda78 Signed-off-by: Mahesh Kumar Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3046184 Reviewed-by: Vinod Gopalakrishnakurup GVS: Gerrit_Virtual_Submit --- drivers/platform/tegra/dce/dce-admin.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/platform/tegra/dce/dce-admin.c b/drivers/platform/tegra/dce/dce-admin.c index 26561a8e..46d3632d 100644 --- a/drivers/platform/tegra/dce/dce-admin.c +++ b/drivers/platform/tegra/dce/dce-admin.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2019-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved. + * Copyright (c) 2019-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved. */ @@ -453,8 +453,15 @@ static int dce_admin_send_cmd_ver(struct tegra_dce *d, dce_err(d, "Error sending get version info : [%d]", ret); goto out; } - dce_info(d, "version : [0x%x] err : [0x%x]", ver_info->version, - resp_msg->error); + + if (resp_msg->error != DCE_ERR_CORE_SUCCESS) { + dce_err(d, "Error in handling DCE_ADMIN_CMD_VERSION on DCE\n"); + ret = resp_msg->error; + goto out; + } + + dce_info(d, "version : dcefw:[0x%x] dcekmd:[0x%x] err : [0x%x]", + ver_info->version, DCE_ADMIN_VERSION, resp_msg->error); out: /**