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

Tegra186: mce: Avoid implementation-defined bitfield types 

GCC version 4.8 (and presumably earlier) warn when non-standard types are
used for bitfield definitions when -pedantic is enabled. This prevents TF
from being built with such toolchains, since -Werror -pedantic options are
used.

gcc-4.9 removed this warning; -pedantic is intended to cause gcc to emit a
warning in all cases required by the standard, but the standard does not
require a warning in this case.

See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57773

Signed-off-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Stephen Warren 2017-02-28 17:12:35 -07:00 committed by Varun Wadekar
parent c459206d21
commit 7b3052710b
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
plat/nvidia/tegra/soc/t186/drivers/include/mce_private.h
View File

@ -100,9 +100,10 @@ typedef union mca_cmd {
******************************************************************************/ ******************************************************************************/
typedef union mca_arg { typedef union mca_arg {
struct err { struct err {
uint64_t error:8; uint32_t error:8;
uint64_t unused:48; uint32_t unused:24;
uint64_t finish:8; uint32_t unused2:24;
uint32_t finish:8;
} err; } err;
struct arg { struct arg {
uint32_t low; uint32_t low;
@ -119,32 +120,32 @@ typedef union uncore_perfmon_req {
/* /*
* Commands: 0 = READ, 1 = WRITE * Commands: 0 = READ, 1 = WRITE
*/ */
uint64_t cmd:8; uint32_t cmd:8;
/* /*
* The unit group: L2=0, L3=1, ROC=2, MC=3, IOB=4 * The unit group: L2=0, L3=1, ROC=2, MC=3, IOB=4
*/ */
uint64_t grp:4; uint32_t grp:4;
/* /*
* Unit selector: Selects the unit instance, with 0 = Unit * Unit selector: Selects the unit instance, with 0 = Unit
* = (number of units in group) - 1. * = (number of units in group) - 1.
*/ */
uint64_t unit:4; uint32_t unit:4;
/* /*
* Selects the uncore perfmon register to access * Selects the uncore perfmon register to access
*/ */
uint64_t reg:8; uint32_t reg:8;
/* /*
* Counter number. Selects which counter to use for * Counter number. Selects which counter to use for
* registers NV_PMEVCNTR and NV_PMEVTYPER. * registers NV_PMEVCNTR and NV_PMEVTYPER.
*/ */
uint64_t counter:8; uint32_t counter:8;
} perfmon_command; } perfmon_command;
struct perfmon_status { struct perfmon_status {
/* /*
* Resulting command status * Resulting command status
*/ */
uint64_t val:8; uint32_t val:8;
uint64_t unused:24; uint32_t unused:24;
} perfmon_status; } perfmon_status;
uint64_t data; uint64_t data;
} uncore_perfmon_req_t; } uncore_perfmon_req_t;