diff options
| author | Alexei Fedorov <Alexei.Fedorov@arm.com> | 2020-01-30 16:55:55 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-30 16:55:55 +0000 |
| commit | f69a5828b74ca27bd3872de9c8c6c5a107915c49 (patch) | |
| tree | 4b0d21b6ac7e97e2e90e56d28dc91b1e7202d366 /drivers | |
| parent | b7e0ed2c7190616e4e0dae2ee8e8b0cc1ce718e5 (diff) | |
| parent | f1be00da0b0acf90355558e01d5f8e1f79c0d481 (diff) | |
| download | platform_external_arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.gz platform_external_arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.tar.bz2 platform_external_arm-trusted-firmware-f69a5828b74ca27bd3872de9c8c6c5a107915c49.zip | |
Merge "Use correct type when reading SCR register" into integration
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/gic/v3/gicv3_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index fb49a579d..a672b18f3 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -235,7 +235,7 @@ void gicv3_rdistif_on(unsigned int proc_num) void gicv3_cpuif_enable(unsigned int proc_num) { uintptr_t gicr_base; - unsigned int scr_el3; + u_register_t scr_el3; unsigned int icc_sre_el3; assert(gicv3_driver_data != NULL); @@ -258,7 +258,7 @@ void gicv3_cpuif_enable(unsigned int proc_num) icc_sre_el3 |= (ICC_SRE_EN_BIT | ICC_SRE_SRE_BIT); write_icc_sre_el3(read_icc_sre_el3() | icc_sre_el3); - scr_el3 = (uint32_t) read_scr_el3(); + scr_el3 = read_scr_el3(); /* * Switch to NS state to write Non secure ICC_SRE_EL1 and |