From: Varun Wadekar Date: Tue, 7 Mar 2023 19:20:13 +0000 (+0000) Subject: fix(tegra): append major revision to the chip_id value X-Git-Tag: baikal/aarch64/sdk5.10~1^2~163^2 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=33c476601cf48a4b02259b8cb43819acd824804f;p=arm-tf.git fix(tegra): append major revision to the chip_id value This patch appends the chip's major revision to the chip id value to form the SoC version value expected by the SMCCC_GET_SOC_VERSION function ID. Signed-off-by: Varun Wadekar Change-Id: I09118f446f6b8198588826d4a161bd97dcb6a581 --- diff --git a/plat/nvidia/tegra/common/tegra_platform.c b/plat/nvidia/tegra/common/tegra_platform.c index f3aa3eafd..6d736b50f 100644 --- a/plat/nvidia/tegra/common/tegra_platform.c +++ b/plat/nvidia/tegra/common/tegra_platform.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2016-2021, ARM Limited and Contributors. All rights reserved. - * Copyright (c) 2020-2021, NVIDIA Corporation. All rights reserved. + * Copyright (c) 2020-2023, NVIDIA Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -272,10 +272,12 @@ bool tegra_platform_is_virt_dev_kit(void) */ int32_t plat_get_soc_version(void) { - uint32_t chip_id = ((tegra_get_chipid() >> CHIP_ID_SHIFT) & CHIP_ID_MASK); + uint32_t chip_id = (tegra_get_chipid() >> CHIP_ID_SHIFT) & CHIP_ID_MASK; + uint32_t major_rev = tegra_get_chipid_major(); uint32_t manfid = SOC_ID_SET_JEP_106(JEDEC_NVIDIA_BKID, JEDEC_NVIDIA_MFID); - return (int32_t)(manfid | (chip_id & SOC_ID_IMPL_DEF_MASK)); + return (int32_t)(manfid | (((chip_id << MAJOR_VERSION_SHIFT) | major_rev) & + SOC_ID_IMPL_DEF_MASK)); } /*