Skip to content

GitLab

Commit ab712fd8 authored by Anthony Zhou's avatar Anthony Zhou Committed by Varun Wadekar
Browse files

Tegra186: mce: fix MISRA defects 



Main 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]
* Force operands of an operator to the same type category [Rule 10.4]
* Added curly braces ({}) around if/while statements in order to
  make them compound [Rule 15.6]
* Added parentheses [Rule 12.1]
* Voided non C-library functions whose return types are not used [Rule 17.7]

Change-Id: I91404edec2e2194b1ce2672d2a3fc6a1f5bf41f1
Signed-off-by: default avatarAnthony Zhou <anzhou@nvidia.com>
Signed-off-by: default avatarVarun Wadekar <vwadekar@nvidia.com>
parent 3436089d
Expand all Hide whitespace changes
Inline Side-by-side
plat/nvidia/tegra/include/drivers/mce.h
View file @ ab712fd8
...@@ -63,14 +63,14 @@ typedef struct mce_cstate_info { ...@@ -63,14 +63,14 @@ typedef struct mce_cstate_info {
} mce_cstate_info_t; } mce_cstate_info_t;
/* public interfaces */ /* public interfaces */
int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, int mce_command_handler(uint64_t cmd, uint64_t arg0, uint64_t arg1,
uint64_t arg2); uint64_t arg2);
int mce_update_reset_vector(void); int mce_update_reset_vector(void);
int mce_update_gsc_videomem(void); int mce_update_gsc_videomem(void);
int mce_update_gsc_tzdram(void); int mce_update_gsc_tzdram(void);
int mce_update_gsc_tzram(void); int mce_update_gsc_tzram(void);
__dead2 void mce_enter_ccplex_state(uint32_t state_idx); __dead2 void mce_enter_ccplex_state(uint32_t state_idx);
void mce_update_cstate_info(mce_cstate_info_t *cstate); void mce_update_cstate_info(const mce_cstate_info_t *cstate);
void mce_verify_firmware_version(void); void mce_verify_firmware_version(void);
#endif /* __MCE_H__ */ #endif /* __MCE_H__ */
plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h
View file @ ab712fd8
...@@ -14,127 +14,68 @@ ...@@ -14,127 +14,68 @@
* Macros to prepare CSTATE info request * Macros to prepare CSTATE info request
******************************************************************************/ ******************************************************************************/
/* Description of the parameters for UPDATE_CSTATE_INFO request */ /* Description of the parameters for UPDATE_CSTATE_INFO request */
#define CLUSTER_CSTATE_MASK 0x7ULL #define CLUSTER_CSTATE_MASK ULL(0x7)
#define CLUSTER_CSTATE_SHIFT 0U #define CLUSTER_CSTATE_SHIFT U(0)
#define CLUSTER_CSTATE_UPDATE_BIT (1ULL << 7) #define CLUSTER_CSTATE_UPDATE_BIT (ULL(1) << 7)
#define CCPLEX_CSTATE_MASK 0x3ULL #define CCPLEX_CSTATE_MASK ULL(0x3)
#define CCPLEX_CSTATE_SHIFT 8ULL #define CCPLEX_CSTATE_SHIFT ULL(8)
#define CCPLEX_CSTATE_UPDATE_BIT (1ULL << 15) #define CCPLEX_CSTATE_UPDATE_BIT (ULL(1) << 15)
#define SYSTEM_CSTATE_MASK 0xFULL #define SYSTEM_CSTATE_MASK ULL(0xF)
#define SYSTEM_CSTATE_SHIFT 16ULL #define SYSTEM_CSTATE_SHIFT ULL(16)
#define SYSTEM_CSTATE_FORCE_UPDATE_SHIFT 22ULL #define SYSTEM_CSTATE_FORCE_UPDATE_SHIFT ULL(22)
#define SYSTEM_CSTATE_FORCE_UPDATE_BIT (1ULL << 22) #define SYSTEM_CSTATE_FORCE_UPDATE_BIT (ULL(1) << 22)
#define SYSTEM_CSTATE_UPDATE_BIT (1ULL << 23) #define SYSTEM_CSTATE_UPDATE_BIT (ULL(1) << 23)
#define CSTATE_WAKE_MASK_UPDATE_BIT (1ULL << 31) #define CSTATE_WAKE_MASK_UPDATE_BIT (ULL(1) << 31)
#define CSTATE_WAKE_MASK_SHIFT 32ULL #define CSTATE_WAKE_MASK_SHIFT ULL(32)
#define CSTATE_WAKE_MASK_CLEAR 0xFFFFFFFFU #define CSTATE_WAKE_MASK_CLEAR U(0xFFFFFFFF)
/******************************************************************************* /*******************************************************************************
* Auto-CC3 control macros * Auto-CC3 control macros
******************************************************************************/ ******************************************************************************/
#define MCE_AUTO_CC3_FREQ_MASK 0x1FFU #define MCE_AUTO_CC3_FREQ_MASK U(0x1FF)
#define MCE_AUTO_CC3_FREQ_SHIFT 0U #define MCE_AUTO_CC3_FREQ_SHIFT U(0)
#define MCE_AUTO_CC3_VTG_MASK 0x7FU #define MCE_AUTO_CC3_VTG_MASK U(0x7F)
#define MCE_AUTO_CC3_VTG_SHIFT 16U #define MCE_AUTO_CC3_VTG_SHIFT U(16)
#define MCE_AUTO_CC3_ENABLE_BIT (1U << 31) #define MCE_AUTO_CC3_ENABLE_BIT (U(1) << 31)
/******************************************************************************* /*******************************************************************************
* Macros for the 'IS_SC7_ALLOWED' command * Macros for the 'IS_SC7_ALLOWED' command
******************************************************************************/ ******************************************************************************/
#define MCE_SC7_ALLOWED_MASK 0x7U #define MCE_SC7_ALLOWED_MASK U(0x7)
#define MCE_SC7_WAKE_TIME_SHIFT 32U #define MCE_SC7_WAKE_TIME_SHIFT U(32)
/******************************************************************************* /*******************************************************************************
* Macros for 'read/write ctats' commands * Macros for 'read/write ctats' commands
******************************************************************************/ ******************************************************************************/
#define MCE_CSTATE_STATS_TYPE_SHIFT 32ULL #define MCE_CSTATE_STATS_TYPE_SHIFT ULL(32)
#define MCE_CSTATE_WRITE_DATA_LO_MASK 0xFU #define MCE_CSTATE_WRITE_DATA_LO_MASK U(0xF)
/******************************************************************************* /*******************************************************************************
* Macros for 'update crossover threshold' command * Macros for 'update crossover threshold' command
******************************************************************************/ ******************************************************************************/
#define MCE_CROSSOVER_THRESHOLD_TIME_SHIFT 32U #define MCE_CROSSOVER_THRESHOLD_TIME_SHIFT U(32)
/******************************************************************************* /*******************************************************************************
* MCA command struct * MCA argument macros
******************************************************************************/ ******************************************************************************/
typedef union mca_cmd { #define MCA_ARG_ERROR_MASK U(0xFF)
struct command { #define MCA_ARG_FINISH_SHIFT U(24)
uint8_t cmd; #define MCA_ARG_FINISH_MASK U(0xFF)
uint8_t idx;
uint8_t subidx;
} command;
struct input {
uint32_t low;
uint32_t high;
} input;
uint64_t data;
} mca_cmd_t;
/*******************************************************************************
* MCA argument struct
******************************************************************************/
typedef union mca_arg {
struct err {
uint32_t error:8;
uint32_t unused:24;
uint32_t unused2:24;
uint32_t finish:8;
} err;
struct arg {
uint32_t low;
uint32_t high;
} arg;
uint64_t data;
} mca_arg_t;
/******************************************************************************* /*******************************************************************************
* Uncore PERFMON ARI struct * Uncore PERFMON ARI struct
******************************************************************************/ ******************************************************************************/
typedef union uncore_perfmon_req { #define UNCORE_PERFMON_CMD_READ U(0)
struct perfmon_command { #define UNCORE_PERFMON_CMD_WRITE U(1)
/*
* Commands: 0 = READ, 1 = WRITE
*/
uint32_t cmd:8;
/*
* The unit group: L2=0, L3=1, ROC=2, MC=3, IOB=4
*/
uint32_t grp:4;
/*
* Unit selector: Selects the unit instance, with 0 = Unit
* = (number of units in group) - 1.
*/
uint32_t unit:4;
/*
* Selects the uncore perfmon register to access
*/
uint32_t reg:8;
/*
* Counter number. Selects which counter to use for
* registers NV_PMEVCNTR and NV_PMEVTYPER.
*/
uint32_t counter:8;
} perfmon_command;
struct perfmon_status {
/*
* Resulting command status
*/
uint32_t val:8;
uint32_t unused:24;
} perfmon_status;
uint64_t data;
} uncore_perfmon_req_t;
#define UNCORE_PERFMON_CMD_READ 0U
#define UNCORE_PERFMON_CMD_WRITE 1U
#define UNCORE_PERFMON_CMD_MASK 0xFFU #define UNCORE_PERFMON_CMD_MASK U(0xFF)
#define UNCORE_PERFMON_UNIT_GRP_MASK 0xFU #define UNCORE_PERFMON_CMD_SHIFT U(24)
#define UNCORE_PERFMON_SELECTOR_MASK 0xFU #define UNCORE_PERFMON_UNIT_GRP_MASK U(0xF)
#define UNCORE_PERFMON_REG_MASK 0xFFU #define UNCORE_PERFMON_SELECTOR_MASK U(0xF)
#define UNCORE_PERFMON_CTR_MASK 0xFFU #define UNCORE_PERFMON_REG_MASK U(0xFF)
#define UNCORE_PERFMON_RESP_STATUS_MASK 0xFFU #define UNCORE_PERFMON_CTR_MASK U(0xFF)
#define UNCORE_PERFMON_RESP_STATUS_MASK U(0xFF)
#define UNCORE_PERFMON_RESP_STATUS_SHIFT U(24)
/******************************************************************************* /*******************************************************************************
* Structure populated by arch specific code to export routines which perform * Structure populated by arch specific code to export routines which perform
...@@ -146,13 +87,13 @@ typedef struct arch_mce_ops { ...@@ -146,13 +87,13 @@ typedef struct arch_mce_ops {
* of STANDBYWFI, update the core power state and expected wake time, * of STANDBYWFI, update the core power state and expected wake time,
* then determine the proper power state to enter. * then determine the proper power state to enter.
*/ */
int (*enter_cstate)(uint32_t ari_base, uint32_t state, int32_t (*enter_cstate)(uint32_t ari_base, uint32_t state,
uint32_t wake_time); uint32_t wake_time);
/* /*
* This ARI request allows updating of the CLUSTER_CSTATE, * This ARI request allows updating of the CLUSTER_CSTATE,
* CCPLEX_CSTATE, and SYSTEM_CSTATE register values. * CCPLEX_CSTATE, and SYSTEM_CSTATE register values.
*/ */
int (*update_cstate_info)(uint32_t ari_base, int32_t (*update_cstate_info)(uint32_t ari_base,
uint32_t cluster, uint32_t cluster,
uint32_t ccplex, uint32_t ccplex,
uint32_t system, uint32_t system,
...@@ -164,7 +105,7 @@ typedef struct arch_mce_ops { ...@@ -164,7 +105,7 @@ typedef struct arch_mce_ops {
* threshold times. An index value specifies which crossover * threshold times. An index value specifies which crossover
* state is being updated. * state is being updated.
*/ */
int (*update_crossover_time)(uint32_t ari_base, int32_t (*update_crossover_time)(uint32_t ari_base,
uint32_t type, uint32_t type,
uint32_t time); uint32_t time);
/* /*
...@@ -177,7 +118,7 @@ typedef struct arch_mce_ops { ...@@ -177,7 +118,7 @@ typedef struct arch_mce_ops {
* This ARI request allows write access to statistical information * This ARI request allows write access to statistical information
* related to power states. * related to power states.
*/ */
int (*write_cstate_stats)(uint32_t ari_base, int32_t (*write_cstate_stats)(uint32_t ari_base,
uint32_t state, uint32_t state,
uint32_t stats); uint32_t stats);
/* /*
...@@ -193,7 +134,7 @@ typedef struct arch_mce_ops { ...@@ -193,7 +134,7 @@ typedef struct arch_mce_ops {
* must be entered. If the CCx state is not allowed, the response * must be entered. If the CCx state is not allowed, the response
* indicates CC6/CC7 can't be entered * indicates CC6/CC7 can't be entered
*/ */
int (*is_ccx_allowed)(uint32_t ari_base, uint32_t state, int32_t (*is_ccx_allowed)(uint32_t ari_base, uint32_t state,
uint32_t wake_time); uint32_t wake_time);
/* /*
* This ARI request allows querying the CCPLEX to determine if * This ARI request allows querying the CCPLEX to determine if
...@@ -203,19 +144,19 @@ typedef struct arch_mce_ops { ...@@ -203,19 +144,19 @@ typedef struct arch_mce_ops {
* indicates SC7 must be entered. If the SC7 state is not allowed, * indicates SC7 must be entered. If the SC7 state is not allowed,
* the response indicates SC7 can't be entered * the response indicates SC7 can't be entered
*/ */
int (*is_sc7_allowed)(uint32_t ari_base, uint32_t state, int32_t (*is_sc7_allowed)(uint32_t ari_base, uint32_t state,
uint32_t wake_time); uint32_t wake_time);
/* /*
* This ARI request allows a core to bring another offlined core * This ARI request allows a core to bring another offlined core
* back online to the C0 state. Note that a core is offlined by * back online to the C0 state. Note that a core is offlined by
* entering a C-state where the WAKE_MASK is all 0. * entering a C-state where the WAKE_MASK is all 0.
*/ */
int (*online_core)(uint32_t ari_base, uint32_t cpuid); int32_t (*online_core)(uint32_t ari_base, uint32_t cpuid);
/* /*
* This ARI request allows the CPU to enable/disable Auto-CC3 idle * This ARI request allows the CPU to enable/disable Auto-CC3 idle
* state. * state.
*/ */
int (*cc3_ctrl)(uint32_t ari_base, int32_t (*cc3_ctrl)(uint32_t ari_base,
uint32_t freq, uint32_t freq,
uint32_t volt, uint32_t volt,
uint8_t enable); uint8_t enable);
...@@ -223,30 +164,30 @@ typedef struct arch_mce_ops { ...@@ -223,30 +164,30 @@ typedef struct arch_mce_ops {
* This ARI request allows updating the reset vector register for * This ARI request allows updating the reset vector register for
* D15 and A57 CPUs. * D15 and A57 CPUs.
*/ */
int (*update_reset_vector)(uint32_t ari_base); int32_t (*update_reset_vector)(uint32_t ari_base);
/* /*
* This ARI request instructs the ROC to flush A57 data caches in * This ARI request instructs the ROC to flush A57 data caches in
* order to maintain coherency with the Denver cluster. * order to maintain coherency with the Denver cluster.
*/ */
int (*roc_flush_cache)(uint32_t ari_base); int32_t (*roc_flush_cache)(uint32_t ari_base);
/* /*
* This ARI request instructs the ROC to flush A57 data caches along * This ARI request instructs the ROC to flush A57 data caches along
* with the caches covering ARM code in order to maintain coherency * with the caches covering ARM code in order to maintain coherency
* with the Denver cluster. * with the Denver cluster.
*/ */
int (*roc_flush_cache_trbits)(uint32_t ari_base); int32_t (*roc_flush_cache_trbits)(uint32_t ari_base);
/* /*
* This ARI request instructs the ROC to clean A57 data caches along * This ARI request instructs the ROC to clean A57 data caches along
* with the caches covering ARM code in order to maintain coherency * with the caches covering ARM code in order to maintain coherency
* with the Denver cluster. * with the Denver cluster.
*/ */
int (*roc_clean_cache)(uint32_t ari_base); int32_t (*roc_clean_cache)(uint32_t ari_base);
/* /*
* This ARI request reads/writes the Machine Check Arch. (MCA) * This ARI request reads/writes the Machine Check Arch. (MCA)
* registers. * registers.
*/ */
uint64_t (*read_write_mca)(uint32_t ari_base, uint64_t (*read_write_mca)(uint32_t ari_base,
mca_cmd_t cmd, uint64_t cmd,
uint64_t *data); uint64_t *data);
/* /*
* Some MC GSC (General Security Carveout) register values are * Some MC GSC (General Security Carveout) register values are
...@@ -258,7 +199,7 @@ typedef struct arch_mce_ops { ...@@ -258,7 +199,7 @@ typedef struct arch_mce_ops {
* register value. This ARI request allows updating the GSC register * register value. This ARI request allows updating the GSC register
* value for a certain carveout in the CCPLEX. * value for a certain carveout in the CCPLEX.
*/ */
int (*update_ccplex_gsc)(uint32_t ari_base, uint32_t gsc_idx); int32_t (*update_ccplex_gsc)(uint32_t ari_base, uint32_t gsc_idx);
/* /*
* This ARI request instructs the CCPLEX to either shutdown or * This ARI request instructs the CCPLEX to either shutdown or
* reset the entire system * reset the entire system
...@@ -268,8 +209,8 @@ typedef struct arch_mce_ops { ...@@ -268,8 +209,8 @@ typedef struct arch_mce_ops {
* This ARI request reads/writes data from/to Uncore PERFMON * This ARI request reads/writes data from/to Uncore PERFMON
* registers * registers
*/ */
int (*read_write_uncore_perfmon)(uint32_t ari_base, int32_t (*read_write_uncore_perfmon)(uint32_t ari_base,
uncore_perfmon_req_t req, uint64_t *data); uint64_t req, uint64_t *data);
/* /*
* This ARI implements ARI_MISC_CCPLEX commands. This can be * This ARI implements ARI_MISC_CCPLEX commands. This can be
* used to enable/disable coresight clock gating. * used to enable/disable coresight clock gating.
...@@ -279,39 +220,42 @@ typedef struct arch_mce_ops { ...@@ -279,39 +220,42 @@ typedef struct arch_mce_ops {
} arch_mce_ops_t; } arch_mce_ops_t;
/* declarations for ARI/NVG handler functions */ /* declarations for ARI/NVG handler functions */
int ari_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time); int32_t ari_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time);
int ari_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex, int32_t ari_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex,
uint32_t system, uint8_t sys_state_force, uint32_t wake_mask, uint32_t system, uint8_t sys_state_force, uint32_t wake_mask,
uint8_t update_wake_mask); uint8_t update_wake_mask);
int ari_update_crossover_time(uint32_t ari_base, uint32_t type, uint32_t time); int32_t ari_update_crossover_time(uint32_t ari_base, uint32_t type, uint32_t time);
uint64_t ari_read_cstate_stats(uint32_t ari_base, uint32_t state); uint64_t ari_read_cstate_stats(uint32_t ari_base, uint32_t state);
int ari_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats); int32_t ari_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats);
uint64_t ari_enumeration_misc(uint32_t ari_base, uint32_t cmd, uint32_t data); uint64_t ari_enumeration_misc(uint32_t ari_base, uint32_t cmd, uint32_t data);
int ari_is_ccx_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time); int32_t ari_is_ccx_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time);
int ari_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time); int32_t ari_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time);
int ari_online_core(uint32_t ari_base, uint32_t core); int32_t ari_online_core(uint32_t ari_base, uint32_t core);
int ari_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable); int32_t ari_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable);
int ari_reset_vector_update(uint32_t ari_base); int32_t ari_reset_vector_update(uint32_t ari_base);
int ari_roc_flush_cache_trbits(uint32_t ari_base); int32_t ari_roc_flush_cache_trbits(uint32_t ari_base);
int ari_roc_flush_cache(uint32_t ari_base); int32_t ari_roc_flush_cache(uint32_t ari_base);
int ari_roc_clean_cache(uint32_t ari_base); int32_t ari_roc_clean_cache(uint32_t ari_base);
uint64_t ari_read_write_mca(uint32_t ari_base, mca_cmd_t cmd, uint64_t *data); uint64_t ari_read_write_mca(uint32_t ari_base, uint64_t cmd, uint64_t *data);
int ari_update_ccplex_gsc(uint32_t ari_base, uint32_t gsc_idx); int32_t ari_update_ccplex_gsc(uint32_t ari_base, uint32_t gsc_idx);
void ari_enter_ccplex_state(uint32_t ari_base, uint32_t state_idx); void ari_enter_ccplex_state(uint32_t ari_base, uint32_t state_idx);
int ari_read_write_uncore_perfmon(uint32_t ari_base, int32_t ari_read_write_uncore_perfmon(uint32_t ari_base,
uncore_perfmon_req_t req, uint64_t *data); uint64_t req, uint64_t *data);
void ari_misc_ccplex(uint32_t ari_base, uint32_t index, uint32_t value); void ari_misc_ccplex(uint32_t ari_base, uint32_t index, uint32_t value);
int nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time); int32_t nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time);
int nvg_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex, int32_t nvg_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex,
uint32_t system, uint8_t sys_state_force, uint32_t wake_mask, uint32_t system, uint8_t sys_state_force, uint32_t wake_mask,
uint8_t update_wake_mask); uint8_t update_wake_mask);
int nvg_update_crossover_time(uint32_t ari_base, uint32_t type, uint32_t time); int32_t nvg_update_crossover_time(uint32_t ari_base, uint32_t type, uint32_t time);
uint64_t nvg_read_cstate_stats(uint32_t ari_base, uint32_t state); uint64_t nvg_read_cstate_stats(uint32_t ari_base, uint32_t state);
int nvg_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t val); int32_t nvg_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats);
int nvg_is_ccx_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time); int32_t nvg_is_ccx_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time);
int nvg_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time); int32_t nvg_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time);
int nvg_online_core(uint32_t ari_base, uint32_t core); int32_t nvg_online_core(uint32_t ari_base, uint32_t core);
int nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable); int32_t nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable);
extern void nvg_set_request_data(uint64_t req, uint64_t data);
extern void nvg_set_request(uint64_t req);
extern uint64_t nvg_get_result(void);
#endif /* __MCE_PRIVATE_H__ */ #endif /* __MCE_PRIVATE_H__ */
plat/nvidia/tegra/soc/t186/drivers/mce/mce.c
View file @ ab712fd8
/* /*
* Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -67,7 +67,7 @@ static arch_mce_ops_t ari_mce_ops = { ...@@ -67,7 +67,7 @@ static arch_mce_ops_t ari_mce_ops = {
.misc_ccplex = ari_misc_ccplex .misc_ccplex = ari_misc_ccplex
}; };
typedef struct mce_config { typedef struct {
uint32_t ari_base; uint32_t ari_base;
arch_mce_ops_t *ops; arch_mce_ops_t *ops;
} mce_config_t; } mce_config_t;
...@@ -108,9 +108,9 @@ static mce_config_t mce_cfg_table[MCE_ARI_APERTURES_MAX] = { ...@@ -108,9 +108,9 @@ static mce_config_t mce_cfg_table[MCE_ARI_APERTURES_MAX] = {
static uint32_t mce_get_curr_cpu_ari_base(void) static uint32_t mce_get_curr_cpu_ari_base(void)
{ {
uint32_t mpidr = read_mpidr(); uint64_t mpidr = read_mpidr();
int cpuid = mpidr & MPIDR_CPU_MASK; uint64_t cpuid = mpidr & (uint64_t)MPIDR_CPU_MASK;
int impl = (read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK; uint64_t impl = (read_midr() >> (uint64_t)MIDR_IMPL_SHIFT) & (uint64_t)MIDR_IMPL_MASK;
/* /*
* T186 has 2 CPU clusters, one with Denver CPUs and the other with * T186 has 2 CPU clusters, one with Denver CPUs and the other with
...@@ -119,17 +119,19 @@ static uint32_t mce_get_curr_cpu_ari_base(void) ...@@ -119,17 +119,19 @@ static uint32_t mce_get_curr_cpu_ari_base(void)
* struct, we have to convert the Denver CPU ids to the corresponding * struct, we have to convert the Denver CPU ids to the corresponding
* indices in the mce_ops_table array. * indices in the mce_ops_table array.
*/ */
if (impl == DENVER_IMPL) if (impl == DENVER_IMPL) {
cpuid |= 0x4; cpuid |= 0x4U;
}
return mce_cfg_table[cpuid].ari_base; return mce_cfg_table[cpuid].ari_base;
} }
static arch_mce_ops_t *mce_get_curr_cpu_ops(void) static arch_mce_ops_t *mce_get_curr_cpu_ops(void)
{ {
uint32_t mpidr = read_mpidr(); uint64_t mpidr = read_mpidr();
int cpuid = mpidr & MPIDR_CPU_MASK; uint64_t cpuid = mpidr & (uint64_t)MPIDR_CPU_MASK;
int impl = (read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK; uint64_t impl = (read_midr() >> (uint64_t)MIDR_IMPL_SHIFT) &
(uint64_t)MIDR_IMPL_MASK;
/* /*
* T186 has 2 CPU clusters, one with Denver CPUs and the other with * T186 has 2 CPU clusters, one with Denver CPUs and the other with
...@@ -138,8 +140,9 @@ static arch_mce_ops_t *mce_get_curr_cpu_ops(void) ...@@ -138,8 +140,9 @@ static arch_mce_ops_t *mce_get_curr_cpu_ops(void)
* struct, we have to convert the Denver CPU ids to the corresponding * struct, we have to convert the Denver CPU ids to the corresponding
* indices in the mce_ops_table array. * indices in the mce_ops_table array.
*/ */
if (impl == DENVER_IMPL) if (impl == DENVER_IMPL) {
cpuid |= 0x4; cpuid |= 0x4U;
}
return mce_cfg_table[cpuid].ops; return mce_cfg_table[cpuid].ops;
} }
...@@ -147,20 +150,16 @@ static arch_mce_ops_t *mce_get_curr_cpu_ops(void) ...@@ -147,20 +150,16 @@ static arch_mce_ops_t *mce_get_curr_cpu_ops(void)
/******************************************************************************* /*******************************************************************************
* Common handler for all MCE commands * Common handler for all MCE commands
******************************************************************************/ ******************************************************************************/
int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, int32_t mce_command_handler(uint64_t cmd, uint64_t arg0, uint64_t arg1,
uint64_t arg2) uint64_t arg2)
{ {
arch_mce_ops_t *ops; const arch_mce_ops_t *ops;
gp_regs_t *gp_regs = get_gpregs_ctx(cm_get_context(NON_SECURE));
uint32_t cpu_ari_base; uint32_t cpu_ari_base;
uint64_t ret64 = 0, arg3, arg4, arg5; uint64_t ret64 = 0, arg3, arg4, arg5;
int ret = 0; int32_t ret = 0;
mca_cmd_t mca_cmd;
uncore_perfmon_req_t req;
cpu_context_t *ctx = cm_get_context(NON_SECURE);
gp_regs_t *gp_regs = get_gpregs_ctx(ctx);
assert(ctx); assert(gp_regs != NULL);
assert(gp_regs);
/* get a pointer to the CPU's arch_mce_ops_t struct */ /* get a pointer to the CPU's arch_mce_ops_t struct */
ops = mce_get_curr_cpu_ops(); ops = mce_get_curr_cpu_ops();
...@@ -171,8 +170,9 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -171,8 +170,9 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
switch (cmd) { switch (cmd) {
case MCE_CMD_ENTER_CSTATE: case MCE_CMD_ENTER_CSTATE:
ret = ops->enter_cstate(cpu_ari_base, arg0, arg1); ret = ops->enter_cstate(cpu_ari_base, arg0, arg1);
if (ret < 0) if (ret < 0) {
ERROR("%s: enter_cstate failed(%d)\n", __func__, ret); ERROR("%s: enter_cstate failed(%d)\n", __func__, ret);
}
break; break;
...@@ -181,28 +181,30 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -181,28 +181,30 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
* get the parameters required for the update cstate info * get the parameters required for the update cstate info
* command * command
*/ */
arg3 = read_ctx_reg(gp_regs, CTX_GPREG_X4); arg3 = read_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X4));
arg4 = read_ctx_reg(gp_regs, CTX_GPREG_X5); arg4 = read_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X5));
arg5 = read_ctx_reg(gp_regs, CTX_GPREG_X6); arg5 = read_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X6));
ret = ops->update_cstate_info(cpu_ari_base, (uint32_t)arg0, ret = ops->update_cstate_info(cpu_ari_base, (uint32_t)arg0,
(uint32_t)arg1, (uint32_t)arg2, (uint8_t)arg3, (uint32_t)arg1, (uint32_t)arg2, (uint8_t)arg3,
(uint32_t)arg4, (uint8_t)arg5); (uint32_t)arg4, (uint8_t)arg5);
if (ret < 0) if (ret < 0) {
ERROR("%s: update_cstate_info failed(%d)\n", ERROR("%s: update_cstate_info failed(%d)\n",
__func__, ret); __func__, ret);
}
write_ctx_reg(gp_regs, CTX_GPREG_X4, 0); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X4), (0));
write_ctx_reg(gp_regs, CTX_GPREG_X5, 0); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X5), (0));
write_ctx_reg(gp_regs, CTX_GPREG_X6, 0); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X6), (0));
break; break;
case MCE_CMD_UPDATE_CROSSOVER_TIME: case MCE_CMD_UPDATE_CROSSOVER_TIME:
ret = ops->update_crossover_time(cpu_ari_base, arg0, arg1); ret = ops->update_crossover_time(cpu_ari_base, arg0, arg1);
if (ret < 0) if (ret < 0) {
ERROR("%s: update_crossover_time failed(%d)\n", ERROR("%s: update_crossover_time failed(%d)\n",
__func__, ret); __func__, ret);
}
break; break;
...@@ -210,16 +212,17 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -210,16 +212,17 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
ret64 = ops->read_cstate_stats(cpu_ari_base, arg0); ret64 = ops->read_cstate_stats(cpu_ari_base, arg0);
/* update context to return cstate stats value */ /* update context to return cstate stats value */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1), (ret64));
write_ctx_reg(gp_regs, CTX_GPREG_X2, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X2), (ret64));
break; break;
case MCE_CMD_WRITE_CSTATE_STATS: case MCE_CMD_WRITE_CSTATE_STATS:
ret = ops->write_cstate_stats(cpu_ari_base, arg0, arg1); ret = ops->write_cstate_stats(cpu_ari_base, arg0, arg1);
if (ret < 0) if (ret < 0) {
ERROR("%s: write_cstate_stats failed(%d)\n", ERROR("%s: write_cstate_stats failed(%d)\n",
__func__, ret); __func__, ret);
}
break; break;
...@@ -231,7 +234,8 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -231,7 +234,8 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
} }
/* update context to return CCx status value */ /* update context to return CCx status value */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1),
(uint64_t)(ret));
break; break;
...@@ -243,22 +247,26 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -243,22 +247,26 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
} }
/* update context to return SC7 status value */ /* update context to return SC7 status value */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1),
write_ctx_reg(gp_regs, CTX_GPREG_X3, ret); (uint64_t)(ret));
write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X3),
(uint64_t)(ret));
break; break;
case MCE_CMD_ONLINE_CORE: case MCE_CMD_ONLINE_CORE:
ret = ops->online_core(cpu_ari_base, arg0); ret = ops->online_core(cpu_ari_base, arg0);
if (ret < 0) if (ret < 0) {
ERROR("%s: online_core failed(%d)\n", __func__, ret); ERROR("%s: online_core failed(%d)\n", __func__, ret);
}
break; break;
case MCE_CMD_CC3_CTRL: case MCE_CMD_CC3_CTRL:
ret = ops->cc3_ctrl(cpu_ari_base, arg0, arg1, arg2); ret = ops->cc3_ctrl(cpu_ari_base, arg0, arg1, arg2);
if (ret < 0) if (ret < 0) {
ERROR("%s: cc3_ctrl failed(%d)\n", __func__, ret); ERROR("%s: cc3_ctrl failed(%d)\n", __func__, ret);
}
break; break;
...@@ -267,8 +275,10 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -267,8 +275,10 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
arg0); arg0);
/* update context to return if echo'd data matched source */ /* update context to return if echo'd data matched source */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret64 == arg0); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1),
write_ctx_reg(gp_regs, CTX_GPREG_X2, ret64 == arg0); ((ret64 == arg0) ? 1ULL : 0ULL));
write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X2),
((ret64 == arg0) ? 1ULL : 0ULL));
break; break;
...@@ -280,8 +290,10 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -280,8 +290,10 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
* version = minor(63:32) | major(31:0). Update context * version = minor(63:32) | major(31:0). Update context
* to return major and minor version number. * to return major and minor version number.
*/ */
write_ctx_reg(gp_regs, CTX_GPREG_X1, (uint32_t)ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1),
write_ctx_reg(gp_regs, CTX_GPREG_X2, (uint32_t)(ret64 >> 32)); (ret64));
write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X2),
(ret64 >> 32ULL));
break; break;
...@@ -290,50 +302,51 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -290,50 +302,51 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
TEGRA_ARI_MISC_FEATURE_LEAF_0, arg0); TEGRA_ARI_MISC_FEATURE_LEAF_0, arg0);
/* update context to return features value */ /* update context to return features value */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1), (ret64));
break; break;
case MCE_CMD_ROC_FLUSH_CACHE_TRBITS: case MCE_CMD_ROC_FLUSH_CACHE_TRBITS:
ret = ops->roc_flush_cache_trbits(cpu_ari_base); ret = ops->roc_flush_cache_trbits(cpu_ari_base);
if (ret < 0) if (ret < 0) {
ERROR("%s: flush cache_trbits failed(%d)\n", __func__, ERROR("%s: flush cache_trbits failed(%d)\n", __func__,
ret); ret);
}
break; break;
case MCE_CMD_ROC_FLUSH_CACHE: case MCE_CMD_ROC_FLUSH_CACHE:
ret = ops->roc_flush_cache(cpu_ari_base); ret = ops->roc_flush_cache(cpu_ari_base);
if (ret < 0) if (ret < 0) {
ERROR("%s: flush cache failed(%d)\n", __func__, ret); ERROR("%s: flush cache failed(%d)\n", __func__, ret);
}
break; break;
case MCE_CMD_ROC_CLEAN_CACHE: case MCE_CMD_ROC_CLEAN_CACHE:
ret = ops->roc_clean_cache(cpu_ari_base); ret = ops->roc_clean_cache(cpu_ari_base);
if (ret < 0) if (ret < 0) {
ERROR("%s: clean cache failed(%d)\n", __func__, ret); ERROR("%s: clean cache failed(%d)\n", __func__, ret);
}
break; break;
case MCE_CMD_ENUM_READ_MCA: case MCE_CMD_ENUM_READ_MCA:
memcpy(&mca_cmd, &arg0, sizeof(arg0)); ret64 = ops->read_write_mca(cpu_ari_base, arg0, &arg1);
ret64 = ops->read_write_mca(cpu_ari_base, mca_cmd, &arg1);
/* update context to return MCA data/error */ /* update context to return MCA data/error */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1), (ret64));
write_ctx_reg(gp_regs, CTX_GPREG_X2, arg1); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X2), (arg1));
write_ctx_reg(gp_regs, CTX_GPREG_X3, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X3), (ret64));
break; break;
case MCE_CMD_ENUM_WRITE_MCA: case MCE_CMD_ENUM_WRITE_MCA:
memcpy(&mca_cmd, &arg0, sizeof(arg0)); ret64 = ops->read_write_mca(cpu_ari_base, arg0, &arg1);
ret64 = ops->read_write_mca(cpu_ari_base, mca_cmd, &arg1);
/* update context to return MCA error */ /* update context to return MCA error */
write_ctx_reg(gp_regs, CTX_GPREG_X1, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1), (ret64));
write_ctx_reg(gp_regs, CTX_GPREG_X3, ret64); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X3), (ret64));
break; break;
...@@ -357,11 +370,10 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -357,11 +370,10 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
#endif #endif
case MCE_CMD_UNCORE_PERFMON_REQ: case MCE_CMD_UNCORE_PERFMON_REQ:
memcpy(&req, &arg0, sizeof(arg0)); ret = ops->read_write_uncore_perfmon(cpu_ari_base, arg0, &arg1);
ret = ops->read_write_uncore_perfmon(cpu_ari_base, req, &arg1);
/* update context to return data */ /* update context to return data */
write_ctx_reg(gp_regs, CTX_GPREG_X1, arg1); write_ctx_reg((gp_regs), (uint32_t)(CTX_GPREG_X1), (arg1));
break; break;
case MCE_CMD_MISC_CCPLEX: case MCE_CMD_MISC_CCPLEX:
...@@ -370,8 +382,9 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -370,8 +382,9 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
break; break;
default: default:
ERROR("unknown MCE command (%d)\n", cmd); ERROR("unknown MCE command (%lu)\n", cmd);
return EINVAL; ret = EINVAL;
break;
} }
return ret; return ret;
...@@ -380,18 +393,18 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1, ...@@ -380,18 +393,18 @@ int mce_command_handler(mce_cmd_t cmd, uint64_t arg0, uint64_t arg1,
/******************************************************************************* /*******************************************************************************
* Handler to update the reset vector for CPUs * Handler to update the reset vector for CPUs
******************************************************************************/ ******************************************************************************/
int mce_update_reset_vector(void) int32_t mce_update_reset_vector(void)
{ {
arch_mce_ops_t *ops = mce_get_curr_cpu_ops(); const arch_mce_ops_t *ops = mce_get_curr_cpu_ops();
ops->update_reset_vector(mce_get_curr_cpu_ari_base()); ops->update_reset_vector(mce_get_curr_cpu_ari_base());
return 0; return 0;
} }
static int mce_update_ccplex_gsc(tegra_ari_gsc_index_t gsc_idx) static int32_t mce_update_ccplex_gsc(tegra_ari_gsc_index_t gsc_idx)
{ {
arch_mce_ops_t *ops = mce_get_curr_cpu_ops(); const arch_mce_ops_t *ops = mce_get_curr_cpu_ops();
ops->update_ccplex_gsc(mce_get_curr_cpu_ari_base(), gsc_idx); ops->update_ccplex_gsc(mce_get_curr_cpu_ari_base(), gsc_idx);
...@@ -401,7 +414,7 @@ static int mce_update_ccplex_gsc(tegra_ari_gsc_index_t gsc_idx) ...@@ -401,7 +414,7 @@ static int mce_update_ccplex_gsc(tegra_ari_gsc_index_t gsc_idx)
/******************************************************************************* /*******************************************************************************
* Handler to update carveout values for Video Memory Carveout region * Handler to update carveout values for Video Memory Carveout region
******************************************************************************/ ******************************************************************************/
int mce_update_gsc_videomem(void) int32_t mce_update_gsc_videomem(void)
{ {
return mce_update_ccplex_gsc(TEGRA_ARI_GSC_VPR_IDX); return mce_update_ccplex_gsc(TEGRA_ARI_GSC_VPR_IDX);
} }
...@@ -409,7 +422,7 @@ int mce_update_gsc_videomem(void) ...@@ -409,7 +422,7 @@ int mce_update_gsc_videomem(void)
/******************************************************************************* /*******************************************************************************
* Handler to update carveout values for TZDRAM aperture * Handler to update carveout values for TZDRAM aperture
******************************************************************************/ ******************************************************************************/
int mce_update_gsc_tzdram(void) int32_t mce_update_gsc_tzdram(void)
{ {
return mce_update_ccplex_gsc(TEGRA_ARI_GSC_TZ_DRAM_IDX); return mce_update_ccplex_gsc(TEGRA_ARI_GSC_TZ_DRAM_IDX);
} }
...@@ -417,7 +430,7 @@ int mce_update_gsc_tzdram(void) ...@@ -417,7 +430,7 @@ int mce_update_gsc_tzdram(void)
/******************************************************************************* /*******************************************************************************
* Handler to update carveout values for TZ SysRAM aperture * Handler to update carveout values for TZ SysRAM aperture
******************************************************************************/ ******************************************************************************/
int mce_update_gsc_tzram(void) int32_t mce_update_gsc_tzram(void)
{ {
return mce_update_ccplex_gsc(TEGRA_ARI_GSC_TZRAM); return mce_update_ccplex_gsc(TEGRA_ARI_GSC_TZRAM);
} }
...@@ -427,28 +440,29 @@ int mce_update_gsc_tzram(void) ...@@ -427,28 +440,29 @@ int mce_update_gsc_tzram(void)
******************************************************************************/ ******************************************************************************/
__dead2 void mce_enter_ccplex_state(uint32_t state_idx) __dead2 void mce_enter_ccplex_state(uint32_t state_idx)
{ {
arch_mce_ops_t *ops = mce_get_curr_cpu_ops(); const arch_mce_ops_t *ops = mce_get_curr_cpu_ops();
/* sanity check state value */ /* sanity check state value */
if (state_idx != TEGRA_ARI_MISC_CCPLEX_SHUTDOWN_POWER_OFF && if ((state_idx != TEGRA_ARI_MISC_CCPLEX_SHUTDOWN_POWER_OFF) &&
state_idx != TEGRA_ARI_MISC_CCPLEX_SHUTDOWN_REBOOT) (state_idx != TEGRA_ARI_MISC_CCPLEX_SHUTDOWN_REBOOT)) {
panic(); panic();
}
ops->enter_ccplex_state(mce_get_curr_cpu_ari_base(), state_idx); ops->enter_ccplex_state(mce_get_curr_cpu_ari_base(), state_idx);
/* wait till the CCPLEX powers down */ /* wait till the CCPLEX powers down */
for (;;) for (;;) {
; ;
}
panic();
} }
/******************************************************************************* /*******************************************************************************
* Handler to issue the UPDATE_CSTATE_INFO request * Handler to issue the UPDATE_CSTATE_INFO request
******************************************************************************/ ******************************************************************************/
void mce_update_cstate_info(mce_cstate_info_t *cstate) void mce_update_cstate_info(const mce_cstate_info_t *cstate)
{ {
arch_mce_ops_t *ops = mce_get_curr_cpu_ops(); const arch_mce_ops_t *ops = mce_get_curr_cpu_ops();
/* issue the UPDATE_CSTATE_INFO request */ /* issue the UPDATE_CSTATE_INFO request */
ops->update_cstate_info(mce_get_curr_cpu_ari_base(), cstate->cluster, ops->update_cstate_info(mce_get_curr_cpu_ari_base(), cstate->cluster,
...@@ -462,7 +476,7 @@ void mce_update_cstate_info(mce_cstate_info_t *cstate) ...@@ -462,7 +476,7 @@ void mce_update_cstate_info(mce_cstate_info_t *cstate)
******************************************************************************/ ******************************************************************************/
void mce_verify_firmware_version(void) void mce_verify_firmware_version(void)
{ {
arch_mce_ops_t *ops; const arch_mce_ops_t *ops;
uint32_t cpu_ari_base; uint32_t cpu_ari_base;
uint64_t version; uint64_t version;
uint32_t major, minor; uint32_t major, minor;
...@@ -470,37 +484,40 @@ void mce_verify_firmware_version(void) ...@@ -470,37 +484,40 @@ void mce_verify_firmware_version(void)
/* /*
* MCE firmware is not supported on simulation platforms. * MCE firmware is not supported on simulation platforms.
*/ */
if (tegra_platform_is_emulation()) if (tegra_platform_is_emulation()) {
return;
/* get a pointer to the CPU's arch_mce_ops_t struct */ INFO("MCE firmware is not supported\n");
ops = mce_get_curr_cpu_ops();
/* get the CPU's ARI base address */ } else {
cpu_ari_base = mce_get_curr_cpu_ari_base(); /* get a pointer to the CPU's arch_mce_ops_t struct */
ops = mce_get_curr_cpu_ops();
/* /* get the CPU's ARI base address */
* Read the MCE firmware version and extract the major and minor cpu_ari_base = mce_get_curr_cpu_ari_base();
* version fields
*/
version = ops->call_enum_misc(cpu_ari_base, TEGRA_ARI_MISC_VERSION, 0);
major = (uint32_t)version;
minor = (uint32_t)(version >> 32);
INFO("MCE Version - HW=%d:%d, SW=%d:%d\n", major, minor, /*
TEGRA_ARI_VERSION_MAJOR, TEGRA_ARI_VERSION_MINOR); * Read the MCE firmware version and extract the major and minor
* version fields
*/
version = ops->call_enum_misc(cpu_ari_base, TEGRA_ARI_MISC_VERSION, 0);
major = (uint32_t)version;
minor = (uint32_t)(version >> 32);
/* INFO("MCE Version - HW=%d:%d, SW=%d:%d\n", major, minor,
* Verify that the MCE firmware version and the interface header TEGRA_ARI_VERSION_MAJOR, TEGRA_ARI_VERSION_MINOR);
* match
*/
if (major != TEGRA_ARI_VERSION_MAJOR) {
ERROR("ARI major version mismatch\n");
panic();
}
if (minor < TEGRA_ARI_VERSION_MINOR) { /*
ERROR("ARI minor version mismatch\n"); * Verify that the MCE firmware version and the interface header
panic(); * match
*/
if (major != TEGRA_ARI_VERSION_MAJOR) {
ERROR("ARI major version mismatch\n");
panic();
}
if (minor < TEGRA_ARI_VERSION_MINOR) {
ERROR("ARI minor version mismatch\n");
panic();
}
} }
} }
plat/nvidia/tegra/soc/t186/drivers/mce/nvg.c
View file @ ab712fd8
/* /*
* Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
...@@ -13,57 +13,63 @@ ...@@ -13,57 +13,63 @@
#include <sys/errno.h> #include <sys/errno.h>
#include <t18x_ari.h> #include <t18x_ari.h>
extern void nvg_set_request_data(uint64_t req, uint64_t data); int32_t nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time)
extern void nvg_set_request(uint64_t req);
extern uint64_t nvg_get_result(void);
int nvg_enter_cstate(uint32_t ari_base, uint32_t state, uint32_t wake_time)
{ {
int32_t ret = 0;
(void)ari_base;
/* check for allowed power state */ /* check for allowed power state */
if (state != TEGRA_ARI_CORE_C0 && state != TEGRA_ARI_CORE_C1 && if ((state != TEGRA_ARI_CORE_C0) && (state != TEGRA_ARI_CORE_C1) &&
state != TEGRA_ARI_CORE_C6 && state != TEGRA_ARI_CORE_C7) { (state != TEGRA_ARI_CORE_C6) && (state != TEGRA_ARI_CORE_C7)) {
ERROR("%s: unknown cstate (%d)\n", __func__, state); ERROR("%s: unknown cstate (%d)\n", __func__, state);
return EINVAL; ret = EINVAL;
} } else {
/* time (TSC ticks) until the core is expected to get a wake event */
/* time (TSC ticks) until the core is expected to get a wake event */ nvg_set_request_data(TEGRA_NVG_CHANNEL_WAKE_TIME, wake_time);
nvg_set_request_data(TEGRA_NVG_CHANNEL_WAKE_TIME, wake_time);
/* set the core cstate */ /* set the core cstate */
write_actlr_el1(state); write_actlr_el1(state);
}
return 0; return ret;
} }
/* /*
* This request allows updating of CLUSTER_CSTATE, CCPLEX_CSTATE and * This request allows updating of CLUSTER_CSTATE, CCPLEX_CSTATE and
* SYSTEM_CSTATE values. * SYSTEM_CSTATE values.
*/ */
int nvg_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex, int32_t nvg_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex,
uint32_t system, uint8_t sys_state_force, uint32_t wake_mask, uint32_t system, uint8_t sys_state_force, uint32_t wake_mask,
uint8_t update_wake_mask) uint8_t update_wake_mask)
{ {
uint64_t val = 0; uint64_t val = 0ULL;
(void)ari_base;
/* update CLUSTER_CSTATE? */ /* update CLUSTER_CSTATE? */
if (cluster) if (cluster != 0U) {
val |= (cluster & CLUSTER_CSTATE_MASK) | val |= ((uint64_t)cluster & CLUSTER_CSTATE_MASK) |
CLUSTER_CSTATE_UPDATE_BIT; CLUSTER_CSTATE_UPDATE_BIT;
}
/* update CCPLEX_CSTATE? */ /* update CCPLEX_CSTATE? */
if (ccplex) if (ccplex != 0U) {
val |= (ccplex & CCPLEX_CSTATE_MASK) << CCPLEX_CSTATE_SHIFT | val |= (((uint64_t)ccplex & CCPLEX_CSTATE_MASK) << CCPLEX_CSTATE_SHIFT) |
CCPLEX_CSTATE_UPDATE_BIT; CCPLEX_CSTATE_UPDATE_BIT;
}
/* update SYSTEM_CSTATE? */ /* update SYSTEM_CSTATE? */
if (system) if (system != 0U) {
val |= ((system & SYSTEM_CSTATE_MASK) << SYSTEM_CSTATE_SHIFT) | val |= (((uint64_t)system & SYSTEM_CSTATE_MASK) << SYSTEM_CSTATE_SHIFT) |
((sys_state_force << SYSTEM_CSTATE_FORCE_UPDATE_SHIFT) | (((uint64_t)sys_state_force << SYSTEM_CSTATE_FORCE_UPDATE_SHIFT) |
SYSTEM_CSTATE_UPDATE_BIT); SYSTEM_CSTATE_UPDATE_BIT);
}
/* update wake mask value? */ /* update wake mask value? */
if (update_wake_mask) if (update_wake_mask != 0U) {
val |= CSTATE_WAKE_MASK_UPDATE_BIT; val |= CSTATE_WAKE_MASK_UPDATE_BIT;
}
/* set the wake mask */ /* set the wake mask */
val &= CSTATE_WAKE_MASK_CLEAR; val &= CSTATE_WAKE_MASK_CLEAR;
...@@ -75,46 +81,60 @@ int nvg_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex, ...@@ -75,46 +81,60 @@ int nvg_update_cstate_info(uint32_t ari_base, uint32_t cluster, uint32_t ccplex,
return 0; return 0;
} }
int nvg_update_crossover_time(uint32_t ari_base, uint32_t type, uint32_t time) int32_t nvg_update_crossover_time(uint32_t ari_base, uint32_t type, uint32_t time)
{ {
/* sanity check crossover type */ int32_t ret = 0;
if (type > TEGRA_ARI_CROSSOVER_CCP3_SC1)
return EINVAL;
/* (void)ari_base;
* The crossover threshold limit types start from
* TEGRA_CROSSOVER_TYPE_C1_C6 to TEGRA_CROSSOVER_TYPE_CCP3_SC7. The
* command indices for updating the threshold can be generated
* by adding the type to the NVG_SET_THRESHOLD_CROSSOVER_C1_C6
* command index.
*/
nvg_set_request_data(TEGRA_NVG_CHANNEL_CROSSOVER_C1_C6 + type,
(uint64_t)time);
return 0; /* sanity check crossover type */
if (type > TEGRA_ARI_CROSSOVER_CCP3_SC1) {
ret = EINVAL;
} else {
/*
* The crossover threshold limit types start from
* TEGRA_CROSSOVER_TYPE_C1_C6 to TEGRA_CROSSOVER_TYPE_CCP3_SC7.
* The command indices for updating the threshold be generated
* by adding the type to the NVG_SET_THRESHOLD_CROSSOVER_C1_C6
* command index.
*/
nvg_set_request_data((TEGRA_NVG_CHANNEL_CROSSOVER_C1_C6 +
(uint64_t)type), (uint64_t)time);
}
return ret;
} }
uint64_t nvg_read_cstate_stats(uint32_t ari_base, uint32_t state) uint64_t nvg_read_cstate_stats(uint32_t ari_base, uint32_t state)
{ {
/* sanity check state */ uint64_t ret;
if (state == 0)
return EINVAL;
/* (void)ari_base;
* The cstate types start from NVG_READ_CSTATE_STATS_SC7_ENTRIES
* to NVG_GET_LAST_CSTATE_ENTRY_A57_3. The command indices for
* reading the threshold can be generated by adding the type to
* the NVG_CLEAR_CSTATE_STATS command index.
*/
nvg_set_request(TEGRA_NVG_CHANNEL_CSTATE_STATS_CLEAR + state);
return (int64_t)nvg_get_result(); /* sanity check state */
if (state == 0U) {
ret = EINVAL;
} else {
/*
* The cstate types start from NVG_READ_CSTATE_STATS_SC7_ENTRIES
* to NVG_GET_LAST_CSTATE_ENTRY_A57_3. The command indices for
* reading the threshold can be generated by adding the type to
* the NVG_CLEAR_CSTATE_STATS command index.
*/
nvg_set_request((TEGRA_NVG_CHANNEL_CSTATE_STATS_CLEAR +
(uint64_t)state));
ret = nvg_get_result();
}
return ret;
} }
int nvg_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats) int32_t nvg_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats)
{ {
uint64_t val; uint64_t val;
(void)ari_base;
/* /*
* The only difference between a CSTATE_STATS_WRITE and * The only difference between a CSTATE_STATS_WRITE and
* CSTATE_STATS_READ is the usage of the 63:32 in the request. * CSTATE_STATS_READ is the usage of the 63:32 in the request.
...@@ -129,71 +149,88 @@ int nvg_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats) ...@@ -129,71 +149,88 @@ int nvg_write_cstate_stats(uint32_t ari_base, uint32_t state, uint32_t stats)
* reading the threshold can be generated by adding the type to * reading the threshold can be generated by adding the type to
* the NVG_CLEAR_CSTATE_STATS command index. * the NVG_CLEAR_CSTATE_STATS command index.
*/ */
nvg_set_request_data(TEGRA_NVG_CHANNEL_CSTATE_STATS_CLEAR + state, val); nvg_set_request_data((TEGRA_NVG_CHANNEL_CSTATE_STATS_CLEAR +
(uint64_t)state), val);
return 0; return 0;
} }
int nvg_is_ccx_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time) int32_t nvg_is_ccx_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time)
{ {
(void)ari_base;
(void)state;
(void)wake_time;
/* This does not apply to the Denver cluster */ /* This does not apply to the Denver cluster */
return 0; return 0;
} }
int nvg_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time) int32_t nvg_is_sc7_allowed(uint32_t ari_base, uint32_t state, uint32_t wake_time)
{ {
uint64_t val; uint64_t val;
int32_t ret;
(void)ari_base;
/* check for allowed power state */ /* check for allowed power state */
if (state != TEGRA_ARI_CORE_C0 && state != TEGRA_ARI_CORE_C1 && if ((state != TEGRA_ARI_CORE_C0) && (state != TEGRA_ARI_CORE_C1) &&
state != TEGRA_ARI_CORE_C6 && state != TEGRA_ARI_CORE_C7) { (state != TEGRA_ARI_CORE_C6) && (state != TEGRA_ARI_CORE_C7)) {
ERROR("%s: unknown cstate (%d)\n", __func__, state); ERROR("%s: unknown cstate (%d)\n", __func__, state);
return EINVAL; ret = EINVAL;
} else {
/*
* Request format -
* 63:32 = wake time
* 31:0 = C-state for this core
*/
val = ((uint64_t)wake_time << MCE_SC7_WAKE_TIME_SHIFT) |
((uint64_t)state & MCE_SC7_ALLOWED_MASK);
/* issue command to check if SC7 is allowed */
nvg_set_request_data(TEGRA_NVG_CHANNEL_IS_SC7_ALLOWED, val);
/* 1 = SC7 allowed, 0 = SC7 not allowed */
ret = (nvg_get_result() != 0ULL) ? 1 : 0;
} }
/* return ret;
* Request format -
* 63:32 = wake time
* 31:0 = C-state for this core
*/
val = ((uint64_t)wake_time << MCE_SC7_WAKE_TIME_SHIFT) |
(state & MCE_SC7_ALLOWED_MASK);
/* issue command to check if SC7 is allowed */
nvg_set_request_data(TEGRA_NVG_CHANNEL_IS_SC7_ALLOWED, val);
/* 1 = SC7 allowed, 0 = SC7 not allowed */
return !!nvg_get_result();
} }
int nvg_online_core(uint32_t ari_base, uint32_t core) int32_t nvg_online_core(uint32_t ari_base, uint32_t core)
{ {
uint32_t cpu = read_mpidr() & MPIDR_CPU_MASK; uint64_t cpu = read_mpidr() & (uint64_t)MPIDR_CPU_MASK;
int impl = (read_midr() >> MIDR_IMPL_SHIFT) & MIDR_IMPL_MASK; uint64_t impl = (read_midr() >> (uint64_t)MIDR_IMPL_SHIFT) &
(uint64_t)MIDR_IMPL_MASK;
int32_t ret = 0;
(void)ari_base;
/* sanity check code id */ /* sanity check code id */
if ((core >= (uint32_t)MCE_CORE_ID_MAX) || (cpu == core)) { if ((core >= (uint32_t)MCE_CORE_ID_MAX) || (cpu == core)) {
ERROR("%s: unsupported core id (%d)\n", __func__, core); ERROR("%s: unsupported core id (%d)\n", __func__, core);
return EINVAL; ret = EINVAL;
} else {
/*
* The Denver cluster has 2 CPUs only - 0, 1.
*/
if ((impl == DENVER_IMPL) && ((core == 2U) || (core == 3U))) {
ERROR("%s: unknown core id (%d)\n", __func__, core);
ret = EINVAL;
} else {
/* get a core online */
nvg_set_request_data(TEGRA_NVG_CHANNEL_ONLINE_CORE,
((uint64_t)core & MCE_CORE_ID_MASK));
}
} }
/* return ret;
* The Denver cluster has 2 CPUs only - 0, 1.
*/
if (impl == DENVER_IMPL && ((core == 2) || (core == 3))) {
ERROR("%s: unknown core id (%d)\n", __func__, core);
return EINVAL;
}
/* get a core online */
nvg_set_request_data(TEGRA_NVG_CHANNEL_ONLINE_CORE, core & MCE_CORE_ID_MASK);
return 0;
} }
int nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable) int32_t nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable)
{ {
int val; uint32_t val;
(void)ari_base;
/* /*
* If the enable bit is cleared, Auto-CC3 will be disabled by setting * If the enable bit is cleared, Auto-CC3 will be disabled by setting
...@@ -207,9 +244,9 @@ int nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable ...@@ -207,9 +244,9 @@ int nvg_cc3_ctrl(uint32_t ari_base, uint32_t freq, uint32_t volt, uint8_t enable
*/ */
val = (((freq & MCE_AUTO_CC3_FREQ_MASK) << MCE_AUTO_CC3_FREQ_SHIFT) |\ val = (((freq & MCE_AUTO_CC3_FREQ_MASK) << MCE_AUTO_CC3_FREQ_SHIFT) |\
((volt & MCE_AUTO_CC3_VTG_MASK) << MCE_AUTO_CC3_VTG_SHIFT) |\ ((volt & MCE_AUTO_CC3_VTG_MASK) << MCE_AUTO_CC3_VTG_SHIFT) |\
(enable ? MCE_AUTO_CC3_ENABLE_BIT : 0)); ((enable != 0U) ? MCE_AUTO_CC3_ENABLE_BIT : 0U));
nvg_set_request_data(TEGRA_NVG_CHANNEL_CC3_CTRL, val); nvg_set_request_data(TEGRA_NVG_CHANNEL_CC3_CTRL, (uint64_t)val);
return 0; return 0;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment