From 46b90333593cd1a6da56eabe711753242f66fde0 Mon Sep 17 00:00:00 2001 From: Yann Gautier Date: Thu, 20 May 2021 11:40:27 +0200 Subject: [PATCH] refactor(plat/nvidia): use SOC_ID defines Use the macros that are now defined in include/lib/smccc.h. Signed-off-by: Yann Gautier Change-Id: Ibe3c17acd2482b7779318c8a922a138dcace5554 --- plat/nvidia/tegra/common/tegra_platform.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plat/nvidia/tegra/common/tegra_platform.c b/plat/nvidia/tegra/common/tegra_platform.c index d45d9886f..3894b7476 100644 --- a/plat/nvidia/tegra/common/tegra_platform.c +++ b/plat/nvidia/tegra/common/tegra_platform.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2020, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2016-2021, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020, NVIDIA Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -280,9 +280,9 @@ 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 manfid = (JEDEC_NVIDIA_BKID << 24) | (JEDEC_NVIDIA_MFID << 16); + uint32_t manfid = SOC_ID_SET_JEP_106(JEDEC_NVIDIA_BKID, JEDEC_NVIDIA_MFID); - return (int32_t)(manfid | (chip_id & 0xFFFF)); + return (int32_t)(manfid | (chip_id & SOC_ID_IMPL_DEF_MASK)); } /* @@ -293,7 +293,8 @@ int32_t plat_get_soc_version(void) */ int32_t plat_get_soc_revision(void) { - return (int32_t)((tegra_get_chipid_major() << 8) | tegra_get_chipid_minor()); + return (int32_t)(((tegra_get_chipid_major() << 8) | tegra_get_chipid_minor()) & + SOC_ID_REV_MASK); } /*****************************************************************************