andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tegra: platform: support simulation platforms and MISRA fixes 

This patch adds support for simulation platforms as well as
fixes issues flagged by the MISRA scans.

Main MISRA fixes:

* Added explicit casts (e.g. 0U) to integers in order for them to be
  compatible with whatever operation they're used in [Rule 10.1]
* Fix return type doesn't match the function type [Rule 10.3]
* Use single return point instead of multiple [Rule 15.5]
* Change return type for the tegra_platform_is_x handlers to bool

Change-Id: I871b7c37b22942f6c0c2049c14cc626d4a24d81c
Signed-off-by: Anthony Zhou <anzhou@nvidia.com>
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
This commit is contained in:
Anthony Zhou 2017-03-22 14:37:04 +08:00 committed by Varun Wadekar
parent cd1f39b48a
commit c62be07999
2 changed files with 178 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

213
plat/nvidia/tegra/common/tegra_platform.c
View File

@ -1,15 +1,16 @@
/* /*
* Copyright (c) 2017, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2016-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <arch_helpers.h> #include <arch_helpers.h>
#include <assert.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <tegra_def.h> #include <tegra_def.h>
#include <tegra_platform.h> #include <tegra_platform.h>
#include <tegra_private.h> #include <tegra_private.h>
#include <utils_def.h>
/******************************************************************************* /*******************************************************************************
* Tegra platforms * Tegra platforms
@ -19,26 +20,45 @@ typedef enum tegra_platform {
TEGRA_PLATFORM_QT, TEGRA_PLATFORM_QT,
TEGRA_PLATFORM_FPGA, TEGRA_PLATFORM_FPGA,
TEGRA_PLATFORM_EMULATION, TEGRA_PLATFORM_EMULATION,
TEGRA_PLATFORM_LINSIM,
TEGRA_PLATFORM_UNIT_FPGA,
TEGRA_PLATFORM_VIRT_DEV_KIT,
TEGRA_PLATFORM_MAX, TEGRA_PLATFORM_MAX,
} tegra_platform_t; } tegra_platform_t;
/******************************************************************************* /*******************************************************************************
* Tegra macros defining all the SoC minor versions * Tegra macros defining all the SoC minor versions
******************************************************************************/ ******************************************************************************/
#define TEGRA_MINOR_QT 0 #define TEGRA_MINOR_QT U(0)
#define TEGRA_MINOR_FPGA 1 #define TEGRA_MINOR_FPGA U(1)
#define TEGRA_MINOR_EMULATION_MIN 2 #define TEGRA_MINOR_ASIM_QT U(2)
#define TEGRA_MINOR_EMULATION_MAX 10 #define TEGRA_MINOR_ASIM_LINSIM U(3)
#define TEGRA_MINOR_DSIM_ASIM_LINSIM U(4)
#define TEGRA_MINOR_UNIT_FPGA U(5)
#define TEGRA_MINOR_VIRT_DEV_KIT U(6)
/******************************************************************************* /*******************************************************************************
* Tegra major, minor version helper macros * Tegra major, minor version helper macros
******************************************************************************/ ******************************************************************************/
#define MAJOR_VERSION_SHIFT 0x4 #define MAJOR_VERSION_SHIFT U(0x4)
#define MAJOR_VERSION_MASK 0xF #define MAJOR_VERSION_MASK U(0xF)
#define MINOR_VERSION_SHIFT 0x10 #define MINOR_VERSION_SHIFT U(0x10)
#define MINOR_VERSION_MASK 0xF #define MINOR_VERSION_MASK U(0xF)
#define CHIP_ID_SHIFT 8 #define CHIP_ID_SHIFT U(8)
#define CHIP_ID_MASK 0xFF #define CHIP_ID_MASK U(0xFF)
#define PRE_SI_PLATFORM_SHIFT U(0x14)
#define PRE_SI_PLATFORM_MASK U(0xF)
/*******************************************************************************
* Tegra macros defining all the SoC pre_si_platform
******************************************************************************/
#define TEGRA_PRE_SI_QT U(1)
#define TEGRA_PRE_SI_FPGA U(2)
#define TEGRA_PRE_SI_UNIT_FPGA U(3)
#define TEGRA_PRE_SI_ASIM_QT U(4)
#define TEGRA_PRE_SI_ASIM_LINSIM U(5)
#define TEGRA_PRE_SI_DSIM_ASIM_LINSIM U(6)
#define TEGRA_PRE_SI_VDK U(8)
/******************************************************************************* /*******************************************************************************
* Tegra chip ID values * Tegra chip ID values
@ -94,59 +114,166 @@ uint8_t tegra_chipid_is_t186(void)
return (chip_id == TEGRA_CHIPID_TEGRA18); return (chip_id == TEGRA_CHIPID_TEGRA18);
} }
/*
* Read the chip's pre_si_platform valus from the chip ID value
*/
static uint32_t tegra_get_chipid_pre_si_platform(void)
{
return (tegra_get_chipid() >> PRE_SI_PLATFORM_SHIFT) & PRE_SI_PLATFORM_MASK;
}
/* /*
* Read the chip ID value and derive the platform * Read the chip ID value and derive the platform
*/ */
static tegra_platform_t tegra_get_platform(void) static tegra_platform_t tegra_get_platform(void)
{ {
uint32_t major = tegra_get_chipid_major(); uint32_t major, minor, pre_si_platform;
uint32_t minor = tegra_get_chipid_minor(); tegra_platform_t ret;
/* Actual silicon platforms have a non-zero major version */ /* get the major/minor chip ID values */
if (major > 0) major = tegra_get_chipid_major();
return TEGRA_PLATFORM_SILICON; minor = tegra_get_chipid_minor();
pre_si_platform = tegra_get_chipid_pre_si_platform();
/* if (major == 0U) {
* The minor version number is used by simulation platforms /*
*/ * The minor version number is used by simulation platforms
*/
switch (minor) {
/*
* Cadence's QuickTurn emulation system is a Solaris-based
* chip emulation system
*/
case TEGRA_MINOR_QT:
case TEGRA_MINOR_ASIM_QT:
ret = TEGRA_PLATFORM_QT;
break;
/* /*
* Cadence's QuickTurn emulation system is a Solaris-based * FPGAs are used during early software/hardware development
* chip emulation system */
*/ case TEGRA_MINOR_FPGA:
if (minor == TEGRA_MINOR_QT) ret = TEGRA_PLATFORM_FPGA;
return TEGRA_PLATFORM_QT; break;
/*
* Linsim is a reconfigurable, clock-driven, mixed RTL/cmodel
* simulation framework.
*/
case TEGRA_MINOR_ASIM_LINSIM:
case TEGRA_MINOR_DSIM_ASIM_LINSIM:
ret = TEGRA_PLATFORM_LINSIM;
break;
/* /*
* FPGAs are used during early software/hardware development * Unit FPGAs run the actual hardware block IP on the FPGA with
*/ * the other parts of the system using Linsim.
if (minor == TEGRA_MINOR_FPGA) */
return TEGRA_PLATFORM_FPGA; case TEGRA_MINOR_UNIT_FPGA:
ret = TEGRA_PLATFORM_UNIT_FPGA;
break;
/*
* The Virtualizer Development Kit (VDK) is the standard chip
* development from Synopsis.
*/
case TEGRA_MINOR_VIRT_DEV_KIT:
ret = TEGRA_PLATFORM_VIRT_DEV_KIT;
break;
default:
assert(0);
ret = TEGRA_PLATFORM_MAX;
break;
}
/* Minor version reserved for other emulation platforms */ } else if (pre_si_platform > 0U) {
if ((minor > TEGRA_MINOR_FPGA) && (minor <= TEGRA_MINOR_EMULATION_MAX))
return TEGRA_PLATFORM_EMULATION;
/* unsupported platform */ switch (pre_si_platform) {
return TEGRA_PLATFORM_MAX; /*
* Cadence's QuickTurn emulation system is a Solaris-based
* chip emulation system
*/
case TEGRA_PRE_SI_QT:
case TEGRA_PRE_SI_ASIM_QT:
ret = TEGRA_PLATFORM_QT;
break;
/*
* FPGAs are used during early software/hardware development
*/
case TEGRA_PRE_SI_FPGA:
ret = TEGRA_PLATFORM_FPGA;
break;
/*
* Linsim is a reconfigurable, clock-driven, mixed RTL/cmodel
* simulation framework.
*/
case TEGRA_PRE_SI_ASIM_LINSIM:
case TEGRA_PRE_SI_DSIM_ASIM_LINSIM:
ret = TEGRA_PLATFORM_LINSIM;
break;
/*
* Unit FPGAs run the actual hardware block IP on the FPGA with
* the other parts of the system using Linsim.
*/
case TEGRA_PRE_SI_UNIT_FPGA:
ret = TEGRA_PLATFORM_UNIT_FPGA;
break;
/*
* The Virtualizer Development Kit (VDK) is the standard chip
* development from Synopsis.
*/
case TEGRA_PRE_SI_VDK:
ret = TEGRA_PLATFORM_VIRT_DEV_KIT;
break;
default:
assert(0);
ret = TEGRA_PLATFORM_MAX;
break;
}
} else {
/* Actual silicon platforms have a non-zero major version */
ret = TEGRA_PLATFORM_SILICON;
}
return ret;
} }
uint8_t tegra_platform_is_silicon(void) bool tegra_platform_is_silicon(void)
{ {
return (tegra_get_platform() == TEGRA_PLATFORM_SILICON); return ((tegra_get_platform() == TEGRA_PLATFORM_SILICON) ? true : false);
} }
uint8_t tegra_platform_is_qt(void) bool tegra_platform_is_qt(void)
{ {
return (tegra_get_platform() == TEGRA_PLATFORM_QT); return ((tegra_get_platform() == TEGRA_PLATFORM_QT) ? true : false);
} }
uint8_t tegra_platform_is_fpga(void) bool tegra_platform_is_linsim(void)
{ {
return (tegra_get_platform() == TEGRA_PLATFORM_FPGA); tegra_platform_t plat = tegra_get_platform();
return (((plat == TEGRA_PLATFORM_LINSIM) ||
(plat == TEGRA_PLATFORM_UNIT_FPGA)) ? true : false);
} }
uint8_t tegra_platform_is_emulation(void) bool tegra_platform_is_fpga(void)
{
return ((tegra_get_platform() == TEGRA_PLATFORM_FPGA) ? true : false);
}
bool tegra_platform_is_emulation(void)
{ {
return (tegra_get_platform() == TEGRA_PLATFORM_EMULATION); return (tegra_get_platform() == TEGRA_PLATFORM_EMULATION);
} }
bool tegra_platform_is_unit_fpga(void)
{
return ((tegra_get_platform() == TEGRA_PLATFORM_UNIT_FPGA) ? true : false);
}
bool tegra_platform_is_virt_dev_kit(void)
{
return ((tegra_get_platform() == TEGRA_PLATFORM_VIRT_DEV_KIT) ? true : false);
}

12
plat/nvidia/tegra/include/tegra_platform.h
View File

@ -8,6 +8,7 @@
#define TEGRA_PLATFORM_H #define TEGRA_PLATFORM_H
#include <cdefs.h> #include <cdefs.h>
#include <stdbool.h>
/* /*
* Tegra chip major/minor version * Tegra chip major/minor version
@ -26,9 +27,12 @@ uint8_t tegra_chipid_is_t186(void);
/* /*
* Tegra platform identifiers * Tegra platform identifiers
*/ */
uint8_t tegra_platform_is_silicon(void); bool tegra_platform_is_silicon(void);
uint8_t tegra_platform_is_qt(void); bool tegra_platform_is_qt(void);
uint8_t tegra_platform_is_emulation(void); bool tegra_platform_is_emulation(void);
uint8_t tegra_platform_is_fpga(void); bool tegra_platform_is_linsim(void);
bool tegra_platform_is_fpga(void);
bool tegra_platform_is_unit_fpga(void);
bool tegra_platform_is_virt_dev_kit(void);
#endif /* TEGRA_PLATFORM_H */ #endif /* TEGRA_PLATFORM_H */